These are chat archives for Rosa-Fox/Dot

24th
Oct 2014
Dorothy Jane Wingrove
@dorothyjane
Oct 24 2014 15:48
glad you got back ok last night! i was drunker than i realised. oopsies.
saw the emails, hope the they give pizza discount! that would be awesome, and really help i think
Rosa Fox
@Rosa-Fox
Oct 24 2014 15:48
aw you didn't seem that drunk
did you guys go anywhere after>
?
yeah hope so pizza pizza :D
Dorothy Jane Wingrove
@dorothyjane
Oct 24 2014 15:49
ahh no we left soon after you! we were all quite tired
heheee
Rosa Fox
@Rosa-Fox
Oct 24 2014 15:49
yeah same, so tired now, prob gonna do half an hour more and then curl up in bed and watch some stuff
Dorothy Jane Wingrove
@dorothyjane
Oct 24 2014 15:50
ahhh that sounds goooood!! i've got a bath running woop B-)
Rosa Fox
@Rosa-Fox
Oct 24 2014 15:50
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
Oct 24 2014 15:50
i'm thinking night in with a mooovie.
ohhh pass it as params
Rosa Fox
@Rosa-Fox
Oct 24 2014 15:50
am trying to find on google but can't find an obvious answer yet
Dorothy Jane Wingrove
@dorothyjane
Oct 24 2014 15:50
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
Oct 24 2014 15:51
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
Oct 24 2014 15:52
ah yeah it would be just the same
Rosa Fox
@Rosa-Fox
Oct 24 2014 15:52
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
Oct 24 2014 15:52
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
Oct 24 2014 15:52
how was ur maths stuff?
Dorothy Jane Wingrove
@dorothyjane
Oct 24 2014 15:53
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
Oct 24 2014 15:53
:D
I think I am getting an eye infection from them drying up looking at the screen too long
Dorothy Jane Wingrove
@dorothyjane
Oct 24 2014 15:55
oh god! you must be staring intently and not blinking!
that's dedication
Rosa Fox
@Rosa-Fox
Oct 24 2014 15:55
turning into a robot, I will force myself to blink
Dorothy Jane Wingrove
@dorothyjane
Oct 24 2014 15:56
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
Oct 24 2014 16:04
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
Oct 24 2014 16:05
ohh i did the upsream thing
yeah
and added the heroku remote
Rosa Fox
@Rosa-Fox
Oct 24 2014 16:05
cool and did you fork the repository?
Dorothy Jane Wingrove
@dorothyjane
Oct 24 2014 16:05
oh ummm
i'll check
Rosa Fox
@Rosa-Fox
Oct 24 2014 16:07
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
Oct 24 2014 16:08
ohh ok
i do have a fork
Rosa Fox
@Rosa-Fox
Oct 24 2014 16:08
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
Oct 24 2014 16:08
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
Oct 24 2014 16:09
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
Oct 24 2014 16:09
ohh a branch.. which pushes to my fork?
ohhhh ok
Rosa Fox
@Rosa-Fox
Oct 24 2014 16:10
yeah and then when you have done everything you want to do for that branch go to the main github page for mentoring.io https://github.com/codebar/mentoring.io and click the big green Compare and pull request button
Dorothy Jane Wingrove
@dorothyjane
Oct 24 2014 16:11
ohhhh ok, let me just clarify. is the merge request for my fork or my branch?
Rosa Fox
@Rosa-Fox
Oct 24 2014 16:11
and then it will get you to select which branch you want to compare to master (compare just means merge into) and then click create pull request
and then someone else can look at it and merge it
Dorothy Jane Wingrove
@dorothyjane
Oct 24 2014 16:12
ahhhhh okkk
cool :)
Rosa Fox
@Rosa-Fox
Oct 24 2014 16:12
yeah so the one you made on your fork will get merged into master
Dorothy Jane Wingrove
@dorothyjane
Oct 24 2014 16:12
shall i pull from staging to get up to date?
ahh i seeee
Rosa Fox
@Rosa-Fox
Oct 24 2014 16:12
and I think if we do it the upstream way it just pushes straight into master... for if we want a small change that we know won't break anything
Dorothy Jane Wingrove
@dorothyjane
Oct 24 2014 16:12
and the fork is so i don't accidentally push to the realy thing
ahh i seeee yess
real thing*
do i pull from 'upstream' or 'staging' to get up to date?
Rosa Fox
@Rosa-Fox
Oct 24 2014 16:16
I think I did origin
though I am not thinking maybe I was supposed to do upstream
origin    https://github.com/Rosa-Fox/mentoring.io (fetch)
origin    https://github.com/Rosa-Fox/mentoring.io (push)
production    git@heroku.com:cryptic-bastion-6957.git (fetch)
production    git@heroku.com:cryptic-bastion-6957.git (push)
upstream    git@github.com:codebar/mentoring.io.git (fetch)
upstream    git@github.com:codebar/mentoring.io.git (push)
cause origin would have been my fork... tough whatever I did I think stuff seemed to be being pulled down
maybe I just did them all
Dorothy Jane Wingrove
@dorothyjane
Oct 24 2014 16:31
haha cool :) thank you!!