Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/292282
Change subject: Merge branch 'master' into wmf_deploy
......................................................................
Merge branch 'master' into wmf_deploy
4a01c97 kvStoreMaintenance: Refactor to use requestIdleCallback
b42d5c6 Use GUI read-only errors instead of DB class errors
cc22b1a Migration of browsertests* Jenkins jobs to selenium* jobs
6400602 Merge "Migration of browsertests* Jenkins jobs to selenium* jobs"
97f1cad Removed unnecessary VERSION from ci.yml file
f225954 choiceData always checks for mw.centralNotice object
9303958 Ensure consistent ordering of choiceData for RL module hashes
6431826 Fix browser tests for choiceData ordering
337ecaf Mixed storage for impression diet and large banner limit
93ea586 Mixed storage for buckets
fd38af3 kvStoreMaintenance: check for and maybe remove fallback cookies
555cd4a Slurp and delete defunct cookies on every pageview
28d8871 Always warn in console using mw.log.warn() instead of mw.log()
6712510 Don't fail hard on dependencies error for ext.centralNotice.startUp
418c2cb Merge "Don't fail hard on dependencies error for
ext.centralNotice.startUp"
06bfa7c Merge "Use GUI read-only errors instead of DB class errors"
a17d448 Remove legacy config
1fd731a Replace usage of wfSetupSession()
1169f1d ext.centralNotice.display: API for registering tests
6290235 Minor clean up in CNChoiceDataResourceLoaderModule
9b61654 Update mediawiki_api gem to 1.7.1
3b2bbab Merge "Minor clean up in CNChoiceDataResourceLoaderModule"
b14d370 jshint, gruntfile, and compatibility fixes
And localisation updates from translatewiki
Bug: T136387
Change-Id: I7ff729afbfe6b60f3bef6e84828d816631432929
---
M resources/subscribing/ext.centralNotice.display.js
M resources/subscribing/ext.centralNotice.display.state.js
2 files changed, 2 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/82/292282/1
diff --git a/resources/subscribing/ext.centralNotice.display.js
b/resources/subscribing/ext.centralNotice.display.js
index a5f2fe9..84e642f 100644
--- a/resources/subscribing/ext.centralNotice.display.js
+++ b/resources/subscribing/ext.centralNotice.display.js
@@ -556,15 +556,6 @@
},
/**
- * Register that the current page view is included in a test.
- * @param {string} identifier A string to identify the test.
Should not contain
- * commas.
- */
- registerTest( identifier ) {
- cn.internal.state.registerTest( identifier );
- },
-
- /**
* Get the value of a property used in campaign/banner
selection and
* display, and for recording the results of that process.
*/
diff --git a/resources/subscribing/ext.centralNotice.display.state.js
b/resources/subscribing/ext.centralNotice.display.state.js
index 36d2956..149698a 100644
--- a/resources/subscribing/ext.centralNotice.display.state.js
+++ b/resources/subscribing/ext.centralNotice.display.state.js
@@ -34,8 +34,8 @@
BANNER_SHOWN: new Status( 'banner_shown', 6
)
},
- // As a temporary measure, we minify banner history logs. Using
a code
- // for hide reasons helps us do that.
+ // Until T114078 is closed, we minify banner history logs. This
lookup
+ // table maps from hide reason string to a numeric code.
REASONS = {
// Any reason not listed here will be stored as "other".
'other': 0,
@@ -358,11 +358,7 @@
* @param {string} identifier A string to identify the test.
Should not contain
* commas.
*/
-<<<<<<< HEAD (88137b ext.centralNotice.display: API for registering tests)
- registerTest( identifier ) {
-=======
registerTest: function( identifier ) {
->>>>>>> BRANCH (6a3ef8 Localisation updates from https://translatewiki.net.)
var tests = state.data.tests = state.data.tests || [];
// Add if it isn't already registered.
--
To view, visit https://gerrit.wikimedia.org/r/292282
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ff729afbfe6b60f3bef6e84828d816631432929
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: wmf_deploy
Gerrit-Owner: Ejegg <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
