Page MenuHomePhabricator
Paste P16759

Getting Error on pushing changes in CentralNotice
ActivePublic

Authored by Sahilgrewalhere on Jul 2 2021, 12:49 PM.
$ git review -R
Enter passphrase for key '/c/Users/sahil grewal/.ssh/id_rsa':
Your change was committed before the commit hook was installed.
Amending the commit to add a gerrit change id.
remote:
remote: Processing changes: refs: 1
remote: Processing changes: refs: 1, done
remote: ERROR: Implicit Merge of bd99005 Making the .gitreview file point to the right spot
remote: ERROR: Implicit Merge of 44b7f7e Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of eb713ef Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of b55239f Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 4124e51 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 840de4d Merge remote-tracking branch 'origin/master' into wmf_deploy
remote: ERROR: Implicit Merge of 21269ca Merge remote-tracking branch 'origin/master' into wmf_deploy
remote: ERROR: Implicit Merge of 8d65bba Merge remote-tracking branch 'origin/master' into HEAD
remote: ERROR: Implicit Merge of 06019c5 Merge commit 'Ensure requests are not cached with session data' into wmf_deploy
remote: ERROR: Implicit Merge of 31e1e68 Merge Custom banner classes from master (also GlobalAlloc)
remote: ERROR: Implicit Merge of e267943 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 9fcdfb1 Merge remote-tracking branch 'origin/master' into wmf_deploy
remote: ERROR: Implicit Merge of 5461bb6 Merge remote-tracking branch 'origin/master' into wmf_deploy
remote: ERROR: Implicit Merge of 3a46e0d Merge remote-tracking branch 'origin/master' into wmf_deploy
remote: ERROR: Implicit Merge of 0a7d49c Merge remote-tracking branch 'origin/master' into wmf_deploy
remote: ERROR: Implicit Merge of 82489dd Merge remote-tracking branch 'origin/master' into HEAD
remote: ERROR: Implicit Merge of de8ec62 Merge remote-tracking branch 'origin/master' into HEAD
remote: ERROR: Implicit Merge of a7fa498 Merge remote-tracking branch 'origin/master' into wmf_deploy
remote: ERROR: Implicit Merge of 87b04f2 Revert "Serve Mobile URLs to Mobile Users"
remote: ERROR: Implicit Merge of f45530c Merge remote-tracking branch 'origin/master' into HEAD
remote: ERROR: Implicit Merge of 1a03d0e Merge remote-tracking branch 'origin/master' into HEAD
remote: ERROR: Implicit Merge of 9bc43e2 Merge remote-tracking branch 'gerrit/master' into wmf_deploy
remote: ERROR: Implicit Merge of 6cea54b Cache Hide Requests
remote: ERROR: Implicit Merge of 7c82639 Do not mobilify hide links
remote: ERROR: Implicit Merge of 7f43299 Merge remote-tracking branch 'gerrit/master' into wmf_deploy
remote: ERROR: Implicit Merge of 76aeea1 Merge remote-tracking branch 'gerrit/master' into wmf_deploy
remote: ERROR: Implicit Merge of 6bde6c2 Merge remote-tracking branch 'gerrit/master' into wmf_deploy
remote: ERROR: Implicit Merge of 8da7637 Merge remote-tracking branch 'gerrit/master' into wmf_deploy
remote: ERROR: Implicit Merge of 784ae06 Merge remote-tracking branch 'origin/master' into wmf_deploy
remote: ERROR: Implicit Merge of c3af74b Merge remote-tracking branch 'origin/master' into wmf_deploy
remote: ERROR: Implicit Merge of 8a7f5a3 Merge remote-tracking branch 'gerrit/master' into wmf_deploy
remote: ERROR: Implicit Merge of fb14d9a Harmonize format of GeoIP cookie
remote: ERROR: Implicit Merge of 47705d8 Adding missing jquery.json depenency needed for dismissing banners
remote: ERROR: Implicit Merge of dbc5061 Merge remote-tracking branch 'origin/master' into wmf_deploy
remote: ERROR: Implicit Merge of 92ca572 Fix banner name filter and put it in URLs
remote: ERROR: Implicit Merge of c2110c3 Add dates to banner-hiding cookies (server side)
remote: ERROR: Implicit Merge of e9a7041 Fix @returns >> @return phpdoc
remote: ERROR: Implicit Merge of d2f0d8f Use public instead of var in classes
remote: ERROR: Implicit Merge of 12339fc Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of b137e81 Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of 6e9c3fa Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of 9d8b23b Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of a49280c Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of dcf92c9 Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of d9cdc72 Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of 6eb4476 Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of 943a907 Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of 0254d2d Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of bdc2c6e Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of f3dce41 Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of e4c533a Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of 4ae59ab Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of 00c45d3 Merge remote-tracking branch 'origin/master' into HEAD
remote: ERROR: Implicit Merge of f545a1f DEPLOY BY 9/16: Swap out jQuery.JSON for native methods
remote: ERROR: Implicit Merge of 182e388 Merge remote-tracking branch 'remotes/origin/master' into wmf_deploy
remote: ERROR: Implicit Merge of 2861233 Make sure we declare globals before using them
remote: ERROR: Implicit Merge of 2c1103e Merge remote-tracking branch 'origin/master' into wmf_deploy
remote: ERROR: Implicit Merge of 4ed5438 Merge master branch into wmf_deploy
remote: ERROR: Implicit Merge of 5915f55 (bug 73389) rollback new controller modules due to mobile fail
remote: ERROR: Implicit Merge of d64c9c1 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 8156813 Merge remote-tracking branch 'origin/master' into HEAD
remote: ERROR: Implicit Merge of b0c7dc1 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of cc7972e Merge master into wmf_deploy
remote: ERROR: Implicit Merge of d7aae2f Merge master to wmf_deploy
remote: ERROR: Implicit Merge of 66cb773 Filter logged-in status on client
remote: ERROR: Implicit Merge of bc08d0c Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 38387ec Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of bc1c675 Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of aead225 remove outdated README
remote: ERROR: Implicit Merge of e7ada13 Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of 71db896 Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of 1ac1aab Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of 673bd51 Localisation updates from https://translatewiki.net.
remote: ERROR: Implicit Merge of e6f3c66 Prevent Google indexing of the CentralNotice div
remote: ERROR: Implicit Merge of ed403a1 Don't insert banner for bots
remote: ERROR: Implicit Merge of 78f6b61 Merge master into wmf_deploy
remote: ERROR: Implicit Merge of 0266dbc Merge master into wmf_deploy
remote: ERROR: Implicit Merge of 1196491 Revert "Don't insert banner for bots" (take 2)
remote: ERROR: Implicit Merge of 08858dc Merge master into wmf_deploy
remote: ERROR: Implicit Merge of 00a3e8a Register some missing autoload classes, to satisfy structure tests
remote: ERROR: Implicit Merge of 6b22bfb Instrumentation to report when alterImpressionData is not found
remote: ERROR: Implicit Merge of ff28a2e Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 26e24e1 Revert "Merge branch 'master' into wmf_deploy"
remote: ERROR: Implicit Merge of c056316 Revert "Revert "Merge branch 'master' into wmf_deploy""
remote: ERROR: Implicit Merge of 9fee16d Revert newline added in past merge
remote: ERROR: Implicit Merge of 3f6cab7 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of f5796d3 Merge master into wmf_deploy
remote: ERROR: Implicit Merge of ade2669 Merge master into wmf_deploy
remote: ERROR: Implicit Merge of 9da392d Merge master into wmf_deploy
remote: ERROR: Implicit Merge of 451f800 Merge master into wmf_deploy
remote: ERROR: Implicit Merge of ffe1d81 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of a1ed003 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of bab5f9a Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 08b47d2 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of c7cb171 Parse region in geoip cookie
remote: ERROR: Implicit Merge of dd66b08 Parse older format of Geo cookies
remote: ERROR: Implicit Merge of 2d87896 Only add UserMerge tables if $wgNoticeInfrastructure = true;
remote: ERROR: Implicit Merge of c01ae1c Merge master into wmf_deploy
remote: ERROR: Implicit Merge of a6a3d0d Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 504c12e Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 85d806f Merge commit 'ff754b0f6176' into wmf_deploy
remote: ERROR: Implicit Merge of 4a005c8 KVStore: batched, more resilient implementation of TTL for items
remote: ERROR: Implicit Merge of d2593e8 BannerHistoryLogger: always send log ID, never send twice
remote: ERROR: Implicit Merge of 04122d6 Enum for banner hide reasons
remote: ERROR: Implicit Merge of 6bd658e Migrate to a terser cookie name and format
remote: ERROR: Implicit Merge of 2e2e1fa Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of fb922ed Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of dac9dd3 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 73e297d impressionDiet: default hide banners if no storage is available
remote: ERROR: Implicit Merge of b933cfd ext.centralNotice.display: add 'namespace' hide reason
remote: ERROR: Implicit Merge of 1d6b70c ext.centralNotice.display: Add API for custom hide cookie reasons and durations
remote: ERROR: Implicit Merge of 05544e7 ext.centralNotice.display.customHideBanner(): fix var name and actually hide
remote: ERROR: Implicit Merge of e33a697 impressionDiet: don't count impressions if banner hidden by close cookie
remote: ERROR: Implicit Merge of 9e1b4a3 Improve impression diet state machine
remote: ERROR: Implicit Merge of 224463a Clean up ext.centralNotice.geoIP qunit tests
remote: ERROR: Implicit Merge of 41f1841 Fix fallback to geoiplookup.wikimedia.org for empty IPv6 geo cookies
remote: ERROR: Implicit Merge of b48299a Merge master into wmf_deploy
remote: ERROR: Implicit Merge of 1bb4ace Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of e72c61d Ensure consistent ordering of choiceData for RL module hashes
remote: ERROR: Implicit Merge of 88137bb ext.centralNotice.display: API for registering tests
remote: ERROR: Implicit Merge of 50b7a37 Revert "ext.centralNotice.display: API for registering tests"
remote: ERROR: Implicit Merge of c2086b8 ext.centralNotice.display: API for registering tests
remote: ERROR: Implicit Merge of 2932196 Re-apply "jshint, gruntfile, and compatibility fixes" (part 1)
remote: ERROR: Implicit Merge of 07e0476 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of c448174 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 86bcb93 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 575f4ae Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 4dbd3f9 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of f3b18a1 Merge master into wmf_deploy
remote: ERROR: Implicit Merge of da3fe1e Merge master into wmf_deploy
remote: ERROR: Implicit Merge of 40ba87c Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 6528207 Handle banner loader errors on client
remote: ERROR: Implicit Merge of 0794373 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 8388ac0 Remove use of deprecated "json" module
remote: ERROR: Implicit Merge of 24e8419 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 7c0c493 Add mediawiki to list of wikis
remote: ERROR: Implicit Merge of 0cbfa06 Merge branch 'master' (7b30a66) into wmf_deploy
remote: ERROR: Implicit Merge of 60ac0a4 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 86153ab Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 5760939 BannerHistoryLogger: Fix ajax options for when sendBeacon is not available
remote: ERROR: Implicit Merge of 42e2fe8 Add ext.centralNotice.adminUi module back to campaign list view
remote: ERROR: Implicit Merge of 57c9a69 Ensure numeric keys without gaps in ChoiceDataProvider::getChoices()
remote: ERROR: Implicit Merge of b1e320c Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 3c4e66a Add API to delay call to record impression
remote: ERROR: Implicit Merge of 53ce612 Add client-side setDebugInfo() method
remote: ERROR: Implicit Merge of c359325 large banner limit: debugging instrumentation
remote: ERROR: Implicit Merge of 6942cdb Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of de6fecb IndexPager wants 'join_conds', not 'joins'
remote: ERROR: Implicit Merge of a311619 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of e9f195f Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 5ea9990 Emit CSP headers on banner previews
remote: ERROR: Implicit Merge of afcf52a Add privacy warning and allow wikitext in banner content field summary
remote: ERROR: Implicit Merge of 5a622c1 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 4de28b6 Convert numerical URL parameters to numbers
remote: ERROR: Implicit Merge of 33e5792 Remove Special:GlobalAllocation
remote: ERROR: Implicit Merge of 5381d32 Add performance mark for when banner is inserted
remote: ERROR: Implicit Merge of 9eecee9 Revert "Add performance mark for when banner is inserted"
remote: ERROR: Implicit Merge of e08244e Add performance mark for when banner is inserted
remote: ERROR: Implicit Merge of 282c22f Replace uses of deprecated Language::truncate()
remote: ERROR: Implicit Merge of ab8225a Declare class properties
remote: ERROR: Implicit Merge of 22ab640 Sanitize translatable banner messages on output
remote: ERROR: Implicit Merge of a0283e2 Include translatable messages from any banner
remote: ERROR: Implicit Merge of 986c01a build: Updating mediawiki/mediawiki-codesniffer to 20.0.0
remote: ERROR: Implicit Merge of f725ab3 build: Updating mediawiki/mediawiki-codesniffer to 21.0.0
remote: ERROR: Implicit Merge of cc3b5ea Fix multiple PHP class declarations in one file
remote: ERROR: Implicit Merge of 65dfdef Remove @static doc annotation
remote: ERROR: Implicit Merge of ded0e79 Make CentralNotice admin group configurable
remote: ERROR: Implicit Merge of d3a3a79 $wgNoticeProtectGroup -> $wgCentralNoticeMessageProtectRight
remote: ERROR: Implicit Merge of 63b5490 Protect banner components in MW NS
remote: ERROR: Implicit Merge of 445deea Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 4f931be Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 67eb7e1 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 8dab353 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 414bf45 Revert "Merge branch 'master' into wmf_deploy"
remote: ERROR: Implicit Merge of 5d71e20 Revert "Revert "Merge branch 'master' into wmf_deploy""
remote: ERROR: Implicit Merge of ac7ae76 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of e2456a3 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 600762e build: Upgrade phan-taint-check-plugin from 1.5.x to 2.0.1
remote: ERROR: Implicit Merge of a4980e0 Avoid usage of deprecated `ObjectCache::getMainWANInstance()`
remote: ERROR: Implicit Merge of ab9c3d2 Make CNDeviceTarget::addDeviceTarget() use DB_MASTER
remote: ERROR: Implicit Merge of 6520be5 Banner history logger: remove loading of schema module
remote: ERROR: Implicit Merge of d294e65 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of c26ef03 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of be08dc1 CentralNotice: Replace deprecated editToken with csrfToken
remote: ERROR: Implicit Merge of 6db58de Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of d0d85fa Update CentralNoticeImpression scheme for campaign fallback
remote: ERROR: Implicit Merge of a8e433f Fix error in CentralNoticeImpression schema
remote: ERROR: Implicit Merge of eabf5ab build: Bump mediawiki-codesniffer to 28.0.0 and make pass
remote: ERROR: Implicit Merge of b4105ab Remove use of jquery.ui module aliases
remote: ERROR: Implicit Merge of 6d35839 build: Updating mediawiki/mediawiki-phan-config to 0.8.0
remote: ERROR: Implicit Merge of d7f4d75 Move test-only classes to new TestAutoloadClasses declaration
remote: ERROR: Implicit Merge of c5e386c build: Updating dependencies
remote: ERROR: Implicit Merge of 5f31add Remove backward compatibility code for OutputPage::parseInline
remote: ERROR: Implicit Merge of d2d573b tests: Don't write to the actual database
remote: ERROR: Implicit Merge of c60eafa Reset hide shouldHide,reason private variables when setting new category
remote: ERROR: Implicit Merge of 54f60b8 Adding new ids for lang and project multi-select tr elements
remote: ERROR: Implicit Merge of 5021b77 Revert "Adding new ids for lang and project multi-select tr elements"
remote: ERROR: Implicit Merge of caba341 Remove usages of deprecated Revision::newFromTitle
remote: ERROR: Implicit Merge of 5b6e82b Merge "Revert "Adding new ids for lang and project multi-select tr elements"" into wmf_deploy
remote: ERROR: Implicit Merge of 6ffaa26 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 7e60ae8 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of c9ece17 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of cf98f39 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of ddb8c60 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 1614500 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 308b9d6 BannerRenderer: Use ResourceLoader::filter instead of internal JavaScriptMinifier
remote: ERROR: Implicit Merge of 974b492 Remove optedOutCampaigns property from impression data
remote: ERROR: Implicit Merge of a8ee3ec Merge "BannerRenderer: Use ResourceLoader::filter instead of internal JavaScriptMinifier" into wmf_deploy
remote: ERROR: Implicit Merge of cc59ac0 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 420a5aa Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of a22d908 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 281c014 Merge branch 'master' into wmf_deploy
remote: ERROR: Implicit Merge of 06f8f53 Merge branch 'master' into wmf_deploy
To ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
! [remote rejected] HEAD -> refs/for/master%topic=T274579 (implicit merges detected)
error: failed to push some refs to 'ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice'