{"action":"created","comment":{"url":"https://api.github.com/repos/owncloud/client/pulls/comments/182355981","pull_request_review_id":113132575,"id":182355981,"diff_hunk":"@@ -228,6 +228,11 @@ QString Theme::helpUrl() const\n     return QString::fromLatin1(\"https://doc.owncloud.org/desktop/%1.%2/\").arg(MIRALL_VERSION_MAJOR).arg(MIRALL_VERSION_MINOR);\n }\n \n+QString Theme::conflictHelpUrl() const\n+{\n+    return helpUrl() + QStringLiteral(\"conflicts.html\");","path":"src/libsync/theme.cpp","position":6,"original_position":6,"commit_id":"a1543bf6d3e6a8972deebc203c7ccb8b153ab88c","original_commit_id":"a1543bf6d3e6a8972deebc203c7ccb8b153ab88c","user":{"login":"ogoffart","id":959326,"avatar_url":"https://avatars3.githubusercontent.com/u/959326?v=4","gravatar_id":"","url":"https://api.github.com/users/ogoffart","html_url":"https://github.com/ogoffart","followers_url":"https://api.github.com/users/ogoffart/followers","following_url":"https://api.github.com/users/ogoffart/following{/other_user}","gists_url":"https://api.github.com/users/ogoffart/gists{/gist_id}","starred_url":"https://api.github.com/users/ogoffart/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ogoffart/subscriptions","organizations_url":"https://api.github.com/users/ogoffart/orgs","repos_url":"https://api.github.com/users/ogoffart/repos","events_url":"https://api.github.com/users/ogoffart/events{/privacy}","received_events_url":"https://api.github.com/users/ogoffart/received_events","type":"User","site_admin":false},"body":"When helpUrl is empty, this should be empty too.","created_at":"2018-04-18T09:00:05Z","updated_at":"2018-04-18T09:00:05Z","html_url":"https://github.com/owncloud/client/pull/6456#discussion_r182355981","pull_request_url":"https://api.github.com/repos/owncloud/client/pulls/6456","author_association":"CONTRIBUTOR","_links":{"self":{"href":"https://api.github.com/repos/owncloud/client/pulls/comments/182355981"},"html":{"href":"https://github.com/owncloud/client/pull/6456#discussion_r182355981"},"pull_request":{"href":"https://api.github.com/repos/owncloud/client/pulls/6456"}}},"pull_request":{"url":"https://api.github.com/repos/owncloud/client/pulls/6456","id":181771435,"html_url":"https://github.com/owncloud/client/pull/6456","diff_url":"https://github.com/owncloud/client/pull/6456.diff","patch_url":"https://github.com/owncloud/client/pull/6456.patch","issue_url":"https://api.github.com/repos/owncloud/client/issues/6456","number":6456,"state":"open","locked":false,"title":"Issues: Show link to conflicts doc if there are some","user":{"login":"ckamm","id":833306,"avatar_url":"https://avatars0.githubusercontent.com/u/833306?v=4","gravatar_id":"","url":"https://api.github.com/users/ckamm","html_url":"https://github.com/ckamm","followers_url":"https://api.github.com/users/ckamm/followers","following_url":"https://api.github.com/users/ckamm/following{/other_user}","gists_url":"https://api.github.com/users/ckamm/gists{/gist_id}","starred_url":"https://api.github.com/users/ckamm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ckamm/subscriptions","organizations_url":"https://api.github.com/users/ckamm/orgs","repos_url":"https://api.github.com/users/ckamm/repos","events_url":"https://api.github.com/users/ckamm/events{/privacy}","received_events_url":"https://api.github.com/users/ckamm/received_events","type":"User","site_admin":false},"body":"The link url is themed.\r\n\r\nFor #6396\r\n\r\nOnly merge once we can check that the link will actually work. Currently it's a 404: https://doc.owncloud.org/desktop/2.5/conflicts.html","created_at":"2018-04-16T07:15:36Z","updated_at":"2018-04-18T09:00:05Z","closed_at":null,"merged_at":null,"merge_commit_sha":"dea5cd3e9b01c7ef385e4fc64eb102bcd2fef6e5","assignee":{"login":"ckamm","id":833306,"avatar_url":"https://avatars0.githubusercontent.com/u/833306?v=4","gravatar_id":"","url":"https://api.github.com/users/ckamm","html_url":"https://github.com/ckamm","followers_url":"https://api.github.com/users/ckamm/followers","following_url":"https://api.github.com/users/ckamm/following{/other_user}","gists_url":"https://api.github.com/users/ckamm/gists{/gist_id}","starred_url":"https://api.github.com/users/ckamm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ckamm/subscriptions","organizations_url":"https://api.github.com/users/ckamm/orgs","repos_url":"https://api.github.com/users/ckamm/repos","events_url":"https://api.github.com/users/ckamm/events{/privacy}","received_events_url":"https://api.github.com/users/ckamm/received_events","type":"User","site_admin":false},"assignees":[{"login":"ckamm","id":833306,"avatar_url":"https://avatars0.githubusercontent.com/u/833306?v=4","gravatar_id":"","url":"https://api.github.com/users/ckamm","html_url":"https://github.com/ckamm","followers_url":"https://api.github.com/users/ckamm/followers","following_url":"https://api.github.com/users/ckamm/following{/other_user}","gists_url":"https://api.github.com/users/ckamm/gists{/gist_id}","starred_url":"https://api.github.com/users/ckamm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ckamm/subscriptions","organizations_url":"https://api.github.com/users/ckamm/orgs","repos_url":"https://api.github.com/users/ckamm/repos","events_url":"https://api.github.com/users/ckamm/events{/privacy}","received_events_url":"https://api.github.com/users/ckamm/received_events","type":"User","site_admin":false}],"requested_reviewers":[{"login":"SamuAlfageme","id":2644445,"avatar_url":"https://avatars2.githubusercontent.com/u/2644445?v=4","gravatar_id":"","url":"https://api.github.com/users/SamuAlfageme","html_url":"https://github.com/SamuAlfageme","followers_url":"https://api.github.com/users/SamuAlfageme/followers","following_url":"https://api.github.com/users/SamuAlfageme/following{/other_user}","gists_url":"https://api.github.com/users/SamuAlfageme/gists{/gist_id}","starred_url":"https://api.github.com/users/SamuAlfageme/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SamuAlfageme/subscriptions","organizations_url":"https://api.github.com/users/SamuAlfageme/orgs","repos_url":"https://api.github.com/users/SamuAlfageme/repos","events_url":"https://api.github.com/users/SamuAlfageme/events{/privacy}","received_events_url":"https://api.github.com/users/SamuAlfageme/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[{"id":334959946,"url":"https://api.github.com/repos/owncloud/client/labels/DO%20NOT%20MERGE%20YET","name":"DO NOT MERGE YET","color":"e44d24","default":false}],"milestone":{"url":"https://api.github.com/repos/owncloud/client/milestones/42","html_url":"https://github.com/owncloud/client/milestone/42","labels_url":"https://api.github.com/repos/owncloud/client/milestones/42/labels","id":2582505,"number":42,"title":"2.5.0","description":"","creator":{"login":"guruz","id":959327,"avatar_url":"https://avatars3.githubusercontent.com/u/959327?v=4","gravatar_id":"","url":"https://api.github.com/users/guruz","html_url":"https://github.com/guruz","followers_url":"https://api.github.com/users/guruz/followers","following_url":"https://api.github.com/users/guruz/following{/other_user}","gists_url":"https://api.github.com/users/guruz/gists{/gist_id}","starred_url":"https://api.github.com/users/guruz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/guruz/subscriptions","organizations_url":"https://api.github.com/users/guruz/orgs","repos_url":"https://api.github.com/users/guruz/repos","events_url":"https://api.github.com/users/guruz/events{/privacy}","received_events_url":"https://api.github.com/users/guruz/received_events","type":"User","site_admin":false},"open_issues":53,"closed_issues":100,"state":"open","created_at":"2017-06-14T10:52:21Z","updated_at":"2018-04-18T08:57:17Z","due_on":null,"closed_at":null},"commits_url":"https://api.github.com/repos/owncloud/client/pulls/6456/commits","review_comments_url":"https://api.github.com/repos/owncloud/client/pulls/6456/comments","review_comment_url":"https://api.github.com/repos/owncloud/client/pulls/comments{/number}","comments_url":"https://api.github.com/repos/owncloud/client/issues/6456/comments","statuses_url":"https://api.github.com/repos/owncloud/client/statuses/a1543bf6d3e6a8972deebc203c7ccb8b153ab88c","head":{"label":"owncloud:show-conflicts-doc-link","ref":"show-conflicts-doc-link","sha":"a1543bf6d3e6a8972deebc203c7ccb8b153ab88c","user":{"login":"owncloud","id":1645051,"avatar_url":"https://avatars3.githubusercontent.com/u/1645051?v=4","gravatar_id":"","url":"https://api.github.com/users/owncloud","html_url":"https://github.com/owncloud","followers_url":"https://api.github.com/users/owncloud/followers","following_url":"https://api.github.com/users/owncloud/following{/other_user}","gists_url":"https://api.github.com/users/owncloud/gists{/gist_id}","starred_url":"https://api.github.com/users/owncloud/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/owncloud/subscriptions","organizations_url":"https://api.github.com/users/owncloud/orgs","repos_url":"https://api.github.com/users/owncloud/repos","events_url":"https://api.github.com/users/owncloud/events{/privacy}","received_events_url":"https://api.github.com/users/owncloud/received_events","type":"Organization","site_admin":false},"repo":{"id":5550623,"name":"client","full_name":"owncloud/client","owner":{"login":"owncloud","id":1645051,"avatar_url":"https://avatars3.githubusercontent.com/u/1645051?v=4","gravatar_id":"","url":"https://api.github.com/users/owncloud","html_url":"https://github.com/owncloud","followers_url":"https://api.github.com/users/owncloud/followers","following_url":"https://api.github.com/users/owncloud/following{/other_user}","gists_url":"https://api.github.com/users/owncloud/gists{/gist_id}","starred_url":"https://api.github.com/users/owncloud/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/owncloud/subscriptions","organizations_url":"https://api.github.com/users/owncloud/orgs","repos_url":"https://api.github.com/users/owncloud/repos","events_url":"https://api.github.com/users/owncloud/events{/privacy}","received_events_url":"https://api.github.com/users/owncloud/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/owncloud/client","description":":computer: Desktop Syncing Client for ownCloud","fork":false,"url":"https://api.github.com/repos/owncloud/client","forks_url":"https://api.github.com/repos/owncloud/client/forks","keys_url":"https://api.github.com/repos/owncloud/client/keys{/key_id}","collaborators_url":"https://api.github.com/repos/owncloud/client/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/owncloud/client/teams","hooks_url":"https://api.github.com/repos/owncloud/client/hooks","issue_events_url":"https://api.github.com/repos/owncloud/client/issues/events{/number}","events_url":"https://api.github.com/repos/owncloud/client/events","assignees_url":"https://api.github.com/repos/owncloud/client/assignees{/user}","branches_url":"https://api.github.com/repos/owncloud/client/branches{/branch}","tags_url":"https://api.github.com/repos/owncloud/client/tags","blobs_url":"https://api.github.com/repos/owncloud/client/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/owncloud/client/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/owncloud/client/git/refs{/sha}","trees_url":"https://api.github.com/repos/owncloud/client/git/trees{/sha}","statuses_url":"https://api.github.com/repos/owncloud/client/statuses/{sha}","languages_url":"https://api.github.com/repos/owncloud/client/languages","stargazers_url":"https://api.github.com/repos/owncloud/client/stargazers","contributors_url":"https://api.github.com/repos/owncloud/client/contributors","subscribers_url":"https://api.github.com/repos/owncloud/client/subscribers","subscription_url":"https://api.github.com/repos/owncloud/client/subscription","commits_url":"https://api.github.com/repos/owncloud/client/commits{/sha}","git_commits_url":"https://api.github.com/repos/owncloud/client/git/commits{/sha}","comments_url":"https://api.github.com/repos/owncloud/client/comments{/number}","issue_comment_url":"https://api.github.com/repos/owncloud/client/issues/comments{/number}","contents_url":"https://api.github.com/repos/owncloud/client/contents/{+path}","compare_url":"https://api.github.com/repos/owncloud/client/compare/{base}...{head}","merges_url":"https://api.github.com/repos/owncloud/client/merges","archive_url":"https://api.github.com/repos/owncloud/client/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/owncloud/client/downloads","issues_url":"https://api.github.com/repos/owncloud/client/issues{/number}","pulls_url":"https://api.github.com/repos/owncloud/client/pulls{/number}","milestones_url":"https://api.github.com/repos/owncloud/client/milestones{/number}","notifications_url":"https://api.github.com/repos/owncloud/client/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/owncloud/client/labels{/name}","releases_url":"https://api.github.com/repos/owncloud/client/releases{/id}","deployments_url":"https://api.github.com/repos/owncloud/client/deployments","created_at":"2012-08-25T10:44:53Z","updated_at":"2018-04-18T08:57:21Z","pushed_at":"2018-04-18T08:57:21Z","git_url":"git://github.com/owncloud/client.git","ssh_url":"git@github.com:owncloud/client.git","clone_url":"https://github.com/owncloud/client.git","svn_url":"https://github.com/owncloud/client","homepage":"","size":149661,"stargazers_count":939,"watchers_count":939,"language":"C++","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":547,"mirror_url":null,"archived":false,"open_issues_count":567,"license":{"key":"other","name":"Other","spdx_id":null,"url":null},"forks":547,"open_issues":567,"watchers":939,"default_branch":"master"}},"base":{"label":"owncloud:master","ref":"master","sha":"2c18ea0a89e3454f2844ed435a4321a9e8745f70","user":{"login":"owncloud","id":1645051,"avatar_url":"https://avatars3.githubusercontent.com/u/1645051?v=4","gravatar_id":"","url":"https://api.github.com/users/owncloud","html_url":"https://github.com/owncloud","followers_url":"https://api.github.com/users/owncloud/followers","following_url":"https://api.github.com/users/owncloud/following{/other_user}","gists_url":"https://api.github.com/users/owncloud/gists{/gist_id}","starred_url":"https://api.github.com/users/owncloud/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/owncloud/subscriptions","organizations_url":"https://api.github.com/users/owncloud/orgs","repos_url":"https://api.github.com/users/owncloud/repos","events_url":"https://api.github.com/users/owncloud/events{/privacy}","received_events_url":"https://api.github.com/users/owncloud/received_events","type":"Organization","site_admin":false},"repo":{"id":5550623,"name":"client","full_name":"owncloud/client","owner":{"login":"owncloud","id":1645051,"avatar_url":"https://avatars3.githubusercontent.com/u/1645051?v=4","gravatar_id":"","url":"https://api.github.com/users/owncloud","html_url":"https://github.com/owncloud","followers_url":"https://api.github.com/users/owncloud/followers","following_url":"https://api.github.com/users/owncloud/following{/other_user}","gists_url":"https://api.github.com/users/owncloud/gists{/gist_id}","starred_url":"https://api.github.com/users/owncloud/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/owncloud/subscriptions","organizations_url":"https://api.github.com/users/owncloud/orgs","repos_url":"https://api.github.com/users/owncloud/repos","events_url":"https://api.github.com/users/owncloud/events{/privacy}","received_events_url":"https://api.github.com/users/owncloud/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/owncloud/client","description":":computer: Desktop Syncing Client for ownCloud","fork":false,"url":"https://api.github.com/repos/owncloud/client","forks_url":"https://api.github.com/repos/owncloud/client/forks","keys_url":"https://api.github.com/repos/owncloud/client/keys{/key_id}","collaborators_url":"https://api.github.com/repos/owncloud/client/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/owncloud/client/teams","hooks_url":"https://api.github.com/repos/owncloud/client/hooks","issue_events_url":"https://api.github.com/repos/owncloud/client/issues/events{/number}","events_url":"https://api.github.com/repos/owncloud/client/events","assignees_url":"https://api.github.com/repos/owncloud/client/assignees{/user}","branches_url":"https://api.github.com/repos/owncloud/client/branches{/branch}","tags_url":"https://api.github.com/repos/owncloud/client/tags","blobs_url":"https://api.github.com/repos/owncloud/client/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/owncloud/client/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/owncloud/client/git/refs{/sha}","trees_url":"https://api.github.com/repos/owncloud/client/git/trees{/sha}","statuses_url":"https://api.github.com/repos/owncloud/client/statuses/{sha}","languages_url":"https://api.github.com/repos/owncloud/client/languages","stargazers_url":"https://api.github.com/repos/owncloud/client/stargazers","contributors_url":"https://api.github.com/repos/owncloud/client/contributors","subscribers_url":"https://api.github.com/repos/owncloud/client/subscribers","subscription_url":"https://api.github.com/repos/owncloud/client/subscription","commits_url":"https://api.github.com/repos/owncloud/client/commits{/sha}","git_commits_url":"https://api.github.com/repos/owncloud/client/git/commits{/sha}","comments_url":"https://api.github.com/repos/owncloud/client/comments{/number}","issue_comment_url":"https://api.github.com/repos/owncloud/client/issues/comments{/number}","contents_url":"https://api.github.com/repos/owncloud/client/contents/{+path}","compare_url":"https://api.github.com/repos/owncloud/client/compare/{base}...{head}","merges_url":"https://api.github.com/repos/owncloud/client/merges","archive_url":"https://api.github.com/repos/owncloud/client/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/owncloud/client/downloads","issues_url":"https://api.github.com/repos/owncloud/client/issues{/number}","pulls_url":"https://api.github.com/repos/owncloud/client/pulls{/number}","milestones_url":"https://api.github.com/repos/owncloud/client/milestones{/number}","notifications_url":"https://api.github.com/repos/owncloud/client/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/owncloud/client/labels{/name}","releases_url":"https://api.github.com/repos/owncloud/client/releases{/id}","deployments_url":"https://api.github.com/repos/owncloud/client/deployments","created_at":"2012-08-25T10:44:53Z","updated_at":"2018-04-18T08:57:21Z","pushed_at":"2018-04-18T08:57:21Z","git_url":"git://github.com/owncloud/client.git","ssh_url":"git@github.com:owncloud/client.git","clone_url":"https://github.com/owncloud/client.git","svn_url":"https://github.com/owncloud/client","homepage":"","size":149661,"stargazers_count":939,"watchers_count":939,"language":"C++","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":547,"mirror_url":null,"archived":false,"open_issues_count":567,"license":{"key":"other","name":"Other","spdx_id":null,"url":null},"forks":547,"open_issues":567,"watchers":939,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/owncloud/client/pulls/6456"},"html":{"href":"https://github.com/owncloud/client/pull/6456"},"issue":{"href":"https://api.github.com/repos/owncloud/client/issues/6456"},"comments":{"href":"https://api.github.com/repos/owncloud/client/issues/6456/comments"},"review_comments":{"href":"https://api.github.com/repos/owncloud/client/pulls/6456/comments"},"review_comment":{"href":"https://api.github.com/repos/owncloud/client/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/owncloud/client/pulls/6456/commits"},"statuses":{"href":"https://api.github.com/repos/owncloud/client/statuses/a1543bf6d3e6a8972deebc203c7ccb8b153ab88c"}},"author_association":"MEMBER"}}
{"actor":{"display_login":"ogoffart"}}