{"action":"opened","number":964,"pull_request":{"url":"https://api.github.com/repos/MTG/freesound/pulls/964","id":143643294,"html_url":"https://github.com/MTG/freesound/pull/964","diff_url":"https://github.com/MTG/freesound/pull/964.diff","patch_url":"https://github.com/MTG/freesound/pull/964.patch","issue_url":"https://api.github.com/repos/MTG/freesound/issues/964","number":964,"state":"open","locked":false,"title":"License refactor and changes in downloads (alt)","user":{"login":"ffont","id":478615,"avatar_url":"https://avatars2.githubusercontent.com/u/478615?v=4","gravatar_id":"","url":"https://api.github.com/users/ffont","html_url":"https://github.com/ffont","followers_url":"https://api.github.com/users/ffont/followers","following_url":"https://api.github.com/users/ffont/following{/other_user}","gists_url":"https://api.github.com/users/ffont/gists{/gist_id}","starred_url":"https://api.github.com/users/ffont/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ffont/subscriptions","organizations_url":"https://api.github.com/users/ffont/orgs","repos_url":"https://api.github.com/users/ffont/repos","events_url":"https://api.github.com/users/ffont/events{/privacy}","received_events_url":"https://api.github.com/users/ffont/received_events","type":"User","site_admin":false},"body":"After having severe trouble trying to merge PR https://github.com/MTG/freesound/pull/928/, I finally decided to go back in the merging process and give it a second try in a new branch.\r\n\r\nWhen I tried to merge master to branch `downloads-refactor` in commit https://github.com/MTG/freesound/commit/60a3a491993659540806ab57a7369fe8b5c7cabe, \"things happened\" which I have not been able to really understand. Apparently, some parts of the code which were newer in master did not make it to the merged versions, but some others did. As a result, tests started failing and some functionality was missing. I tried to look at git history to understand what happened but I could not get a clear answer. For that reason I went back to the state in https://github.com/MTG/freesound/commit/e0863ec0a184baeb5d187bea1a3fd2b84533a95b (the last commit before the merge) and I re-applied the (few) changes that we had done in the branch after that commit. The next step is to try merge master again here.","created_at":"2017-09-28T13:08:48Z","updated_at":"2017-09-28T13:08:48Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"milestone":null,"commits_url":"https://api.github.com/repos/MTG/freesound/pulls/964/commits","review_comments_url":"https://api.github.com/repos/MTG/freesound/pulls/964/comments","review_comment_url":"https://api.github.com/repos/MTG/freesound/pulls/comments{/number}","comments_url":"https://api.github.com/repos/MTG/freesound/issues/964/comments","statuses_url":"https://api.github.com/repos/MTG/freesound/statuses/e0863ec0a184baeb5d187bea1a3fd2b84533a95b","head":{"label":"MTG:downloads-refactor-alt","ref":"downloads-refactor-alt","sha":"e0863ec0a184baeb5d187bea1a3fd2b84533a95b","user":{"login":"MTG","id":2728938,"avatar_url":"https://avatars0.githubusercontent.com/u/2728938?v=4","gravatar_id":"","url":"https://api.github.com/users/MTG","html_url":"https://github.com/MTG","followers_url":"https://api.github.com/users/MTG/followers","following_url":"https://api.github.com/users/MTG/following{/other_user}","gists_url":"https://api.github.com/users/MTG/gists{/gist_id}","starred_url":"https://api.github.com/users/MTG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MTG/subscriptions","organizations_url":"https://api.github.com/users/MTG/orgs","repos_url":"https://api.github.com/users/MTG/repos","events_url":"https://api.github.com/users/MTG/events{/privacy}","received_events_url":"https://api.github.com/users/MTG/received_events","type":"Organization","site_admin":false},"repo":{"id":6583992,"name":"freesound","full_name":"MTG/freesound","owner":{"login":"MTG","id":2728938,"avatar_url":"https://avatars0.githubusercontent.com/u/2728938?v=4","gravatar_id":"","url":"https://api.github.com/users/MTG","html_url":"https://github.com/MTG","followers_url":"https://api.github.com/users/MTG/followers","following_url":"https://api.github.com/users/MTG/following{/other_user}","gists_url":"https://api.github.com/users/MTG/gists{/gist_id}","starred_url":"https://api.github.com/users/MTG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MTG/subscriptions","organizations_url":"https://api.github.com/users/MTG/orgs","repos_url":"https://api.github.com/users/MTG/repos","events_url":"https://api.github.com/users/MTG/events{/privacy}","received_events_url":"https://api.github.com/users/MTG/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/MTG/freesound","description":"The freesound.org website","fork":false,"url":"https://api.github.com/repos/MTG/freesound","forks_url":"https://api.github.com/repos/MTG/freesound/forks","keys_url":"https://api.github.com/repos/MTG/freesound/keys{/key_id}","collaborators_url":"https://api.github.com/repos/MTG/freesound/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/MTG/freesound/teams","hooks_url":"https://api.github.com/repos/MTG/freesound/hooks","issue_events_url":"https://api.github.com/repos/MTG/freesound/issues/events{/number}","events_url":"https://api.github.com/repos/MTG/freesound/events","assignees_url":"https://api.github.com/repos/MTG/freesound/assignees{/user}","branches_url":"https://api.github.com/repos/MTG/freesound/branches{/branch}","tags_url":"https://api.github.com/repos/MTG/freesound/tags","blobs_url":"https://api.github.com/repos/MTG/freesound/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/MTG/freesound/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/MTG/freesound/git/refs{/sha}","trees_url":"https://api.github.com/repos/MTG/freesound/git/trees{/sha}","statuses_url":"https://api.github.com/repos/MTG/freesound/statuses/{sha}","languages_url":"https://api.github.com/repos/MTG/freesound/languages","stargazers_url":"https://api.github.com/repos/MTG/freesound/stargazers","contributors_url":"https://api.github.com/repos/MTG/freesound/contributors","subscribers_url":"https://api.github.com/repos/MTG/freesound/subscribers","subscription_url":"https://api.github.com/repos/MTG/freesound/subscription","commits_url":"https://api.github.com/repos/MTG/freesound/commits{/sha}","git_commits_url":"https://api.github.com/repos/MTG/freesound/git/commits{/sha}","comments_url":"https://api.github.com/repos/MTG/freesound/comments{/number}","issue_comment_url":"https://api.github.com/repos/MTG/freesound/issues/comments{/number}","contents_url":"https://api.github.com/repos/MTG/freesound/contents/{+path}","compare_url":"https://api.github.com/repos/MTG/freesound/compare/{base}...{head}","merges_url":"https://api.github.com/repos/MTG/freesound/merges","archive_url":"https://api.github.com/repos/MTG/freesound/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/MTG/freesound/downloads","issues_url":"https://api.github.com/repos/MTG/freesound/issues{/number}","pulls_url":"https://api.github.com/repos/MTG/freesound/pulls{/number}","milestones_url":"https://api.github.com/repos/MTG/freesound/milestones{/number}","notifications_url":"https://api.github.com/repos/MTG/freesound/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/MTG/freesound/labels{/name}","releases_url":"https://api.github.com/repos/MTG/freesound/releases{/id}","deployments_url":"https://api.github.com/repos/MTG/freesound/deployments","created_at":"2012-11-07T18:25:03Z","updated_at":"2017-09-28T10:54:39Z","pushed_at":"2017-09-28T13:01:30Z","git_url":"git://github.com/MTG/freesound.git","ssh_url":"git@github.com:MTG/freesound.git","clone_url":"https://github.com/MTG/freesound.git","svn_url":"https://github.com/MTG/freesound","homepage":"http://freesound.org","size":58440,"stargazers_count":125,"watchers_count":125,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":33,"mirror_url":null,"open_issues_count":115,"forks":33,"open_issues":115,"watchers":125,"default_branch":"master"}},"base":{"label":"MTG:master","ref":"master","sha":"4906ee07d8f9dbe0d247fe73604ffb1eba188201","user":{"login":"MTG","id":2728938,"avatar_url":"https://avatars0.githubusercontent.com/u/2728938?v=4","gravatar_id":"","url":"https://api.github.com/users/MTG","html_url":"https://github.com/MTG","followers_url":"https://api.github.com/users/MTG/followers","following_url":"https://api.github.com/users/MTG/following{/other_user}","gists_url":"https://api.github.com/users/MTG/gists{/gist_id}","starred_url":"https://api.github.com/users/MTG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MTG/subscriptions","organizations_url":"https://api.github.com/users/MTG/orgs","repos_url":"https://api.github.com/users/MTG/repos","events_url":"https://api.github.com/users/MTG/events{/privacy}","received_events_url":"https://api.github.com/users/MTG/received_events","type":"Organization","site_admin":false},"repo":{"id":6583992,"name":"freesound","full_name":"MTG/freesound","owner":{"login":"MTG","id":2728938,"avatar_url":"https://avatars0.githubusercontent.com/u/2728938?v=4","gravatar_id":"","url":"https://api.github.com/users/MTG","html_url":"https://github.com/MTG","followers_url":"https://api.github.com/users/MTG/followers","following_url":"https://api.github.com/users/MTG/following{/other_user}","gists_url":"https://api.github.com/users/MTG/gists{/gist_id}","starred_url":"https://api.github.com/users/MTG/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MTG/subscriptions","organizations_url":"https://api.github.com/users/MTG/orgs","repos_url":"https://api.github.com/users/MTG/repos","events_url":"https://api.github.com/users/MTG/events{/privacy}","received_events_url":"https://api.github.com/users/MTG/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/MTG/freesound","description":"The freesound.org website","fork":false,"url":"https://api.github.com/repos/MTG/freesound","forks_url":"https://api.github.com/repos/MTG/freesound/forks","keys_url":"https://api.github.com/repos/MTG/freesound/keys{/key_id}","collaborators_url":"https://api.github.com/repos/MTG/freesound/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/MTG/freesound/teams","hooks_url":"https://api.github.com/repos/MTG/freesound/hooks","issue_events_url":"https://api.github.com/repos/MTG/freesound/issues/events{/number}","events_url":"https://api.github.com/repos/MTG/freesound/events","assignees_url":"https://api.github.com/repos/MTG/freesound/assignees{/user}","branches_url":"https://api.github.com/repos/MTG/freesound/branches{/branch}","tags_url":"https://api.github.com/repos/MTG/freesound/tags","blobs_url":"https://api.github.com/repos/MTG/freesound/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/MTG/freesound/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/MTG/freesound/git/refs{/sha}","trees_url":"https://api.github.com/repos/MTG/freesound/git/trees{/sha}","statuses_url":"https://api.github.com/repos/MTG/freesound/statuses/{sha}","languages_url":"https://api.github.com/repos/MTG/freesound/languages","stargazers_url":"https://api.github.com/repos/MTG/freesound/stargazers","contributors_url":"https://api.github.com/repos/MTG/freesound/contributors","subscribers_url":"https://api.github.com/repos/MTG/freesound/subscribers","subscription_url":"https://api.github.com/repos/MTG/freesound/subscription","commits_url":"https://api.github.com/repos/MTG/freesound/commits{/sha}","git_commits_url":"https://api.github.com/repos/MTG/freesound/git/commits{/sha}","comments_url":"https://api.github.com/repos/MTG/freesound/comments{/number}","issue_comment_url":"https://api.github.com/repos/MTG/freesound/issues/comments{/number}","contents_url":"https://api.github.com/repos/MTG/freesound/contents/{+path}","compare_url":"https://api.github.com/repos/MTG/freesound/compare/{base}...{head}","merges_url":"https://api.github.com/repos/MTG/freesound/merges","archive_url":"https://api.github.com/repos/MTG/freesound/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/MTG/freesound/downloads","issues_url":"https://api.github.com/repos/MTG/freesound/issues{/number}","pulls_url":"https://api.github.com/repos/MTG/freesound/pulls{/number}","milestones_url":"https://api.github.com/repos/MTG/freesound/milestones{/number}","notifications_url":"https://api.github.com/repos/MTG/freesound/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/MTG/freesound/labels{/name}","releases_url":"https://api.github.com/repos/MTG/freesound/releases{/id}","deployments_url":"https://api.github.com/repos/MTG/freesound/deployments","created_at":"2012-11-07T18:25:03Z","updated_at":"2017-09-28T10:54:39Z","pushed_at":"2017-09-28T13:01:30Z","git_url":"git://github.com/MTG/freesound.git","ssh_url":"git@github.com:MTG/freesound.git","clone_url":"https://github.com/MTG/freesound.git","svn_url":"https://github.com/MTG/freesound","homepage":"http://freesound.org","size":58440,"stargazers_count":125,"watchers_count":125,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":33,"mirror_url":null,"open_issues_count":115,"forks":33,"open_issues":115,"watchers":125,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/MTG/freesound/pulls/964"},"html":{"href":"https://github.com/MTG/freesound/pull/964"},"issue":{"href":"https://api.github.com/repos/MTG/freesound/issues/964"},"comments":{"href":"https://api.github.com/repos/MTG/freesound/issues/964/comments"},"review_comments":{"href":"https://api.github.com/repos/MTG/freesound/pulls/964/comments"},"review_comment":{"href":"https://api.github.com/repos/MTG/freesound/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/MTG/freesound/pulls/964/commits"},"statuses":{"href":"https://api.github.com/repos/MTG/freesound/statuses/e0863ec0a184baeb5d187bea1a3fd2b84533a95b"}},"author_association":"OWNER","merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":17,"additions":209,"deletions":330,"changed_files":12}}
{"actor":{"display_login":"ffont"}}