{"action":"created","comment":{"url":"https://api.github.com/repos/CenterForOpenScience/osf.io/pulls/comments/29462734","id":29462734,"diff_hunk":"@@ -72,6 +72,21 @@\n \n INVALID_EMAIL_CONFIRM_TOKEN = 'This confirmation link is invalid. Please <a href=\"/login/\">log in</a> to continue.'\n \n+CANNOT_MERGE_ACCOUNTS_SHORT = 'Cannot Merge Accounts'\n+\n+CANNOT_MERGE_ACCOUNTS_LONG = 'Accounts cannot be merged due to a conflict.'","path":"website/language.py","position":6,"original_position":6,"commit_id":"70db6e0a730142b1ca5d52132bc561ccf14aaef9","original_commit_id":"70db6e0a730142b1ca5d52132bc561ccf14aaef9","user":{"login":"sloria","id":2379650,"avatar_url":"https://avatars.githubusercontent.com/u/2379650?v=3","gravatar_id":"","url":"https://api.github.com/users/sloria","html_url":"https://github.com/sloria","followers_url":"https://api.github.com/users/sloria/followers","following_url":"https://api.github.com/users/sloria/following{/other_user}","gists_url":"https://api.github.com/users/sloria/gists{/gist_id}","starred_url":"https://api.github.com/users/sloria/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sloria/subscriptions","organizations_url":"https://api.github.com/users/sloria/orgs","repos_url":"https://api.github.com/users/sloria/repos","events_url":"https://api.github.com/users/sloria/events{/privacy}","received_events_url":"https://api.github.com/users/sloria/received_events","type":"User","site_admin":false},"body":"Is this what the user sees if there are addons that can't be merged? At the very least, the user should be given what action needs to be taken before merging.","created_at":"2015-04-30T19:40:16Z","updated_at":"2015-04-30T19:40:16Z","html_url":"https://github.com/CenterForOpenScience/osf.io/pull/2548#discussion_r29462734","pull_request_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/pulls/2548","_links":{"self":{"href":"https://api.github.com/repos/CenterForOpenScience/osf.io/pulls/comments/29462734"},"html":{"href":"https://github.com/CenterForOpenScience/osf.io/pull/2548#discussion_r29462734"},"pull_request":{"href":"https://api.github.com/repos/CenterForOpenScience/osf.io/pulls/2548"}}},"pull_request":{"url":"https://api.github.com/repos/CenterForOpenScience/osf.io/pulls/2548","id":33783119,"html_url":"https://github.com/CenterForOpenScience/osf.io/pull/2548","diff_url":"https://github.com/CenterForOpenScience/osf.io/pull/2548.diff","patch_url":"https://github.com/CenterForOpenScience/osf.io/pull/2548.patch","issue_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/issues/2548","number":2548,"state":"open","locked":false,"title":"[feature] User account merging","user":{"login":"lyndsysimon","id":131414,"avatar_url":"https://avatars.githubusercontent.com/u/131414?v=3","gravatar_id":"","url":"https://api.github.com/users/lyndsysimon","html_url":"https://github.com/lyndsysimon","followers_url":"https://api.github.com/users/lyndsysimon/followers","following_url":"https://api.github.com/users/lyndsysimon/following{/other_user}","gists_url":"https://api.github.com/users/lyndsysimon/gists{/gist_id}","starred_url":"https://api.github.com/users/lyndsysimon/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lyndsysimon/subscriptions","organizations_url":"https://api.github.com/users/lyndsysimon/orgs","repos_url":"https://api.github.com/users/lyndsysimon/repos","events_url":"https://api.github.com/users/lyndsysimon/events{/privacy}","received_events_url":"https://api.github.com/users/lyndsysimon/received_events","type":"User","site_admin":false},"body":"Ready for review.\r\n\r\nNote that the additions to `language.py` should be reviewed and probably edited.","created_at":"2015-04-21T17:15:09Z","updated_at":"2015-04-30T19:40:16Z","closed_at":null,"merged_at":null,"merge_commit_sha":"68e7f9de01985351161887554414d62211cb89e8","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/pulls/2548/commits","review_comments_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/pulls/2548/comments","review_comment_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/pulls/comments{/number}","comments_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/issues/2548/comments","statuses_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/statuses/70db6e0a730142b1ca5d52132bc561ccf14aaef9","head":{"label":"lyndsysimon:feature/account-merging","ref":"feature/account-merging","sha":"70db6e0a730142b1ca5d52132bc561ccf14aaef9","user":{"login":"lyndsysimon","id":131414,"avatar_url":"https://avatars.githubusercontent.com/u/131414?v=3","gravatar_id":"","url":"https://api.github.com/users/lyndsysimon","html_url":"https://github.com/lyndsysimon","followers_url":"https://api.github.com/users/lyndsysimon/followers","following_url":"https://api.github.com/users/lyndsysimon/following{/other_user}","gists_url":"https://api.github.com/users/lyndsysimon/gists{/gist_id}","starred_url":"https://api.github.com/users/lyndsysimon/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lyndsysimon/subscriptions","organizations_url":"https://api.github.com/users/lyndsysimon/orgs","repos_url":"https://api.github.com/users/lyndsysimon/repos","events_url":"https://api.github.com/users/lyndsysimon/events{/privacy}","received_events_url":"https://api.github.com/users/lyndsysimon/received_events","type":"User","site_admin":false},"repo":{"id":26919430,"name":"osf.io","full_name":"lyndsysimon/osf.io","owner":{"login":"lyndsysimon","id":131414,"avatar_url":"https://avatars.githubusercontent.com/u/131414?v=3","gravatar_id":"","url":"https://api.github.com/users/lyndsysimon","html_url":"https://github.com/lyndsysimon","followers_url":"https://api.github.com/users/lyndsysimon/followers","following_url":"https://api.github.com/users/lyndsysimon/following{/other_user}","gists_url":"https://api.github.com/users/lyndsysimon/gists{/gist_id}","starred_url":"https://api.github.com/users/lyndsysimon/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lyndsysimon/subscriptions","organizations_url":"https://api.github.com/users/lyndsysimon/orgs","repos_url":"https://api.github.com/users/lyndsysimon/repos","events_url":"https://api.github.com/users/lyndsysimon/events{/privacy}","received_events_url":"https://api.github.com/users/lyndsysimon/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/lyndsysimon/osf.io","description":"Facilitating Open Science","fork":true,"url":"https://api.github.com/repos/lyndsysimon/osf.io","forks_url":"https://api.github.com/repos/lyndsysimon/osf.io/forks","keys_url":"https://api.github.com/repos/lyndsysimon/osf.io/keys{/key_id}","collaborators_url":"https://api.github.com/repos/lyndsysimon/osf.io/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/lyndsysimon/osf.io/teams","hooks_url":"https://api.github.com/repos/lyndsysimon/osf.io/hooks","issue_events_url":"https://api.github.com/repos/lyndsysimon/osf.io/issues/events{/number}","events_url":"https://api.github.com/repos/lyndsysimon/osf.io/events","assignees_url":"https://api.github.com/repos/lyndsysimon/osf.io/assignees{/user}","branches_url":"https://api.github.com/repos/lyndsysimon/osf.io/branches{/branch}","tags_url":"https://api.github.com/repos/lyndsysimon/osf.io/tags","blobs_url":"https://api.github.com/repos/lyndsysimon/osf.io/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/lyndsysimon/osf.io/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/lyndsysimon/osf.io/git/refs{/sha}","trees_url":"https://api.github.com/repos/lyndsysimon/osf.io/git/trees{/sha}","statuses_url":"https://api.github.com/repos/lyndsysimon/osf.io/statuses/{sha}","languages_url":"https://api.github.com/repos/lyndsysimon/osf.io/languages","stargazers_url":"https://api.github.com/repos/lyndsysimon/osf.io/stargazers","contributors_url":"https://api.github.com/repos/lyndsysimon/osf.io/contributors","subscribers_url":"https://api.github.com/repos/lyndsysimon/osf.io/subscribers","subscription_url":"https://api.github.com/repos/lyndsysimon/osf.io/subscription","commits_url":"https://api.github.com/repos/lyndsysimon/osf.io/commits{/sha}","git_commits_url":"https://api.github.com/repos/lyndsysimon/osf.io/git/commits{/sha}","comments_url":"https://api.github.com/repos/lyndsysimon/osf.io/comments{/number}","issue_comment_url":"https://api.github.com/repos/lyndsysimon/osf.io/issues/comments{/number}","contents_url":"https://api.github.com/repos/lyndsysimon/osf.io/contents/{+path}","compare_url":"https://api.github.com/repos/lyndsysimon/osf.io/compare/{base}...{head}","merges_url":"https://api.github.com/repos/lyndsysimon/osf.io/merges","archive_url":"https://api.github.com/repos/lyndsysimon/osf.io/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/lyndsysimon/osf.io/downloads","issues_url":"https://api.github.com/repos/lyndsysimon/osf.io/issues{/number}","pulls_url":"https://api.github.com/repos/lyndsysimon/osf.io/pulls{/number}","milestones_url":"https://api.github.com/repos/lyndsysimon/osf.io/milestones{/number}","notifications_url":"https://api.github.com/repos/lyndsysimon/osf.io/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/lyndsysimon/osf.io/labels{/name}","releases_url":"https://api.github.com/repos/lyndsysimon/osf.io/releases{/id}","created_at":"2014-11-20T15:49:38Z","updated_at":"2014-11-20T15:49:42Z","pushed_at":"2015-04-29T16:23:51Z","git_url":"git://github.com/lyndsysimon/osf.io.git","ssh_url":"git@github.com:lyndsysimon/osf.io.git","clone_url":"https://github.com/lyndsysimon/osf.io.git","svn_url":"https://github.com/lyndsysimon/osf.io","homepage":"http://osf.io","size":85678,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":2,"mirror_url":null,"open_issues_count":0,"forks":2,"open_issues":0,"watchers":0,"default_branch":"develop"}},"base":{"label":"CenterForOpenScience:develop","ref":"develop","sha":"687d14a4e596dbd31f9e10843f4113f9436593d6","user":{"login":"CenterForOpenScience","id":3344584,"avatar_url":"https://avatars.githubusercontent.com/u/3344584?v=3","gravatar_id":"","url":"https://api.github.com/users/CenterForOpenScience","html_url":"https://github.com/CenterForOpenScience","followers_url":"https://api.github.com/users/CenterForOpenScience/followers","following_url":"https://api.github.com/users/CenterForOpenScience/following{/other_user}","gists_url":"https://api.github.com/users/CenterForOpenScience/gists{/gist_id}","starred_url":"https://api.github.com/users/CenterForOpenScience/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/CenterForOpenScience/subscriptions","organizations_url":"https://api.github.com/users/CenterForOpenScience/orgs","repos_url":"https://api.github.com/users/CenterForOpenScience/repos","events_url":"https://api.github.com/users/CenterForOpenScience/events{/privacy}","received_events_url":"https://api.github.com/users/CenterForOpenScience/received_events","type":"Organization","site_admin":false},"repo":{"id":10199599,"name":"osf.io","full_name":"CenterForOpenScience/osf.io","owner":{"login":"CenterForOpenScience","id":3344584,"avatar_url":"https://avatars.githubusercontent.com/u/3344584?v=3","gravatar_id":"","url":"https://api.github.com/users/CenterForOpenScience","html_url":"https://github.com/CenterForOpenScience","followers_url":"https://api.github.com/users/CenterForOpenScience/followers","following_url":"https://api.github.com/users/CenterForOpenScience/following{/other_user}","gists_url":"https://api.github.com/users/CenterForOpenScience/gists{/gist_id}","starred_url":"https://api.github.com/users/CenterForOpenScience/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/CenterForOpenScience/subscriptions","organizations_url":"https://api.github.com/users/CenterForOpenScience/orgs","repos_url":"https://api.github.com/users/CenterForOpenScience/repos","events_url":"https://api.github.com/users/CenterForOpenScience/events{/privacy}","received_events_url":"https://api.github.com/users/CenterForOpenScience/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/CenterForOpenScience/osf.io","description":"Facilitating Open Science","fork":false,"url":"https://api.github.com/repos/CenterForOpenScience/osf.io","forks_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/forks","keys_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/keys{/key_id}","collaborators_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/teams","hooks_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/hooks","issue_events_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/issues/events{/number}","events_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/events","assignees_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/assignees{/user}","branches_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/branches{/branch}","tags_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/tags","blobs_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/git/refs{/sha}","trees_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/git/trees{/sha}","statuses_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/statuses/{sha}","languages_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/languages","stargazers_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/stargazers","contributors_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/contributors","subscribers_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/subscribers","subscription_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/subscription","commits_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/commits{/sha}","git_commits_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/git/commits{/sha}","comments_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/comments{/number}","issue_comment_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/issues/comments{/number}","contents_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/contents/{+path}","compare_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/compare/{base}...{head}","merges_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/merges","archive_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/downloads","issues_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/issues{/number}","pulls_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/pulls{/number}","milestones_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/milestones{/number}","notifications_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/labels{/name}","releases_url":"https://api.github.com/repos/CenterForOpenScience/osf.io/releases{/id}","created_at":"2013-05-21T15:53:37Z","updated_at":"2015-04-30T18:18:50Z","pushed_at":"2015-04-30T19:39:36Z","git_url":"git://github.com/CenterForOpenScience/osf.io.git","ssh_url":"git@github.com:CenterForOpenScience/osf.io.git","clone_url":"https://github.com/CenterForOpenScience/osf.io.git","svn_url":"https://github.com/CenterForOpenScience/osf.io","homepage":"http://osf.io","size":204164,"stargazers_count":97,"watchers_count":97,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":77,"mirror_url":null,"open_issues_count":387,"forks":77,"open_issues":387,"watchers":97,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/CenterForOpenScience/osf.io/pulls/2548"},"html":{"href":"https://github.com/CenterForOpenScience/osf.io/pull/2548"},"issue":{"href":"https://api.github.com/repos/CenterForOpenScience/osf.io/issues/2548"},"comments":{"href":"https://api.github.com/repos/CenterForOpenScience/osf.io/issues/2548/comments"},"review_comments":{"href":"https://api.github.com/repos/CenterForOpenScience/osf.io/pulls/2548/comments"},"review_comment":{"href":"https://api.github.com/repos/CenterForOpenScience/osf.io/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/CenterForOpenScience/osf.io/pulls/2548/commits"},"statuses":{"href":"https://api.github.com/repos/CenterForOpenScience/osf.io/statuses/70db6e0a730142b1ca5d52132bc561ccf14aaef9"}}}}