{"action":"created","issue":{"url":"https://api.github.com/repos/publiclab/plots2/issues/788","repository_url":"https://api.github.com/repos/publiclab/plots2","labels_url":"https://api.github.com/repos/publiclab/plots2/issues/788/labels{/name}","comments_url":"https://api.github.com/repos/publiclab/plots2/issues/788/comments","events_url":"https://api.github.com/repos/publiclab/plots2/issues/788/events","html_url":"https://github.com/publiclab/plots2/pull/788","id":174929030,"number":788,"title":"Body preview","user":{"login":"nickstaggs","id":19981283,"avatar_url":"https://avatars.githubusercontent.com/u/19981283?v=3","gravatar_id":"","url":"https://api.github.com/users/nickstaggs","html_url":"https://github.com/nickstaggs","followers_url":"https://api.github.com/users/nickstaggs/followers","following_url":"https://api.github.com/users/nickstaggs/following{/other_user}","gists_url":"https://api.github.com/users/nickstaggs/gists{/gist_id}","starred_url":"https://api.github.com/users/nickstaggs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nickstaggs/subscriptions","organizations_url":"https://api.github.com/users/nickstaggs/orgs","repos_url":"https://api.github.com/users/nickstaggs/repos","events_url":"https://api.github.com/users/nickstaggs/events{/privacy}","received_events_url":"https://api.github.com/users/nickstaggs/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/publiclab/plots2/labels/in%20progress","name":"in progress","color":"ededed"}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":11,"created_at":"2016-09-04T03:16:31Z","updated_at":"2016-09-12T13:53:26Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/publiclab/plots2/pulls/788","html_url":"https://github.com/publiclab/plots2/pull/788","diff_url":"https://github.com/publiclab/plots2/pull/788.diff","patch_url":"https://github.com/publiclab/plots2/pull/788.patch"},"body":"Created new pull request for body_preview method based on a feature branch. Still need to create the unit tests.\r\n\r\nMake sure these boxes are checked before your pull request is ready to be reviewed and merged. Thanks!\r\n\r\n* [x] All tests pass -- `rake test:all`\r\n* [x] code is in uniquely-named feature branch, and has been rebased on top of latest master (especially if you've been asked to make additional changes)\r\n* [x] pull request are descriptively named\r\n* [x] if possible, multiple commits squashed if they're smaller changes\r\n* [ ] reviewed/confirmed/tested by another contributor or maintainer\r\n* [x] `schema.rb.example` has been updated if any database migrations were added"},"comment":{"url":"https://api.github.com/repos/publiclab/plots2/issues/comments/246353922","html_url":"https://github.com/publiclab/plots2/pull/788#issuecomment-246353922","issue_url":"https://api.github.com/repos/publiclab/plots2/issues/788","id":246353922,"user":{"login":"jywarren","id":24359,"avatar_url":"https://avatars.githubusercontent.com/u/24359?v=3","gravatar_id":"","url":"https://api.github.com/users/jywarren","html_url":"https://github.com/jywarren","followers_url":"https://api.github.com/users/jywarren/followers","following_url":"https://api.github.com/users/jywarren/following{/other_user}","gists_url":"https://api.github.com/users/jywarren/gists{/gist_id}","starred_url":"https://api.github.com/users/jywarren/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jywarren/subscriptions","organizations_url":"https://api.github.com/users/jywarren/orgs","repos_url":"https://api.github.com/users/jywarren/repos","events_url":"https://api.github.com/users/jywarren/events{/privacy}","received_events_url":"https://api.github.com/users/jywarren/received_events","type":"User","site_admin":false},"created_at":"2016-09-12T13:53:26Z","updated_at":"2016-09-12T13:53:26Z","body":"All tests passed, great! And your code looks nice and clean, thanks.\r\n\r\nHowever, just a small thing; it looks like you merged publiclab/plots2 master into your feature branch -- what you want to do is take your last commit -- c4540b58f87693e7190a99e8f15124b4faa3ef3e -- (which you can get back to with `git reset --hard c4540b58f87693e7190a99e8f15124b4faa3ef3e` and from there, rebase on top of publiclab/plots2 master with the following steps:\r\n\r\n`git checkout master`\r\n`git pull https://github.com/publiclab/plots2.git` -- get the latest master in your local master branch (assuming your local master has none of your new commits)\r\n`git checkout body_preview` -- move back to your feature branch\r\n`git rebase master` -- detach your feature branch from the /old/ master, and replay it on top of the latest master (that you just pulled in). \r\n\r\nThis will ensure your changes are submitted relative to the latest version of the code, and will result in a cleaner, linear history, that's easier for us to follow and debug. \r\n\r\nThanks, Nick, looking forward to merging this tomorrow on our schedule!"}}
{"actor":{"display_login":"jywarren"}}