{"action":"created","comment":{"url":"https://api.github.com/repos/OpenHumans/oh-proj-management/pulls/comments/193633568","pull_request_review_id":126642456,"id":193633568,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDE5MzYzMzU2OA==","diff_hunk":"@@ -1,7 +1,15 @@\n from django.contrib import admin\n+<<<<<<< HEAD\n+from .models import Project, ProjectGroup, ProjectMember, File, Note\n+=======\n from .models import Project, ProjectGroup, ProjectMember, File\n+>>>>>>> master\n # Register your models here.\n admin.site.register(Project)\n admin.site.register(ProjectGroup)\n admin.site.register(ProjectMember)\n admin.site.register(File)\n+<<<<<<< HEAD","path":"project_admin/admin.py","position":12,"original_position":12,"commit_id":"13189ecf439d83c4044acd7dc53d957702ec4ff8","original_commit_id":"13189ecf439d83c4044acd7dc53d957702ec4ff8","user":{"login":"houndci-bot","id":6697940,"node_id":"MDQ6VXNlcjY2OTc5NDA=","avatar_url":"https://avatars0.githubusercontent.com/u/6697940?v=4","gravatar_id":"","url":"https://api.github.com/users/houndci-bot","html_url":"https://github.com/houndci-bot","followers_url":"https://api.github.com/users/houndci-bot/followers","following_url":"https://api.github.com/users/houndci-bot/following{/other_user}","gists_url":"https://api.github.com/users/houndci-bot/gists{/gist_id}","starred_url":"https://api.github.com/users/houndci-bot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/houndci-bot/subscriptions","organizations_url":"https://api.github.com/users/houndci-bot/orgs","repos_url":"https://api.github.com/users/houndci-bot/repos","events_url":"https://api.github.com/users/houndci-bot/events{/privacy}","received_events_url":"https://api.github.com/users/houndci-bot/received_events","type":"User","site_admin":false},"body":"missing whitespace around bitwise or shift operator<br>missing whitespace around operator","created_at":"2018-06-07T06:03:58Z","updated_at":"2018-06-07T06:04:00Z","html_url":"https://github.com/OpenHumans/oh-proj-management/pull/59#discussion_r193633568","pull_request_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/pulls/59","author_association":"NONE","_links":{"self":{"href":"https://api.github.com/repos/OpenHumans/oh-proj-management/pulls/comments/193633568"},"html":{"href":"https://github.com/OpenHumans/oh-proj-management/pull/59#discussion_r193633568"},"pull_request":{"href":"https://api.github.com/repos/OpenHumans/oh-proj-management/pulls/59"}}},"pull_request":{"url":"https://api.github.com/repos/OpenHumans/oh-proj-management/pulls/59","id":192451351,"node_id":"MDExOlB1bGxSZXF1ZXN0MTkyNDUxMzUx","html_url":"https://github.com/OpenHumans/oh-proj-management/pull/59","diff_url":"https://github.com/OpenHumans/oh-proj-management/pull/59.diff","patch_url":"https://github.com/OpenHumans/oh-proj-management/pull/59.patch","issue_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/issues/59","number":59,"state":"open","locked":false,"title":"[WIP] #40 Notes for members","user":{"login":"rosygupta","id":6587993,"node_id":"MDQ6VXNlcjY1ODc5OTM=","avatar_url":"https://avatars2.githubusercontent.com/u/6587993?v=4","gravatar_id":"","url":"https://api.github.com/users/rosygupta","html_url":"https://github.com/rosygupta","followers_url":"https://api.github.com/users/rosygupta/followers","following_url":"https://api.github.com/users/rosygupta/following{/other_user}","gists_url":"https://api.github.com/users/rosygupta/gists{/gist_id}","starred_url":"https://api.github.com/users/rosygupta/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rosygupta/subscriptions","organizations_url":"https://api.github.com/users/rosygupta/orgs","repos_url":"https://api.github.com/users/rosygupta/repos","events_url":"https://api.github.com/users/rosygupta/events{/privacy}","received_events_url":"https://api.github.com/users/rosygupta/received_events","type":"User","site_admin":false},"body":"#40 \r\n- Changed the member card collapse view\r\n- Added feature to add and view notes for members.\r\n- TODO: edit and delete notes\r\n ","created_at":"2018-06-04T15:46:02Z","updated_at":"2018-06-07T06:04:00Z","closed_at":null,"merged_at":null,"merge_commit_sha":"5e19821c78a1ff9320e08b47ca7e30469e332b86","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/pulls/59/commits","review_comments_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/pulls/59/comments","review_comment_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/pulls/comments{/number}","comments_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/issues/59/comments","statuses_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/statuses/13189ecf439d83c4044acd7dc53d957702ec4ff8","head":{"label":"rosygupta:note","ref":"note","sha":"13189ecf439d83c4044acd7dc53d957702ec4ff8","user":{"login":"rosygupta","id":6587993,"node_id":"MDQ6VXNlcjY1ODc5OTM=","avatar_url":"https://avatars2.githubusercontent.com/u/6587993?v=4","gravatar_id":"","url":"https://api.github.com/users/rosygupta","html_url":"https://github.com/rosygupta","followers_url":"https://api.github.com/users/rosygupta/followers","following_url":"https://api.github.com/users/rosygupta/following{/other_user}","gists_url":"https://api.github.com/users/rosygupta/gists{/gist_id}","starred_url":"https://api.github.com/users/rosygupta/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rosygupta/subscriptions","organizations_url":"https://api.github.com/users/rosygupta/orgs","repos_url":"https://api.github.com/users/rosygupta/repos","events_url":"https://api.github.com/users/rosygupta/events{/privacy}","received_events_url":"https://api.github.com/users/rosygupta/received_events","type":"User","site_admin":false},"repo":{"id":121858555,"node_id":"MDEwOlJlcG9zaXRvcnkxMjE4NTg1NTU=","name":"oh-proj-management","full_name":"rosygupta/oh-proj-management","owner":{"login":"rosygupta","id":6587993,"node_id":"MDQ6VXNlcjY1ODc5OTM=","avatar_url":"https://avatars2.githubusercontent.com/u/6587993?v=4","gravatar_id":"","url":"https://api.github.com/users/rosygupta","html_url":"https://github.com/rosygupta","followers_url":"https://api.github.com/users/rosygupta/followers","following_url":"https://api.github.com/users/rosygupta/following{/other_user}","gists_url":"https://api.github.com/users/rosygupta/gists{/gist_id}","starred_url":"https://api.github.com/users/rosygupta/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rosygupta/subscriptions","organizations_url":"https://api.github.com/users/rosygupta/orgs","repos_url":"https://api.github.com/users/rosygupta/repos","events_url":"https://api.github.com/users/rosygupta/events{/privacy}","received_events_url":"https://api.github.com/users/rosygupta/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/rosygupta/oh-proj-management","description":"Draft web app Open Humans projects can use to view and work with members and data","fork":true,"url":"https://api.github.com/repos/rosygupta/oh-proj-management","forks_url":"https://api.github.com/repos/rosygupta/oh-proj-management/forks","keys_url":"https://api.github.com/repos/rosygupta/oh-proj-management/keys{/key_id}","collaborators_url":"https://api.github.com/repos/rosygupta/oh-proj-management/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/rosygupta/oh-proj-management/teams","hooks_url":"https://api.github.com/repos/rosygupta/oh-proj-management/hooks","issue_events_url":"https://api.github.com/repos/rosygupta/oh-proj-management/issues/events{/number}","events_url":"https://api.github.com/repos/rosygupta/oh-proj-management/events","assignees_url":"https://api.github.com/repos/rosygupta/oh-proj-management/assignees{/user}","branches_url":"https://api.github.com/repos/rosygupta/oh-proj-management/branches{/branch}","tags_url":"https://api.github.com/repos/rosygupta/oh-proj-management/tags","blobs_url":"https://api.github.com/repos/rosygupta/oh-proj-management/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/rosygupta/oh-proj-management/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/rosygupta/oh-proj-management/git/refs{/sha}","trees_url":"https://api.github.com/repos/rosygupta/oh-proj-management/git/trees{/sha}","statuses_url":"https://api.github.com/repos/rosygupta/oh-proj-management/statuses/{sha}","languages_url":"https://api.github.com/repos/rosygupta/oh-proj-management/languages","stargazers_url":"https://api.github.com/repos/rosygupta/oh-proj-management/stargazers","contributors_url":"https://api.github.com/repos/rosygupta/oh-proj-management/contributors","subscribers_url":"https://api.github.com/repos/rosygupta/oh-proj-management/subscribers","subscription_url":"https://api.github.com/repos/rosygupta/oh-proj-management/subscription","commits_url":"https://api.github.com/repos/rosygupta/oh-proj-management/commits{/sha}","git_commits_url":"https://api.github.com/repos/rosygupta/oh-proj-management/git/commits{/sha}","comments_url":"https://api.github.com/repos/rosygupta/oh-proj-management/comments{/number}","issue_comment_url":"https://api.github.com/repos/rosygupta/oh-proj-management/issues/comments{/number}","contents_url":"https://api.github.com/repos/rosygupta/oh-proj-management/contents/{+path}","compare_url":"https://api.github.com/repos/rosygupta/oh-proj-management/compare/{base}...{head}","merges_url":"https://api.github.com/repos/rosygupta/oh-proj-management/merges","archive_url":"https://api.github.com/repos/rosygupta/oh-proj-management/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/rosygupta/oh-proj-management/downloads","issues_url":"https://api.github.com/repos/rosygupta/oh-proj-management/issues{/number}","pulls_url":"https://api.github.com/repos/rosygupta/oh-proj-management/pulls{/number}","milestones_url":"https://api.github.com/repos/rosygupta/oh-proj-management/milestones{/number}","notifications_url":"https://api.github.com/repos/rosygupta/oh-proj-management/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/rosygupta/oh-proj-management/labels{/name}","releases_url":"https://api.github.com/repos/rosygupta/oh-proj-management/releases{/id}","deployments_url":"https://api.github.com/repos/rosygupta/oh-proj-management/deployments","created_at":"2018-02-17T13:43:13Z","updated_at":"2018-02-17T13:43:14Z","pushed_at":"2018-06-07T06:03:48Z","git_url":"git://github.com/rosygupta/oh-proj-management.git","ssh_url":"git@github.com:rosygupta/oh-proj-management.git","clone_url":"https://github.com/rosygupta/oh-proj-management.git","svn_url":"https://github.com/rosygupta/oh-proj-management","homepage":null,"size":133,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"OpenHumans:master","ref":"master","sha":"a7cf020be9491d15537901969b136de72a28db3e","user":{"login":"OpenHumans","id":3341265,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMzNDEyNjU=","avatar_url":"https://avatars3.githubusercontent.com/u/3341265?v=4","gravatar_id":"","url":"https://api.github.com/users/OpenHumans","html_url":"https://github.com/OpenHumans","followers_url":"https://api.github.com/users/OpenHumans/followers","following_url":"https://api.github.com/users/OpenHumans/following{/other_user}","gists_url":"https://api.github.com/users/OpenHumans/gists{/gist_id}","starred_url":"https://api.github.com/users/OpenHumans/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OpenHumans/subscriptions","organizations_url":"https://api.github.com/users/OpenHumans/orgs","repos_url":"https://api.github.com/users/OpenHumans/repos","events_url":"https://api.github.com/users/OpenHumans/events{/privacy}","received_events_url":"https://api.github.com/users/OpenHumans/received_events","type":"Organization","site_admin":false},"repo":{"id":101097317,"node_id":"MDEwOlJlcG9zaXRvcnkxMDEwOTczMTc=","name":"oh-proj-management","full_name":"OpenHumans/oh-proj-management","owner":{"login":"OpenHumans","id":3341265,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMzNDEyNjU=","avatar_url":"https://avatars3.githubusercontent.com/u/3341265?v=4","gravatar_id":"","url":"https://api.github.com/users/OpenHumans","html_url":"https://github.com/OpenHumans","followers_url":"https://api.github.com/users/OpenHumans/followers","following_url":"https://api.github.com/users/OpenHumans/following{/other_user}","gists_url":"https://api.github.com/users/OpenHumans/gists{/gist_id}","starred_url":"https://api.github.com/users/OpenHumans/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OpenHumans/subscriptions","organizations_url":"https://api.github.com/users/OpenHumans/orgs","repos_url":"https://api.github.com/users/OpenHumans/repos","events_url":"https://api.github.com/users/OpenHumans/events{/privacy}","received_events_url":"https://api.github.com/users/OpenHumans/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/OpenHumans/oh-proj-management","description":"Draft web app Open Humans projects can use to view and work with members and data","fork":false,"url":"https://api.github.com/repos/OpenHumans/oh-proj-management","forks_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/forks","keys_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/keys{/key_id}","collaborators_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/teams","hooks_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/hooks","issue_events_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/issues/events{/number}","events_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/events","assignees_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/assignees{/user}","branches_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/branches{/branch}","tags_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/tags","blobs_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/git/refs{/sha}","trees_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/git/trees{/sha}","statuses_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/statuses/{sha}","languages_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/languages","stargazers_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/stargazers","contributors_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/contributors","subscribers_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/subscribers","subscription_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/subscription","commits_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/commits{/sha}","git_commits_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/git/commits{/sha}","comments_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/comments{/number}","issue_comment_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/issues/comments{/number}","contents_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/contents/{+path}","compare_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/compare/{base}...{head}","merges_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/merges","archive_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/downloads","issues_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/issues{/number}","pulls_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/pulls{/number}","milestones_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/milestones{/number}","notifications_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/labels{/name}","releases_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/releases{/id}","deployments_url":"https://api.github.com/repos/OpenHumans/oh-proj-management/deployments","created_at":"2017-08-22T18:57:00Z","updated_at":"2018-06-04T17:12:30Z","pushed_at":"2018-06-07T06:03:49Z","git_url":"git://github.com/OpenHumans/oh-proj-management.git","ssh_url":"git@github.com:OpenHumans/oh-proj-management.git","clone_url":"https://github.com/OpenHumans/oh-proj-management.git","svn_url":"https://github.com/OpenHumans/oh-proj-management","homepage":null,"size":82,"stargazers_count":3,"watchers_count":3,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":27,"mirror_url":null,"archived":false,"open_issues_count":12,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":27,"open_issues":12,"watchers":3,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/OpenHumans/oh-proj-management/pulls/59"},"html":{"href":"https://github.com/OpenHumans/oh-proj-management/pull/59"},"issue":{"href":"https://api.github.com/repos/OpenHumans/oh-proj-management/issues/59"},"comments":{"href":"https://api.github.com/repos/OpenHumans/oh-proj-management/issues/59/comments"},"review_comments":{"href":"https://api.github.com/repos/OpenHumans/oh-proj-management/pulls/59/comments"},"review_comment":{"href":"https://api.github.com/repos/OpenHumans/oh-proj-management/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/OpenHumans/oh-proj-management/pulls/59/commits"},"statuses":{"href":"https://api.github.com/repos/OpenHumans/oh-proj-management/statuses/13189ecf439d83c4044acd7dc53d957702ec4ff8"}},"author_association":"COLLABORATOR"}}
{"actor":{"display_login":"houndci-bot"}}