{"action":"created","comment":{"url":"https://api.github.com/repos/Wikia/app/pulls/comments/51839267","id":51839267,"diff_hunk":"@@ -44,13 +48,11 @@\n \t\tdisplay: inline;\n \t\tfont-size: 26px;","path":"skins/oasis/css/core/PageHeader.scss","position":74,"original_position":74,"commit_id":"4b62ecb363c9a2a92bd49f0fe96156a2508699b1","original_commit_id":"90cdc186c708393d7789de1febde6dd9b3d7c43c","user":{"login":"michalroszka","id":16726,"avatar_url":"https://avatars.githubusercontent.com/u/16726?v=3","gravatar_id":"","url":"https://api.github.com/users/michalroszka","html_url":"https://github.com/michalroszka","followers_url":"https://api.github.com/users/michalroszka/followers","following_url":"https://api.github.com/users/michalroszka/following{/other_user}","gists_url":"https://api.github.com/users/michalroszka/gists{/gist_id}","starred_url":"https://api.github.com/users/michalroszka/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/michalroszka/subscriptions","organizations_url":"https://api.github.com/users/michalroszka/orgs","repos_url":"https://api.github.com/users/michalroszka/repos","events_url":"https://api.github.com/users/michalroszka/events{/privacy}","received_events_url":"https://api.github.com/users/michalroszka/received_events","type":"User","site_admin":false},"body":":question: does https://github.com/WikiaVolDev/app/commit/4ff5617491d6aa833edc1e3601fbb97897aebcc3#diff-5a1adbc1aca329ef8b292df01c02a86eR314 have anything to do with this one?","created_at":"2016-02-04T07:55:37Z","updated_at":"2016-02-04T07:55:37Z","html_url":"https://github.com/Wikia/app/pull/9609#discussion_r51839267","pull_request_url":"https://api.github.com/repos/Wikia/app/pulls/9609","_links":{"self":{"href":"https://api.github.com/repos/Wikia/app/pulls/comments/51839267"},"html":{"href":"https://github.com/Wikia/app/pull/9609#discussion_r51839267"},"pull_request":{"href":"https://api.github.com/repos/Wikia/app/pulls/9609"}}},"pull_request":{"url":"https://api.github.com/repos/Wikia/app/pulls/9609","id":57836418,"html_url":"https://github.com/Wikia/app/pull/9609","diff_url":"https://github.com/Wikia/app/pull/9609.diff","patch_url":"https://github.com/Wikia/app/pull/9609.patch","issue_url":"https://api.github.com/repos/Wikia/app/issues/9609","number":9609,"state":"open","locked":false,"title":"Reapply changes by @onei from VOLDEV-145","user":{"login":"michalroszka","id":16726,"avatar_url":"https://avatars.githubusercontent.com/u/16726?v=3","gravatar_id":"","url":"https://api.github.com/users/michalroszka","html_url":"https://github.com/michalroszka","followers_url":"https://api.github.com/users/michalroszka/followers","following_url":"https://api.github.com/users/michalroszka/following{/other_user}","gists_url":"https://api.github.com/users/michalroszka/gists{/gist_id}","starred_url":"https://api.github.com/users/michalroszka/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/michalroszka/subscriptions","organizations_url":"https://api.github.com/users/michalroszka/orgs","repos_url":"https://api.github.com/users/michalroszka/repos","events_url":"https://api.github.com/users/michalroszka/events{/privacy}","received_events_url":"https://api.github.com/users/michalroszka/received_events","type":"User","site_admin":false},"body":"# VOLDEV-145 & SUS-28 & XW-396\r\n\r\n* https://wikia-inc.atlassian.net/browse/VOLDEV-145\r\n* https://wikia-inc.atlassian.net/browse/XW-396\r\n* https://wikia-inc.atlassian.net/browse/SUS-28\r\n\r\n## Description\r\n\r\nIt was unable to simply merge @onei's PR https://github.com/Wikia/app/pull/8755 because of the changes we have made in the meantime.\r\n\r\nSo I examined file by file all the changes made by @onei while implementing VOLDEV-145 and re-applied it manually onto our fresh dev. There were 27 files in the original PR and as you can see, I named my commits accordingly.\r\n\r\n### Removed files\r\n\r\nFIles listed in this section were simply removed by VOLDEV-145\r\n\r\n* `PageHeader_EditBox.php`\r\n\r\n### Clean files (only @onei's changes):\r\n\r\nFiles listed in this section remained unchanged within the timeframe between #8755 and now and can be safely replaced:\r\n\r\n* `ForumHooksHelper.class.php`\r\n* ~~`LicensedVideoSwapHooksHelper.class.php`~~ (removed in the meantime along with the entire extension)\r\n* `Oasis_setup.php`\r\n* ~~`PageShare.js`~~ — incorrectly changed, we keep the original version\r\n* `PageShare.scss`\r\n* `PlacesHooks.class.php`\r\n* `SpecialVideos.setup.php`\r\n* `WikiaHubsV3.scss`\r\n* `PageHeader.scss`\r\n* `BodyController.class.php`\r\n* `PageHeader_Corporate.php`\r\n* `PageHeader_EditPage.php`\r\n* `PageHeader_Hubs.php`\r\n* `WikiHeader_Index.php`\r\n\r\n### Changed files (by @onei and Wikia in the meantime)\r\n\r\nFiles listed in this section have been changed by VOLDEV-145 and also changed by Wikia within the timeframe between #8755 and now. I have examined them and applied bot @onei's and Wikia's changes manually.\r\n\r\n* `WallHooksHelper.class.php`\r\n* `WikiaNewFilesHooks.php`\r\n* `Article.php`\r\n* `DefaultSettings.php`\r\n* `SpecialVideosHooks.php`\r\n* `PageHeaderController.class.php`\r\n* `Body_Index.php`\r\n* `PageHeader_Index.php`\r\n\r\n### New files (added by @onei)\r\n\r\nFiles listed in this section have been added by @onei while implementing VOLDEV-145 and can be safely added to our fresh dev.\r\n\r\n* `WikiaNewFilesHooks.php` — then renamed to `WikiaNewFilesHooks.class.php`\r\n* `ContributeController.class.php` — originally created by @onei\r\n* `ContributeModule.scss` — originally created by @onei\r\n* `Contribute_index.php` — originally created by @onei\r\n\r\n## Code Reviewers\r\n\r\n* @onei — please, review the code as you are the author of the changes.\r\n* @Warkot — in case you still remember the context, your pair of eyes would be helpful\r\n* @Wikia/sustaining-team ","created_at":"2016-02-01T13:01:27Z","updated_at":"2016-02-04T07:55:37Z","closed_at":null,"merged_at":null,"merge_commit_sha":"1d0b14a4925f7796c3bc3b8520e74d7c75de78f1","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/Wikia/app/pulls/9609/commits","review_comments_url":"https://api.github.com/repos/Wikia/app/pulls/9609/comments","review_comment_url":"https://api.github.com/repos/Wikia/app/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Wikia/app/issues/9609/comments","statuses_url":"https://api.github.com/repos/Wikia/app/statuses/4b62ecb363c9a2a92bd49f0fe96156a2508699b1","head":{"label":"Wikia:SUS-28-dev-VOLDEV-145-reapply-changes-by-onei","ref":"SUS-28-dev-VOLDEV-145-reapply-changes-by-onei","sha":"4b62ecb363c9a2a92bd49f0fe96156a2508699b1","user":{"login":"Wikia","id":1171011,"avatar_url":"https://avatars.githubusercontent.com/u/1171011?v=3","gravatar_id":"","url":"https://api.github.com/users/Wikia","html_url":"https://github.com/Wikia","followers_url":"https://api.github.com/users/Wikia/followers","following_url":"https://api.github.com/users/Wikia/following{/other_user}","gists_url":"https://api.github.com/users/Wikia/gists{/gist_id}","starred_url":"https://api.github.com/users/Wikia/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Wikia/subscriptions","organizations_url":"https://api.github.com/users/Wikia/orgs","repos_url":"https://api.github.com/users/Wikia/repos","events_url":"https://api.github.com/users/Wikia/events{/privacy}","received_events_url":"https://api.github.com/users/Wikia/received_events","type":"Organization","site_admin":false},"repo":{"id":5532313,"name":"app","full_name":"Wikia/app","owner":{"login":"Wikia","id":1171011,"avatar_url":"https://avatars.githubusercontent.com/u/1171011?v=3","gravatar_id":"","url":"https://api.github.com/users/Wikia","html_url":"https://github.com/Wikia","followers_url":"https://api.github.com/users/Wikia/followers","following_url":"https://api.github.com/users/Wikia/following{/other_user}","gists_url":"https://api.github.com/users/Wikia/gists{/gist_id}","starred_url":"https://api.github.com/users/Wikia/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Wikia/subscriptions","organizations_url":"https://api.github.com/users/Wikia/orgs","repos_url":"https://api.github.com/users/Wikia/repos","events_url":"https://api.github.com/users/Wikia/events{/privacy}","received_events_url":"https://api.github.com/users/Wikia/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Wikia/app","description":"Wikia Application Code","fork":false,"url":"https://api.github.com/repos/Wikia/app","forks_url":"https://api.github.com/repos/Wikia/app/forks","keys_url":"https://api.github.com/repos/Wikia/app/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Wikia/app/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Wikia/app/teams","hooks_url":"https://api.github.com/repos/Wikia/app/hooks","issue_events_url":"https://api.github.com/repos/Wikia/app/issues/events{/number}","events_url":"https://api.github.com/repos/Wikia/app/events","assignees_url":"https://api.github.com/repos/Wikia/app/assignees{/user}","branches_url":"https://api.github.com/repos/Wikia/app/branches{/branch}","tags_url":"https://api.github.com/repos/Wikia/app/tags","blobs_url":"https://api.github.com/repos/Wikia/app/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Wikia/app/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Wikia/app/git/refs{/sha}","trees_url":"https://api.github.com/repos/Wikia/app/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Wikia/app/statuses/{sha}","languages_url":"https://api.github.com/repos/Wikia/app/languages","stargazers_url":"https://api.github.com/repos/Wikia/app/stargazers","contributors_url":"https://api.github.com/repos/Wikia/app/contributors","subscribers_url":"https://api.github.com/repos/Wikia/app/subscribers","subscription_url":"https://api.github.com/repos/Wikia/app/subscription","commits_url":"https://api.github.com/repos/Wikia/app/commits{/sha}","git_commits_url":"https://api.github.com/repos/Wikia/app/git/commits{/sha}","comments_url":"https://api.github.com/repos/Wikia/app/comments{/number}","issue_comment_url":"https://api.github.com/repos/Wikia/app/issues/comments{/number}","contents_url":"https://api.github.com/repos/Wikia/app/contents/{+path}","compare_url":"https://api.github.com/repos/Wikia/app/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Wikia/app/merges","archive_url":"https://api.github.com/repos/Wikia/app/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Wikia/app/downloads","issues_url":"https://api.github.com/repos/Wikia/app/issues{/number}","pulls_url":"https://api.github.com/repos/Wikia/app/pulls{/number}","milestones_url":"https://api.github.com/repos/Wikia/app/milestones{/number}","notifications_url":"https://api.github.com/repos/Wikia/app/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Wikia/app/labels{/name}","releases_url":"https://api.github.com/repos/Wikia/app/releases{/id}","deployments_url":"https://api.github.com/repos/Wikia/app/deployments","created_at":"2012-08-23T20:55:58Z","updated_at":"2016-01-29T15:35:46Z","pushed_at":"2016-02-04T07:31:13Z","git_url":"git://github.com/Wikia/app.git","ssh_url":"git@github.com:Wikia/app.git","clone_url":"https://github.com/Wikia/app.git","svn_url":"https://github.com/Wikia/app","homepage":"http://dev.wikia.com","size":665624,"stargazers_count":97,"watchers_count":97,"language":"PHP","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":71,"mirror_url":null,"open_issues_count":83,"forks":71,"open_issues":83,"watchers":97,"default_branch":"dev"}},"base":{"label":"Wikia:dev","ref":"dev","sha":"56806862afca65ef22a021676e86e1aa65fb2fa0","user":{"login":"Wikia","id":1171011,"avatar_url":"https://avatars.githubusercontent.com/u/1171011?v=3","gravatar_id":"","url":"https://api.github.com/users/Wikia","html_url":"https://github.com/Wikia","followers_url":"https://api.github.com/users/Wikia/followers","following_url":"https://api.github.com/users/Wikia/following{/other_user}","gists_url":"https://api.github.com/users/Wikia/gists{/gist_id}","starred_url":"https://api.github.com/users/Wikia/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Wikia/subscriptions","organizations_url":"https://api.github.com/users/Wikia/orgs","repos_url":"https://api.github.com/users/Wikia/repos","events_url":"https://api.github.com/users/Wikia/events{/privacy}","received_events_url":"https://api.github.com/users/Wikia/received_events","type":"Organization","site_admin":false},"repo":{"id":5532313,"name":"app","full_name":"Wikia/app","owner":{"login":"Wikia","id":1171011,"avatar_url":"https://avatars.githubusercontent.com/u/1171011?v=3","gravatar_id":"","url":"https://api.github.com/users/Wikia","html_url":"https://github.com/Wikia","followers_url":"https://api.github.com/users/Wikia/followers","following_url":"https://api.github.com/users/Wikia/following{/other_user}","gists_url":"https://api.github.com/users/Wikia/gists{/gist_id}","starred_url":"https://api.github.com/users/Wikia/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Wikia/subscriptions","organizations_url":"https://api.github.com/users/Wikia/orgs","repos_url":"https://api.github.com/users/Wikia/repos","events_url":"https://api.github.com/users/Wikia/events{/privacy}","received_events_url":"https://api.github.com/users/Wikia/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Wikia/app","description":"Wikia Application Code","fork":false,"url":"https://api.github.com/repos/Wikia/app","forks_url":"https://api.github.com/repos/Wikia/app/forks","keys_url":"https://api.github.com/repos/Wikia/app/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Wikia/app/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Wikia/app/teams","hooks_url":"https://api.github.com/repos/Wikia/app/hooks","issue_events_url":"https://api.github.com/repos/Wikia/app/issues/events{/number}","events_url":"https://api.github.com/repos/Wikia/app/events","assignees_url":"https://api.github.com/repos/Wikia/app/assignees{/user}","branches_url":"https://api.github.com/repos/Wikia/app/branches{/branch}","tags_url":"https://api.github.com/repos/Wikia/app/tags","blobs_url":"https://api.github.com/repos/Wikia/app/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Wikia/app/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Wikia/app/git/refs{/sha}","trees_url":"https://api.github.com/repos/Wikia/app/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Wikia/app/statuses/{sha}","languages_url":"https://api.github.com/repos/Wikia/app/languages","stargazers_url":"https://api.github.com/repos/Wikia/app/stargazers","contributors_url":"https://api.github.com/repos/Wikia/app/contributors","subscribers_url":"https://api.github.com/repos/Wikia/app/subscribers","subscription_url":"https://api.github.com/repos/Wikia/app/subscription","commits_url":"https://api.github.com/repos/Wikia/app/commits{/sha}","git_commits_url":"https://api.github.com/repos/Wikia/app/git/commits{/sha}","comments_url":"https://api.github.com/repos/Wikia/app/comments{/number}","issue_comment_url":"https://api.github.com/repos/Wikia/app/issues/comments{/number}","contents_url":"https://api.github.com/repos/Wikia/app/contents/{+path}","compare_url":"https://api.github.com/repos/Wikia/app/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Wikia/app/merges","archive_url":"https://api.github.com/repos/Wikia/app/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Wikia/app/downloads","issues_url":"https://api.github.com/repos/Wikia/app/issues{/number}","pulls_url":"https://api.github.com/repos/Wikia/app/pulls{/number}","milestones_url":"https://api.github.com/repos/Wikia/app/milestones{/number}","notifications_url":"https://api.github.com/repos/Wikia/app/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Wikia/app/labels{/name}","releases_url":"https://api.github.com/repos/Wikia/app/releases{/id}","deployments_url":"https://api.github.com/repos/Wikia/app/deployments","created_at":"2012-08-23T20:55:58Z","updated_at":"2016-01-29T15:35:46Z","pushed_at":"2016-02-04T07:31:13Z","git_url":"git://github.com/Wikia/app.git","ssh_url":"git@github.com:Wikia/app.git","clone_url":"https://github.com/Wikia/app.git","svn_url":"https://github.com/Wikia/app","homepage":"http://dev.wikia.com","size":665624,"stargazers_count":97,"watchers_count":97,"language":"PHP","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":71,"mirror_url":null,"open_issues_count":83,"forks":71,"open_issues":83,"watchers":97,"default_branch":"dev"}},"_links":{"self":{"href":"https://api.github.com/repos/Wikia/app/pulls/9609"},"html":{"href":"https://github.com/Wikia/app/pull/9609"},"issue":{"href":"https://api.github.com/repos/Wikia/app/issues/9609"},"comments":{"href":"https://api.github.com/repos/Wikia/app/issues/9609/comments"},"review_comments":{"href":"https://api.github.com/repos/Wikia/app/pulls/9609/comments"},"review_comment":{"href":"https://api.github.com/repos/Wikia/app/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Wikia/app/pulls/9609/commits"},"statuses":{"href":"https://api.github.com/repos/Wikia/app/statuses/4b62ecb363c9a2a92bd49f0fe96156a2508699b1"}}}}