GitHub PullRequestEvent at 2014-01-15 17:10:04
Repository: mf-geoadmin3
Actor: procrastinatio
Payload: {"action":"closed","number":922,"pull_request":{"url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/pulls/922","id":11542203,"html_url":"https://github.com/geoadmin/mf-geoadmin3/pull/922","diff_url":"https://github.com/geoadmin/mf-geoadmin3/pull/922.diff","patch_url":"https://github.com/geoadmin/mf-geoadmin3/pull/922.patch","issue_url":"https://github.com/geoadmin/mf-geoadmin3/pull/922","number":922,"state":"closed","title":"Fix singleclick conflicts storing measure directive state in the $rootScope","user":{"login":"oterral","id":621420,"avatar_url":"https://gravatar.com/avatar/f42230151d95e440df21166893d44aaa?d=https%3A%2F%2Fidenticons.github.com%2F34b50854d28e4c5213dea00936fd15a9.png&r=x","gravatar_id":"f42230151d95e440df21166893d44aaa","url":"https://api.github.com/users/oterral","html_url":"https://github.com/oterral","followers_url":"https://api.github.com/users/oterral/followers","following_url":"https://api.github.com/users/oterral/following{/other_user}","gists_url":"https://api.github.com/users/oterral/gists{/gist_id}","starred_url":"https://api.github.com/users/oterral/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/oterral/subscriptions","organizations_url":"https://api.github.com/users/oterral/orgs","repos_url":"https://api.github.com/users/oterral/repos","events_url":"https://api.github.com/users/oterral/events{/privacy}","received_events_url":"https://api.github.com/users/oterral/received_events","type":"User","site_admin":false},"body":"I really don't like but it's the only thing I succeed to make it work to fix the conflict","created_at":"2014-01-15T16:44:00Z","updated_at":"2014-01-15T17:10:04Z","closed_at":"2014-01-15T17:10:04Z","merged_at":"2014-01-15T17:10:04Z","merge_commit_sha":"ee535fba8f984dd30f565194d62cea118043569e","assignee":null,"milestone":null,"commits_url":"https://github.com/geoadmin/mf-geoadmin3/pull/922/commits","review_comments_url":"https://github.com/geoadmin/mf-geoadmin3/pull/922/comments","review_comment_url":"/repos/geoadmin/mf-geoadmin3/pulls/comments/{number}","comments_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/issues/922/comments","statuses_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/statuses/dcc865a4130d2e685a16ae1eedb1190a773e627a","head":{"label":"geoadmin:dev_measure","ref":"dev_measure","sha":"dcc865a4130d2e685a16ae1eedb1190a773e627a","user":{"login":"geoadmin","id":3369793,"avatar_url":"https://gravatar.com/avatar/09b2643b75739dfe879abfbb69d3c593?d=https%3A%2F%2Fidenticons.github.com%2F648867e2cf06973bf630ba2a237362e2.png&r=x","gravatar_id":"09b2643b75739dfe879abfbb69d3c593","url":"https://api.github.com/users/geoadmin","html_url":"https://github.com/geoadmin","followers_url":"https://api.github.com/users/geoadmin/followers","following_url":"https://api.github.com/users/geoadmin/following{/other_user}","gists_url":"https://api.github.com/users/geoadmin/gists{/gist_id}","starred_url":"https://api.github.com/users/geoadmin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/geoadmin/subscriptions","organizations_url":"https://api.github.com/users/geoadmin/orgs","repos_url":"https://api.github.com/users/geoadmin/repos","events_url":"https://api.github.com/users/geoadmin/events{/privacy}","received_events_url":"https://api.github.com/users/geoadmin/received_events","type":"Organization","site_admin":false},"repo":{"id":10399273,"name":"mf-geoadmin3","full_name":"geoadmin/mf-geoadmin3","owner":{"login":"geoadmin","id":3369793,"avatar_url":"https://gravatar.com/avatar/09b2643b75739dfe879abfbb69d3c593?d=https%3A%2F%2Fidenticons.github.com%2F648867e2cf06973bf630ba2a237362e2.png&r=x","gravatar_id":"09b2643b75739dfe879abfbb69d3c593","url":"https://api.github.com/users/geoadmin","html_url":"https://github.com/geoadmin","followers_url":"https://api.github.com/users/geoadmin/followers","following_url":"https://api.github.com/users/geoadmin/following{/other_user}","gists_url":"https://api.github.com/users/geoadmin/gists{/gist_id}","starred_url":"https://api.github.com/users/geoadmin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/geoadmin/subscriptions","organizations_url":"https://api.github.com/users/geoadmin/orgs","repos_url":"https://api.github.com/users/geoadmin/repos","events_url":"https://api.github.com/users/geoadmin/events{/privacy}","received_events_url":"https://api.github.com/users/geoadmin/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/geoadmin/mf-geoadmin3","description":"next generation map.geo.admin.ch","fork":false,"url":"https://api.github.com/repos/geoadmin/mf-geoadmin3","forks_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/forks","keys_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/keys{/key_id}","collaborators_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/teams","hooks_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/hooks","issue_events_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/issues/events{/number}","events_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/events","assignees_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/assignees{/user}","branches_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/branches{/branch}","tags_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/tags","blobs_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/git/refs{/sha}","trees_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/git/trees{/sha}","statuses_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/statuses/{sha}","languages_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/languages","stargazers_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/stargazers","contributors_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/contributors","subscribers_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/subscribers","subscription_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/subscription","commits_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/commits{/sha}","git_commits_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/git/commits{/sha}","comments_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/comments{/number}","issue_comment_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/issues/comments/{number}","contents_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/contents/{+path}","compare_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/compare/{base}...{head}","merges_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/merges","archive_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/downloads","issues_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/issues{/number}","pulls_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/pulls{/number}","milestones_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/milestones{/number}","notifications_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/labels{/name}","releases_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/releases{/id}","created_at":"2013-05-31T06:37:20Z","updated_at":"2014-01-15T17:10:04Z","pushed_at":"2014-01-15T17:10:04Z","git_url":"git://github.com/geoadmin/mf-geoadmin3.git","ssh_url":"git@github.com:geoadmin/mf-geoadmin3.git","clone_url":"https://github.com/geoadmin/mf-geoadmin3.git","svn_url":"https://github.com/geoadmin/mf-geoadmin3","homepage":null,"size":16500,"stargazers_count":21,"watchers_count":21,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"forks_count":2,"mirror_url":null,"open_issues_count":42,"forks":2,"open_issues":42,"watchers":21,"default_branch":"master","master_branch":"master"}},"base":{"label":"geoadmin:master","ref":"master","sha":"6112a741e7a14cd47e255507638eb4eb12fefa90","user":{"login":"geoadmin","id":3369793,"avatar_url":"https://gravatar.com/avatar/09b2643b75739dfe879abfbb69d3c593?d=https%3A%2F%2Fidenticons.github.com%2F648867e2cf06973bf630ba2a237362e2.png&r=x","gravatar_id":"09b2643b75739dfe879abfbb69d3c593","url":"https://api.github.com/users/geoadmin","html_url":"https://github.com/geoadmin","followers_url":"https://api.github.com/users/geoadmin/followers","following_url":"https://api.github.com/users/geoadmin/following{/other_user}","gists_url":"https://api.github.com/users/geoadmin/gists{/gist_id}","starred_url":"https://api.github.com/users/geoadmin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/geoadmin/subscriptions","organizations_url":"https://api.github.com/users/geoadmin/orgs","repos_url":"https://api.github.com/users/geoadmin/repos","events_url":"https://api.github.com/users/geoadmin/events{/privacy}","received_events_url":"https://api.github.com/users/geoadmin/received_events","type":"Organization","site_admin":false},"repo":{"id":10399273,"name":"mf-geoadmin3","full_name":"geoadmin/mf-geoadmin3","owner":{"login":"geoadmin","id":3369793,"avatar_url":"https://gravatar.com/avatar/09b2643b75739dfe879abfbb69d3c593?d=https%3A%2F%2Fidenticons.github.com%2F648867e2cf06973bf630ba2a237362e2.png&r=x","gravatar_id":"09b2643b75739dfe879abfbb69d3c593","url":"https://api.github.com/users/geoadmin","html_url":"https://github.com/geoadmin","followers_url":"https://api.github.com/users/geoadmin/followers","following_url":"https://api.github.com/users/geoadmin/following{/other_user}","gists_url":"https://api.github.com/users/geoadmin/gists{/gist_id}","starred_url":"https://api.github.com/users/geoadmin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/geoadmin/subscriptions","organizations_url":"https://api.github.com/users/geoadmin/orgs","repos_url":"https://api.github.com/users/geoadmin/repos","events_url":"https://api.github.com/users/geoadmin/events{/privacy}","received_events_url":"https://api.github.com/users/geoadmin/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/geoadmin/mf-geoadmin3","description":"next generation map.geo.admin.ch","fork":false,"url":"https://api.github.com/repos/geoadmin/mf-geoadmin3","forks_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/forks","keys_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/keys{/key_id}","collaborators_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/teams","hooks_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/hooks","issue_events_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/issues/events{/number}","events_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/events","assignees_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/assignees{/user}","branches_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/branches{/branch}","tags_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/tags","blobs_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/git/refs{/sha}","trees_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/git/trees{/sha}","statuses_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/statuses/{sha}","languages_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/languages","stargazers_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/stargazers","contributors_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/contributors","subscribers_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/subscribers","subscription_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/subscription","commits_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/commits{/sha}","git_commits_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/git/commits{/sha}","comments_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/comments{/number}","issue_comment_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/issues/comments/{number}","contents_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/contents/{+path}","compare_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/compare/{base}...{head}","merges_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/merges","archive_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/downloads","issues_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/issues{/number}","pulls_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/pulls{/number}","milestones_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/milestones{/number}","notifications_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/labels{/name}","releases_url":"https://api.github.com/repos/geoadmin/mf-geoadmin3/releases{/id}","created_at":"2013-05-31T06:37:20Z","updated_at":"2014-01-15T17:10:04Z","pushed_at":"2014-01-15T17:10:04Z","git_url":"git://github.com/geoadmin/mf-geoadmin3.git","ssh_url":"git@github.com:geoadmin/mf-geoadmin3.git","clone_url":"https://github.com/geoadmin/mf-geoadmin3.git","svn_url":"https://github.com/geoadmin/mf-geoadmin3","homepage":null,"size":16500,"stargazers_count":21,"watchers_count":21,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"forks_count":2,"mirror_url":null,"open_issues_count":42,"forks":2,"open_issues":42,"watchers":21,"default_branch":"master","master_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/geoadmin/mf-geoadmin3/pulls/922"},"html":{"href":"https://github.com/geoadmin/mf-geoadmin3/pull/922"},"issue":{"href":"https://api.github.com/repos/geoadmin/mf-geoadmin3/issues/922"},"comments":{"href":"https://api.github.com/repos/geoadmin/mf-geoadmin3/issues/922/comments"},"review_comments":{"href":"https://api.github.com/repos/geoadmin/mf-geoadmin3/pulls/922/comments"},"statuses":{"href":"https://api.github.com/repos/geoadmin/mf-geoadmin3/statuses/dcc865a4130d2e685a16ae1eedb1190a773e627a"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"procrastinatio","id":1236739,"avatar_url":"https://gravatar.com/avatar/7fc06239ee9524a8eb08ea18bd489c3a?d=https%3A%2F%2Fidenticons.github.com%2Fe619a4822c4f32f5c39659644e37f586.png&r=x","gravatar_id":"7fc06239ee9524a8eb08ea18bd489c3a","url":"https://api.github.com/users/procrastinatio","html_url":"https://github.com/procrastinatio","followers_url":"https://api.github.com/users/procrastinatio/followers","following_url":"https://api.github.com/users/procrastinatio/following{/other_user}","gists_url":"https://api.github.com/users/procrastinatio/gists{/gist_id}","starred_url":"https://api.github.com/users/procrastinatio/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/procrastinatio/subscriptions","organizations_url":"https://api.github.com/users/procrastinatio/orgs","repos_url":"https://api.github.com/users/procrastinatio/repos","events_url":"https://api.github.com/users/procrastinatio/events{/privacy}","received_events_url":"https://api.github.com/users/procrastinatio/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"commits":1,"additions":11,"deletions":17,"changed_files":3}}