GitHub PullRequestReviewCommentEvent at 2014-11-20 10:08:02
Repository: e-commerce
Actor: lmignon
Payload: {"action":"created","comment":{"url":"https://api.github.com/repos/OCA/e-commerce/pulls/comments/20636427","id":20636427,"diff_hunk":"@@ -54,6 +55,7 @@ def validate_picking(self, cr, uid, ids, context=None):\n                 }\n             self.do_partial(cr, uid, [picking.id], partial_data)\n         return True\n+<<<<<<< HEAD:__unported__/sale_automatic_workflow/stock.py","path":"__unported__/sale_automatic_workflow/stock.py","position":14,"original_position":14,"commit_id":"36d3feff87ac67e8ce474936f6527099c32c8fcf","original_commit_id":"4af8b784b03efb33763ed1bd5ffa4485cbe2f581","user":{"login":"lmignon","id":544090,"avatar_url":"https://avatars.githubusercontent.com/u/544090?v=3","gravatar_id":"","url":"https://api.github.com/users/lmignon","html_url":"https://github.com/lmignon","followers_url":"https://api.github.com/users/lmignon/followers","following_url":"https://api.github.com/users/lmignon/following{/other_user}","gists_url":"https://api.github.com/users/lmignon/gists{/gist_id}","starred_url":"https://api.github.com/users/lmignon/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lmignon/subscriptions","organizations_url":"https://api.github.com/users/lmignon/orgs","repos_url":"https://api.github.com/users/lmignon/repos","events_url":"https://api.github.com/users/lmignon/events{/privacy}","received_events_url":"https://api.github.com/users/lmignon/received_events","type":"User","site_admin":false},"body":"merge conflict","created_at":"2014-11-20T10:08:02Z","updated_at":"2014-11-20T10:08:02Z","html_url":"https://github.com/OCA/e-commerce/pull/23#discussion_r20636427","pull_request_url":"https://api.github.com/repos/OCA/e-commerce/pulls/23","_links":{"self":{"href":"https://api.github.com/repos/OCA/e-commerce/pulls/comments/20636427"},"html":{"href":"https://github.com/OCA/e-commerce/pull/23#discussion_r20636427"},"pull_request":{"href":"https://api.github.com/repos/OCA/e-commerce/pulls/23"}}},"pull_request":{"url":"https://api.github.com/repos/OCA/e-commerce/pulls/23","id":24753884,"html_url":"https://github.com/OCA/e-commerce/pull/23","diff_url":"https://github.com/OCA/e-commerce/pull/23.diff","patch_url":"https://github.com/OCA/e-commerce/pull/23.patch","issue_url":"https://api.github.com/repos/OCA/e-commerce/issues/23","number":23,"state":"open","locked":false,"title":"Forward port of 7.0 to 8.0 with last pylint fixes","user":{"login":"guewen","id":417223,"avatar_url":"https://avatars.githubusercontent.com/u/417223?v=3","gravatar_id":"","url":"https://api.github.com/users/guewen","html_url":"https://github.com/guewen","followers_url":"https://api.github.com/users/guewen/followers","following_url":"https://api.github.com/users/guewen/following{/other_user}","gists_url":"https://api.github.com/users/guewen/gists{/gist_id}","starred_url":"https://api.github.com/users/guewen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/guewen/subscriptions","organizations_url":"https://api.github.com/users/guewen/orgs","repos_url":"https://api.github.com/users/guewen/repos","events_url":"https://api.github.com/users/guewen/events{/privacy}","received_events_url":"https://api.github.com/users/guewen/received_events","type":"User","site_admin":false},"body":"I pulled https://github.com/OCA/e-commerce/pull/21                                                                                                                                                             \r\nSo it includes all the last changes of 7.0 + the pylint fixes.                                                                                                                                                 \r\n                                                                                                                                                                                                           \r\nAlso, .travis.yml conflicted so I corrected it.","created_at":"2014-11-20T10:03:45Z","updated_at":"2014-11-20T10:08:02Z","closed_at":null,"merged_at":null,"merge_commit_sha":"746565c511f9180ec0d4b4ee43da675b46e7742d","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/OCA/e-commerce/pulls/23/commits","review_comments_url":"https://api.github.com/repos/OCA/e-commerce/pulls/23/comments","review_comment_url":"https://api.github.com/repos/OCA/e-commerce/pulls/comments/{number}","comments_url":"https://api.github.com/repos/OCA/e-commerce/issues/23/comments","statuses_url":"https://api.github.com/repos/OCA/e-commerce/statuses/36d3feff87ac67e8ce474936f6527099c32c8fcf","head":{"label":"guewen:8.0-forward-port","ref":"8.0-forward-port","sha":"36d3feff87ac67e8ce474936f6527099c32c8fcf","user":{"login":"guewen","id":417223,"avatar_url":"https://avatars.githubusercontent.com/u/417223?v=3","gravatar_id":"","url":"https://api.github.com/users/guewen","html_url":"https://github.com/guewen","followers_url":"https://api.github.com/users/guewen/followers","following_url":"https://api.github.com/users/guewen/following{/other_user}","gists_url":"https://api.github.com/users/guewen/gists{/gist_id}","starred_url":"https://api.github.com/users/guewen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/guewen/subscriptions","organizations_url":"https://api.github.com/users/guewen/orgs","repos_url":"https://api.github.com/users/guewen/repos","events_url":"https://api.github.com/users/guewen/events{/privacy}","received_events_url":"https://api.github.com/users/guewen/received_events","type":"User","site_admin":false},"repo":{"id":21571341,"name":"e-commerce","full_name":"guewen/e-commerce","owner":{"login":"guewen","id":417223,"avatar_url":"https://avatars.githubusercontent.com/u/417223?v=3","gravatar_id":"","url":"https://api.github.com/users/guewen","html_url":"https://github.com/guewen","followers_url":"https://api.github.com/users/guewen/followers","following_url":"https://api.github.com/users/guewen/following{/other_user}","gists_url":"https://api.github.com/users/guewen/gists{/gist_id}","starred_url":"https://api.github.com/users/guewen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/guewen/subscriptions","organizations_url":"https://api.github.com/users/guewen/orgs","repos_url":"https://api.github.com/users/guewen/repos","events_url":"https://api.github.com/users/guewen/events{/privacy}","received_events_url":"https://api.github.com/users/guewen/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/guewen/e-commerce","description":"","fork":true,"url":"https://api.github.com/repos/guewen/e-commerce","forks_url":"https://api.github.com/repos/guewen/e-commerce/forks","keys_url":"https://api.github.com/repos/guewen/e-commerce/keys{/key_id}","collaborators_url":"https://api.github.com/repos/guewen/e-commerce/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/guewen/e-commerce/teams","hooks_url":"https://api.github.com/repos/guewen/e-commerce/hooks","issue_events_url":"https://api.github.com/repos/guewen/e-commerce/issues/events{/number}","events_url":"https://api.github.com/repos/guewen/e-commerce/events","assignees_url":"https://api.github.com/repos/guewen/e-commerce/assignees{/user}","branches_url":"https://api.github.com/repos/guewen/e-commerce/branches{/branch}","tags_url":"https://api.github.com/repos/guewen/e-commerce/tags","blobs_url":"https://api.github.com/repos/guewen/e-commerce/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/guewen/e-commerce/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/guewen/e-commerce/git/refs{/sha}","trees_url":"https://api.github.com/repos/guewen/e-commerce/git/trees{/sha}","statuses_url":"https://api.github.com/repos/guewen/e-commerce/statuses/{sha}","languages_url":"https://api.github.com/repos/guewen/e-commerce/languages","stargazers_url":"https://api.github.com/repos/guewen/e-commerce/stargazers","contributors_url":"https://api.github.com/repos/guewen/e-commerce/contributors","subscribers_url":"https://api.github.com/repos/guewen/e-commerce/subscribers","subscription_url":"https://api.github.com/repos/guewen/e-commerce/subscription","commits_url":"https://api.github.com/repos/guewen/e-commerce/commits{/sha}","git_commits_url":"https://api.github.com/repos/guewen/e-commerce/git/commits{/sha}","comments_url":"https://api.github.com/repos/guewen/e-commerce/comments{/number}","issue_comment_url":"https://api.github.com/repos/guewen/e-commerce/issues/comments/{number}","contents_url":"https://api.github.com/repos/guewen/e-commerce/contents/{+path}","compare_url":"https://api.github.com/repos/guewen/e-commerce/compare/{base}...{head}","merges_url":"https://api.github.com/repos/guewen/e-commerce/merges","archive_url":"https://api.github.com/repos/guewen/e-commerce/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/guewen/e-commerce/downloads","issues_url":"https://api.github.com/repos/guewen/e-commerce/issues{/number}","pulls_url":"https://api.github.com/repos/guewen/e-commerce/pulls{/number}","milestones_url":"https://api.github.com/repos/guewen/e-commerce/milestones{/number}","notifications_url":"https://api.github.com/repos/guewen/e-commerce/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/guewen/e-commerce/labels{/name}","releases_url":"https://api.github.com/repos/guewen/e-commerce/releases{/id}","created_at":"2014-07-07T13:22:31Z","updated_at":"2014-07-07T14:19:15Z","pushed_at":"2014-11-20T10:07:48Z","git_url":"git://github.com/guewen/e-commerce.git","ssh_url":"git@github.com:guewen/e-commerce.git","clone_url":"https://github.com/guewen/e-commerce.git","svn_url":"https://github.com/guewen/e-commerce","homepage":null,"size":2243,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"OCA:8.0","ref":"8.0","sha":"e334462ae6a6bb907d5d9f6451bd6c1352f807bd","user":{"login":"OCA","id":7600578,"avatar_url":"https://avatars.githubusercontent.com/u/7600578?v=3","gravatar_id":"","url":"https://api.github.com/users/OCA","html_url":"https://github.com/OCA","followers_url":"https://api.github.com/users/OCA/followers","following_url":"https://api.github.com/users/OCA/following{/other_user}","gists_url":"https://api.github.com/users/OCA/gists{/gist_id}","starred_url":"https://api.github.com/users/OCA/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OCA/subscriptions","organizations_url":"https://api.github.com/users/OCA/orgs","repos_url":"https://api.github.com/users/OCA/repos","events_url":"https://api.github.com/users/OCA/events{/privacy}","received_events_url":"https://api.github.com/users/OCA/received_events","type":"Organization","site_admin":false},"repo":{"id":20893062,"name":"e-commerce","full_name":"OCA/e-commerce","owner":{"login":"OCA","id":7600578,"avatar_url":"https://avatars.githubusercontent.com/u/7600578?v=3","gravatar_id":"","url":"https://api.github.com/users/OCA","html_url":"https://github.com/OCA","followers_url":"https://api.github.com/users/OCA/followers","following_url":"https://api.github.com/users/OCA/following{/other_user}","gists_url":"https://api.github.com/users/OCA/gists{/gist_id}","starred_url":"https://api.github.com/users/OCA/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OCA/subscriptions","organizations_url":"https://api.github.com/users/OCA/orgs","repos_url":"https://api.github.com/users/OCA/repos","events_url":"https://api.github.com/users/OCA/events{/privacy}","received_events_url":"https://api.github.com/users/OCA/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/OCA/e-commerce","description":"","fork":false,"url":"https://api.github.com/repos/OCA/e-commerce","forks_url":"https://api.github.com/repos/OCA/e-commerce/forks","keys_url":"https://api.github.com/repos/OCA/e-commerce/keys{/key_id}","collaborators_url":"https://api.github.com/repos/OCA/e-commerce/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/OCA/e-commerce/teams","hooks_url":"https://api.github.com/repos/OCA/e-commerce/hooks","issue_events_url":"https://api.github.com/repos/OCA/e-commerce/issues/events{/number}","events_url":"https://api.github.com/repos/OCA/e-commerce/events","assignees_url":"https://api.github.com/repos/OCA/e-commerce/assignees{/user}","branches_url":"https://api.github.com/repos/OCA/e-commerce/branches{/branch}","tags_url":"https://api.github.com/repos/OCA/e-commerce/tags","blobs_url":"https://api.github.com/repos/OCA/e-commerce/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/OCA/e-commerce/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/OCA/e-commerce/git/refs{/sha}","trees_url":"https://api.github.com/repos/OCA/e-commerce/git/trees{/sha}","statuses_url":"https://api.github.com/repos/OCA/e-commerce/statuses/{sha}","languages_url":"https://api.github.com/repos/OCA/e-commerce/languages","stargazers_url":"https://api.github.com/repos/OCA/e-commerce/stargazers","contributors_url":"https://api.github.com/repos/OCA/e-commerce/contributors","subscribers_url":"https://api.github.com/repos/OCA/e-commerce/subscribers","subscription_url":"https://api.github.com/repos/OCA/e-commerce/subscription","commits_url":"https://api.github.com/repos/OCA/e-commerce/commits{/sha}","git_commits_url":"https://api.github.com/repos/OCA/e-commerce/git/commits{/sha}","comments_url":"https://api.github.com/repos/OCA/e-commerce/comments{/number}","issue_comment_url":"https://api.github.com/repos/OCA/e-commerce/issues/comments/{number}","contents_url":"https://api.github.com/repos/OCA/e-commerce/contents/{+path}","compare_url":"https://api.github.com/repos/OCA/e-commerce/compare/{base}...{head}","merges_url":"https://api.github.com/repos/OCA/e-commerce/merges","archive_url":"https://api.github.com/repos/OCA/e-commerce/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/OCA/e-commerce/downloads","issues_url":"https://api.github.com/repos/OCA/e-commerce/issues{/number}","pulls_url":"https://api.github.com/repos/OCA/e-commerce/pulls{/number}","milestones_url":"https://api.github.com/repos/OCA/e-commerce/milestones{/number}","notifications_url":"https://api.github.com/repos/OCA/e-commerce/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/OCA/e-commerce/labels{/name}","releases_url":"https://api.github.com/repos/OCA/e-commerce/releases{/id}","created_at":"2014-06-16T17:06:27Z","updated_at":"2014-10-08T16:22:18Z","pushed_at":"2014-10-20T12:36:37Z","git_url":"git://github.com/OCA/e-commerce.git","ssh_url":"git@github.com:OCA/e-commerce.git","clone_url":"https://github.com/OCA/e-commerce.git","svn_url":"https://github.com/OCA/e-commerce","homepage":null,"size":2438,"stargazers_count":3,"watchers_count":3,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":10,"mirror_url":null,"open_issues_count":12,"forks":10,"open_issues":12,"watchers":3,"default_branch":"8.0"}},"_links":{"self":{"href":"https://api.github.com/repos/OCA/e-commerce/pulls/23"},"html":{"href":"https://github.com/OCA/e-commerce/pull/23"},"issue":{"href":"https://api.github.com/repos/OCA/e-commerce/issues/23"},"comments":{"href":"https://api.github.com/repos/OCA/e-commerce/issues/23/comments"},"review_comments":{"href":"https://api.github.com/repos/OCA/e-commerce/pulls/23/comments"},"review_comment":{"href":"https://api.github.com/repos/OCA/e-commerce/pulls/comments/{number}"},"commits":{"href":"https://api.github.com/repos/OCA/e-commerce/pulls/23/commits"},"statuses":{"href":"https://api.github.com/repos/OCA/e-commerce/statuses/36d3feff87ac67e8ce474936f6527099c32c8fcf"}}}}