{"action":"created","issue":{"url":"https://api.github.com/repos/cyclestreets/cyclescape/issues/353","labels_url":"https://api.github.com/repos/cyclestreets/cyclescape/issues/353/labels{/name}","comments_url":"https://api.github.com/repos/cyclestreets/cyclescape/issues/353/comments","events_url":"https://api.github.com/repos/cyclestreets/cyclescape/issues/353/events","html_url":"https://github.com/cyclestreets/cyclescape/pull/353","id":59852332,"number":353,"title":"Staging","user":{"login":"nikolai-b","id":6289830,"avatar_url":"https://avatars.githubusercontent.com/u/6289830?v=3","gravatar_id":"","url":"https://api.github.com/users/nikolai-b","html_url":"https://github.com/nikolai-b","followers_url":"https://api.github.com/users/nikolai-b/followers","following_url":"https://api.github.com/users/nikolai-b/following{/other_user}","gists_url":"https://api.github.com/users/nikolai-b/gists{/gist_id}","starred_url":"https://api.github.com/users/nikolai-b/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nikolai-b/subscriptions","organizations_url":"https://api.github.com/users/nikolai-b/orgs","repos_url":"https://api.github.com/users/nikolai-b/repos","events_url":"https://api.github.com/users/nikolai-b/events{/privacy}","received_events_url":"https://api.github.com/users/nikolai-b/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-03-04T19:56:11Z","updated_at":"2015-03-05T16:23:26Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/cyclestreets/cyclescape/pulls/353","html_url":"https://github.com/cyclestreets/cyclescape/pull/353","diff_url":"https://github.com/cyclestreets/cyclescape/pull/353.diff","patch_url":"https://github.com/cyclestreets/cyclescape/pull/353.patch"},"body":"At the risk of having too many PRs open, I'm happy with this code going into master.  Do we have a process for this?"},"comment":{"url":"https://api.github.com/repos/cyclestreets/cyclescape/issues/comments/77395341","html_url":"https://github.com/cyclestreets/cyclescape/pull/353#issuecomment-77395341","issue_url":"https://api.github.com/repos/cyclestreets/cyclescape/issues/353","id":77395341,"user":{"login":"gravitystorm","id":360803,"avatar_url":"https://avatars.githubusercontent.com/u/360803?v=3","gravatar_id":"","url":"https://api.github.com/users/gravitystorm","html_url":"https://github.com/gravitystorm","followers_url":"https://api.github.com/users/gravitystorm/followers","following_url":"https://api.github.com/users/gravitystorm/following{/other_user}","gists_url":"https://api.github.com/users/gravitystorm/gists{/gist_id}","starred_url":"https://api.github.com/users/gravitystorm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gravitystorm/subscriptions","organizations_url":"https://api.github.com/users/gravitystorm/orgs","repos_url":"https://api.github.com/users/gravitystorm/repos","events_url":"https://api.github.com/users/gravitystorm/events{/privacy}","received_events_url":"https://api.github.com/users/gravitystorm/received_events","type":"User","site_admin":false},"created_at":"2015-03-05T16:23:26Z","updated_at":"2015-03-05T16:23:26Z","body":"There's no real process, but the way it works is on a \"you break it, you get to keep it\" approach! So when I used to do the merging, I would do so towards the end of the day (so that it included as much stuff as was in staging as possible) but with plenty of time left so that I could fix things if the deployment went wrong.\r\n\r\nMy approach was always to\r\n* locally, run the tests on staging. This finds anything that's amiss after PR merging etc\r\n* locally, merge staging into master, and deal with any merge conflicts\r\n* locally, update the public changelog (app/views/pages/changelog.html.haml) by going through the git log\r\n* locally, run the tests again, just to be double-sure\r\n* push master to the repo\r\n* check around 15-20 minutes past the hour that everything is still working, and that the new version is live\r\n* `git checkout staging && git merge master --ff-only` to make sure I left my local repo ready for more work\r\n\r\nI'd suggest avoiding using PRs for merging into master, since the automatic merging check doesn't ensure that the tests also pass.\r\n\r\nApart from that, feel free to deploy!"}}