Where communities thrive


  • Join over 1.5M+ people
  • Join over 100K+ communities
  • Free without limits
  • Create your own community
People
Activity
    Dorothy Jane Wingrove
    @dorothyjane
    ahhh that sounds goooood!! i've got a bath running woop B-)
    Rosa Fox
    @Rosa-Fox
    do you by any chance know how I would pass a token instead of an :id into the url for a show route?
    Dorothy Jane Wingrove
    @dorothyjane
    i'm thinking night in with a mooovie.
    ohhh pass it as params
    Rosa Fox
    @Rosa-Fox
    am trying to find on google but can't find an obvious answer yet
    Dorothy Jane Wingrove
    @dorothyjane
    so ?token=893724987jkahfjksf
    where that is the token
    and then when you're in the controller you should have params['token']
    so the url would be '/my/url/?token=alsjfashfakjshfkajshf'
    if that's what you mean anyway, i think that's how you'd do it
    are you doing the twitter stuff?
    Rosa Fox
    @Rosa-Fox
    ah ok so kind of the same as with id... I thought maybe it needed to be routed differently but sounds like I just need to pass in token and it will work
    Dorothy Jane Wingrove
    @dorothyjane
    ah yeah it would be just the same
    Rosa Fox
    @Rosa-Fox
    yeah, it works with an :id because I thought if I could do that it would be easy enough to change to token
    k I will try, thanks!
    Dorothy Jane Wingrove
    @dorothyjane
    you could even pass it without the ? if you're going to have the url set up to receive it, but i'm not sure how that works in the rails...
    kl :)
    Rosa Fox
    @Rosa-Fox
    how was ur maths stuff?
    Dorothy Jane Wingrove
    @dorothyjane
    ahhh yeh good! i just finished the chapter i had to do, ready for my day long class tomorrow :)
    i'm actualyl up to date now!
    Rosa Fox
    @Rosa-Fox
    :D
    I think I am getting an eye infection from them drying up looking at the screen too long
    Dorothy Jane Wingrove
    @dorothyjane
    oh god! you must be staring intently and not blinking!
    that's dedication
    Rosa Fox
    @Rosa-Fox
    turning into a robot, I will force myself to blink
    Dorothy Jane Wingrove
    @dorothyjane
    hehe
    i think i heard that women blink more than men
    btw if i want to do some work on mentoring.io, is there anything i have to do? i saw all that chat yday about pr and stuff. but i didn't really understand, mainly because i don't understand how pull requests work...
    Rosa Fox
    @Rosa-Fox
    well I guess either pick up one of the trello tasks. She said this was a priority Notify mentors when classifieds relevant to their skills are listed but sounds quite complicated, so they would get notifications on the site I guess like on Facebook but I have no idea how to do that. Or have a look at the issues she has opened on Github: https://github.com/codebar/mentoring.io/issues
    the pull request thing...
    did you add the remotes like she said at some point in the many messages?
    Dorothy Jane Wingrove
    @dorothyjane
    ohh i did the upsream thing
    yeah
    and added the heroku remote
    Rosa Fox
    @Rosa-Fox
    cool and did you fork the repository?
    Dorothy Jane Wingrove
    @dorothyjane
    oh ummm
    i'll check
    Rosa Fox
    @Rosa-Fox
    this is the text from the convo where she explained it:

    usually fork my own, and push my branches to origin/branch, then open pull requests through github
    when i do small fixes, typo, readme etc
    i just push to master on upstream
    no need to go through a PR
    or if i need to merge things through the command line (following instructiosn on the PRs) you have to remember to change 'origin' to 'upstream'
    e.g. go here codebar/mentoring.io#1 click on 'merge on command line'

    ooh ok I get it so I could fork mentoring.io github, make a branch and push to origin/that branch and then it could get merged in via a pull request which I open on github or I could push to upstream and it would work like we have been doing this weekend and it would go straight to master and the command line can give me instructions as to how to merge it

    Dorothy Jane Wingrove
    @dorothyjane
    ohh ok
    i do have a fork
    Rosa Fox
    @Rosa-Fox
    To fork it go here https://github.com/codebar/mentoring.io and click on the little fork button in the corner
    ah cool
    so basically get up to date with master
    Dorothy Jane Wingrove
    @dorothyjane
    so i push to my fork.. then if i want to merge, i go on github and can do it from there
    cool ok
    Rosa Fox
    @Rosa-Fox
    yeah, so git pull origin master and then create a branch to work on
    then you do git push origin name-of-new-branch
    Dorothy Jane Wingrove
    @dorothyjane
    ohh a branch.. which pushes to my fork?
    ohhhh ok