[MediaWiki-commits] [Gerrit] package.json: Update devDependencies - change (oojs/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110144
Change subject: package.json: Update devDependencies
..
package.json: Update devDependencies
Change-Id: I0fce45d98c5f3ef3a9036ca6a1482519bc19dbec
---
M package.json
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/44/110144/1
diff --git a/package.json b/package.json
index 4cfb127..106c5d1 100644
--- a/package.json
+++ b/package.json
@@ -29,9 +29,9 @@
devDependencies: {
qunit: 0.5.17,
grunt: 0.4.2,
-grunt-contrib-jshint: 0.5.4,
-grunt-contrib-qunit: 0.2.2,
-grunt-contrib-watch: 0.4.4,
-grunt-jscs-checker: 0.2.6
+grunt-contrib-jshint: 0.8.0,
+grunt-contrib-qunit: 0.4.0,
+grunt-contrib-watch: 0.5.3,
+grunt-jscs-checker: 0.3.2
}
}
--
To view, visit https://gerrit.wikimedia.org/r/110144
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fce45d98c5f3ef3a9036ca6a1482519bc19dbec
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] deployment: puppet 3 compatibility fix: full path to puppet... - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110145
Change subject: deployment: puppet 3 compatibility fix: full path to puppet
file server
..
deployment: puppet 3 compatibility fix: full path to puppet file server
Files found in modules without specifying 'modules' in file path will be
deprecated in the next major release
Change-Id: Ic6610fa7bb8770aba0bc5fbdf0411432689c906d
---
M modules/deployment/manifests/salt_master.pp
1 file changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/110145/1
diff --git a/modules/deployment/manifests/salt_master.pp
b/modules/deployment/manifests/salt_master.pp
index 0ab53c5..288bccc 100644
--- a/modules/deployment/manifests/salt_master.pp
+++ b/modules/deployment/manifests/salt_master.pp
@@ -24,7 +24,7 @@
}
file { ${state_dir}/top.sls:
-source = 'puppet:///deployment/states/top.sls',
+source = 'puppet:///modules/deployment/states/top.sls',
mode= '0444',
owner = 'root',
group = 'root',
@@ -32,7 +32,7 @@
}
file { ${state_dir}/deploy/sync_all.sls:
-source = 'puppet:///deployment/states/deploy/sync_all.sls',
+source = 'puppet:///modules/deployment/states/deploy/sync_all.sls',
mode= '0444',
owner = 'root',
group = 'root',
@@ -40,7 +40,7 @@
}
file { ${runner_dir}/deploy.py:
-source = 'puppet:///deployment/runners/deploy.py',
+source = 'puppet:///modules/deployment/runners/deploy.py',
mode= '0555',
owner = 'root',
group = 'root',
@@ -80,7 +80,7 @@
}
file { ${module_dir}/deploy.py:
-source = 'puppet:///deployment/modules/deploy.py',
+source = 'puppet:///modules/deployment/modules/deploy.py',
mode= '0555',
owner = 'root',
group = 'root',
@@ -88,7 +88,7 @@
}
file { ${returner_dir}/deploy_redis.py:
-source = 'puppet:///deployment/returners/deploy_redis.py',
+source = 'puppet:///modules/deployment/returners/deploy_redis.py',
mode= '0555',
owner = 'root',
group = 'root',
@@ -96,7 +96,7 @@
}
file { ${module_dir}/parsoid.py:
-source = 'puppet:///deployment/modules/parsoid.py',
+source = 'puppet:///modules/deployment/modules/parsoid.py',
mode= '0555',
owner = 'root',
group = 'root',
@@ -104,7 +104,7 @@
}
file { ${module_dir}/mwprof.py:
-source = 'puppet:///deployment/modules/mwprof.py',
+source = 'puppet:///modules/deployment/modules/mwprof.py',
mode= '0555',
owner = 'root',
group = 'root',
@@ -112,7 +112,7 @@
}
file { ${module_dir}/mediawiki.py:
-source = 'puppet:///deployment/modules/mediawiki.py',
+source = 'puppet:///modules/deployment/modules/mediawiki.py',
mode= '0555',
owner = 'root',
group = 'root',
--
To view, visit https://gerrit.wikimedia.org/r/110145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6610fa7bb8770aba0bc5fbdf0411432689c906d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Slide the keyboard down on search result item tap. - change (apps...wikipedia)
Yuvipanda has submitted this change and it was merged.
Change subject: Slide the keyboard down on search result item tap.
..
Slide the keyboard down on search result item tap.
* Makes more of the article readable faster.
* Appears to potentially fix a screen rotation bug as well.
* For now, search term stays in search bar in case it was a mis-tap.
Change-Id: Ib56432c3ed1ee058c234eca92a3747c655664117
---
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index a204749..fd41869 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -164,6 +164,8 @@
public void onItemClick(AdapterView? parent, View view, int
position, long id) {
PageTitle title = (PageTitle)
searchResultsList.getAdapter().getItem(position);
HistoryEntry historyEntry = new HistoryEntry(title,
HistoryEntry.SOURCE_SEARCH);
+InputMethodManager keyboard =
(InputMethodManager)app.getSystemService(Context.INPUT_METHOD_SERVICE);
+
keyboard.hideSoftInputFromWindow(searchTermText.getWindowToken(), 0);
app.getBus().post(new NewWikiPageNavigationEvent(title,
historyEntry));
displayResults(null);
}
--
To view, visit https://gerrit.wikimedia.org/r/109504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib56432c3ed1ee058c234eca92a3747c655664117
Gerrit-PatchSet: 4
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt ab...@wikimedia.org
Gerrit-Reviewer: Dr0ptp4kt ab...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] svn: convert into a module - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: svn: convert into a module
..
svn: convert into a module
I have removed the svn::groups class as svn is only served readonly, and it
seems it can be removed.
I didn't include init.pp as it seems redundant here.
also removed the apache dependency for the time being until the status
of this service is cleared out.
- move server.pp to init.pp
- rename svn::server to subversion and svn::client to subversion::client etc
- adjust file pathes
- add role class
- minor lint stuff like line over 80 chars and aligned arrows
Change-Id: Ife6ab663edba01ecd86977ae13a3838f3979e2ed
---
A manifests/role/subversion.pp
M manifests/site.pp
D manifests/svn.pp
R modules/subversion/files/apache/svn.wikimedia.org
R modules/subversion/files/docroot/robots.txt
R modules/subversion/files/revision.ezt
R modules/subversion/files/sillyshell
R modules/subversion/files/viewvc.conf
A modules/subversion/manifests/client.pp
A modules/subversion/manifests/conversion.pp
A modules/subversion/manifests/init.pp
A modules/subversion/manifests/viewvc.pp
12 files changed, 149 insertions(+), 129 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/subversion.pp b/manifests/role/subversion.pp
new file mode 100644
index 000..7625924
--- /dev/null
+++ b/manifests/role/subversion.pp
@@ -0,0 +1,16 @@
+# manifests/role/subversion.pp
+
+class role::subversion {
+
+system::role { 'role::subversion': description = 'public, read-only SVN
server' }
+
+class { '::subversion':
+host = 'svn.wikimedia.org',
+}
+
+monitor_service { 'https':
+description = 'HTTPS',
+check_command = check_ssl_cert!${host}
+}
+}
+
diff --git a/manifests/site.pp b/manifests/site.pp
index fecc6cf..1584cc0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -27,7 +27,6 @@
import search.pp
import snapshots.pp
import sudo.pp
-import svn.pp
import swift.pp
import webserver.pp
import zuul.pp
@@ -189,7 +188,7 @@
groups::wikidev,
accounts::demon,
role::gitblit,
-svn::server
+role::subversion
# full root for gerrit admin (RT-3698)
sudo_user { demon: privileges = ['ALL = NOPASSWD: ALL'] }
@@ -222,7 +221,7 @@
interface::add_ip6_mapped { main: interface = eth0 }
include standard,
-svn::client,
+subversion::client,
admins::roots,
admins::mortals,
admins::restricted,
@@ -867,7 +866,7 @@
interface::add_ip6_mapped { main: interface = eth0 }
include role::applicationserver::maintenance,
-svn::client,
+subversion::client,
nfs::netapp::home,
admins::roots,
admins::mortals,
@@ -919,7 +918,7 @@
$ssh_x11_forwarding = no
include standard,
webserver::php5,
-svn::server,
+role::subversion,
backup::client,
role::deployment::test
diff --git a/manifests/svn.pp b/manifests/svn.pp
deleted file mode 100644
index b42abd2..000
--- a/manifests/svn.pp
+++ /dev/null
@@ -1,124 +0,0 @@
-class svn::server {
- system::role { 'svn::server': description = 'public SVN server' }
-
- require 'svn::groups::svn'
-
- # include webserver::php5
-
- package { [ 'libsvn-notify-perl', 'python-subversion',
- 'libapache2-svn', 'python-pygments' ]:
- ensure = latest;
- }
-
- file {
- '/usr/local/bin/sillyshell':
- owner = 'root',
- group = 'root',
- mode = '0555',
- source = 'puppet:///files/svn/sillyshell';
- '/etc/apache2/sites-available/svn':
- owner = 'root',
- group = 'root',
- mode = '0444',
- source =
'puppet:///files/apache/sites/svn.wikimedia.org',
- notify = Service[apache2];
- '/srv/org/wikimedia/svn':
- ensure = directory,
- source = 'puppet:///files/svn/docroot',
- owner = 'root',
- group = 'svnadm',
- mode = '0664',
- recurse = true;
- '/var/cache/svnusers':
- ensure = directory,
- owner = 'www-data',
- group = 'www-data',
- mode = '0755';
- '/svnroot':
- ensure = directory,
- owner = 'root',
- group = 'svn',
- mode = '0775';
- }
-
-include backup::host
-backup::set { 'svnroot': }
-
- apache_site { 'svn': name = 'svn', prefix = '000-' }
- apache_module { 'authz_svn':
[MediaWiki-commits] [Gerrit] Add i18n file - change (mediawiki...MobileApp)
Raimond Spekking has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110146
Change subject: Add i18n file
..
Add i18n file
Change-Id: I9376997c65b888c5fdbb0aa4b30ecb73b6b63430
---
A MobileApp.i18n.php
M MobileApp.php
2 files changed, 27 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileApp
refs/changes/46/110146/1
diff --git a/MobileApp.i18n.php b/MobileApp.i18n.php
new file mode 100644
index 000..c056af2
--- /dev/null
+++ b/MobileApp.i18n.php
@@ -0,0 +1,23 @@
+?php
+/**
+ * Internationalisation for MobileApp
+ *
+ * @file
+ * @ingroup Extensions
+ */
+$messages = array();
+
+/** English
+ * @author Yuvi Panda
+ */
+$messages['en'] = array(
+ 'mobileapp-desc' = 'Serves styles and scripts for use in the Wikimedia
Mobile Applications',
+);
+
+/** Message documentation (Message documentation)
+ * @author Raimond Spekking
+ */
+$messages['qqq'] = array(
+ 'mobileapp-desc' = '{{desc|name=Mobile
App|url=http://www.mediawiki.org/wiki/Extension:MobileApp}}',
+);
+
diff --git a/MobileApp.php b/MobileApp.php
index 34c8e86..d1f5e87 100644
--- a/MobileApp.php
+++ b/MobileApp.php
@@ -21,9 +21,12 @@
'path' = __FILE__,
'name' = 'MobileApp',
'author' = array( 'Yuvi Panda' ),
- 'url' = 'https://www.mediawiki.org/wiki/Extension:MobileApp'
+ 'url' = 'https://www.mediawiki.org/wiki/Extension:MobileApp',
+ 'descriptionmsg' = 'mobileapp-desc',
);
+$wgExtensionMessagesFiles['MobileApp'] = __DIR__ . '/MobileApp.i18n.php';
+
// List of less files included for both iOS and Android
$commonStyles = array(
'MobileApp/less/common.less'
--
To view, visit https://gerrit.wikimedia.org/r/110146
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9376997c65b888c5fdbb0aa4b30ecb73b6b63430
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileApp
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] deployment: puppet 3 compatibility fix: full path to puppet... - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: deployment: puppet 3 compatibility fix: full path to puppet
file server
..
deployment: puppet 3 compatibility fix: full path to puppet file server
Files found in modules without specifying 'modules' in file path will be
deprecated in the next major release
Change-Id: Ic6610fa7bb8770aba0bc5fbdf0411432689c906d
---
M modules/deployment/manifests/salt_master.pp
1 file changed, 8 insertions(+), 8 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/deployment/manifests/salt_master.pp
b/modules/deployment/manifests/salt_master.pp
index 0ab53c5..288bccc 100644
--- a/modules/deployment/manifests/salt_master.pp
+++ b/modules/deployment/manifests/salt_master.pp
@@ -24,7 +24,7 @@
}
file { ${state_dir}/top.sls:
-source = 'puppet:///deployment/states/top.sls',
+source = 'puppet:///modules/deployment/states/top.sls',
mode= '0444',
owner = 'root',
group = 'root',
@@ -32,7 +32,7 @@
}
file { ${state_dir}/deploy/sync_all.sls:
-source = 'puppet:///deployment/states/deploy/sync_all.sls',
+source = 'puppet:///modules/deployment/states/deploy/sync_all.sls',
mode= '0444',
owner = 'root',
group = 'root',
@@ -40,7 +40,7 @@
}
file { ${runner_dir}/deploy.py:
-source = 'puppet:///deployment/runners/deploy.py',
+source = 'puppet:///modules/deployment/runners/deploy.py',
mode= '0555',
owner = 'root',
group = 'root',
@@ -80,7 +80,7 @@
}
file { ${module_dir}/deploy.py:
-source = 'puppet:///deployment/modules/deploy.py',
+source = 'puppet:///modules/deployment/modules/deploy.py',
mode= '0555',
owner = 'root',
group = 'root',
@@ -88,7 +88,7 @@
}
file { ${returner_dir}/deploy_redis.py:
-source = 'puppet:///deployment/returners/deploy_redis.py',
+source = 'puppet:///modules/deployment/returners/deploy_redis.py',
mode= '0555',
owner = 'root',
group = 'root',
@@ -96,7 +96,7 @@
}
file { ${module_dir}/parsoid.py:
-source = 'puppet:///deployment/modules/parsoid.py',
+source = 'puppet:///modules/deployment/modules/parsoid.py',
mode= '0555',
owner = 'root',
group = 'root',
@@ -104,7 +104,7 @@
}
file { ${module_dir}/mwprof.py:
-source = 'puppet:///deployment/modules/mwprof.py',
+source = 'puppet:///modules/deployment/modules/mwprof.py',
mode= '0555',
owner = 'root',
group = 'root',
@@ -112,7 +112,7 @@
}
file { ${module_dir}/mediawiki.py:
-source = 'puppet:///deployment/modules/mediawiki.py',
+source = 'puppet:///modules/deployment/modules/mediawiki.py',
mode= '0555',
owner = 'root',
group = 'root',
--
To view, visit https://gerrit.wikimedia.org/r/110145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6610fa7bb8770aba0bc5fbdf0411432689c906d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] snapshots: lint - change (operations/puppet)
ArielGlenn has submitted this change and it was merged.
Change subject: snapshots: lint
..
snapshots: lint
Change-Id: I0e42779d9b8e5ed1e64fa66ff759323d4435dfbc
---
M manifests/snapshots.pp
1 file changed, 57 insertions(+), 40 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/snapshots.pp b/manifests/snapshots.pp
index 0c452bb..554a8ad 100644
--- a/manifests/snapshots.pp
+++ b/manifests/snapshots.pp
@@ -1,60 +1,77 @@
class snapshots::packages {
- # pick up various users, twemproxy
- include mediawiki
+# pick up various users, twemproxy
+include mediawiki
- if ($::lsbdistcodename == 'precise') {
- package { [ 'subversion', 'php5', 'php5-cli', 'php5-mysql',
'mysql-client-5.5', 'p7zip-full', 'libicu42', 'utfnormal', 'mwbzutils' ]:
- ensure = present;
- }
- }
- else {
- package { [ 'subversion', 'php5', 'php5-cli', 'php5-mysql',
'mysql-client-5.1', 'p7zip-full', 'libicu42', 'wikimedia-php5-utfnormal' ]:
- ensure = present;
- }
- }
+if ($::lsbdistcodename == 'precise') {
+package { [ 'subversion',
+'php5',
+'php5-cli',
+'php5-mysql',
+'mysql-client-5.5',
+'p7zip-full',
+'libicu42',
+'utfnormal',
+'mwbzutils'
+]:
+ensure = 'present',
+}
+}
+else {
+package { [ 'subversion',
+'php5',
+'php5-cli',
+'php5-mysql',
+'mysql-client-5.1',
+'p7zip-full',
+'libicu42',
+'wikimedia-php5-utfnormal'
+]:
+ensure = 'present',
+}
+}
}
class snapshots::files {
- require snapshots::packages
+require snapshots::packages
- if ($::lsbdistcodename != 'precise') {
- file { 'snapshot-php5-cli-ini':
- path = /etc/php5/cli/php.ini,
- mode = 0644,
- owner = root,
- group = root,
- source =
puppet:///files/php/php.ini.cli.snaps.${::lsbdistcodename},
- ensure = present;
- }
+if ($::lsbdistcodename != 'precise') {
+file { 'snapshot-php5-cli-ini':
+ensure = 'present',
+path = '/etc/php5/cli/php.ini',
+mode = '0644',
+owner = 'root',
+group = 'root',
+source =
puppet:///files/php/php.ini.cli.snaps.${::lsbdistcodename},
+}
- file { 'snapshot-fss-ini':
- path = /etc/php5/conf.d/fss.ini,
- mode = 0644,
- owner = root,
- group = root,
- source =
puppet:///files/php/fss.ini.snaps.${::lsbdistcodename},
- ensure = present;
- }
- }
+file { 'snapshot-fss-ini':
+ensure = 'present',
+path = '/etc/php5/conf.d/fss.ini',
+mode = '0644',
+owner = 'root',
+group = 'root',
+source = puppet:///files/php/fss.ini.snaps.${::lsbdistcodename},
+}
+}
}
class snapshots::sync {
- require snapshots::packages
+require snapshots::packages
exec { 'snapshot-trigger-mw-sync':
-command = '/bin/true',
-notify = Exec['mw-sync'],
-unless = /usr/bin/test -d /usr/local/apache/common-local;
+command = '/bin/true',
+notify = Exec['mw-sync'],
+unless = '/usr/bin/test -d /usr/local/apache/common-local',
}
}
class snapshots::noapache {
- service { 'noapache':
- name = apache2,
- enable = false,
- ensure = stopped;
- }
+service { 'noapache':
+ensure = 'stopped',
+name = 'apache2',
+enable = false,
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/109653
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e42779d9b8e5ed1e64fa66ff759323d4435dfbc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits
[MediaWiki-commits] [Gerrit] Add mr1-eqiad.wikimedia.org forward record - change (operations/dns)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/110148 Change subject: Add mr1-eqiad.wikimedia.org forward record .. Add mr1-eqiad.wikimedia.org forward record Reverse exists, IP is configured on the interface, might just as well put a DNS name for it in the config. Change-Id: Ie522ca35d587b0d8c9c8b23131155f204f084b78 --- M templates/wikimedia.org 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/48/110148/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index e682448..6e02d97 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -413,6 +413,7 @@ csw1-sdtpa 1H IN A208.80.152.193 +mr1-eqiad 1H IN A208.80.154.201 mr1-pmtpa 1H IN A216.87.189.242 vl2-eth0.lvs1 1H IN A10.0.0.11 -- To view, visit https://gerrit.wikimedia.org/r/110148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie522ca35d587b0d8c9c8b23131155f204f084b78 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove references to br1/2-ulsfo - change (operations/dns)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110149
Change subject: Remove references to br1/2-ulsfo
..
Remove references to br1/2-ulsfo
I assume this was a now-abandoned experiment with virtual routers.
Remove A//PTRs for both of them, and empty the cross-router subnets.
Change-Id: Ib05ba20e3eb7a7101d2e58ad0d5798dbc4a716e6
---
M templates/26.35.198.in-addr.arpa
M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
3 files changed, 2 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/49/110149/1
diff --git a/templates/26.35.198.in-addr.arpa b/templates/26.35.198.in-addr.arpa
index 4504f38..d45c394 100644
--- a/templates/26.35.198.in-addr.arpa
+++ b/templates/26.35.198.in-addr.arpa
@@ -54,16 +54,12 @@
1921H IN PTR cr1-ulsfo.wikimedia.org.
1931H IN PTR cr2-ulsfo.wikimedia.org.
-1941H IN PTR br1-ulsfo.wikimedia.org.
-1951H IN PTR br2-ulsfo.wikimedia.org.
; 198.35.26.196/31
1961H IN PTR ae0-2.cr1-ulsfo.wikimedia.org.
1971H IN PTR ae0-2.cr2-ulsfo.wikimedia.org.
; 198.35.26.198/31
-1981H IN PTR ae0-3.br1-ulsfo.wikimedia.org.
-1991H IN PTR ae0-3.br2-ulsfo.wikimedia.org.
; 198.35.26.200/29
2011H IN PTR cr1-ulsfo.wikimedia.org.
@@ -71,9 +67,5 @@
2031H IN PTR mr1-ulsfo.wikimedia.org.
; 198.35.26.208/31
-2081H IN PTR lt-0-0-0-0.cr1-ulsfo.wikimedia.org.
-2091H IN PTR lt-0-0-0-1.br1-ulsfo.wikimedia.org.
; 198.35.26.210/31
-2101H IN PTR lt-0-0-0-0.cr2-ulsfo.wikimedia.org.
-2111H IN PTR lt-0-0-0-1.br2-ulsfo.wikimedia.org.
diff --git a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 8593b4d..13c44cc 100644
--- a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -68,17 +68,13 @@
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
xe-5-2-2.cr2-eqiad.wikimedia.org.
2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
xe-0-0-3-538.cr1-ulsfo.wikimedia.org.
-; cr1-ulsfo -- br1-ulsfo (2620:0:863:fe02::/64)
+; empty (2620:0:863:fe02::/64)
$ORIGIN 2.0.e.f.{{ zonename }}.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR lt0-0.cr1-ulsfo.wikimedia.org.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR lt0-1.br1-ulsfo.wikimedia.org.
-; cr2-ulsfo -- br2-ulsfo (2620:0:863:fe03::/64)
+; empty (2620:0:863:fe03::/64)
$ORIGIN 3.0.e.f.{{ zonename }}.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR lt0-0.cr2-ulsfo.wikimedia.org.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR lt0-1.br2-ulsfo.wikimedia.org.
; cr2-ulsfo -- cr1-eqiad (2620:0:863:fe04::/64)
@@ -91,8 +87,6 @@
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR cr1-ulsfo.wikimedia.org.
2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR cr2-ulsfo.wikimedia.org.
-3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR br1-ulsfo.wikimedia.org.
-4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR br2-ulsfo.wikimedia.org.
; LVS Service IPs, 2620:0:863:ed1a::/64
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 6e02d97..5f29d9a 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -375,12 +375,6 @@
; Networking
-br1-ulsfo 1H IN A198.35.26.194
- IN 2620:0:863:::3
-
-br2-ulsfo 1H IN A198.35.26.195
- IN 2620:0:863:::4
-
cr1-eqiad 1H IN A208.80.154.196
IN 2620:0:861:::1
--
To view, visit https://gerrit.wikimedia.org/r/110149
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib05ba20e3eb7a7101d2e58ad0d5798dbc4a716e6
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove call to deprecated ParserOptions::getMath - change (mediawiki...Math)
Physikerwelt has submitted this change and it was merged.
Change subject: Remove call to deprecated ParserOptions::getMath
..
Remove call to deprecated ParserOptions::getMath
Since math has been moved from core to an extension
it should take care of the caching by its own.
Therefore, a call to the parserOptions::getMath is removed
and own caching logic is introduced, once getMath is removed
from core.
Bug: 14202
Change-Id: Ifa847b61264f8d640c9886fd374eb3d6cf482c0c
---
M Math.hooks.php
M Math.php
2 files changed, 94 insertions(+), 16 deletions(-)
Approvals:
Physikerwelt: Looks good to me, approved
diff --git a/Math.hooks.php b/Math.hooks.php
index 3a3147a..b9453a5 100644
--- a/Math.hooks.php
+++ b/Math.hooks.php
@@ -7,16 +7,65 @@
*/
class MathHooks {
+ const mathCacheKey = 'math=';
+
+ /*
+* Generate a user dependent hash cache key.
+* The hash key depends on the rendering mode.
+* @param $confstr The to-be-hashed key string that is being
constructed
+* @param User $user reference to the current user
+* @param array $forOptions userOptions used on that page
+*/
+ public static function onPageRenderingHash( $confstr, $user = false,
$forOptions = array() ) {
+ global $wgUser;
+
+ // To be independent of the MediaWiki core version,
+ // we check if the core caching logic for math is still
available.
+ if ( ! is_callable( 'ParserOptions::getMath' ) in_array(
'math', $forOptions) ) {
+ if ( $user === false ) {
+ $user = $wgUser;
+ }
+
+ $mathOption = $user-getOption( 'math' );
+ // Check if the key already contains the math option
part
+ if (
+ !preg_match(
+ '/(^|!)' . self::mathCacheKey .
$mathOption . '(!|$)/',
+ $confstr
+ )
+ ) {
+ // The math part of cache key starts with
math= followed by a star or a number for the math mode
+ // and the optional letter j that indicates if
clientside MathJax rendering is used.
+ if ( preg_match( '/(^|!)' .
self::mathCacheKey.'[*\d]m?(!|$)/', $confstr ) ) {
+ $confstr = preg_replace(
+ '/(^|!)' . self::mathCacheKey .
'[*\d]m?(!|$)/',
+ '\1' . self::mathCacheKey .
$mathOption . '\2',
+ $confstr
+ );
+ } else {
+ $confstr .= '!' . self::mathCacheKey .
$mathOption;
+ }
+
+ wfDebugLog( 'Math', New cache key: $confstr );
+ } else {
+ wfDebugLog( 'Math', Cache key found $confstr
);
+ }
+ }
+
+ return true;
+ }
+
/**
-* Set up $wgMathPath and $wgMathDirectory globals if they're not
already
-* set.
+* Set up $wgMathPath and $wgMathDirectory globals if they're not
already set.
*/
static function setup() {
- global $wgMathPath, $wgMathDirectory;
- global $wgUploadPath, $wgUploadDirectory;
+ global $wgMathPath, $wgMathDirectory,
+ $wgUploadPath, $wgUploadDirectory;
+
if ( $wgMathPath === false ) {
$wgMathPath = {$wgUploadPath}/math;
}
+
if ( $wgMathDirectory === false ) {
$wgMathDirectory = {$wgUploadDirectory}/math;
}
@@ -30,6 +79,7 @@
*/
static function onParserFirstCallInit( $parser ) {
$parser-setHook( 'math', array( 'MathHooks', 'mathTagHook' ) );
+
return true;
}
@@ -38,35 +88,48 @@
*
* @param $content (the LaTeX input)
* @param $attributes
-* @param $parser Parser
+* @param Parser $parser
* @return string
*/
static function mathTagHook( $content, $attributes, $parser ) {
- global $wgMathDisableTexFilter, $wgContLang, $wgUseMathJax;
- if ( trim( $content ) === ) { // bug 8372
- return ;
+ global $wgContLang, $wgUseMathJax, $wgMathDisableTexFilter;
+
+ if ( trim( $content ) === '' ) { // bug 8372
+ return '';
}
+
wfProfileIn( __METHOD__ );
- $mode
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4c3da1b..dd9ff82 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/110150 Change subject: Syncronize VisualEditor: 4c3da1b..dd9ff82 .. Syncronize VisualEditor: 4c3da1b..dd9ff82 Change-Id: I357dcc289cc0164c9530633c48446f7a9b9eb7e7 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/50/110150/1 diff --git a/VisualEditor b/VisualEditor index 4c3da1b..dd9ff82 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 4c3da1b01797eb967ac35a8e96198ae61afc0e7f +Subproject commit dd9ff827b5f164d6ab76a62d9ee4529cdcfd9bfe -- To view, visit https://gerrit.wikimedia.org/r/110150 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I357dcc289cc0164c9530633c48446f7a9b9eb7e7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4c3da1b..dd9ff82 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 4c3da1b..dd9ff82 .. Syncronize VisualEditor: 4c3da1b..dd9ff82 Change-Id: I357dcc289cc0164c9530633c48446f7a9b9eb7e7 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 4c3da1b..dd9ff82 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 4c3da1b01797eb967ac35a8e96198ae61afc0e7f +Subproject commit dd9ff827b5f164d6ab76a62d9ee4529cdcfd9bfe -- To view, visit https://gerrit.wikimedia.org/r/110150 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I357dcc289cc0164c9530633c48446f7a9b9eb7e7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Follow-up 7994eae8c2: Fix uncommitted loader change causing 404 - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Follow-up 7994eae8c2: Fix uncommitted loader change causing 404 .. Follow-up 7994eae8c2: Fix uncommitted loader change causing 404 That commit added jquery.uls to the ve-mw repo, and updated lib/ve to a commit after we removed it from the ve repo and from modules.json. These changes are being made by grunt-build every run and should've been comitted to the repo. See also 1e92abe028. Change-Id: Ie318643d080e9f5a63793ef60153ef4d82a13d8c --- M .docs/eg-iframe.html 1 file changed, 0 insertions(+), 20 deletions(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html index 5878ef3..181ff2c 100644 --- a/.docs/eg-iframe.html +++ b/.docs/eg-iframe.html @@ -7,16 +7,6 @@ !-- oojs-ui -- link rel=stylesheet href=lib/ve/lib/oojs-ui/oojs-ui.svg.css - !-- jquery.uls.grid -- - link rel=stylesheet href=lib/ve/lib/jquery.uls/css/jquery.uls.grid.css - - !-- jquery.uls.compact -- - link rel=stylesheet href=lib/ve/lib/jquery.uls/css/jquery.uls.compact.css - - !-- jquery.uls -- - link rel=stylesheet href=lib/ve/lib/jquery.uls/css/jquery.uls.css - link rel=stylesheet href=lib/ve/lib/jquery.uls/css/jquery.uls.lcd.css - !-- visualEditor.standalone -- link rel=stylesheet href=lib/ve/modules/ve/init/sa/styles/ve.init.sa.css @@ -65,16 +55,6 @@ script src=lib/ve/modules/unicodejs/unicodejs.graphemebreak.js/script script src=lib/ve/modules/unicodejs/unicodejs.wordbreakproperties.js/script script src=lib/ve/modules/unicodejs/unicodejs.wordbreak.js/script - - !-- jquery.uls.data -- - script src=lib/ve/lib/jquery.uls/src/jquery.uls.data.js/script - script src=lib/ve/lib/jquery.uls/src/jquery.uls.data.utils.js/script - - !-- jquery.uls -- - script src=lib/ve/lib/jquery.uls/src/jquery.uls.core.js/script - script src=lib/ve/lib/jquery.uls/src/jquery.uls.lcd.js/script - script src=lib/ve/lib/jquery.uls/src/jquery.uls.languagefilter.js/script - script src=lib/ve/lib/jquery.uls/src/jquery.uls.regionfilter.js/script !-- jquery.i18n -- script src=lib/ve/lib/jquery.i18n/src/jquery.i18n.js/script -- To view, visit https://gerrit.wikimedia.org/r/110121 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie318643d080e9f5a63793ef60153ef4d82a13d8c Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Esanders esand...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use API for formatting Wikibase item links - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110151
Change subject: Use API for formatting Wikibase item links
..
Use API for formatting Wikibase item links
Change-Id: Ida65a6c07572bf146ac496e5e23fb0615ddc73db
---
M composer.json
M lib/resources/Resources.php
M lib/resources/formatters/wikibase.formatters.register.js
M
lib/resources/jquery.valueview.experts.wikibase/experts.wikibase.EntityIdValue.js
4 files changed, 12 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/51/110151/1
diff --git a/composer.json b/composer.json
index 9540cac..c7fde1c 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
data-values/data-types: ~0.1,
data-values/serialization: ~0.1,
data-values/javascript: ~0.2,
- data-values/value-view: 0.*,=0.1.1,
+ data-values/value-view: master-dev,
wikibase/data-model: 0.6.*,
diff/diff: =0.9,
wikibase/easyrdf_lite: *
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 1b20432..fd4c090 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -160,6 +160,7 @@
'dataValues.values',
'mw.ext.valueFormatters',
'wikibase.QuantityFormatter',
+ 'wikibase.datamodel'
),
),
@@ -847,7 +848,6 @@
'jquery.eachchange',
'jquery.inputautoexpand',
'wikibase.utilities',
- 'wikibase.store.FetchedContent'
),
'messages' = array(
'wikibase-entity-item',
diff --git a/lib/resources/formatters/wikibase.formatters.register.js
b/lib/resources/formatters/wikibase.formatters.register.js
index 9ea1470..e875c97 100644
--- a/lib/resources/formatters/wikibase.formatters.register.js
+++ b/lib/resources/formatters/wikibase.formatters.register.js
@@ -17,4 +17,9 @@
wb.dataTypes.getDataType( 'commonsMedia' )
);
+
mw.ext.valueFormatters.valueFormatterProvider.registerDataValueFormatter(
+ wb.formatters.ApiBasedValueFormatter,
+ wb.EntityId.TYPE
+ );
+
}( mediaWiki, wikibase, dataValues ) );
diff --git
a/lib/resources/jquery.valueview.experts.wikibase/experts.wikibase.EntityIdValue.js
b/lib/resources/jquery.valueview.experts.wikibase/experts.wikibase.EntityIdValue.js
index cf73014..9ff0acb 100644
---
a/lib/resources/jquery.valueview.experts.wikibase/experts.wikibase.EntityIdValue.js
+++
b/lib/resources/jquery.valueview.experts.wikibase/experts.wikibase.EntityIdValue.js
@@ -2,7 +2,7 @@
* @licence GNU GPL v2+
* @author Daniel Werner daniel.wer...@wikimedia.de
*/
-( function( mw, wb, $, vv ) {
+( function( mw, wb, vv ) {
'use strict';
// temporarily define a hard coded prefix map until we get this from
the server
@@ -13,27 +13,6 @@
var PARENT = vv.BifidExpert,
editableExpert = vv.experts.wikibase.EntityIdInput;
-
- /**
-* Helper for building a pretty link or info about an Entity.
-*
-* @param {string} entityId
-* @returns jQuery
-*/
- function buildEntityRefDom( entityId ) {
- var fetchedEntity = wb.fetchedEntities[ entityId ];
-
- if( !fetchedEntity ) {
- // Entity missing, deleted or not in local store,
generate info:
- return wb.utilities.ui.buildMissingEntityInfo(
entityId, wb.Item );
- }
-
- var $label = wb.utilities.ui.buildPrettyEntityLabel(
fetchedEntity.getContent() );
-
- return $( 'a/', {
- href: fetchedEntity.getTitle().getUrl()
- } ).append( $label );
- }
/**
* Valueview expert for handling Wikibase Entity references.
@@ -59,24 +38,15 @@
*/
_staticExpertOptions: {
domBuilder: function( currentRawValue, viewState ) {
- if( !currentRawValue ) {
- return '';
- }
-
- // We have to check for string or instance of
wb.EntityId since the EntityIdInput
- // expert has this huge flaw that it takes a
wb.EntityId but returns a string as
- // raw value. This is all related to the
current entity ID mess.
- var entityId = currentRawValue instanceof
wb.EntityId
-
[MediaWiki-commits] [Gerrit] Ensure page is valid XML - change (mediawiki...erudite)
Njw has uploaded a new change for review. https://gerrit.wikimedia.org/r/110152 Change subject: Ensure page is valid XML .. Ensure page is valid XML Change-Id: I05b2ab2cb4bc6c2959e2665a4bbf758f1065cd06 --- M Erudite.skin.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/erudite refs/changes/52/110152/1 diff --git a/Erudite.skin.php b/Erudite.skin.php index 5068298..339bd54 100644 --- a/Erudite.skin.php +++ b/Erudite.skin.php @@ -18,7 +18,7 @@ * desktop dimensions, so they won't downscale and will instead respect * things like CSS's @media rules */ $out-addHeadItem( 'viewport', - 'meta name=viewport content=width=device-width, initial-scale=1' + 'meta name=viewport content=width=device-width, initial-scale=1 /' ); } -- To view, visit https://gerrit.wikimedia.org/r/110152 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05b2ab2cb4bc6c2959e2665a4bbf758f1065cd06 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/erudite Gerrit-Branch: master Gerrit-Owner: Njw nick.wh...@durham.ac.uk ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] imagescaler: lint - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: imagescaler: lint
..
imagescaler: lint
Change-Id: I475f0c3072e11a3c01b3356e5110784aad2b9e3d
---
M manifests/imagescaler.pp
1 file changed, 117 insertions(+), 107 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/imagescaler.pp b/manifests/imagescaler.pp
index 309af89..4518bb8 100644
--- a/manifests/imagescaler.pp
+++ b/manifests/imagescaler.pp
@@ -1,133 +1,143 @@
# imagescaler.pp
# Virtual resource for the monitoring server
-@monitor_group { imagescaler: description = image scalers }
+@monitor_group { 'imagescaler': description = 'image scalers' }
-## need to move the /a/magick-tmp stuff to /tmp/magick-tmp this will require a
mediawiki change, it would seem
+# need to move the /a/magick-tmp stuff to /tmp/magick-tmp
+#this will require a mediawiki change, it would seem
class imagescaler::cron {
- cron { removetmpfiles:
- command = for dir in /tmp /a/magick-tmp /tmp/magick-tmp; do
find \$dir -ignore_readdir_race -type f \\( -name 'gs_*' -o -name 'magick-*' -o
-name 'localcopy_*svg' -o -name 'vips-*.v' \\) -cmin +15 -exec rm -f {} \\;;
done,
- user = root,
- minute = '*/5',
- ensure = present;
-
- }
+cron { 'removetmpfiles':
+ensure = 'present',
+command = for dir in /tmp /a/magick-tmp /tmp/magick-tmp; do find
\$dir -ignore_readdir_race -type f \\( -name 'gs_*' -o -name 'magick-*' -o
-name 'localcopy_*svg' -o -name 'vips-*.v' \\) -cmin +15 -exec rm -f {} \\;;
done,
+user= 'root',
+minute = '*/5',
+}
}
class imagescaler::packages {
- include imagescaler::packages::fonts
+include imagescaler::packages::fonts
- package {
- [
- imagemagick,
- ghostscript,
- ffmpeg,
- ffmpeg2theora,
- librsvg2-bin,
- djvulibre-bin,
- netpbm,
- libogg0,
- libvorbisenc2,
- libtheora0,
- oggvideotools,
- libvips15,
- libvips-tools,
- libjpeg-turbo-progs
- ]:
- ensure = latest;
- }
+package {
+[
+'imagemagick',
+'ghostscript',
+'ffmpeg',
+'ffmpeg2theora',
+'librsvg2-bin',
+'djvulibre-bin',
+'netpbm',
+'libogg0',
+'libvorbisenc2',
+'libtheora0',
+'oggvideotools',
+'libvips15',
+'libvips-tools',
+'libjpeg-turbo-progs'
+]:
+ensure = 'latest',
+}
}
class imagescaler::packages::fonts {
- package {
- [
- culmus, # bug 38946
- culmus-fancy, # bug 38946
+package {
+[
+'culmus', # bug 38946
+'culmus-fancy', # bug 38946
- fonts-arabeyes,
- fonts-lklug-sinhala, # bug 55462
- fonts-arphic-ukai,
- fonts-arphic-uming,
- fonts-farsiweb,
- fonts-kacst,
- fonts-khmeros,
- fonts-lao,
- fonts-liberation,
- fonts-linuxlibertine,
- fonts-manchufont,
- fonts-mgopen,
- fonts-nafees,
- fonts-sil-abyssinica,
- fonts-sil-ezra,
- fonts-sil-padauk,
- fonts-sil-scheherazade,
- fonts-sil-nuosusil, # used to be fonts-sil-yi RT 6500
- fonts-takao-gothic,
- fonts-takao-mincho,
- fonts-thai-tlwg,
- fonts-tibetan-machine,
- fonts-unfonts-extra,
+'fonts-arabeyes',
+'fonts-lklug-sinhala', # bug 55462
+'fonts-arphic-ukai',
+'fonts-arphic-uming',
+'fonts-farsiweb',
+'fonts-kacst',
+'fonts-khmeros',
+'fonts-lao',
+'fonts-liberation',
+'fonts-linuxlibertine',
+'fonts-manchufont',
+'fonts-mgopen',
+'fonts-nafees',
+'fonts-sil-abyssinica',
+'fonts-sil-ezra',
+'fonts-sil-padauk',
+'fonts-sil-scheherazade',
+'fonts-sil-nuosusil', # used to be fonts-sil-yi RT 6500
+'fonts-takao-gothic',
+'fonts-takao-mincho',
+'fonts-thai-tlwg',
+
[MediaWiki-commits] [Gerrit] [bug 60564] Re-enable pageName for summary message - change (pywikibot/core)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110153
Change subject: [bug 60564] Re-enable pageName for summary message
..
[bug 60564] Re-enable pageName for summary message
- pageName is extracted from command option handled by pagegenerators
if availlable. Otherwise we ask for the message.
- -images option is deprecated. -imagelinks from pagegenerators is
used. We just append the right option command to the option list
- deprecated setAction() is removed
- docu replacement from pagegenerators
Change-Id: Ie65f05430e14d4b18060b26577232a47ea51b78d
---
M scripts/delete.py
1 file changed, 47 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/53/110153/1
diff --git a/scripts/delete.py b/scripts/delete.py
index cf8c3d4..60c9ed8 100644
--- a/scripts/delete.py
+++ b/scripts/delete.py
@@ -3,20 +3,20 @@
This script can be used to delete and undelete pages en masse.
Of course, you will need an admin account on the relevant wiki.
-Syntax: python delete.py [-category categoryName]
+These command line parameters can be used to specify which pages to work on:
-Command line options:
+params;
--page: Delete specified page
--cat:Delete all pages in the given category.
--links: Delete all pages linked from a given page.
--file: Delete all pages listed in a text file.
--ref:Delete all pages referring from a given page.
--images: Delete all images used on a given page.
--always: Don't prompt to delete pages, just do it.
--summary:Supply a custom edit summary.
--undelete: Actually undelete pages instead of deleting.
- Obviously makes sense only with -page and -file.
+Furthermore, the following command line parameters are supported:
+
+-always: Don't prompt to delete pages, just do it.
+
+-summary: Supply a custom edit summary.
+
+-undelete:Actually undelete pages instead of deleting.
+ Obviously makes sense only with -page and -file.
+
+Usage: python delete.py [-category categoryName]
Examples:
@@ -25,7 +25,7 @@
python delete.py -cat:To delete -always
#
-# (C) Pywikibot team, 2013
+# (c) Pywikibot team, 2014
#
# Distributed under the terms of the MIT license.
#
@@ -36,36 +36,45 @@
from pywikibot import i18n
from pywikibot import pagegenerators
+# This is required for the text that is shown when you run this script
+# with the parameter -help.
+docuReplacements = {
+'params;': pagegenerators.parameterHelp,
+}
+
class DeletionRobot:
This robot allows deletion of pages en masse.
def __init__(self, generator, summary, always=False, undelete=True):
- Arguments:
-* generator - A page generator.
-* always - Delete without prompting?
+
+Arguments:
+* generator - A page generator.
+* always - Delete without prompting?
self.generator = generator
self.summary = summary
-self.always = always
+self.prompt = not always
self.undelete = undelete
def run(self):
- Starts the robot's action.
-#Loop through everything in the page generator and delete it.
+ Starts the robot's action:
+Loop through everything in the page generator and delete it.
+
+
for page in self.generator:
pywikibot.output(u'Processing page %s' % page.title())
if self.undelete:
-page.undelete(self.summary, throttle=True)
+page.undelete(self.summary)
else:
-page.delete(self.summary, not self.always, throttle=True)
+page.delete(self.summary, self.prompt)
def main():
genFactory = pagegenerators.GeneratorFactory()
pageName = ''
-summary = ''
+summary = None
always = False
doImages = False
undelete = False
@@ -84,17 +93,18 @@
else:
summary = arg[len('-summary:'):]
elif arg.startswith('-images'):
-doImages = True
-if len(arg) == len('-images'):
-pageName = pywikibot.input(
-u'Enter the page with the images to delete:')
-else:
-pageName = arg[len('-images'):]
+pywikibot.output('\n\03{lightred}-image option is deprecated. '
+ 'Please use -imagelinks instead.\03{default}\n')
+localargs.append('-imagelinks' + arg[7:])
elif arg.startswith('-undelete'):
undelete = True
else:
genFactory.handleArg(arg)
-if not summary:
+found = arg.find(':') + 1
+if found:
+pageName = arg[found:]
+
+if pageName and not summary:
if arg.startswith('-category'):
summary =
[MediaWiki-commits] [Gerrit] Ensure page is valid XML - change (mediawiki...erudite)
Njw has submitted this change and it was merged. Change subject: Ensure page is valid XML .. Ensure page is valid XML Change-Id: I05b2ab2cb4bc6c2959e2665a4bbf758f1065cd06 --- M Erudite.skin.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Njw: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/Erudite.skin.php b/Erudite.skin.php index 5068298..339bd54 100644 --- a/Erudite.skin.php +++ b/Erudite.skin.php @@ -18,7 +18,7 @@ * desktop dimensions, so they won't downscale and will instead respect * things like CSS's @media rules */ $out-addHeadItem( 'viewport', - 'meta name=viewport content=width=device-width, initial-scale=1' + 'meta name=viewport content=width=device-width, initial-scale=1 /' ); } -- To view, visit https://gerrit.wikimedia.org/r/110152 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05b2ab2cb4bc6c2959e2665a4bbf758f1065cd06 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/erudite Gerrit-Branch: master Gerrit-Owner: Njw nick.wh...@durham.ac.uk Gerrit-Reviewer: Njw nick.wh...@durham.ac.uk Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [bug 60564] Re-enable pageName for summary message (update f... - change (pywikibot/compat)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110154
Change subject: [bug 60564] Re-enable pageName for summary message (update from
core)
..
[bug 60564] Re-enable pageName for summary message (update from core)
- pageName is extracted from command option handled by pagegenerators
if availlable. Otherwise we ask for the message.
- -images option is deprecated. -imagelinks from pagegenerators is
used. We just append the right option command to the option list
- deprecated setAction() is removed
- docu replacement from pagegenerators
Change-Id: I203c224b8c802e5752b796a7aaa305c5b400419e
---
M delete.py
1 file changed, 46 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat
refs/changes/54/110154/1
diff --git a/delete.py b/delete.py
index 029b3f0..9ed298b 100644
--- a/delete.py
+++ b/delete.py
@@ -3,20 +3,20 @@
This script can be used to delete and undelete pages en masse.
Of course, you will need an admin account on the relevant wiki.
-Syntax: python delete.py [-category categoryName]
+These command line parameters can be used to specify which pages to work on:
-Command line options:
+params;
--page: Delete specified page
--cat:Delete all pages in the given category.
--links: Delete all pages linked from a given page.
--file: Delete all pages listed in a text file.
--ref:Delete all pages referring from a given page.
--images: Delete all images used on a given page.
--always: Don't prompt to delete pages, just do it.
--summary:Supply a custom edit summary.
--undelete: Actually undelete pages instead of deleting.
- Obviously makes sense only with -page and -file.
+Furthermore, the following command line parameters are supported:
+
+-always: Don't prompt to delete pages, just do it.
+
+-summary: Supply a custom edit summary.
+
+-undelete:Actually undelete pages instead of deleting.
+ Obviously makes sense only with -page and -file.
+
+Usage: python delete.py [-category categoryName]
Examples:
@@ -25,7 +25,7 @@
python delete.py -cat:To delete -always
#
-# (C) Pywikibot team, 2006-2013
+# (c) Pywikibot team, 2006-2014
#
# Distributed under the terms of the MIT license.
#
@@ -36,36 +36,45 @@
from pywikibot import i18n
import pagegenerators
+# This is required for the text that is shown when you run this script
+# with the parameter -help.
+docuReplacements = {
+'params;': pagegenerators.parameterHelp,
+}
+
class DeletionRobot:
This robot allows deletion of pages en masse.
def __init__(self, generator, summary, always=False, undelete=True):
- Arguments:
-* generator - A page generator.
-* always - Delete without prompting?
+
+Arguments:
+* generator - A page generator.
+* always - Delete without prompting?
self.generator = generator
self.summary = summary
-self.always = always
+self.prompt = not always
self.undelete = undelete
def run(self):
- Starts the robot's action.
-#Loop through everything in the page generator and delete it.
+ Starts the robot's action:
+Loop through everything in the page generator and delete it.
+
+
for page in self.generator:
pywikibot.output(u'Processing page %s' % page.title())
if self.undelete:
page.undelete(self.summary, throttle=True)
else:
-page.delete(self.summary, not self.always, throttle=True)
+page.delete(self.summary, self.prompt, throttle=True)
def main():
genFactory = pagegenerators.GeneratorFactory()
pageName = ''
-summary = ''
+summary = None
always = False
doImages = False
undelete = False
@@ -84,17 +93,18 @@
else:
summary = arg[len('-summary:'):]
elif arg.startswith('-images'):
-doImages = True
-if len(arg) == len('-images'):
-pageName = pywikibot.input(
-u'Enter the page with the images to delete:')
-else:
-pageName = arg[len('-images'):]
+pywikibot.output('\n\03{lightred}-image option is deprecated. '
+ 'Please use -imagelinks instead.\03{default}\n')
+localargs.append('-imagelinks' + arg[7:])
elif arg.startswith('-undelete'):
undelete = True
else:
genFactory.handleArg(arg)
-if not summary:
+found = arg.find(':') + 1
+if found:
+pageName = arg[found:]
+
+if pageName and not summary:
if arg.startswith('-category'):
summary = i18n.twtranslate(mysite, 'delete-from-category',
[MediaWiki-commits] [Gerrit] Add variant rewrites for zhwikivoyage - change (operations/apache-config)
TTO has uploaded a new change for review. https://gerrit.wikimedia.org/r/110155 Change subject: Add variant rewrites for zhwikivoyage .. Add variant rewrites for zhwikivoyage Bug: 60473 Change-Id: I16d961e0774f43ac8902378d4b7af2f120f43e49 --- M main.conf 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/apache-config refs/changes/55/110155/1 diff --git a/main.conf b/main.conf index cd8cee1..f97bbb1 100644 --- a/main.conf +++ b/main.conf @@ -726,6 +726,14 @@ /IfModule /Directory +# Variant aliases +Alias /zh /usr/local/apache/common/docroot/wikivoyage.org/w/index.php +Alias /zh-hans /usr/local/apache/common/docroot/wikivoyage.org/w/index.php +Alias /zh-hant /usr/local/apache/common/docroot/wikivoyage.org/w/index.php +Alias /zh-cn /usr/local/apache/common/docroot/wikivoyage.org/w/index.php +Alias /zh-hk /usr/local/apache/common/docroot/wikivoyage.org/w/index.php +Alias /zh-sg /usr/local/apache/common/docroot/wikivoyage.org/w/index.php +Alias /zh-tw /usr/local/apache/common/docroot/wikivoyage.org/w/index.php /VirtualHost LoadModule deflate_module /usr/lib/apache2/modules/mod_deflate.so -- To view, visit https://gerrit.wikimedia.org/r/110155 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I16d961e0774f43ac8902378d4b7af2f120f43e49 Gerrit-PatchSet: 1 Gerrit-Project: operations/apache-config Gerrit-Branch: master Gerrit-Owner: TTO at.li...@live.com.au ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] payments1-4 decom, replace payments100x in ganglia - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110156
Change subject: payments1-4 decom,replace payments100x in ganglia
..
payments1-4 decom,replace payments100x in ganglia
- remove payments1-4 from site.pp
- remove payments1-4 from DHCP
- in ganglia replace payments1/2 with payments1001/1002
RT #6635 - decom pmtpa fundraising servers
per JeffGreen they can be all removed, adding Jeff to confirm
the Ganglia change is also what was expected
Change-Id: Idca420d4636d0879cab46d841b9e5acaaddaf158
---
M manifests/ganglia.pp
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 1 insertion(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/56/110156/1
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 9bf2f72..f349b43 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -300,7 +300,7 @@
PDF servers=
pdf1.wikimedia.org pdf2.wikimedia.org,
LVS loadbalancers pmtpa=
lvs1.wikimedia.org lvs2.wikimedia.org,
Miscellaneous =
tarin.pmtpa.wmnet,
-Fundraiser payments=
payments1.wikimedia.org payments2.wikimedia.org,
+Fundraiser payments=
payments1001.wikimedia.org payments1002.wikimedia.org,
Fundraising eqiad =
pay-lvs1001.frack.eqiad.wmnet pay-lvs1002.frack.eqiad.wmnet,
SSL cluster esams =
hooft.esams.wikimedia.org:11675 ssl3001.esams.wikimedia.org
ssl3002.esams.wikimedia.org,
Swift pmtpa=
ms-fe1.pmtpa.wmnet ms-fe2.pmtpa.wmnet,
diff --git a/manifests/site.pp b/manifests/site.pp
index 1584cc0..c60c881 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2742,10 +2742,6 @@
# pappas.wikimedia.org (pmtpa)
# pay-lvs1001.frack.eqiad.wmnet
# pay-lvs1002.frack.eqiad.wmnet
-# payments1.wikimedia.org (pmtpa)
-# payments2.wikimedia.org (pmtpa)
-# payments3.wikimedia.org (pmtpa)
-# payments4.wikimedia.org (pmtpa)
# payments1001.frack.eqiad.wmnet
# payments1002.frack.eqiad.wmnet
# payments1003.frack.eqiad.wmnet
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 06d5aef..ed1cfe2 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3551,26 +3551,6 @@
filename /pxelinux.0;
}
-host payments1 {
- hardware ethernet 84:2b:2b:54:91:75;
- fixed-address payments1.pmtpa.wmnet;
-}
-
-host payments2 {
- hardware ethernet 84:2b:2b:55:19:25;
- fixed-address payments2.pmtpa.wmnet;
-}
-
-host payments3 {
- hardware ethernet 84:2b:2b:55:16:fc;
- fixed-address payments3.pmtpa.wmnet;
-}
-
-host payments4 {
- hardware ethernet 84:2b:2b:55:16:ea;
- fixed-address payments4.pmtpa.wmnet;
-}
-
host pdf2 {
hardware ethernet 00:21:9B:93:CC:34;
fixed-address pdf2.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/110156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idca420d4636d0879cab46d841b9e5acaaddaf158
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use Revision ID instead of current Rev ID - change (mediawiki...Annotator)
Chiborg has uploaded a new change for review. https://gerrit.wikimedia.org/r/110157 Change subject: Use Revision ID instead of current Rev ID .. Use Revision ID instead of current Rev ID This ensures that when displaying an old version of the page only the annotations of the old page are shown. Change-Id: I1011d55d415d7dcf83e8590ce112add15d4e14b2 --- M modules/Annotator.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Annotator refs/changes/57/110157/1 diff --git a/modules/Annotator.js b/modules/Annotator.js index e22e392..e22d027 100755 --- a/modules/Annotator.js +++ b/modules/Annotator.js @@ -56,7 +56,7 @@ } //Get the Revision Id of the page - revid = mw.config.get( 'wgCurRevisionId' ); + revid = mw.config.get( 'wgRevisionId' ); //Get the userId userId = mw.user.getId(); //Set the userPermission to user id if the user is logged in and to -1 if its an anon so that no user can update and delete the comments made by anons -- To view, visit https://gerrit.wikimedia.org/r/110157 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1011d55d415d7dcf83e8590ce112add15d4e14b2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Annotator Gerrit-Branch: master Gerrit-Owner: Chiborg g...@birke-software.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix resize engine for fullscreen - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix resize engine for fullscreen
..
Fix resize engine for fullscreen
This sorta has a few other miscellaneous fixes in it, but it works!
There are maybe still funky behaviours left. Test it?
Also refactor some bits, so we aren't accessing mw.mediaViewer in the
interface code.
Change-Id: I69db8e7b4ff5f994ba706fd4965688f3c26859f4
---
M MultimediaViewer.php
M resources/mmv/mmv.css
M resources/mmv/mmv.js
M resources/mmv/mmv.lightboxinterface.js
A resources/mmv/mmv.multilightbox.js
M resources/multilightbox/lightboxinterface.js
M resources/multilightbox/multilightbox.js
7 files changed, 120 insertions(+), 24 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index d325f1f..87a9d9a 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -108,6 +108,17 @@
),
), $moduleInfoMMVM );
+$wgResourceModules['mmv.multilightbox'] = array_merge( array(
+ 'scripts' = array(
+ 'mmv.multilightbox.js',
+ ),
+
+ 'dependencies' = array(
+ 'oojs',
+ 'multilightbox',
+ ),
+), $moduleInfoMMV );
+
$wgResourceModules['mmv.model.FileUsage'] = array_merge( array(
'scripts' = array(
'mmv.model.FileUsage.js',
@@ -201,6 +212,7 @@
'mmv.model.Repo',
'mmv.provider',
'mediawiki.language',
+ 'mmv.multilightbox',
),
'messages' = array(
diff --git a/resources/mmv/mmv.css b/resources/mmv/mmv.css
index 5093ff1..17edb47 100644
--- a/resources/mmv/mmv.css
+++ b/resources/mmv/mmv.css
@@ -20,6 +20,11 @@
bottom: 82px;
}
+.jq-fullscreened .mlb-image-wrapper,
+.jq-fullscreened .mw-mlb-controls {
+ bottom: 0px;
+}
+
.mlb-image-wrapper {
position: fixed;
}
diff --git a/resources/mmv/mmv.js b/resources/mmv/mmv.js
index d8c05ce..77345a1 100755
--- a/resources/mmv/mmv.js
+++ b/resources/mmv/mmv.js
@@ -171,7 +171,7 @@
}
// Only if we find legit images, create a MultiLightbox object
- this.lightbox = new MultiLightbox( urls, 0,
mw.LightboxInterface );
+ this.lightbox = new mw.MultiLightbox( urls, 0,
mw.LightboxInterface, this );
// Register various event hooks. TODO: Make this a function
that's only called once.
@@ -188,6 +188,7 @@
}
viewer.hasAnimatedMetadata = false;
+ viewer.isOpen = false;
} );
lightboxHooks.register( 'imageResize', function () {
@@ -331,6 +332,8 @@
this.fetchImageInfo( fileTitle, [ 'url' ] ).done( function (
imageData, repoInfo, targetWidth, requestedWidth ) {
viewer.loadResizedImage( ui, imageData, targetWidth,
requestedWidth );
} );
+
+ this.updateControls();
};
/**
@@ -367,7 +370,6 @@
image.width = targetWidth;
}
ui.replaceImageWith( image );
- this.updateControls();
}
};
@@ -623,7 +625,15 @@
this.currentImageFilename =
image.filePageTitle.getPrefixedText();
this.currentImageFileTitle = image.filePageTitle;
this.lightbox.iface.comingFromPopstate = comingFromPopstate;
- this.lightbox.open();
+
+ if ( !this.isOpen ) {
+ this.lightbox.open();
+ this.isOpen = true;
+ } else {
+ this.lightbox.iface.empty();
+ this.lightbox.iface.load( image );
+ }
+
$( document.body ).addClass( 'mw-mlb-lightbox-open' );
mdpid = this.profileStart( 'metadata-fetch' );
diff --git a/resources/mmv/mmv.lightboxinterface.js
b/resources/mmv/mmv.lightboxinterface.js
index 3aeb104..3c5114a 100644
--- a/resources/mmv/mmv.lightboxinterface.js
+++ b/resources/mmv/mmv.lightboxinterface.js
@@ -24,8 +24,10 @@
* Represents the main interface of the lightbox
* @constructor
*/
- function LightboxInterface() {
+ function LightboxInterface( viewer ) {
MLBInterface.call( this );
+
+ this.viewer = viewer;
this.eventsRegistered = {};
@@ -126,10 +128,10 @@
};
LIP.load = function ( image ) {
- var hashFragment = '#mediaviewer/' +
mw.mediaViewer.currentImageFilename + '/' +
mw.mediaViewer.lightbox.currentIndex;
+ var hashFragment = '#mediaviewer/' +
this.viewer.currentImageFilename + '/' + this.viewer.lightbox.currentIndex;
- mw.mediaViewer.ui = this;
-
[MediaWiki-commits] [Gerrit] decom pappas (formerly fr bastion) - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110158
Change subject: decom pappas (formerly fr bastion)
..
decom pappas (formerly fr bastion)
- remove pappas comment from site.pp
- remove pappas from dsh group
- remove pappas from DHCP
RT #6635 - decom pmtpa fundraising
this used to be the fundraising bastion
0) confirm anything interesting is backed up elsewhere
per Jeff it's done though
Change-Id: I5f6e670c5bab418fba4b8ab1c917c4774b95eb17
---
M files/dsh/group/misc_pmtpa
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 0 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/110158/1
diff --git a/files/dsh/group/misc_pmtpa b/files/dsh/group/misc_pmtpa
index 02702d9..ea023d4 100644
--- a/files/dsh/group/misc_pmtpa
+++ b/files/dsh/group/misc_pmtpa
@@ -16,7 +16,6 @@
maurus
mchenry
mexia
-pappas
pdf1
pdf2
pdf3
diff --git a/manifests/site.pp b/manifests/site.pp
index 1584cc0..4bcc858 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2739,7 +2739,6 @@
# db1025.frack.eqiad.wmnet
# indium.frack.eqiad.wmnet
# lutetium.frack.eqiad.wmnet
-# pappas.wikimedia.org (pmtpa)
# pay-lvs1001.frack.eqiad.wmnet
# pay-lvs1002.frack.eqiad.wmnet
# payments1.wikimedia.org (pmtpa)
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 06d5aef..e84ef9d 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3544,13 +3544,6 @@
fixed-address palladium.eqiad.wmnet;
}
-host pappas {
- hardware ethernet 90:b1:1c:13:3d:22;
- fixed-address pappas.wikimedia.org;
- next-server 10.64.40.66;
- filename /pxelinux.0;
-}
-
host payments1 {
hardware ethernet 84:2b:2b:54:91:75;
fixed-address payments1.pmtpa.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/110158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f6e670c5bab418fba4b8ab1c917c4774b95eb17
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add hook PhpTagsRuntimeFirstInit - change (mediawiki...PhpTags)
Pastakhov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110159
Change subject: add hook PhpTagsRuntimeFirstInit
..
add hook PhpTagsRuntimeFirstInit
Change-Id: Id8287c9ca6c4721f8237da3ebefa3e677793afb6
---
M PhpTags.body.php
M PhpTags.php
M includes/ExceptionPhpTags.php
M includes/Runtime.php
M tests/phpunit/includes/RuntimeTest.php
5 files changed, 83 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PhpTags
refs/changes/59/110159/1
diff --git a/PhpTags.body.php b/PhpTags.body.php
index 1a212db..61bea80 100644
--- a/PhpTags.body.php
+++ b/PhpTags.body.php
@@ -13,7 +13,8 @@
static $DebugLoops = false;
static $startTime = false;
- static $frames=array();
+ private static $frames=array();
+ private static $needInitRuntime = true;
/**
*
@@ -27,6 +28,11 @@
$is_banned = self::isBanned($frame);
if ( $is_banned ) {
return $is_banned;
+ }
+
+ if ( self::$needInitRuntime ) {
+ \wfRunHooks( 'PhpTagsRuntimeFirstInit' );
+ self::$needInitRuntime = false;
}
$command = array_shift($args);
@@ -67,6 +73,11 @@
return $is_banned;
}
+ if ( self::$needInitRuntime ) {
+ \wfRunHooks( 'PhpTagsRuntimeFirstInit' );
+ self::$needInitRuntime = false;
+ }
+
$is_debug = isset($args['debug']);
$return = false;
diff --git a/PhpTags.php b/PhpTags.php
index 81136e7..e00f77c 100644
--- a/PhpTags.php
+++ b/PhpTags.php
@@ -15,7 +15,10 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry
point.' );
}
-define( 'PHPTAGS_VERSION' , '1.0.0' );
+define( 'PHPTAGS_MAJOR_VERSION' , 1 );
+define( 'PHPTAGS_MINOR_VERSION' , 0 );
+define( 'PHPTAGS_RELEASE_VERSION' , 1 );
+define( 'PHPTAGS_VERSION' , PHPTAGS_MAJOR_VERSION . '.' .
PHPTAGS_MINOR_VERSION . '.' . PHPTAGS_RELEASE_VERSION );
// Register this extension on Special:Version
$wgExtensionCredits['parserhook'][] = array(
@@ -40,6 +43,17 @@
$parser-setHook( 'phptag', 'PhpTags::render' );
return true;
};
+$wgHooks['PhpTagsRuntimeFirstInit'][] = function() {
+ \PhpTags\Runtime::setConstantsValue(
+ array(
+ 'PHPTAGS_MAJOR_VERSION' =
PHPTAGS_MAJOR_VERSION,
+ 'PHPTAGS_MINOR_VERSION' =
PHPTAGS_MINOR_VERSION,
+ 'PHPTAGS_RELEASE_VERSION' =
PHPTAGS_RELEASE_VERSION,
+ 'PHPTAGS_VERSION' = PHPTAGS_VERSION,
+ )
+ );
+ return true;
+};
/**
* @codeCoverageIgnore
diff --git a/includes/ExceptionPhpTags.php b/includes/ExceptionPhpTags.php
index 58786cc..1a2e6c1 100644
--- a/includes/ExceptionPhpTags.php
+++ b/includes/ExceptionPhpTags.php
@@ -2,15 +2,20 @@
namespace PhpTags;
define( 'PHPTAGS_EXCEPTION_SYNTAX_ERROR_UNEXPECTED', 1001 ); // PHP Parse
error: syntax error, unexpected $end, expecting ',' or ';' in Command line
code on line 1
-define( 'PHPTAGS_EXCEPTION_NOTICE_UNDEFINED_VARIABLE', 1002 ); // PHP Notice:
Undefined variable: $1 in Command line code on line 1
-define( 'PHPTAGS_EXCEPTION_FATAL_CANNOT_USE_FOR_READING', 1003 ); // PHP Fatal
error: Cannot use [] for reading in Command line code on line 1
-define( 'PHPTAGS_EXCEPTION_WARNING_DIVISION_BY_ZERO', 1004 ); // PHP Warning:
Division by zero
-define( 'PHPTAGS_EXCEPTION_NOTICE_UNINIT_STRING_OFFSET', 1005 ); // PHP
Notice: Uninitialized string offset: $1
-define( 'PHPTAGS_EXCEPTION_NOTICE_UNDEFINED_OFFSET', 1006 ); // PHP Notice:
Undefined offset: 4 in Command line code on line 1
-define( 'PHPTAGS_EXCEPTION_FATAL_STRING_OFFSET_AS_ARRAY', 1007 ); // PHP Fatal
error: Cannot use string offset as an array
-define( 'PHPTAGS_EXCEPTION_WARNING_SCALAR_VALUE_AS_ARRAY', 1008 ); // PHP
Warning: Cannot use a scalar value as an array
-define( 'PHPTAGS_EXCEPTION_WARNING_INVALID_ARGUMENT_FOR_FOREACH', 1009 ); //
PHP Warning: Invalid argument supplied for foreach()
-//
+
+define( 'PHPTAGS_EXCEPTION_NOTICE_UNDEFINED_VARIABLE', 2001 ); // PHP Notice:
Undefined variable: $1 in Command line code on line 1
+define( 'PHPTAGS_EXCEPTION_NOTICE_UNINIT_STRING_OFFSET', 2002 ); // PHP
Notice: Uninitialized string offset: $1
+define( 'PHPTAGS_EXCEPTION_NOTICE_UNDEFINED_OFFSET', 2003 ); // PHP Notice:
Undefined offset: 4 in Command line code on line 1
+define( 'PHPTAGS_EXCEPTION_NOTICE_UNDEFINED_CONSTANT', 2004 ); // PHP Notice:
Use of undefined constant $1 - assumed '$1'
+
+define( 'PHPTAGS_EXCEPTION_WARNING_DIVISION_BY_ZERO', 3001 ); // PHP Warning:
Division by zero
+define(
[MediaWiki-commits] [Gerrit] add hook PhpTagsRuntimeFirstInit - change (mediawiki...PhpTags)
Pastakhov has submitted this change and it was merged.
Change subject: add hook PhpTagsRuntimeFirstInit
..
add hook PhpTagsRuntimeFirstInit
Change-Id: Id8287c9ca6c4721f8237da3ebefa3e677793afb6
---
M PhpTags.body.php
M PhpTags.php
M includes/ExceptionPhpTags.php
M includes/Runtime.php
M tests/phpunit/includes/RuntimeTest.php
5 files changed, 83 insertions(+), 26 deletions(-)
Approvals:
Pastakhov: Verified; Looks good to me, approved
diff --git a/PhpTags.body.php b/PhpTags.body.php
index 1a212db..61bea80 100644
--- a/PhpTags.body.php
+++ b/PhpTags.body.php
@@ -13,7 +13,8 @@
static $DebugLoops = false;
static $startTime = false;
- static $frames=array();
+ private static $frames=array();
+ private static $needInitRuntime = true;
/**
*
@@ -27,6 +28,11 @@
$is_banned = self::isBanned($frame);
if ( $is_banned ) {
return $is_banned;
+ }
+
+ if ( self::$needInitRuntime ) {
+ \wfRunHooks( 'PhpTagsRuntimeFirstInit' );
+ self::$needInitRuntime = false;
}
$command = array_shift($args);
@@ -67,6 +73,11 @@
return $is_banned;
}
+ if ( self::$needInitRuntime ) {
+ \wfRunHooks( 'PhpTagsRuntimeFirstInit' );
+ self::$needInitRuntime = false;
+ }
+
$is_debug = isset($args['debug']);
$return = false;
diff --git a/PhpTags.php b/PhpTags.php
index 81136e7..e00f77c 100644
--- a/PhpTags.php
+++ b/PhpTags.php
@@ -15,7 +15,10 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry
point.' );
}
-define( 'PHPTAGS_VERSION' , '1.0.0' );
+define( 'PHPTAGS_MAJOR_VERSION' , 1 );
+define( 'PHPTAGS_MINOR_VERSION' , 0 );
+define( 'PHPTAGS_RELEASE_VERSION' , 1 );
+define( 'PHPTAGS_VERSION' , PHPTAGS_MAJOR_VERSION . '.' .
PHPTAGS_MINOR_VERSION . '.' . PHPTAGS_RELEASE_VERSION );
// Register this extension on Special:Version
$wgExtensionCredits['parserhook'][] = array(
@@ -40,6 +43,17 @@
$parser-setHook( 'phptag', 'PhpTags::render' );
return true;
};
+$wgHooks['PhpTagsRuntimeFirstInit'][] = function() {
+ \PhpTags\Runtime::setConstantsValue(
+ array(
+ 'PHPTAGS_MAJOR_VERSION' =
PHPTAGS_MAJOR_VERSION,
+ 'PHPTAGS_MINOR_VERSION' =
PHPTAGS_MINOR_VERSION,
+ 'PHPTAGS_RELEASE_VERSION' =
PHPTAGS_RELEASE_VERSION,
+ 'PHPTAGS_VERSION' = PHPTAGS_VERSION,
+ )
+ );
+ return true;
+};
/**
* @codeCoverageIgnore
diff --git a/includes/ExceptionPhpTags.php b/includes/ExceptionPhpTags.php
index 58786cc..1a2e6c1 100644
--- a/includes/ExceptionPhpTags.php
+++ b/includes/ExceptionPhpTags.php
@@ -2,15 +2,20 @@
namespace PhpTags;
define( 'PHPTAGS_EXCEPTION_SYNTAX_ERROR_UNEXPECTED', 1001 ); // PHP Parse
error: syntax error, unexpected $end, expecting ',' or ';' in Command line
code on line 1
-define( 'PHPTAGS_EXCEPTION_NOTICE_UNDEFINED_VARIABLE', 1002 ); // PHP Notice:
Undefined variable: $1 in Command line code on line 1
-define( 'PHPTAGS_EXCEPTION_FATAL_CANNOT_USE_FOR_READING', 1003 ); // PHP Fatal
error: Cannot use [] for reading in Command line code on line 1
-define( 'PHPTAGS_EXCEPTION_WARNING_DIVISION_BY_ZERO', 1004 ); // PHP Warning:
Division by zero
-define( 'PHPTAGS_EXCEPTION_NOTICE_UNINIT_STRING_OFFSET', 1005 ); // PHP
Notice: Uninitialized string offset: $1
-define( 'PHPTAGS_EXCEPTION_NOTICE_UNDEFINED_OFFSET', 1006 ); // PHP Notice:
Undefined offset: 4 in Command line code on line 1
-define( 'PHPTAGS_EXCEPTION_FATAL_STRING_OFFSET_AS_ARRAY', 1007 ); // PHP Fatal
error: Cannot use string offset as an array
-define( 'PHPTAGS_EXCEPTION_WARNING_SCALAR_VALUE_AS_ARRAY', 1008 ); // PHP
Warning: Cannot use a scalar value as an array
-define( 'PHPTAGS_EXCEPTION_WARNING_INVALID_ARGUMENT_FOR_FOREACH', 1009 ); //
PHP Warning: Invalid argument supplied for foreach()
-//
+
+define( 'PHPTAGS_EXCEPTION_NOTICE_UNDEFINED_VARIABLE', 2001 ); // PHP Notice:
Undefined variable: $1 in Command line code on line 1
+define( 'PHPTAGS_EXCEPTION_NOTICE_UNINIT_STRING_OFFSET', 2002 ); // PHP
Notice: Uninitialized string offset: $1
+define( 'PHPTAGS_EXCEPTION_NOTICE_UNDEFINED_OFFSET', 2003 ); // PHP Notice:
Undefined offset: 4 in Command line code on line 1
+define( 'PHPTAGS_EXCEPTION_NOTICE_UNDEFINED_CONSTANT', 2004 ); // PHP Notice:
Use of undefined constant $1 - assumed '$1'
+
+define( 'PHPTAGS_EXCEPTION_WARNING_DIVISION_BY_ZERO', 3001 ); // PHP Warning:
Division by zero
+define( 'PHPTAGS_EXCEPTION_WARNING_SCALAR_VALUE_AS_ARRAY', 3002 ); // PHP
Warning: Cannot use a scalar
[MediaWiki-commits] [Gerrit] Remove tabs from release notes - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/110160 Change subject: Remove tabs from release notes .. Remove tabs from release notes Change-Id: I7b2074d26712b7f13c9fb328bb5919456f5ff579 --- M client/RELEASE-NOTES M repo/RELEASE-NOTES 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/60/110160/1 diff --git a/client/RELEASE-NOTES b/client/RELEASE-NOTES index 8c395ff..2aaf900 100644 --- a/client/RELEASE-NOTES +++ b/client/RELEASE-NOTES @@ -1,5 +1,5 @@ These are the release notes for the Wikibase Client extension. - + Extension page on mediawiki.org: https://www.mediawiki.org/wiki/Extension:Wikibase_Client Latest version of the release notes: https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/extensions/Wikibase.git;a=blob;f=client/RELEASE-NOTES diff --git a/repo/RELEASE-NOTES b/repo/RELEASE-NOTES index e75749d..4ee3030 100644 --- a/repo/RELEASE-NOTES +++ b/repo/RELEASE-NOTES @@ -1,5 +1,5 @@ These are the release notes for the Wikibase extension. - + Extension page on mediawiki.org: https://www.mediawiki.org/wiki/Extension:Wikibase Latest version of the release notes: https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/extensions/Wikibase.git;a=blob;f=repo/RELEASE-NOTES -- To view, visit https://gerrit.wikimedia.org/r/110160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b2074d26712b7f13c9fb328bb5919456f5ff579 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Addshore addshorew...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Split TemplateRegistry file into 2 class files - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110161
Change subject: Split TemplateRegistry file into 2 class files
..
Split TemplateRegistry file into 2 class files
Change-Id: I39c67751c0b9e1638f27a81bdfbbf14c50d10300
---
A lib/includes/Template.php
M lib/includes/TemplateRegistry.php
2 files changed, 58 insertions(+), 49 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/61/110161/1
diff --git a/lib/includes/Template.php b/lib/includes/Template.php
new file mode 100644
index 000..6e7ec71
--- /dev/null
+++ b/lib/includes/Template.php
@@ -0,0 +1,55 @@
+?php
+
+namespace Wikibase;
+
+/**
+ * Allows storing and accessing of templates (e.g. snippets commonly used in
server-side HTML
+ * generation and client-side JavaScript processing).
+ *
+ * This class Represents a template that can contain placeholders just like
MediaWiki messages.
+ *
+ * @since 0.2
+ *
+ * @licence GNU GPL v2+
+ * @author H. Snater mediaw...@snater.com
+ */
+class Template extends \Message {
+
+ protected $templateRegistry;
+
+ /**
+* important! note that the Template class does not escape anything.
+* be sure to escape your params before using this class!
+*
+* @param TemplateRegistry $templateRegistry
+* @param $key: message key, or array of message keys to try
+* and use the first non-empty message for
+* @param $params Array message parameters
+*/
+ public function __construct( TemplateRegistry $templateRegistry, $key,
$params = array() ) {
+ $this-templateRegistry = $templateRegistry;
+ parent::__construct( $key, $params );
+ }
+
+ /**
+* Fetch a template from the template store.
+* @see \Message.fetchMessage()
+*
+* @return string template
+*/
+ protected function fetchMessage() {
+ if ( !isset( $this-message ) ) {
+ $this-message = $this-templateRegistry-getTemplate(
$this-key );
+ }
+ return $this-message;
+ }
+
+ /**
+* @return string
+*/
+ public function render() {
+ // Use plain() to prevent replacing {{...}}:
+ return $this-plain();
+ }
+
+}
diff --git a/lib/includes/TemplateRegistry.php
b/lib/includes/TemplateRegistry.php
index 64ef8f9..07285b2 100644
--- a/lib/includes/TemplateRegistry.php
+++ b/lib/includes/TemplateRegistry.php
@@ -6,14 +6,12 @@
* Allows storing and accessing of templates (e.g. snippets commonly used in
server-side HTML
* generation and client-side JavaScript processing).
*
+ * This class Stores plain templates.
+ *
* @since 0.2
*
* @licence GNU GPL v2+
* @author H. Snater mediaw...@snater.com
- */
-
-/**
- * Stores plain templates.
*/
class TemplateRegistry {
@@ -77,48 +75,4 @@
return $instance;
}
-}
-
-/**
- * Represents a template that can contain placeholders just like MediaWiki
messages.
- */
-class Template extends \Message {
-
- protected $templateRegistry;
-
- /**
-* important! note that the Template class does not escape anything.
-* be sure to escape your params before using this class!
-*
-* @param TemplateRegistry $templateRegistry
-* @param $key: message key, or array of message keys to try
-* and use the first non-empty message for
-* @param $params Array message parameters
-*/
- public function __construct( TemplateRegistry $templateRegistry, $key,
$params = array() ) {
- $this-templateRegistry = $templateRegistry;
- parent::__construct( $key, $params );
- }
-
- /**
-* Fetch a template from the template store.
-* @see \Message.fetchMessage()
-*
-* @return string template
-*/
- protected function fetchMessage() {
- if ( !isset( $this-message ) ) {
- $this-message = $this-templateRegistry-getTemplate(
$this-key );
- }
- return $this-message;
- }
-
- /**
-* @return string
-*/
- public function render() {
- // Use plain() to prevent replacing {{...}}:
- return $this-plain();
- }
-
-}
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/110161
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39c67751c0b9e1638f27a81bdfbbf14c50d10300
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] Add $wgLocalInterwikis to handle multiple local prefixes - change (mediawiki/core)
TTO has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110162
Change subject: Add $wgLocalInterwikis to handle multiple local prefixes
..
Add $wgLocalInterwikis to handle multiple local prefixes
This is akin to $wgSkipSkin/$wgSkipSkins. It is quite plausible for a wiki
to have more than one self prefix (e.g. enwiki has w: en: wikipedia: and
maybe others).
Some recent changes code seems to use $wgLocalInterwiki for quite unclear
purposes:
- I removed the line using $wgLocalInterwiki from the RecentChange
class, as the 'lang' field of $mExtra is not used anywhere in core code.
Extensions may use it, but it would seem more appropriate for them to
use something like $wgDBname (or indeed to consult $wgLocalInterwikis
directly) if they need to identify a particular wiki.
- In the IRC formatter, it does not appear to matter which local interwiki
prefix is used, so the first prefix in the array is used (if set).
Related to bug 954 comment 3.
Change-Id: I9dbb566385b464402c5e78510b95dd2ffb4d9489
---
M RELEASE-NOTES-1.23
M includes/DefaultSettings.php
M includes/Setup.php
M includes/Title.php
M includes/changes/RecentChange.php
M includes/rcfeed/IRCColourfulRCFeedFormatter.php
6 files changed, 35 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/62/110162/1
diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 10caf6f..a9de1ac 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -32,6 +32,11 @@
the system message 'emailsender' should be modified (default:
{{SITENAME}}).
* $wgDBAhandler was removed as the only class using it was also removed
* The 'max threads' setting was removed from $wgDBservers.
+* $wgLocalInterwikis is an array containing multiple local interwiki prefixes
+ (interwiki prefixes that point back to the current wiki). This effectively
+ allows more than one value of $wgLocalInterwiki to be specified and
+ understood by the parser. The value of $wgLocalInterwiki is automatically
+ appended to the end of this array.
=== New features in 1.23 ===
* ResourceLoader can utilize the Web Storage API to cache modules client-side.
@@ -201,6 +206,9 @@
* (bug 52813) Preference Show table of contents (for pages with more than
3 headings) was removed.
* (bug 52810) Preference Justify paragraphs was removed.
+* RecentChange::mExtra['lang'] is no longer used. Extensions should read from
+ other configuration variables, including $wgLocalInterwikis, to identify the
+ current wiki.
Removed classes
* FakeMemCachedClient (deprecated in 1.18)
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 326a1c2..3c7bb89 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3462,6 +3462,12 @@
$wgLocalInterwiki = false;
/**
+ * Array for multiple $wgLocalInterwiki values, in case there are several
+ * interwiki prefixes pointing to the current wiki.
+ */
+$wgLocalInterwikis = array();
+
+/**
* Expiry time for cache of interwiki table
*/
$wgInterwikiExpiry = 10800;
diff --git a/includes/Setup.php b/includes/Setup.php
index d1269ad..37865ba 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -265,6 +265,10 @@
$wgSkipSkins[] = $wgSkipSkin;
}
+if ( $wgLocalInterwiki ) {
+ $wgLocalInterwikis[] = $wgLocalInterwiki;
+}
+
# Set default shared prefix
if ( $wgSharedPrefix === false ) {
$wgSharedPrefix = $wgDBprefix;
diff --git a/includes/Title.php b/includes/Title.php
index bdba578..b385ffc 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -3211,7 +3211,7 @@
* @return Bool true on success
*/
private function secureAndSplit() {
- global $wgContLang, $wgLocalInterwiki;
+ global $wgContLang, $wgLocalInterwikis;
# Initialisation
$this-mInterwiki = '';
@@ -3284,17 +3284,17 @@
$this-mInterwiki = $wgContLang-lc( $p
);
# Redundant interwiki prefix to the
local wiki
- if ( $wgLocalInterwiki !== false
-0 == strcasecmp(
$this-mInterwiki, $wgLocalInterwiki )
- ) {
- if ( $dbkey == '' ) {
- # Can't have an empty
self-link
- return false;
+ foreach ( $wgLocalInterwikis as
$localIW ) {
+ if ( 0 == strcasecmp(
$this-mInterwiki, $localIW ) ) {
+ if ( $dbkey == '' ) {
+ # Can't have an
empty self-link
+
[MediaWiki-commits] [Gerrit] fix svn::client requirement in ganglia::web - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110163
Change subject: fix svn::client requirement in ganglia::web
..
fix svn::client requirement in ganglia::web
after recent SVN to module change this
needs to use subversion::client instead now
Change-Id: I19b431fb504357cec1a45fed65270a009363b181
---
M manifests/ganglia.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/63/110163/1
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 9bf2f72..8e0feb3 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -435,7 +435,7 @@
require ganglia::collector,
webserver::php5-gd,
webserver::php5-mysql,
-svn::client
+subversion::client
class {'webserver::php5': ssl = true; }
--
To view, visit https://gerrit.wikimedia.org/r/110163
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I19b431fb504357cec1a45fed65270a009363b181
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add jobs for mw/ext/PhpTags and remove jobs for mw/ext/Foxway - change (integration/jenkins-job-builder-config)
Pastakhov has uploaded a new change for review. https://gerrit.wikimedia.org/r/110164 Change subject: Add jobs for mw/ext/PhpTags and remove jobs for mw/ext/Foxway .. Add jobs for mw/ext/PhpTags and remove jobs for mw/ext/Foxway mw/ext/Foxway was replaced by mw/ext/PhpTags Change-Id: I72b53bf39a2b621bcef9a71dc68f1545a017468e --- M mediawiki-extensions.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/64/110164/1 diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index b364219..184091f 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -345,7 +345,6 @@ - FeaturedFeeds - Flow - FormPreloadPostCache - - Foxway - FundraiserLandingPage - Gadgets - GeoCrumbs @@ -412,6 +411,7 @@ - Parsoid - PdfHandler - PHPExcel + - PhpTags - Poem - PoolCounter - PostEdit -- To view, visit https://gerrit.wikimedia.org/r/110164 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I72b53bf39a2b621bcef9a71dc68f1545a017468e Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Pastakhov pastak...@yandex.ru ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix svn::client requirement in ganglia::web - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: fix svn::client requirement in ganglia::web
..
fix svn::client requirement in ganglia::web
after recent SVN to module change this
needs to use subversion::client instead now
Change-Id: I19b431fb504357cec1a45fed65270a009363b181
---
M manifests/ganglia.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 9bf2f72..8e0feb3 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -435,7 +435,7 @@
require ganglia::collector,
webserver::php5-gd,
webserver::php5-mysql,
-svn::client
+subversion::client
class {'webserver::php5': ssl = true; }
--
To view, visit https://gerrit.wikimedia.org/r/110163
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I19b431fb504357cec1a45fed65270a009363b181
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Matanya mata...@foss.co.il
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Split TemplateRegistry file into 2 class files - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Split TemplateRegistry file into 2 class files
..
Split TemplateRegistry file into 2 class files
Change-Id: I39c67751c0b9e1638f27a81bdfbbf14c50d10300
---
A lib/includes/Template.php
M lib/includes/TemplateRegistry.php
2 files changed, 58 insertions(+), 49 deletions(-)
Approvals:
WikidataJenkins: Verified
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/Template.php b/lib/includes/Template.php
new file mode 100644
index 000..6e7ec71
--- /dev/null
+++ b/lib/includes/Template.php
@@ -0,0 +1,55 @@
+?php
+
+namespace Wikibase;
+
+/**
+ * Allows storing and accessing of templates (e.g. snippets commonly used in
server-side HTML
+ * generation and client-side JavaScript processing).
+ *
+ * This class Represents a template that can contain placeholders just like
MediaWiki messages.
+ *
+ * @since 0.2
+ *
+ * @licence GNU GPL v2+
+ * @author H. Snater mediaw...@snater.com
+ */
+class Template extends \Message {
+
+ protected $templateRegistry;
+
+ /**
+* important! note that the Template class does not escape anything.
+* be sure to escape your params before using this class!
+*
+* @param TemplateRegistry $templateRegistry
+* @param $key: message key, or array of message keys to try
+* and use the first non-empty message for
+* @param $params Array message parameters
+*/
+ public function __construct( TemplateRegistry $templateRegistry, $key,
$params = array() ) {
+ $this-templateRegistry = $templateRegistry;
+ parent::__construct( $key, $params );
+ }
+
+ /**
+* Fetch a template from the template store.
+* @see \Message.fetchMessage()
+*
+* @return string template
+*/
+ protected function fetchMessage() {
+ if ( !isset( $this-message ) ) {
+ $this-message = $this-templateRegistry-getTemplate(
$this-key );
+ }
+ return $this-message;
+ }
+
+ /**
+* @return string
+*/
+ public function render() {
+ // Use plain() to prevent replacing {{...}}:
+ return $this-plain();
+ }
+
+}
diff --git a/lib/includes/TemplateRegistry.php
b/lib/includes/TemplateRegistry.php
index 64ef8f9..07285b2 100644
--- a/lib/includes/TemplateRegistry.php
+++ b/lib/includes/TemplateRegistry.php
@@ -6,14 +6,12 @@
* Allows storing and accessing of templates (e.g. snippets commonly used in
server-side HTML
* generation and client-side JavaScript processing).
*
+ * This class Stores plain templates.
+ *
* @since 0.2
*
* @licence GNU GPL v2+
* @author H. Snater mediaw...@snater.com
- */
-
-/**
- * Stores plain templates.
*/
class TemplateRegistry {
@@ -77,48 +75,4 @@
return $instance;
}
-}
-
-/**
- * Represents a template that can contain placeholders just like MediaWiki
messages.
- */
-class Template extends \Message {
-
- protected $templateRegistry;
-
- /**
-* important! note that the Template class does not escape anything.
-* be sure to escape your params before using this class!
-*
-* @param TemplateRegistry $templateRegistry
-* @param $key: message key, or array of message keys to try
-* and use the first non-empty message for
-* @param $params Array message parameters
-*/
- public function __construct( TemplateRegistry $templateRegistry, $key,
$params = array() ) {
- $this-templateRegistry = $templateRegistry;
- parent::__construct( $key, $params );
- }
-
- /**
-* Fetch a template from the template store.
-* @see \Message.fetchMessage()
-*
-* @return string template
-*/
- protected function fetchMessage() {
- if ( !isset( $this-message ) ) {
- $this-message = $this-templateRegistry-getTemplate(
$this-key );
- }
- return $this-message;
- }
-
- /**
-* @return string
-*/
- public function render() {
- // Use plain() to prevent replacing {{...}}:
- return $this-plain();
- }
-
-}
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/110161
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I39c67751c0b9e1638f27a81bdfbbf14c50d10300
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
[MediaWiki-commits] [Gerrit] Proxy ubuntu cloud archive so we can install openstack stuff. - change (operations/puppet)
Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/110165 Change subject: Proxy ubuntu cloud archive so we can install openstack stuff. .. Proxy ubuntu cloud archive so we can install openstack stuff. Change-Id: I7fe787fff7681208e6475010ebe62dbe5f59137f --- M modules/apt/manifests/init.pp 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/65/110165/1 diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp index 48a3be3..ed76f86 100644 --- a/modules/apt/manifests/init.pp +++ b/modules/apt/manifests/init.pp @@ -57,6 +57,11 @@ priority = '80', key = 'Acquire::http::Proxy::security.ubuntu.com', value= 'http://brewster.wikimedia.org:8080'; +'ubuntu-cloud-archive-proxy': +ensure = $enable_proxy, +priority = '80', +key = 'Acquire::http::Proxy::ubuntu-cloud.archive.canonical.com', +value= 'http://brewster.wikimedia.org:8080'; 'old-releases-proxy': ensure = $enable_proxy, priority = '80', -- To view, visit https://gerrit.wikimedia.org/r/110165 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7fe787fff7681208e6475010ebe62dbe5f59137f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott abog...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix svn::client include in contint module - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110166
Change subject: fix svn::client include in contint module
..
fix svn::client include in contint module
since Ife6ab663edba01ecd86977ae13a3838f3979e2ed
this needs to be subversion::client from the module
Change-Id: Iea4f18aacd0c9746a1eede6fdac26da162691879
---
M modules/contint/manifests/packages.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/66/110166/1
diff --git a/modules/contint/manifests/packages.pp
b/modules/contint/manifests/packages.pp
index 2e410fb..6362b9e 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -33,7 +33,7 @@
# Lint authdns templates config
include authdns::lint
-include svn::client
+include subversion::client
# PHP related packages
package { [
--
To view, visit https://gerrit.wikimedia.org/r/110166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea4f18aacd0c9746a1eede6fdac26da162691879
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Proxy ubuntu cloud archive so we can install openstack stuff. - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged. Change subject: Proxy ubuntu cloud archive so we can install openstack stuff. .. Proxy ubuntu cloud archive so we can install openstack stuff. Change-Id: I7fe787fff7681208e6475010ebe62dbe5f59137f --- M modules/apt/manifests/init.pp 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp index 48a3be3..ed76f86 100644 --- a/modules/apt/manifests/init.pp +++ b/modules/apt/manifests/init.pp @@ -57,6 +57,11 @@ priority = '80', key = 'Acquire::http::Proxy::security.ubuntu.com', value= 'http://brewster.wikimedia.org:8080'; +'ubuntu-cloud-archive-proxy': +ensure = $enable_proxy, +priority = '80', +key = 'Acquire::http::Proxy::ubuntu-cloud.archive.canonical.com', +value= 'http://brewster.wikimedia.org:8080'; 'old-releases-proxy': ensure = $enable_proxy, priority = '80', -- To view, visit https://gerrit.wikimedia.org/r/110165 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7fe787fff7681208e6475010ebe62dbe5f59137f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott abog...@wikimedia.org Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix svn::client include in contint module - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: fix svn::client include in contint module
..
fix svn::client include in contint module
since Ife6ab663edba01ecd86977ae13a3838f3979e2ed
this needs to be subversion::client from the module
Change-Id: Iea4f18aacd0c9746a1eede6fdac26da162691879
---
M modules/contint/manifests/packages.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Matanya: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/contint/manifests/packages.pp
b/modules/contint/manifests/packages.pp
index 2e410fb..6362b9e 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -33,7 +33,7 @@
# Lint authdns templates config
include authdns::lint
-include svn::client
+include subversion::client
# PHP related packages
package { [
--
To view, visit https://gerrit.wikimedia.org/r/110166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea4f18aacd0c9746a1eede6fdac26da162691879
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Matanya mata...@foss.co.il
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix Special:PrefixIndex omits stripprefix=1 for Next page ... - change (mediawiki/core)
Se4598 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110168
Change subject: fix Special:PrefixIndex omits stripprefix=1 for Next page link
..
fix Special:PrefixIndex omits stripprefix=1 for Next page link
Bug: 60543
Change-Id: I05c26db132d0f7edadb82a798fdba37277a3eddb
---
M includes/specials/SpecialPrefixindex.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/68/110168/1
diff --git a/includes/specials/SpecialPrefixindex.php
b/includes/specials/SpecialPrefixindex.php
index c6307f0..4548b63 100644
--- a/includes/specials/SpecialPrefixindex.php
+++ b/includes/specials/SpecialPrefixindex.php
@@ -264,6 +264,7 @@
'from' = $s-page_title,
'prefix' = $prefix,
'hideredirects' = $this-hideRedirects,
+ 'stripprefix' = $this-stripPrefix,
);
if ( $namespace || $prefix == '' ) {
--
To view, visit https://gerrit.wikimedia.org/r/110168
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I05c26db132d0f7edadb82a798fdba37277a3eddb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Se4598 se4...@gmx.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Release v1.8 - change (mediawiki...erudite)
Njw has uploaded a new change for review. https://gerrit.wikimedia.org/r/110169 Change subject: Release v1.8 .. Release v1.8 Change-Id: I2b459729dbecc0ef1a48a71990dff2dbb76b8633 --- M erudite.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/erudite refs/changes/69/110169/1 diff --git a/erudite.php b/erudite.php index 10adb44..96dcfc3 100644 --- a/erudite.php +++ b/erudite.php @@ -17,7 +17,7 @@ 'name' = 'Erudite', 'url' = 'https://www.mediawiki.org/wiki/Skin:Erudite', 'author' = array( 'Nick White', 'Matt Wiebe', 'Colin Andrew Ferm' ), - 'version' = '1.7', + 'version' = '1.8', 'descriptionmsg' = 'erudite-desc', ); -- To view, visit https://gerrit.wikimedia.org/r/110169 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b459729dbecc0ef1a48a71990dff2dbb76b8633 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/erudite Gerrit-Branch: master Gerrit-Owner: Njw nick.wh...@durham.ac.uk ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Release v1.8 - change (mediawiki...erudite)
Njw has submitted this change and it was merged. Change subject: Release v1.8 .. Release v1.8 Change-Id: I2b459729dbecc0ef1a48a71990dff2dbb76b8633 --- M erudite.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Njw: Verified; Looks good to me, approved diff --git a/erudite.php b/erudite.php index 10adb44..96dcfc3 100644 --- a/erudite.php +++ b/erudite.php @@ -17,7 +17,7 @@ 'name' = 'Erudite', 'url' = 'https://www.mediawiki.org/wiki/Skin:Erudite', 'author' = array( 'Nick White', 'Matt Wiebe', 'Colin Andrew Ferm' ), - 'version' = '1.7', + 'version' = '1.8', 'descriptionmsg' = 'erudite-desc', ); -- To view, visit https://gerrit.wikimedia.org/r/110169 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2b459729dbecc0ef1a48a71990dff2dbb76b8633 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/erudite Gerrit-Branch: master Gerrit-Owner: Njw nick.wh...@durham.ac.uk Gerrit-Reviewer: Njw nick.wh...@durham.ac.uk Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implement rendering item links as HTML. - change (mediawiki...Wikibase)
Addshore has submitted this change and it was merged.
Change subject: Implement rendering item links as HTML.
..
Implement rendering item links as HTML.
Change-Id: I2da16e594d8d9fc687be267c62ae52308df052da
---
A lib/includes/formatters/EntityIdHtmlLinkFormatter.php
M lib/includes/formatters/EntityIdLabelFormatter.php
M lib/includes/formatters/WikibaseValueFormatterBuilders.php
M lib/tests/phpunit/formatters/WikibaseSnakFormatterBuildersTest.php
M lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
M repo/tests/phpunit/includes/api/FormatSnakValueTest.php
6 files changed, 112 insertions(+), 24 deletions(-)
Approvals:
Addshore: Verified; Looks good to me, approved
diff --git a/lib/includes/formatters/EntityIdHtmlLinkFormatter.php
b/lib/includes/formatters/EntityIdHtmlLinkFormatter.php
new file mode 100644
index 000..4b70895
--- /dev/null
+++ b/lib/includes/formatters/EntityIdHtmlLinkFormatter.php
@@ -0,0 +1,43 @@
+?php
+
+namespace Wikibase\Lib;
+
+use InvalidArgumentException;
+use Html;
+use Title;
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\EntityIdValue;
+
+/**
+ * Formats entity IDs by generating an html link to the corresponding page
title.
+ *
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
+ * @author Adrian Lang
+ */
+class EntityIdHtmlLinkFormatter extends EntityIdLabelFormatter {
+
+ /**
+* Format an EntityId data value
+*
+* @param EntityId|EntityIdValue $value The value to format
+*
+* @return string
+*
+* @throws InvalidArgumentException
+*/
+ public function format( $value ) {
+ $value = $this-unwrapEntityId( $value );
+
+ $title = parent::format( $value );
+
+ $attributes = array(
+ 'href' = Title::newFromText( $value-getPrefixedId()
)-getLocalUrl()
+ );
+
+ $html = Html::element( 'a', $attributes, $title );
+
+ return $html;
+ }
+}
diff --git a/lib/includes/formatters/EntityIdLabelFormatter.php
b/lib/includes/formatters/EntityIdLabelFormatter.php
index 28bd6ea..1941488 100644
--- a/lib/includes/formatters/EntityIdLabelFormatter.php
+++ b/lib/includes/formatters/EntityIdLabelFormatter.php
@@ -89,15 +89,9 @@
* @throws InvalidArgumentException
*/
public function format( $value ) {
- if ( $value instanceof EntityIdValue ) {
- $value = $value-getEntityId();
- }
+ $value = $this-unwrapEntityId( $value );
- if ( !( $value instanceof EntityId ) ) {
- throw new InvalidArgumentException( 'Data value type
mismatch. Expected an EntityId or EntityIdValue.' );
- }
-
- if ( $this-getOption( self::OPT_RESOLVE_ID ) ) {
+ if ( $this-getOption( self::OPT_RESOLVE_ID ) ) {
$label = $this-lookupItemLabel( $value );
} else {
$label = false;
@@ -121,6 +115,28 @@
}
/**
+* Unwrap an EntityId value which might be wrapped in an EntityIdValue
+*
+* @param EntityId|EntityIdValue $value The value to format
+*
+* @return EntityId
+*
+* @throws InvalidArgumentException
+*/
+
+ protected function unwrapEntityId( $value ) {
+ if ( $value instanceof EntityIdValue ) {
+ $value = $value-getEntityId();
+ }
+
+ if ( !( $value instanceof EntityId ) ) {
+ throw new InvalidArgumentException( 'Data value type
mismatch. Expected an EntityId or EntityIdValue.' );
+ }
+
+ return $value;
+ }
+
+ /**
* Lookup a label for an entity
*
* @since 0.4
diff --git a/lib/includes/formatters/WikibaseValueFormatterBuilders.php
b/lib/includes/formatters/WikibaseValueFormatterBuilders.php
index 939b376..7fe9fb8 100644
--- a/lib/includes/formatters/WikibaseValueFormatterBuilders.php
+++ b/lib/includes/formatters/WikibaseValueFormatterBuilders.php
@@ -77,7 +77,7 @@
SnakFormatter::FORMAT_HTML = array(
'PT:url' = 'Wikibase\Lib\HtmlUrlFormatter',
'PT:commonsMedia' =
'Wikibase\Lib\CommonsLinkFormatter',
- //'PT:wikibase-item' =
'Wikibase\Lib\ItemLinkFormatter', // TODO
+ 'PT:wikibase-item' = array(
'Wikibase\Lib\WikibaseValueFormatterBuilders', 'newEntityIdHtmlLinkFormatter' ),
),
// Formatters to use for HTML widgets.
@@ -307,7 +307,7 @@
* @return ValueFormatter[] A map from prefixed type IDs to
ValueFormatter instances.
*/
public function getWikiTextFormatters( FormatterOptions $options, array
$skip =
[MediaWiki-commits] [Gerrit] Reduce badges to items listed in config - change (mediawiki...Wikibase)
Addshore has submitted this change and it was merged.
Change subject: Reduce badges to items listed in config
..
Reduce badges to items listed in config
Created a config variable badgeItems where the item ids are stored that may
be used as badges. Also updated the api module, special pages and tests.
Bug: 40810
Change-Id: If3e7ed5af4009f028884368ec45045b6f691d396
---
M lib/config/WikibaseLib.default.php
M repo/Wikibase.i18n.php
M repo/includes/ChangeOp/ChangeOpSiteLink.php
M repo/includes/api/ModifyEntity.php
M repo/includes/specials/SpecialSetSiteLink.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
M repo/tests/phpunit/includes/api/EditEntityTest.php
M repo/tests/phpunit/includes/api/SetSiteLinkTest.php
8 files changed, 83 insertions(+), 11 deletions(-)
Approvals:
WikidataJenkins: Verified
Addshore: Looks good to me, approved
diff --git a/lib/config/WikibaseLib.default.php
b/lib/config/WikibaseLib.default.php
index c4be0fc..0e48fce 100644
--- a/lib/config/WikibaseLib.default.php
+++ b/lib/config/WikibaseLib.default.php
@@ -39,6 +39,9 @@
'specialSiteLinkGroups' = array(),
+ // items allowed to be used as badges
+ 'badgeItems' = array(),
+
// local by default. Set to something LBFactory understands.
'changesDatabase' = false,
diff --git a/repo/Wikibase.i18n.php b/repo/Wikibase.i18n.php
index a38ba10..eb77aa2 100644
--- a/repo/Wikibase.i18n.php
+++ b/repo/Wikibase.i18n.php
@@ -185,6 +185,7 @@
'wikibase-setsitelink-warning-remove' = 'Do you really want to remove
the site link of [[$1]]?',
'wikibase-setsitelink-invalid-site' = 'The site id $1 is unknown.
Please use an existing site id, such as enwiki.',
'wikibase-setsitelink-not-item' = 'The id $1 does not belong to an
item.',
+ 'wikibase-setsitelink-not-badge' = 'The item $1 is not a badge.',
'wikibase-setsitelink-add-failed' = 'The site link could not be
saved.',
'wikibase-setsitelink-remove-failed' = 'The site link could not be
removed.',
'wikibase-setsitelink-not-itemid' = '$1 is not a valid item id. Site
links can only be set for items.',
@@ -902,6 +903,10 @@
Parameters:
* $1 - the invalid id',
+ 'wikibase-setsitelink-not-badge' = 'Response informing that the given
item is not specified to be used as a badge.
+
+Parameters:
+* $1 - the invalid item\'s id',
'wikibase-setsitelink-add-failed' = 'Error message when the site link
could not be saved.',
'wikibase-setsitelink-remove-failed' = 'Error message when the site
link could not be removed.',
'wikibase-setsitelink-not-itemid' = 'Error message when an entity id,
other than item id, is entered. The message advises users that the id is
invalid and only items have site links.
diff --git a/repo/includes/ChangeOp/ChangeOpSiteLink.php
b/repo/includes/ChangeOp/ChangeOpSiteLink.php
index e71a691..d90c4a9 100644
--- a/repo/includes/ChangeOp/ChangeOpSiteLink.php
+++ b/repo/includes/ChangeOp/ChangeOpSiteLink.php
@@ -8,6 +8,7 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
use Wikibase\Summary;
+use Wikibase\Settings;
/**
* Class for sitelink change operation
@@ -68,6 +69,9 @@
if ( !( $badge instanceof ItemId ) ) {
throw new InvalidArgumentException(
'$badges need to be an array of ItemIds or null' );
}
+ if ( !in_array( $badge-getPrefixedId(),
array_keys( Settings::get( 'badgeItems' ) ) ) ) {
+ throw new InvalidArgumentException(
'Only items specified in the config can be badges' );
+ }
}
$badges = $this-removeDuplicateBadges( $badges );
diff --git a/repo/includes/api/ModifyEntity.php
b/repo/includes/api/ModifyEntity.php
index 6f1c6af..51ec7c6 100644
--- a/repo/includes/api/ModifyEntity.php
+++ b/repo/includes/api/ModifyEntity.php
@@ -175,6 +175,10 @@
$this-dieUsage( Badges: entity with id
'{$badgeSerialization}' is not an item, 'not-item' );
}
+ if ( !in_array( $badgeId-getPrefixedId(), array_keys(
Settings::get( 'badgeItems' ) ) ) ) {
+ $this-dieUsage( Badges: item
'{$badgeSerialization}' is not a badge, 'not-badge' );
+ }
+
$itemTitle = $entityContentFactory-getTitleForId(
$badgeId, Revision::FOR_THIS_USER );
if ( is_null( $itemTitle ) || !$itemTitle-exists() ) {
diff --git a/repo/includes/specials/SpecialSetSiteLink.php
b/repo/includes/specials/SpecialSetSiteLink.php
index 68ac73e..735cfba 100644
--- a/repo/includes/specials/SpecialSetSiteLink.php
+++
[MediaWiki-commits] [Gerrit] fix collectstats.pl cron for new Bugzilla - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110170
Change subject: fix collectstats.pl cron for new Bugzilla
..
fix collectstats.pl cron for new Bugzilla
this was disabled in Ia76b4093d856f15a51218277f68e9b4540c4e2e6
because it caused cron spam
the difference is actually this:
on kaulen what it does was and is:
cd /srv/org/wikimedia/bugzilla/ ; ./collectstats.pl
when converting to module we changed that after a code review
comment to just be:
/srv/org/wikimedia/bugzilla/collectstats.pl
but with that you are getting :
Can't locate Bugzilla.pm in @INC
so, just do it like it has been done before and still works on kaulen
P.S. totally independent from this the script runs on kaulen
but reports some errors there when collecting the stats
Change-Id: I518a386c98bc0d30c682a6a57448fafb3ca4d33b
---
M modules/bugzilla/manifests/init.pp
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/110170/1
diff --git a/modules/bugzilla/manifests/init.pp
b/modules/bugzilla/manifests/init.pp
index 8191a4c..75031e8 100644
--- a/modules/bugzilla/manifests/init.pp
+++ b/modules/bugzilla/manifests/init.pp
@@ -131,8 +131,8 @@
# 1) get statistics for the day:
# tmp. disabled, collectstats.pl is missing
cron { 'bugzilla_collectstats':
-ensure = 'absent',
-command = ${bz_path}/${collectstats},
+ensure = 'present',
+command = cd ${bz_path}; ./${collectstats},
user= 'root',
hour= '0',
minute = '5',
@@ -142,8 +142,8 @@
# 2) on sunday, regenerates the whole statistics data
# temp. disabled, collectstats.pl is missing
cron { 'bugzilla_collectstats_regenerate':
-ensure = 'absent',
-command = ${bz_path}/${collectstats} --regenerate,
+ensure = 'present',
+command = cd ${bz_path}; ./${collectstats} --regenerate,
user= root,
hour= 0,
minute = 5,
--
To view, visit https://gerrit.wikimedia.org/r/110170
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I518a386c98bc0d30c682a6a57448fafb3ca4d33b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed warning message displayed while building the gem - change (mediawiki/selenium)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/110171 Change subject: Fixed warning message displayed while building the gem .. Fixed warning message displayed while building the gem $ gem build mediawiki-selenium.gemspec WARNING: open-ended dependency on cucumber (= 0) is not recommended if cucumber is semantically versioned, use: add_runtime_dependency 'cucumber', '~ 0' WARNING: open-ended dependency on json (= 0) is not recommended if json is semantically versioned, use: add_runtime_dependency 'json', '~ 0' WARNING: open-ended dependency on net-http-persistent (= 0) is not recommended if net-http-persistent is semantically versioned, use: add_runtime_dependency 'net-http-persistent', '~ 0' WARNING: open-ended dependency on page-object (= 0) is not recommended if page-object is semantically versioned, use: add_runtime_dependency 'page-object', '~ 0' WARNING: open-ended dependency on rest-client (= 0) is not recommended if rest-client is semantically versioned, use: add_runtime_dependency 'rest-client', '~ 0' WARNING: open-ended dependency on rspec-expectations (= 0) is not recommended if rspec-expectations is semantically versioned, use: add_runtime_dependency 'rspec-expectations', '~ 0' WARNING: open-ended dependency on syntax (= 0) is not recommended if syntax is semantically versioned, use: add_runtime_dependency 'syntax', '~ 0' WARNING: See http://guides.rubygems.org/specification-reference/ for help Successfully built RubyGem Name: mediawiki-selenium Version: 0.1.16 File: mediawiki-selenium-0.1.16.gem Change-Id: I43ffef1d6bcdfbebfad22dd593894be8739d9806 --- M mediawiki-selenium.gemspec 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium refs/changes/71/110171/1 diff --git a/mediawiki-selenium.gemspec b/mediawiki-selenium.gemspec index 842541e..0650454 100644 --- a/mediawiki-selenium.gemspec +++ b/mediawiki-selenium.gemspec @@ -17,11 +17,11 @@ spec.files = `git ls-files`.split($/) spec.require_paths = [lib] - spec.add_runtime_dependency cucumber - spec.add_runtime_dependency json - spec.add_runtime_dependency net-http-persistent - spec.add_runtime_dependency page-object - spec.add_runtime_dependency rest-client - spec.add_runtime_dependency rspec-expectations - spec.add_runtime_dependency syntax + spec.add_runtime_dependency cucumber, '~ 0' + spec.add_runtime_dependency json, '~ 0' + spec.add_runtime_dependency net-http-persistent, '~ 0' + spec.add_runtime_dependency page-object, '~ 0' + spec.add_runtime_dependency rest-client, '~ 0' + spec.add_runtime_dependency rspec-expectations, '~ 0' + spec.add_runtime_dependency syntax, '~ 0' end -- To view, visit https://gerrit.wikimedia.org/r/110171 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43ffef1d6bcdfbebfad22dd593894be8739d9806 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix collectstats.pl cron for new Bugzilla - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: fix collectstats.pl cron for new Bugzilla
..
fix collectstats.pl cron for new Bugzilla
this was disabled in Ia76b4093d856f15a51218277f68e9b4540c4e2e6
because it caused cron spam
the difference is actually this:
on kaulen what it does was and is:
cd /srv/org/wikimedia/bugzilla/ ; ./collectstats.pl
when converting to module we changed that after a code review
comment to just be:
/srv/org/wikimedia/bugzilla/collectstats.pl
but with that you are getting :
Can't locate Bugzilla.pm in @INC
so, just do it like it has been done before and still works on kaulen
P.S. totally independent from this the script runs on kaulen
but reports some errors there when collecting the stats
Change-Id: I518a386c98bc0d30c682a6a57448fafb3ca4d33b
---
M modules/bugzilla/manifests/init.pp
1 file changed, 4 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/bugzilla/manifests/init.pp
b/modules/bugzilla/manifests/init.pp
index 8191a4c..cea44f2 100644
--- a/modules/bugzilla/manifests/init.pp
+++ b/modules/bugzilla/manifests/init.pp
@@ -129,10 +129,9 @@
$collectstats = 'collectstats.pl'
# 1) get statistics for the day:
-# tmp. disabled, collectstats.pl is missing
cron { 'bugzilla_collectstats':
-ensure = 'absent',
-command = ${bz_path}/${collectstats},
+ensure = 'present',
+command = cd ${bz_path}; ./${collectstats},
user= 'root',
hour= '0',
minute = '5',
@@ -140,10 +139,9 @@
}
# 2) on sunday, regenerates the whole statistics data
-# temp. disabled, collectstats.pl is missing
cron { 'bugzilla_collectstats_regenerate':
-ensure = 'absent',
-command = ${bz_path}/${collectstats} --regenerate,
+ensure = 'present',
+command = cd ${bz_path}; ./${collectstats} --regenerate,
user= root,
hour= 0,
minute = 5,
--
To view, visit https://gerrit.wikimedia.org/r/110170
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I518a386c98bc0d30c682a6a57448fafb3ca4d33b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Display error message if browser is not started for some reason - change (mediawiki/selenium)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110167
Change subject: Display error message if browser is not started for some reason
..
Display error message if browser is not started for some reason
Change-Id: I486c056c8302a112f384bcd1d7a9611f9d463cd7
---
M lib/mediawiki/selenium/sauce.rb
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium
refs/changes/67/110167/1
diff --git a/lib/mediawiki/selenium/sauce.rb b/lib/mediawiki/selenium/sauce.rb
index 7d0cedb..ee94d13 100644
--- a/lib/mediawiki/selenium/sauce.rb
+++ b/lib/mediawiki/selenium/sauce.rb
@@ -14,7 +14,11 @@
module Cucumber::Formatter
class Sauce Junit
def format_exception(exception)
- sauce_job_page = Sauce Labs job URL:
http://saucelabs.com/jobs/#{$session_id}\n;
+ if $session_id
+sauce_job_page = Sauce Labs job URL:
http://saucelabs.com/jobs/#{$session_id}\n;
+ else
+sauce_job_page = Uh-oh. Could not find link to Sauce Labs job URL.
+ end
([sauce_job_page] + [#{exception.message} (#{exception.class})] +
exception.backtrace).join(\n)
end
end
--
To view, visit https://gerrit.wikimedia.org/r/110167
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I486c056c8302a112f384bcd1d7a9611f9d463cd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix whine.pl whining cron for new Bugzilla - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110172
Change subject: fix whine.pl whining cron for new Bugzilla
..
fix whine.pl whining cron for new Bugzilla
this was disabled in Iae70bc596a573bdc996eb75834bb66ccd2db1e7e
because it caused cron spam
exactly same fix here as in I518a386c98bc0d30c682a6a57448fafb3ca4d33b
Change-Id: If13930f48674a87b2e75be6a868f0c8ef4e3cecc
---
M modules/bugzilla/manifests/init.pp
1 file changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/110172/1
diff --git a/modules/bugzilla/manifests/init.pp
b/modules/bugzilla/manifests/init.pp
index cea44f2..89f6f40 100644
--- a/modules/bugzilla/manifests/init.pp
+++ b/modules/bugzilla/manifests/init.pp
@@ -116,10 +116,9 @@
$bz_path = '/srv/org/wikimedia/bugzilla'
$whine = 'whine.pl'
-# disabled, it's broken on new server
cron { 'bugzilla_whine':
-ensure = 'absent',
-command = ${bz_path}/${whine},
+ensure = 'present',
+command = cd ${bz_path}; ./${whine},
user= 'root',
minute = '15',
}
--
To view, visit https://gerrit.wikimedia.org/r/110172
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If13930f48674a87b2e75be6a868f0c8ef4e3cecc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP Passed Jenkins jobs have links to Sauce Labs jobs - change (qa/browsertests)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/110173 Change subject: WIP Passed Jenkins jobs have links to Sauce Labs jobs .. WIP Passed Jenkins jobs have links to Sauce Labs jobs Until now only failed jobs had the link to Sauce Labs jobs. Bug: 46890 Change-Id: I00ae0eb29e19aefd75c3b2d2a3f050f2eeb332ad --- M Gemfile.lock 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests refs/changes/73/110173/1 diff --git a/Gemfile.lock b/Gemfile.lock index e7114b3..6606f88 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,7 +25,7 @@ multi_json (~ 1.3) i18n (0.6.9) json (1.8.1) -mediawiki-selenium (0.1.15) +mediawiki-selenium (0.1.18pre1) cucumber json net-http-persistent -- To view, visit https://gerrit.wikimedia.org/r/110173 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I00ae0eb29e19aefd75c3b2d2a3f050f2eeb332ad Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix whine.pl whining cron for new Bugzilla - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: fix whine.pl whining cron for new Bugzilla
..
fix whine.pl whining cron for new Bugzilla
this was disabled in Iae70bc596a573bdc996eb75834bb66ccd2db1e7e
because it caused cron spam
exactly same fix here as in I518a386c98bc0d30c682a6a57448fafb3ca4d33b
Change-Id: If13930f48674a87b2e75be6a868f0c8ef4e3cecc
---
M modules/bugzilla/manifests/init.pp
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/bugzilla/manifests/init.pp
b/modules/bugzilla/manifests/init.pp
index cea44f2..89f6f40 100644
--- a/modules/bugzilla/manifests/init.pp
+++ b/modules/bugzilla/manifests/init.pp
@@ -116,10 +116,9 @@
$bz_path = '/srv/org/wikimedia/bugzilla'
$whine = 'whine.pl'
-# disabled, it's broken on new server
cron { 'bugzilla_whine':
-ensure = 'absent',
-command = ${bz_path}/${whine},
+ensure = 'present',
+command = cd ${bz_path}; ./${whine},
user= 'root',
minute = '15',
}
--
To view, visit https://gerrit.wikimedia.org/r/110172
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If13930f48674a87b2e75be6a868f0c8ef4e3cecc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use Nazli for Persian - change (mediawiki...latex_renderer)
Reza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110174
Change subject: Use Nazli for Persian
..
Use Nazli for Persian
Change-Id: I60463baa9fad4cabd3b07d5aa848a49cd87ff941
---
M .travis.yml
M README.md
M lib/index.js
M lib/polyglossia.js
4 files changed, 7 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/latex_renderer
refs/changes/74/110174/1
diff --git a/.travis.yml b/.travis.yml
index 6553d8e..b57bcd4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,4 +5,4 @@
before_install:
- sudo add-apt-repository -y ppa:texlive-backports/ppa
- sudo apt-get update -qq
- - sudo apt-get install -qq texlive-xetex texlive-latex-recommended
texlive-latex-extra texlive-generic-extra texlive-fonts-recommended
texlive-fonts-extra fonts-hosny-amiri ttf-devanagari-fonts fonts-nafees
ttf-indic-fonts-core ttf-malayalam-fonts fonts-arphic-uming fonts-arphic-ukai
fonts-droid fonts-baekmuk texlive-lang-all latex-xcolor lmodern imagemagick
librsvg2-bin unzip
+ - sudo apt-get install -qq texlive-xetex texlive-latex-recommended
texlive-latex-extra texlive-generic-extra texlive-fonts-recommended
texlive-fonts-extra fonts-hosny-amiri ttf-farsiweb ttf-devanagari-fonts
fonts-nafees ttf-indic-fonts-core ttf-malayalam-fonts fonts-arphic-uming
fonts-arphic-ukai fonts-droid fonts-baekmuk texlive-lang-all latex-xcolor
lmodern imagemagick librsvg2-bin unzip
diff --git a/README.md b/README.md
index b07ebfe..de8e9e5 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@
apt-get install texlive-xetex texlive-latex-recommended \
texlive-latex-extra texlive-generic-extra \
texlive-fonts-recommended texlive-fonts-extra \
-fonts-hosny-amiri fonts-nakula fonts-nafees fonts-smc \
-fonts-arphic-uming fonts-arphic-ukai fonts-droid fonts-baekmuk\
+fonts-hosny-amiri ttf-farsiweb fonts-nakula fonts-nafees
fonts-smc \
+fonts-arphic-uming fonts-arphic-ukai fonts-droid fonts-baekmuk
\
texlive-lang-all latex-xcolor imagemagick librsvg2-bin unzip
```
diff --git a/lib/index.js b/lib/index.js
index 5bfcd65..32d3137 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -47,6 +47,8 @@
'vietnamese': { name: 'Linux Libertine O', opts: 'Language=Vietnamese'
},
// from fonts-nafees
'urdu': { name: 'Nafees', opts: FAKESTYLES },
+ // from ttf-farsiweb
+ 'persian': { name: 'Nazli' },
// from fonts-arphic-uming, fonts-arphic-ukai, fonts-droid
'chinese': { cjk:true, name: 'AR PL UMing CN', opts: 'BoldFont=Droid
Sans Fallback,ItalicFont=AR PL UKai CN,Language=Chinese
Simplified,CJKShape=Simplified' },
// from texlive-lang-cjk, fonts-droid
diff --git a/lib/polyglossia.js b/lib/polyglossia.js
index 57fe021..9c7b814 100644
--- a/lib/polyglossia.js
+++ b/lib/polyglossia.js
@@ -8,7 +8,7 @@
chinese: { script: 'CJK' },
coptic: { script: 'Coptic' },
divehi: { dir: 'rtl', script: 'Thaana' },
- farsi: { dir: 'rtl', script: 'Arabic' },
+ persian: { dir: 'rtl', script: 'Arabic' },
greek: { script: 'Greek' },
hebrew: { dir: 'rtl', script: 'Hebrew' },
hindi: { script: 'Devanagari' },
@@ -54,7 +54,7 @@
en: { lang: 'english' },
eo: { lang: 'esperanto' },
et: { lang: 'estonian' },
- fa: { lang: 'farsi' },
+ fa: { lang: 'persian' },
fi: { lang: 'finnish' },
fr: { lang: 'french' },
fur: { lang: 'friulan' },
--
To view, visit https://gerrit.wikimedia.org/r/110174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I60463baa9fad4cabd3b07d5aa848a49cd87ff941
Gerrit-PatchSet: 1
Gerrit-Project:
mediawiki/extensions/Collection/OfflineContentGenerator/latex_renderer
Gerrit-Branch: master
Gerrit-Owner: Reza reza.ene...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Put wbsetsitelink badges into experimental - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110175
Change subject: Put wbsetsitelink badges into experimental
..
Put wbsetsitelink badges into experimental
Change-Id: I41c5871155d8bc28be0984bbab30866b814693aa
---
M repo/includes/api/SetSiteLink.php
1 file changed, 54 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/75/110175/1
diff --git a/repo/includes/api/SetSiteLink.php
b/repo/includes/api/SetSiteLink.php
index c6c6709..c0be067 100644
--- a/repo/includes/api/SetSiteLink.php
+++ b/repo/includes/api/SetSiteLink.php
@@ -20,6 +20,7 @@
* @author Daniel Kinzler
* @author Tobias Gritschacher tobias.gritschac...@wikimedia.de
* @author Michał Łazowik
+ * @author Adam Shorland
*/
class SetSiteLink extends ModifyEntity {
@@ -164,6 +165,20 @@
*/
public function getAllowedParams() {
$sites = $this-siteLinkTargetProvider-getSiteList(
Settings::get( 'siteLinkGroups' ) );
+
+ // Experimental setting of badges in api
+ // @todo remove experimental once JS UI is in place, (also
remove the experimental examples below)
+ if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
+ $experimentalParams = array(
+ 'badges' = array(
+ ApiBase::PARAM_TYPE = 'string',
+ ApiBase::PARAM_ISMULTI = true,
+ ),
+ );
+ } else {
+ $experimentalParams = array();
+ }
+
return array_merge(
parent::getAllowedParams(),
parent::getAllowedParamsForId(),
@@ -177,11 +192,8 @@
'linktitle' = array(
ApiBase::PARAM_TYPE = 'string',
),
- 'badges' = array(
- ApiBase::PARAM_TYPE = 'string',
- ApiBase::PARAM_ISMULTI = true,
- ),
- )
+ ),
+ $experimentalParams
);
}
@@ -192,6 +204,20 @@
* @return array|bool False on no parameter descriptions
*/
public function getParamDescription() {
+
+ // Experimental setting of badges in api
+ // @todo remove experimental once JS UI is in place, (also
remove the experimental examples below)
+ if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
+ $experimentalParams = array(
+ 'badges' = 'The IDs of items to be set as
badges. They will replace the current ones. If this parameter is not set, the
badges will not be changed',
+ 'linktitle' = 'The title of the article to
link. If this parameter is an empty string or both linktitle and badges are not
set, the link will be removed.',
+ );
+ } else {
+ $experimentalParams = array(
+ 'linktitle' = 'The title of the article to
link. If this parameter is an empty the link will be removed.'
+ );
+ }
+
return array_merge(
parent::getParamDescription(),
parent::getParamDescriptionForId(),
@@ -199,9 +225,8 @@
parent::getParamDescriptionForEntity(),
array(
'linksite' = 'The identifier of the site on
which the article to link resides',
- 'linktitle' = 'The title of the article to
link. If this parameter is an empty string or both linktitle and badges are not
set, the link will be removed.',
- 'badges' = 'The IDs of items to be set as
badges. They will replace the current ones. If this parameter is not set, the
badges will not be changed',
- )
+ ),
+ $experimentalParams
);
}
@@ -219,7 +244,25 @@
* @return bool|string|array
*/
protected function getExamples() {
- return array(
+ // Experimental setting of badges in api
+ // @todo remove experimental once JS UI is in place, (also
remove the experimental examples below)
+ if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
+
+ $experimentalExamples = array(
+
[MediaWiki-commits] [Gerrit] WIP Passed Jenkins jobs have links to Sauce Labs jobs - change (mediawiki/selenium)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110176
Change subject: WIP Passed Jenkins jobs have links to Sauce Labs jobs
..
WIP Passed Jenkins jobs have links to Sauce Labs jobs
The xml file contains the link[1] but for some reason Jenkins is not
displaying it[2].
1:
https://wmf.ci.cloudbees.com/view/fs/job/free-style-browsertests/ws/repo
rts/junit/TEST-features-login.xml/*view*/
2:
https://wmf.ci.cloudbees.com/view/fs/job/free-style-browsertests/39/test
Report/(root)/Log%20in/Go_to_Log_in_page/
Bug: 46890
Change-Id: I1db4a0cdc8210d8692a13aa2f2a7b16e5265cde0
---
M lib/mediawiki/selenium/sauce.rb
1 file changed, 31 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium
refs/changes/76/110176/1
diff --git a/lib/mediawiki/selenium/sauce.rb b/lib/mediawiki/selenium/sauce.rb
index ee94d13..8ffd574 100644
--- a/lib/mediawiki/selenium/sauce.rb
+++ b/lib/mediawiki/selenium/sauce.rb
@@ -13,6 +13,37 @@
module Cucumber::Formatter
class Sauce Junit
+
+private
+
+def build_testcase(duration, status, exception = nil, suffix = )
+ @time += duration
+ classname = @feature_name
+ name = #{@scenario}#{suffix}
+ pending = [:pending, :undefined].include?(status) (!@options[:strict])
+
+ @builder.testcase(:classname = classname, :name = name, :time =
%.6f % duration) do
+if status == :skipped || pending
+ @builder.skipped
+ @skipped += 1
+elsif status != :passed
+ @builder.failure(:message = #{status.to_s} #{name}, :type =
status.to_s) do
+@builder.cdata! @output
+@builder.cdata!(format_exception(exception)) if exception
+ end
+ @failures += 1
+elsif status == :passed
+ @builder.passed(:message = #{status.to_s} #{name}, :type =
status.to_s) do
+@builder.cdata! @output
+@builder.cdata!(Sauce Labs job URL:
http://saucelabs.com/jobs/#{$session_id}\n;)
+ end
+end
+@builder.tag!('system-out')
+@builder.tag!('system-err')
+ end
+ @tests += 1
+end
+
def format_exception(exception)
if $session_id
sauce_job_page = Sauce Labs job URL:
http://saucelabs.com/jobs/#{$session_id}\n;
--
To view, visit https://gerrit.wikimedia.org/r/110176
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1db4a0cdc8210d8692a13aa2f2a7b16e5265cde0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Put wbsetsitelink badges into experimental - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110177
Change subject: Put wbsetsitelink badges into experimental
..
Put wbsetsitelink badges into experimental
Change-Id: I41c5871155d8bc28be0984bbab30866b814693aa
---
M repo/includes/api/SetSiteLink.php
1 file changed, 54 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/77/110177/1
diff --git a/repo/includes/api/SetSiteLink.php
b/repo/includes/api/SetSiteLink.php
index c6c6709..c0be067 100644
--- a/repo/includes/api/SetSiteLink.php
+++ b/repo/includes/api/SetSiteLink.php
@@ -20,6 +20,7 @@
* @author Daniel Kinzler
* @author Tobias Gritschacher tobias.gritschac...@wikimedia.de
* @author Michał Łazowik
+ * @author Adam Shorland
*/
class SetSiteLink extends ModifyEntity {
@@ -164,6 +165,20 @@
*/
public function getAllowedParams() {
$sites = $this-siteLinkTargetProvider-getSiteList(
Settings::get( 'siteLinkGroups' ) );
+
+ // Experimental setting of badges in api
+ // @todo remove experimental once JS UI is in place, (also
remove the experimental examples below)
+ if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
+ $experimentalParams = array(
+ 'badges' = array(
+ ApiBase::PARAM_TYPE = 'string',
+ ApiBase::PARAM_ISMULTI = true,
+ ),
+ );
+ } else {
+ $experimentalParams = array();
+ }
+
return array_merge(
parent::getAllowedParams(),
parent::getAllowedParamsForId(),
@@ -177,11 +192,8 @@
'linktitle' = array(
ApiBase::PARAM_TYPE = 'string',
),
- 'badges' = array(
- ApiBase::PARAM_TYPE = 'string',
- ApiBase::PARAM_ISMULTI = true,
- ),
- )
+ ),
+ $experimentalParams
);
}
@@ -192,6 +204,20 @@
* @return array|bool False on no parameter descriptions
*/
public function getParamDescription() {
+
+ // Experimental setting of badges in api
+ // @todo remove experimental once JS UI is in place, (also
remove the experimental examples below)
+ if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
+ $experimentalParams = array(
+ 'badges' = 'The IDs of items to be set as
badges. They will replace the current ones. If this parameter is not set, the
badges will not be changed',
+ 'linktitle' = 'The title of the article to
link. If this parameter is an empty string or both linktitle and badges are not
set, the link will be removed.',
+ );
+ } else {
+ $experimentalParams = array(
+ 'linktitle' = 'The title of the article to
link. If this parameter is an empty the link will be removed.'
+ );
+ }
+
return array_merge(
parent::getParamDescription(),
parent::getParamDescriptionForId(),
@@ -199,9 +225,8 @@
parent::getParamDescriptionForEntity(),
array(
'linksite' = 'The identifier of the site on
which the article to link resides',
- 'linktitle' = 'The title of the article to
link. If this parameter is an empty string or both linktitle and badges are not
set, the link will be removed.',
- 'badges' = 'The IDs of items to be set as
badges. They will replace the current ones. If this parameter is not set, the
badges will not be changed',
- )
+ ),
+ $experimentalParams
);
}
@@ -219,7 +244,25 @@
* @return bool|string|array
*/
protected function getExamples() {
- return array(
+ // Experimental setting of badges in api
+ // @todo remove experimental once JS UI is in place, (also
remove the experimental examples below)
+ if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
+
+ $experimentalExamples = array(
+
[MediaWiki-commits] [Gerrit] Remove references to br1/2-ulsfo - change (operations/dns)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Remove references to br1/2-ulsfo
..
Remove references to br1/2-ulsfo
I assume this was a now-abandoned experiment with virtual routers.
Remove A//PTRs for both of them, and empty the cross-router subnets.
Change-Id: Ib05ba20e3eb7a7101d2e58ad0d5798dbc4a716e6
---
M templates/26.35.198.in-addr.arpa
M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
3 files changed, 2 insertions(+), 22 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/26.35.198.in-addr.arpa b/templates/26.35.198.in-addr.arpa
index 4504f38..d45c394 100644
--- a/templates/26.35.198.in-addr.arpa
+++ b/templates/26.35.198.in-addr.arpa
@@ -54,16 +54,12 @@
1921H IN PTR cr1-ulsfo.wikimedia.org.
1931H IN PTR cr2-ulsfo.wikimedia.org.
-1941H IN PTR br1-ulsfo.wikimedia.org.
-1951H IN PTR br2-ulsfo.wikimedia.org.
; 198.35.26.196/31
1961H IN PTR ae0-2.cr1-ulsfo.wikimedia.org.
1971H IN PTR ae0-2.cr2-ulsfo.wikimedia.org.
; 198.35.26.198/31
-1981H IN PTR ae0-3.br1-ulsfo.wikimedia.org.
-1991H IN PTR ae0-3.br2-ulsfo.wikimedia.org.
; 198.35.26.200/29
2011H IN PTR cr1-ulsfo.wikimedia.org.
@@ -71,9 +67,5 @@
2031H IN PTR mr1-ulsfo.wikimedia.org.
; 198.35.26.208/31
-2081H IN PTR lt-0-0-0-0.cr1-ulsfo.wikimedia.org.
-2091H IN PTR lt-0-0-0-1.br1-ulsfo.wikimedia.org.
; 198.35.26.210/31
-2101H IN PTR lt-0-0-0-0.cr2-ulsfo.wikimedia.org.
-2111H IN PTR lt-0-0-0-1.br2-ulsfo.wikimedia.org.
diff --git a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 8593b4d..13c44cc 100644
--- a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -68,17 +68,13 @@
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
xe-5-2-2.cr2-eqiad.wikimedia.org.
2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
xe-0-0-3-538.cr1-ulsfo.wikimedia.org.
-; cr1-ulsfo -- br1-ulsfo (2620:0:863:fe02::/64)
+; empty (2620:0:863:fe02::/64)
$ORIGIN 2.0.e.f.{{ zonename }}.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR lt0-0.cr1-ulsfo.wikimedia.org.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR lt0-1.br1-ulsfo.wikimedia.org.
-; cr2-ulsfo -- br2-ulsfo (2620:0:863:fe03::/64)
+; empty (2620:0:863:fe03::/64)
$ORIGIN 3.0.e.f.{{ zonename }}.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR lt0-0.cr2-ulsfo.wikimedia.org.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR lt0-1.br2-ulsfo.wikimedia.org.
; cr2-ulsfo -- cr1-eqiad (2620:0:863:fe04::/64)
@@ -91,8 +87,6 @@
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR cr1-ulsfo.wikimedia.org.
2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR cr2-ulsfo.wikimedia.org.
-3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR br1-ulsfo.wikimedia.org.
-4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR br2-ulsfo.wikimedia.org.
; LVS Service IPs, 2620:0:863:ed1a::/64
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 6e02d97..5f29d9a 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -375,12 +375,6 @@
; Networking
-br1-ulsfo 1H IN A198.35.26.194
- IN 2620:0:863:::3
-
-br2-ulsfo 1H IN A198.35.26.195
- IN 2620:0:863:::4
-
cr1-eqiad 1H IN A208.80.154.196
IN 2620:0:861:::1
--
To view, visit https://gerrit.wikimedia.org/r/110149
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib05ba20e3eb7a7101d2e58ad0d5798dbc4a716e6
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add mr1-eqiad.wikimedia.org forward record - change (operations/dns)
Faidon Liambotis has submitted this change and it was merged. Change subject: Add mr1-eqiad.wikimedia.org forward record .. Add mr1-eqiad.wikimedia.org forward record Reverse exists, IP is configured on the interface, might just as well put a DNS name for it in the config. Change-Id: Ie522ca35d587b0d8c9c8b23131155f204f084b78 --- M templates/wikimedia.org 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wikimedia.org b/templates/wikimedia.org index e682448..6e02d97 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -413,6 +413,7 @@ csw1-sdtpa 1H IN A208.80.152.193 +mr1-eqiad 1H IN A208.80.154.201 mr1-pmtpa 1H IN A216.87.189.242 vl2-eth0.lvs1 1H IN A10.0.0.11 -- To view, visit https://gerrit.wikimedia.org/r/110148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie522ca35d587b0d8c9c8b23131155f204f084b78 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP Tweak search config for performance - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/110178 Change subject: WIP Tweak search config for performance .. WIP Tweak search config for performance This turns off leading wildards (? and *) and weakens fuzzy queryies (~) to only match terms that share the first two characters with the term marked as fuzzy. Both of these should speed up queries by bounding the portion of the terms that Lucene will have to check. Without this we scan across a huge portion of the terms dictionary with both of these which is slow. WIP because of lack of testing. Change-Id: Ic6a84da7ddbccbb1756f8bea84bf013494ef950d --- M includes/Searcher.php 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/78/110178/1 diff --git a/includes/Searcher.php b/includes/Searcher.php index 19be362..beb5c58 100644 --- a/includes/Searcher.php +++ b/includes/Searcher.php @@ -714,6 +714,8 @@ $query-setAutoGeneratePhraseQueries( true ); $query-setPhraseSlop( $wgCirrusSearchPhraseSlop ); $query-setDefaultOperator( 'AND' ); + $query-setAllowLeadingWildcard( false ); + $query-setFuzzyPrefixLength( 2 ); return $query; } @@ -889,6 +891,10 @@ $string = preg_replace_callback( '/(?![\w])~/', 'CirrusSearch\Searcher::escapeBadSyntax', $string ); + // Escape ? and * that don't follow a term. These are slow so we turned them off. + $string = preg_replace_callback( '/(?![\w])[?*]/', + 'CirrusSearch\Searcher::escapeBadSyntax', $string ); + // Turn bad fuzzy searches into searches that contain a ~ and set $this-fuzzyQuery for good ones. $searcher = $this; $fuzzyQuery = $this-fuzzyQuery; -- To view, visit https://gerrit.wikimedia.org/r/110178 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6a84da7ddbccbb1756f8bea84bf013494ef950d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Put wbsetsitelink badges into experimental - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Put wbsetsitelink badges into experimental
..
Put wbsetsitelink badges into experimental
Change-Id: I41c5871155d8bc28be0984bbab30866b814693aa
---
M repo/includes/api/SetSiteLink.php
1 file changed, 54 insertions(+), 17 deletions(-)
Approvals:
WikidataJenkins: Verified
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/SetSiteLink.php
b/repo/includes/api/SetSiteLink.php
index c6c6709..c0be067 100644
--- a/repo/includes/api/SetSiteLink.php
+++ b/repo/includes/api/SetSiteLink.php
@@ -20,6 +20,7 @@
* @author Daniel Kinzler
* @author Tobias Gritschacher tobias.gritschac...@wikimedia.de
* @author Michał Łazowik
+ * @author Adam Shorland
*/
class SetSiteLink extends ModifyEntity {
@@ -164,6 +165,20 @@
*/
public function getAllowedParams() {
$sites = $this-siteLinkTargetProvider-getSiteList(
Settings::get( 'siteLinkGroups' ) );
+
+ // Experimental setting of badges in api
+ // @todo remove experimental once JS UI is in place, (also
remove the experimental examples below)
+ if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
+ $experimentalParams = array(
+ 'badges' = array(
+ ApiBase::PARAM_TYPE = 'string',
+ ApiBase::PARAM_ISMULTI = true,
+ ),
+ );
+ } else {
+ $experimentalParams = array();
+ }
+
return array_merge(
parent::getAllowedParams(),
parent::getAllowedParamsForId(),
@@ -177,11 +192,8 @@
'linktitle' = array(
ApiBase::PARAM_TYPE = 'string',
),
- 'badges' = array(
- ApiBase::PARAM_TYPE = 'string',
- ApiBase::PARAM_ISMULTI = true,
- ),
- )
+ ),
+ $experimentalParams
);
}
@@ -192,6 +204,20 @@
* @return array|bool False on no parameter descriptions
*/
public function getParamDescription() {
+
+ // Experimental setting of badges in api
+ // @todo remove experimental once JS UI is in place, (also
remove the experimental examples below)
+ if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
+ $experimentalParams = array(
+ 'badges' = 'The IDs of items to be set as
badges. They will replace the current ones. If this parameter is not set, the
badges will not be changed',
+ 'linktitle' = 'The title of the article to
link. If this parameter is an empty string or both linktitle and badges are not
set, the link will be removed.',
+ );
+ } else {
+ $experimentalParams = array(
+ 'linktitle' = 'The title of the article to
link. If this parameter is an empty the link will be removed.'
+ );
+ }
+
return array_merge(
parent::getParamDescription(),
parent::getParamDescriptionForId(),
@@ -199,9 +225,8 @@
parent::getParamDescriptionForEntity(),
array(
'linksite' = 'The identifier of the site on
which the article to link resides',
- 'linktitle' = 'The title of the article to
link. If this parameter is an empty string or both linktitle and badges are not
set, the link will be removed.',
- 'badges' = 'The IDs of items to be set as
badges. They will replace the current ones. If this parameter is not set, the
badges will not be changed',
- )
+ ),
+ $experimentalParams
);
}
@@ -219,7 +244,25 @@
* @return bool|string|array
*/
protected function getExamples() {
- return array(
+ // Experimental setting of badges in api
+ // @todo remove experimental once JS UI is in place, (also
remove the experimental examples below)
+ if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
+
+ $experimentalExamples = array(
+
[MediaWiki-commits] [Gerrit] generic-definitions: lint - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110179
Change subject: generic-definitions: lint
..
generic-definitions: lint
Change-Id: I86d39d45896264ecacbd2aa37b99ccf375e685e7
---
M manifests/generic-definitions.pp
1 file changed, 47 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/79/110179/1
diff --git a/manifests/generic-definitions.pp b/manifests/generic-definitions.pp
index 7fc25c4..75cd6c5 100644
--- a/manifests/generic-definitions.pp
+++ b/manifests/generic-definitions.pp
@@ -3,42 +3,57 @@
# File that contains generally useful definitions, e.g. for creating system
users
# Enables a certain Apache 2 site
-define apache_site($name, $prefix=, $ensure=link) {
- file { /etc/apache2/sites-enabled/${prefix}${name}:
- target = /etc/apache2/sites-available/$name,
- ensure = $ensure;
- }
+define apache_site(
+$name,
+$prefix = '',
+$ensure = 'link',
+) {
+
+file { /etc/apache2/sites-enabled/${prefix}${name}:
+ensure = $ensure,
+target = /etc/apache2/sites-available/$name,
+}
}
# Enables a certain Apache 2 module
define apache_module($name) {
- file {
- /etc/apache2/mods-available/${name}.conf:
- ensure = present;
- /etc/apache2/mods-available/${name}.load:
- ensure = present;
- /etc/apache2/mods-enabled/${name}.conf:
- ensure = ../mods-available/${name}.conf;
- /etc/apache2/mods-enabled/${name}.load:
- ensure = ../mods-available/${name}.load;
- }
+file { /etc/apache2/mods-available/${name}.conf:
+ensure = present,
+}
+
+file { /etc/apache2/mods-available/${name}.load:
+ensure = present,
+}
+
+file { /etc/apache2/mods-enabled/${name}.conf:
+ensure = ../mods-available/${name}.conf,
+}
+
+file { /etc/apache2/mods-enabled/${name}.load:
+ensure = ../mods-available/${name}.load,
+}
}
-define apache_confd($install=false, $enable=true, $ensure=present) {
- case $install {
- true: {
- file { /etc/apache2/conf.d/${name}:
- source =
puppet:///files/apache/conf.d/${name},
- mode = 0444,
- ensure = $ensure;
- }
- }
- template: {
- file { /etc/apache2/conf.d/${name}:
- content =
template(apache/conf.d/${name}.erb),
- mode = 0444,
- ensure = $ensure;
- }
- }
- }
+define apache_confd(
+$install= false,
+$enable = true,
+$ensure = 'present'
+) {
+
+case $install {
+true: {
+file { /etc/apache2/conf.d/${name}:
+ensure = $ensure,
+source = puppet:///files/apache/conf.d/${name},
+mode = '0444',
+}
+}
+'template': {
+file { /etc/apache2/conf.d/${name}:
+ensure = $ensure,
+content = template(apache/conf.d/${name}.erb),
+mode= '0444',
+}
+}
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/110179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86d39d45896264ecacbd2aa37b99ccf375e685e7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1040, warm up - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: repool db1040, warm up .. repool db1040, warm up Change-Id: I0d973241db27e752493be7794445a9cd88b3068d --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d475bb6..2462498 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -115,7 +115,7 @@ 'db1004' = 0, # watchlist, recentchangeslinked, contributions, logpager 'db1011' = 400, 'db1020' = 400, - # schema changes 'db1040' = 400, + 'db1040' = 50, # warm up ), 's5' = array( 'db1058' = 0, -- To view, visit https://gerrit.wikimedia.org/r/110180 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d973241db27e752493be7794445a9cd88b3068d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1040, warm up - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/110180 Change subject: repool db1040, warm up .. repool db1040, warm up Change-Id: I0d973241db27e752493be7794445a9cd88b3068d --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/80/110180/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d475bb6..2462498 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -115,7 +115,7 @@ 'db1004' = 0, # watchlist, recentchangeslinked, contributions, logpager 'db1011' = 400, 'db1020' = 400, - # schema changes 'db1040' = 400, + 'db1040' = 50, # warm up ), 's5' = array( 'db1058' = 0, -- To view, visit https://gerrit.wikimedia.org/r/110180 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d973241db27e752493be7794445a9cd88b3068d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use DataModel references in ResultBuilder - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/110181 Change subject: Use DataModel references in ResultBuilder .. Use DataModel references in ResultBuilder Change-Id: I7bdc0fdee029cadb6d3e9efc535d216ae84219b7 --- M repo/includes/api/ResultBuilder.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/81/110181/1 diff --git a/repo/includes/api/ResultBuilder.php b/repo/includes/api/ResultBuilder.php index 0df6847..4792c75 100644 --- a/repo/includes/api/ResultBuilder.php +++ b/repo/includes/api/ResultBuilder.php @@ -6,15 +6,15 @@ use InvalidArgumentException; use Revision; use Status; -use Wikibase\Claim; -use Wikibase\Claims; +use Wikibase\DataModel\Claim\Claim; +use Wikibase\DataModel\Claim\Claims; use Wikibase\DataModel\Entity\EntityId; +use Wikibase\DataModel\Reference; use Wikibase\EntityRevision; use Wikibase\EntityTitleLookup; use Wikibase\Lib\Serializers\EntitySerializer; use Wikibase\Lib\Serializers\SerializationOptions; use Wikibase\Lib\Serializers\SerializerFactory; -use Wikibase\Reference; /** * Builder for Api Results -- To view, visit https://gerrit.wikimedia.org/r/110181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7bdc0fdee029cadb6d3e9efc535d216ae84219b7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Addshore addshorew...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Format dates with more than 4 digit years - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Format dates with more than 4 digit years
..
Format dates with more than 4 digit years
Change-Id: Ic8e31cf4098b3d80fac46e0a8d84dfe7a8ca0e4c
---
M lib/includes/formatters/MwTimeIsoFormatter.php
M lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
2 files changed, 86 insertions(+), 42 deletions(-)
Approvals:
WikidataJenkins: Verified
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/formatters/MwTimeIsoFormatter.php
b/lib/includes/formatters/MwTimeIsoFormatter.php
index 36fa7f4..af11674 100644
--- a/lib/includes/formatters/MwTimeIsoFormatter.php
+++ b/lib/includes/formatters/MwTimeIsoFormatter.php
@@ -2,6 +2,7 @@
namespace Wikibase\Lib;
+use DataValues\TimeValue;
use Language;
use ValueFormatters\FormatterOptions;
use ValueFormatters\TimeIsoFormatter;
@@ -14,6 +15,7 @@
*
* @licence GNU GPL v2+
* @author H. Snater mediaw...@snater.com
+ * @author Adam Shorland
*/
class MwTimeIsoFormatter extends ValueFormatterBase implements
TimeIsoFormatter {
@@ -50,39 +52,65 @@
* @see TimeIsoFormatter::formatDate
*/
public function formatDate( $extendedIsoTimestamp, $precision ) {
- if(
- // TODO: Localize dates not featuring a positive
4-digit year.
- preg_match( '/^\+0*(\d{4})-/', $extendedIsoTimestamp,
$matches )
- // TODO: Support precision above year
-$precision = 9
- ) {
- // Positive 4-digit year allows using Language object.
- $strippedTime = preg_replace( '/^(\+0*)(\d{4})/', '$2',
$extendedIsoTimestamp );
+ /**
+* $matches for +0002013-07-16T01:02:03Z
+* [0] = +0002013-07-16T00:00:00Z
+* [1] = +
+* [2] = 000
+* [3] = 2013
+* [4] = 07
+* [5] = 16
+* [6] = 01
+* [7] = 02
+* [8] = 03
+*/
+ $regexSuccess = preg_match(
'/^(\+|\-)(\d{7})?(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})Z/',
+ $extendedIsoTimestamp, $matches );
- $timestamp = wfTimestamp( TS_MW, $strippedTime );
- $dateFormat = $this-language-getDateFormatString(
- 'date',
- $this-language-getDefaultDateFormat()
- );
-
- // TODO: Implement more sophisticated replace algorithm
since characters may be escaped
- // or, even better, find a way to avoid having to do
replacements.
- if( $precision 11 ) {
- // Remove day placeholder:
- $dateFormat = preg_replace(
'/((x\w{1})?(j|t)|d)/', '', $dateFormat );
- }
-
- if( $precision 10 ) {
- // Remove month placeholder:
- $dateFormat = preg_replace(
'/((x\w{1})?(F|n)|m)/', '', $dateFormat );
- }
-
- // TODO: Currently, the year will always be formatted
with 4 digits. Years 1000 will
- // features leading zero(s) that would need to be
stripped.
- return $this-language-sprintfDate( trim( $dateFormat
), $timestamp );
- } else {
+ //TODO: format values with - or more precise than a year
+ if( !$regexSuccess || $matches[1] === '-' || $precision
TimeValue::PRECISION_YEAR ) {
return $extendedIsoTimestamp;
}
+
+ // Positive 4-digit year allows using Language object.
+ $fourDigitYearTimestamp = str_replace( '+' . $matches[2], '',
$extendedIsoTimestamp );
+ $timestamp = wfTimestamp( TS_MW, $fourDigitYearTimestamp );
+ $dateFormat = $this-language-getDateFormatString(
+ 'date',
+ $this-language-getDefaultDateFormat()
+ );
+
+ // TODO: Implement more sophisticated replace algorithm since
characters may be escaped
+ // or, even better, find a way to avoid having to do
replacements.
+ if( $precision TimeValue::PRECISION_DAY ) {
+ // Remove day placeholder:
+ $dateFormat = preg_replace( '/((x\w{1})?(j|t)|d)/', '',
$dateFormat );
+ }
+
+ if( $precision TimeValue::PRECISION_MONTH ) {
+ // Remove month placeholder:
+ $dateFormat = preg_replace( '/((x\w{1})?(F|n)|m)/', '',
$dateFormat );
+
[MediaWiki-commits] [Gerrit] Also Format 10years+ precisions - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Also Format 10years+ precisions
..
Also Format 10years+ precisions
Change-Id: Icb6dbc87aa01743773dbf623d54983a5779de55a
---
M lib/includes/formatters/MwTimeIsoFormatter.php
M lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
2 files changed, 181 insertions(+), 41 deletions(-)
Approvals:
WikidataJenkins: Verified
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/formatters/MwTimeIsoFormatter.php
b/lib/includes/formatters/MwTimeIsoFormatter.php
index af11674..52031c6 100644
--- a/lib/includes/formatters/MwTimeIsoFormatter.php
+++ b/lib/includes/formatters/MwTimeIsoFormatter.php
@@ -10,7 +10,6 @@
use ValueFormatters\ValueFormatterBase;
/**
- *
* @since 0.4
*
* @licence GNU GPL v2+
@@ -56,32 +55,58 @@
* $matches for +0002013-07-16T01:02:03Z
* [0] = +0002013-07-16T00:00:00Z
* [1] = +
-* [2] = 000
-* [3] = 2013
-* [4] = 07
-* [5] = 16
-* [6] = 01
-* [7] = 02
-* [8] = 03
+* [2] = 0002013
+* [3] = 000
+* [4] = 2013
+* [5] = 07
+* [6] = 16
+* [7] = 01
+* [8] = 02
+* [9] = 03
*/
- $regexSuccess = preg_match(
'/^(\+|\-)(\d{7})?(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})Z/',
+ $regexSuccess = preg_match(
'/^(\+|\-)((\d{7})?(\d{4}))-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})Z/',
$extendedIsoTimestamp, $matches );
- //TODO: format values with - or more precise than a year
- if( !$regexSuccess || $matches[1] === '-' || $precision
TimeValue::PRECISION_YEAR ) {
+ //TODO: format values with -
+ if( !$regexSuccess || $matches[1] === '-') {
return $extendedIsoTimestamp;
}
// Positive 4-digit year allows using Language object.
- $fourDigitYearTimestamp = str_replace( '+' . $matches[2], '',
$extendedIsoTimestamp );
+ $fourDigitYearTimestamp = str_replace( '+' . $matches[3], '',
$extendedIsoTimestamp );
$timestamp = wfTimestamp( TS_MW, $fourDigitYearTimestamp );
+
+ $localisedDate = $this-language-sprintfDate(
+ $this-getDateFormat( $precision ),
+ $timestamp
+ );
+
+ //If we cant reliably fix the year return the full timestamp,
+ // this should never happen as sprintfDate should always
return a 4 digit year
+ if( substr_count( $localisedDate, $matches[4] ) !== 1 ) {
+ return $extendedIsoTimestamp;
+ }
+
+ $localisedDate = str_replace(
+ $matches[4],
+ $this-formatYear( $matches[2], $precision ),
+ $localisedDate
+ );
+
+ return $localisedDate;
+ }
+
+ /**
+* Get the dateformat string for the given precision to be used by
sprintfDate
+* @param integer $precision
+* @return string dateFormat to be used by sprintfDate
+*/
+ private function getDateFormat( $precision ) {
$dateFormat = $this-language-getDateFormatString(
'date',
$this-language-getDefaultDateFormat()
);
- // TODO: Implement more sophisticated replace algorithm since
characters may be escaped
- // or, even better, find a way to avoid having to do
replacements.
if( $precision TimeValue::PRECISION_DAY ) {
// Remove day placeholder:
$dateFormat = preg_replace( '/((x\w{1})?(j|t)|d)/', '',
$dateFormat );
@@ -91,26 +116,79 @@
// Remove month placeholder:
$dateFormat = preg_replace( '/((x\w{1})?(F|n)|m)/', '',
$dateFormat );
}
+ return trim( $dateFormat );
+ }
- $localisedDate = $this-language-sprintfDate( trim(
$dateFormat ), $timestamp );
+ /**
+* @param string $fullYear
+* @param integer $precision
+*
+* @return string the formatted year
+*/
+ private function formatYear( $fullYear, $precision ) {
+ $beforeYear = '';
+ $afterYear = '';
- //If we cant reliably fix the year return the full timestamp,
- // this should never happen as sprintfDate should always
return a 4 digit year
- if( substr_count( $localisedDate, $matches[3]
[MediaWiki-commits] [Gerrit] Revert New extra language for wikidata: Ottoman Turkish (ota) - change (operations/mediawiki-config)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/110182 Change subject: Revert New extra language for wikidata: Ottoman Turkish (ota) .. Revert New extra language for wikidata: Ottoman Turkish (ota) it's not really working as it should (e.g. not in ULS, can't set label etc for it) we should investigate and perhaps re-enable on test.wikidata first This reverts commit f1aa003bc330c6633f7f8a31accc7f20234d7257. Change-Id: Id0dea6e40ed9ce18cdd58c0de4323e125a68dae0 --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/82/110182/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 2c9e49b..67034cc 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11975,15 +11975,6 @@ 'wikimania2013wiki' = true, 'wikimania2014wiki' = true, ), - -'wgExtraLanguageNames' = array( - 'default' = array(), - - 'wikidata' = array( - 'ota' = 'لسان توركى', // Bug 57342 - ), -), - 'wmgUseCleanChanges' = array( 'default' = false, // 'metawiki' = true, // bug 53541 -- To view, visit https://gerrit.wikimedia.org/r/110182 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id0dea6e40ed9ce18cdd58c0de4323e125a68dae0 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove tabs from release notes - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Remove tabs from release notes .. Remove tabs from release notes Change-Id: I7b2074d26712b7f13c9fb328bb5919456f5ff579 --- M client/RELEASE-NOTES M repo/RELEASE-NOTES 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: WikidataJenkins: Verified Adrian Lang: Looks good to me, approved jenkins-bot: Verified diff --git a/client/RELEASE-NOTES b/client/RELEASE-NOTES index 8c395ff..2aaf900 100644 --- a/client/RELEASE-NOTES +++ b/client/RELEASE-NOTES @@ -1,5 +1,5 @@ These are the release notes for the Wikibase Client extension. - + Extension page on mediawiki.org: https://www.mediawiki.org/wiki/Extension:Wikibase_Client Latest version of the release notes: https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/extensions/Wikibase.git;a=blob;f=client/RELEASE-NOTES diff --git a/repo/RELEASE-NOTES b/repo/RELEASE-NOTES index e75749d..4ee3030 100644 --- a/repo/RELEASE-NOTES +++ b/repo/RELEASE-NOTES @@ -1,5 +1,5 @@ These are the release notes for the Wikibase extension. - + Extension page on mediawiki.org: https://www.mediawiki.org/wiki/Extension:Wikibase Latest version of the release notes: https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/extensions/Wikibase.git;a=blob;f=repo/RELEASE-NOTES -- To view, visit https://gerrit.wikimedia.org/r/110160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7b2074d26712b7f13c9fb328bb5919456f5ff579 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Addshore addshorew...@gmail.com Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add jshint and clean up files which fail its validation - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Add jshint and clean up files which fail its validation
..
Add jshint and clean up files which fail its validation
Change-Id: I719764d50638e8db34b544bdd99c527004b632c7
---
A .jshintignore
M .jshintrc
M modules/base/ext.flow.base.js
M modules/base/ui-functions.js
M modules/base/utils.js
M modules/discussion/paging.js
M modules/discussion/ui.js
M modules/editor/editors/ext.flow.editors.none.js
M modules/editor/editors/ext.flow.editors.visualeditor.js
9 files changed, 101 insertions(+), 64 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000..9539ad7
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1 @@
+modules/jquery.scroll.js
diff --git a/.jshintrc b/.jshintrc
index 0967ef4..20762bc 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1 +1,27 @@
-{}
+{
+ globals: {
+ console: true,
+ jQuery: true,
+ JsDiff: true,
+ Hogan: true,
+ QUnit: true,
+ mw: true,
+ mediaWiki: true,
+ strictEqual: true,
+ deepEqual: true,
+ ok: true,
+ sinon: true,
+ ve: true
+ },
+ browser: true, // document, navigator, etc.
+ curly:true, // requres curly braces around loops and conditionals
+ devel:true, // console, alert, etc.
+ eqeqeq: true, // prohibits == and !=
+ forin:false, // make for-in loops require hasOwnProperty check
+ onevar: true, // only one var declaration per function
+ supernew: true, // suppress warnings about weird object
constructions
+ trailing: true, // disallow trailing whitespace
+ undef : true // prohibits the use of undefined variables
+ //unused: true, // complain about unused variables and arugments
+ //white:true, // enforce Crockford rules
+}
diff --git a/modules/base/ext.flow.base.js b/modules/base/ext.flow.base.js
index f4841a1..e019ff3 100644
--- a/modules/base/ext.flow.base.js
+++ b/modules/base/ext.flow.base.js
@@ -137,9 +137,10 @@
},
generateTopicAction: function( actionName, parameterList,
promiseFilterCallback ) {
- var params = $.makeArray( arguments );
+ var params = $.makeArray( arguments ),
+ innerAction;
params.unshift( 'topic' );
- var innerAction =
mw.flow.api.generateBlockAction.apply( this, params );
+ innerAction = mw.flow.api.generateBlockAction.apply(
this, params );
return function( topicId ) {
var actionParams = $.makeArray( arguments );
@@ -161,14 +162,14 @@
requestParams = {},
paramIndex = 1,
requestArguments = arguments,
- newDeferredObject;
+ newDeferredObject,
+ realParams = {};
$.each( parameterList, function ( key, value ) {
requestParams[value] =
requestArguments[paramIndex];
paramIndex++;
} );
- var realParams = {};
realParams[blockName] = requestParams;
mw.flow.api.executeAction(
@@ -298,15 +299,15 @@
};
mw.flow.exception.prototype.getCode = function() {
- return this.code;
+ return this.code;
};
mw.flow.exception.prototype.getData = function() {
- return this.data;
+ return this.data;
};
mw.flow.exception.prototype.getErrorInfo = function() {
- return [this.code, this.data];
+ return [this.code, this.data];
};
} )( jQuery, mediaWiki );
diff --git a/modules/base/ui-functions.js b/modules/base/ui-functions.js
index 2418a07..5735a4b 100644
--- a/modules/base/ui-functions.js
+++ b/modules/base/ui-functions.js
@@ -90,14 +90,15 @@
* when the form submission has returned.
*/
'setupEditForm' : function( type, initialContent,
submitFunction, loadFunction ) {
- var $contentContainer = $(this);
- var deferredObject = $.Deferred();
+ var $contentContainer = $( this ),
+ deferredObject = $.Deferred(),
+
[MediaWiki-commits] [Gerrit] Use anonymous user in maintenance scripts - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Use anonymous user in maintenance scripts
..
Use anonymous user in maintenance scripts
Bug: 60418
Change-Id: Ice7f9eb739426c91a8ad8c45c4757960a7fa109c
---
M container.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/container.php b/container.php
index e48626b..b972ec5 100644
--- a/container.php
+++ b/container.php
@@ -3,7 +3,11 @@
$c = new Flow\Container;
// MediaWiki
-$c['user'] = $GLOBALS['wgUser'];
+if ( defined( 'RUN_MAINTENANCE_IF_MAIN' ) ) {
+ $c['user'] = new User;
+} else {
+ $c['user'] = isset( $GLOBALS['wgUser'] );
+}
$c['output'] = $GLOBALS['wgOut'];
$c['request'] = $GLOBALS['wgRequest'];
if ( $GLOBALS['wgFlowUseMemcache'] ) {
--
To view, visit https://gerrit.wikimedia.org/r/109927
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice7f9eb739426c91a8ad8c45c4757960a7fa109c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove useless/unused use statements - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Remove useless/unused use statements .. Remove useless/unused use statements Change-Id: I858893d2f91346c15060eac85af713c2f89d8234 --- M FlowActions.php 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/FlowActions.php b/FlowActions.php index ffd890b..dd18eda 100644 --- a/FlowActions.php +++ b/FlowActions.php @@ -5,10 +5,8 @@ use Flow\Model\UUID; use Flow\RevisionActionPermissions; use Flow\Log\Logger; -use Flow\Block\Block; use Flow\Templating; use Flow\Container; -use \Message; /** * Flow actions: key = value map with key being the action name. -- To view, visit https://gerrit.wikimedia.org/r/109845 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I858893d2f91346c15060eac85af713c2f89d8234 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove no longer existing classes from autloading global - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Remove no longer existing classes from autloading global .. Remove no longer existing classes from autloading global Change-Id: Ic4d371ae139dd670e176cb085f4d080ba67d52ba --- M Flow.php 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/Flow.php b/Flow.php index d323341..8f3cd1f 100755 --- a/Flow.php +++ b/Flow.php @@ -148,12 +148,9 @@ // The individual workflow pieces $wgAutoloadClasses['Flow\Block\Block'] = $dir . 'includes/Block/Block.php'; $wgAutoloadClasses['Flow\Block\AbstractBlock'] = $dir . 'includes/Block/Block.php'; -$wgAutoloadClasses['Flow\Block\BlockView'] = $dir . 'includes/Block/Block.php'; $wgAutoloadClasses['Flow\Block\HeaderBlock'] = $dir . 'includes/Block/Header.php'; $wgAutoloadClasses['Flow\Block\TopicListBlock'] = $dir . 'includes/Block/TopicList.php'; -$wgAutoloadClasses['Flow\Block\TopicListView'] = $dir . 'includes/Block/TopicList.php'; $wgAutoloadClasses['Flow\Block\TopicBlock'] = $dir . 'includes/Block/Topic.php'; -$wgAutoloadClasses['Flow\Block\TopicView'] = $dir . 'includes/Block/Topic.php'; // phpunit helper $wgAutoloadClasses['Flow\Tests\PostRevisionTestCase'] = $dir . 'tests/PostRevisionTestCase.php'; -- To view, visit https://gerrit.wikimedia.org/r/109717 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic4d371ae139dd670e176cb085f4d080ba67d52ba Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Bsitu bs...@wikimedia.org Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ignore temp files from jedit - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Ignore temp files from jedit .. Ignore temp files from jedit Change-Id: I248e280908e407382bf4b0011c998d97b10dc058 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 159b13a..4832e7d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ .*.swp scripts/hhvm-wrapper.phar node_modules/ +\#*# -- To view, visit https://gerrit.wikimedia.org/r/109809 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I248e280908e407382bf4b0011c998d97b10dc058 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] db1040 full steam - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: db1040 full steam .. db1040 full steam Change-Id: Ie90cff5ff83109dc7f2421a86d384bdca425a1d7 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 2462498..20c051c 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -115,7 +115,7 @@ 'db1004' = 0, # watchlist, recentchangeslinked, contributions, logpager 'db1011' = 400, 'db1020' = 400, - 'db1040' = 50, # warm up + 'db1040' = 400, # warm up ), 's5' = array( 'db1058' = 0, -- To view, visit https://gerrit.wikimedia.org/r/110183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie90cff5ff83109dc7f2421a86d384bdca425a1d7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] db1040 full steam - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/110183 Change subject: db1040 full steam .. db1040 full steam Change-Id: Ie90cff5ff83109dc7f2421a86d384bdca425a1d7 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/83/110183/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 2462498..20c051c 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -115,7 +115,7 @@ 'db1004' = 0, # watchlist, recentchangeslinked, contributions, logpager 'db1011' = 400, 'db1020' = 400, - 'db1040' = 50, # warm up + 'db1040' = 400, # warm up ), 's5' = array( 'db1058' = 0, -- To view, visit https://gerrit.wikimedia.org/r/110183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie90cff5ff83109dc7f2421a86d384bdca425a1d7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Quickfix: $c['user'] was bool, should be User - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110184
Change subject: Quickfix: $c['user'] was bool, should be User
..
Quickfix: $c['user'] was bool, should be User
I was too soon to merge https://gerrit.wikimedia.org/r/#/c/109927
Change-Id: I11ce51cba759c02afbcd68fd8a0eecc6dcfed601
---
M container.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/84/110184/1
diff --git a/container.php b/container.php
index d686da3..11161ff 100644
--- a/container.php
+++ b/container.php
@@ -6,7 +6,7 @@
if ( defined( 'RUN_MAINTENANCE_IF_MAIN' ) ) {
$c['user'] = new User;
} else {
- $c['user'] = isset( $GLOBALS['wgUser'] );
+ $c['user'] = isset( $GLOBALS['wgUser'] ) ? $GLOBALS['wgUser'] : new
User;
}
$c['output'] = $GLOBALS['wgOut'];
$c['request'] = $GLOBALS['wgRequest'];
--
To view, visit https://gerrit.wikimedia.org/r/110184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I11ce51cba759c02afbcd68fd8a0eecc6dcfed601
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] puppet-merge: warn if multiple committers - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: puppet-merge: warn if multiple committers
..
puppet-merge: warn if multiple committers
puppet-merge makes it easy to merge a change without intending to, because its
diff output is verbose, causing antecedent patches to scroll past. This patch
makes puppet-merge print a summary of commiter names and commit subjects. When
the candidate revision range contains commits by more than one committer,
puppet-merge will also print a warning.
Change-Id: I3f0062fcc95ee856b18198c20e6cd226602d308a
---
M modules/puppetmaster/files/puppet-merge
1 file changed, 11 insertions(+), 0 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/modules/puppetmaster/files/puppet-merge
b/modules/puppetmaster/files/puppet-merge
index a471ba9..c911c58 100755
--- a/modules/puppetmaster/files/puppet-merge
+++ b/modules/puppetmaster/files/puppet-merge
@@ -5,6 +5,12 @@
set -e
+# Colorized output helpers
+RED=$(tput bold; tput setaf 1)
+MAGENTA=$(tput bold; tput setaf 9)
+RESET=$(tput sgr0)
+
+
# TODO: Remove this after sockpuppet is dead
if [ `hostname` = sockpuppet ]; then
echo You shouldn't run puppet-merge here. Sockpuppet is unused. Go to
palladium.eqiad.wmnet instead
@@ -83,6 +89,11 @@
echo
echo
echo --
+git log HEAD..${fetch_head_sha1} --format=${MAGENTA}%cn${RESET}: %s (%t)
+if ! git log HEAD..${fetch_head_sha1} --format=%ce | sort | uniq | wc -l |
grep -Eq '\s+1$'; then
+echo ${RED}WARNING${RESET}: Revision range includes commits from multiple
committers!
+fi
+
echo -n Merge these changes? (yes/no)?
read answer
--
To view, visit https://gerrit.wikimedia.org/r/110104
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3f0062fcc95ee856b18198c20e6cd226602d308a
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Quickfix: $c['user'] was bool, should be User - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Quickfix: $c['user'] was bool, should be User
..
Quickfix: $c['user'] was bool, should be User
I was too soon to merge https://gerrit.wikimedia.org/r/#/c/109927
Change-Id: I11ce51cba759c02afbcd68fd8a0eecc6dcfed601
---
M container.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/container.php b/container.php
index d686da3..11161ff 100644
--- a/container.php
+++ b/container.php
@@ -6,7 +6,7 @@
if ( defined( 'RUN_MAINTENANCE_IF_MAIN' ) ) {
$c['user'] = new User;
} else {
- $c['user'] = isset( $GLOBALS['wgUser'] );
+ $c['user'] = isset( $GLOBALS['wgUser'] ) ? $GLOBALS['wgUser'] : new
User;
}
$c['output'] = $GLOBALS['wgOut'];
$c['request'] = $GLOBALS['wgRequest'];
--
To view, visit https://gerrit.wikimedia.org/r/110184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I11ce51cba759c02afbcd68fd8a0eecc6dcfed601
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] emery: move rsync teahouse job - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: emery: move rsync teahouse job
..
emery: move rsync teahouse job
Per RT #6143 and https://gerrit.wikimedia.org/r/#/c/109849/ removing the
rsync job too
Change-Id: I9a94fddd117d84f9c9fffc7c0c70993a45aa249e
---
M manifests/misc/statistics.pp
1 file changed, 0 insertions(+), 6 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index 6830416..4f1f63e 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -691,12 +691,6 @@
destination = /a/squid/archive/api,
}
-# teahouse logs from emery
-misc::statistics::rsync_job { teahouse:
-source =
emery.wikimedia.org::udp2log/webrequest/archive/teahouse*.gz,
-destination = /a/squid/archive/teahouse,
-}
-
# sampled-1000 logs from emery
misc::statistics::rsync_job { sampled_1000:
source =
emery.wikimedia.org::udp2log/webrequest/archive/sampled-1000*.gz,
--
To view, visit https://gerrit.wikimedia.org/r/109894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a94fddd117d84f9c9fffc7c0c70993a45aa249e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Exclude user interface elements in content from selection - change (mediawiki/core)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110186
Change subject: Exclude user interface elements in content from selection
..
Exclude user interface elements in content from selection
Steps to test the change:
* Open a random page in browser.
* Select all or a part of the page.
* Copy the selection to clipboard.
* Open a word processor like LibreOffice Writer.
* Paste the content of the clipboard.
Change-Id: Ic05ac226ee4985ae637928f96f1760c0b74aa7ef
---
A resources/mediawiki.action/mediawiki.action.view.metadata.css
M skins/common/shared.css
2 files changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/86/110186/1
diff --git a/resources/mediawiki.action/mediawiki.action.view.metadata.css
b/resources/mediawiki.action/mediawiki.action.view.metadata.css
new file mode 100644
index 000..f38515b
--- /dev/null
+++ b/resources/mediawiki.action/mediawiki.action.view.metadata.css
@@ -0,0 +1,6 @@
+.mw-metadata-show-hide-extended {
+ -moz-user-select: none;
+ -webkit-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
diff --git a/skins/common/shared.css b/skins/common/shared.css
index 1657d97..0af1432 100644
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -1178,6 +1178,8 @@
.mw-editsection,
.toctoggle,
+.tochidden,
+.magnify,
#jump-to-nav {
-moz-user-select: none;
-webkit-user-select: none;
--
To view, visit https://gerrit.wikimedia.org/r/110186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic05ac226ee4985ae637928f96f1760c0b74aa7ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rm use of Class aliases deprecated since 0.5 - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/110187 Change subject: Rm use of Class aliases deprecated since 0.5 .. Rm use of Class aliases deprecated since 0.5 Change-Id: Ia1f5cc229b06fcb8b94f6af9cc855742f513b732 --- M client/tests/phpunit/includes/RepoLinkerTest.php M lib/includes/changes/EntityChange.php M lib/includes/store/sql/SqlEntityInfoBuilder.php M lib/includes/store/sql/TermSqlIndex.php M lib/tests/phpunit/MockPropertyLabelResolver.php M lib/tests/phpunit/MockRepository.php M lib/tests/phpunit/ReferencedUrlFinderTest.php M lib/tests/phpunit/store/MockTermIndex.php M repo/includes/SummaryFormatter.php M repo/includes/api/SearchEntities.php M repo/includes/content/EntityContentFactory.php M repo/includes/content/ItemContent.php M repo/includes/content/ItemHandler.php M repo/includes/rdf/RdfBuilder.php M repo/includes/specials/SpecialModifyEntity.php M repo/includes/store/sql/EntityPerPageTable.php M repo/tests/phpunit/includes/LabelDescriptionDuplicateDetectorTest.php M repo/tests/phpunit/includes/api/EditPageTest.php M repo/tests/phpunit/includes/rdf/RdfBuilderTest.php 19 files changed, 20 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/87/110187/1 diff --git a/client/tests/phpunit/includes/RepoLinkerTest.php b/client/tests/phpunit/includes/RepoLinkerTest.php index 1645a1f..fb9eedf 100644 --- a/client/tests/phpunit/includes/RepoLinkerTest.php +++ b/client/tests/phpunit/includes/RepoLinkerTest.php @@ -4,7 +4,7 @@ use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Entity\PropertyId; -use Wikibase\EntityId; +use Wikibase\DataModel\Entity\EntityId; use Wikibase\RepoLinker; /** diff --git a/lib/includes/changes/EntityChange.php b/lib/includes/changes/EntityChange.php index d68e747..cc64b86 100644 --- a/lib/includes/changes/EntityChange.php +++ b/lib/includes/changes/EntityChange.php @@ -5,6 +5,7 @@ use MWException; use RecentChange; use User; +use Wikibase\DataModel\Entity\EntityId; /** * Represents a change for an entity; to be extended by various change subtypes diff --git a/lib/includes/store/sql/SqlEntityInfoBuilder.php b/lib/includes/store/sql/SqlEntityInfoBuilder.php index 9defd5c..a828fcd 100644 --- a/lib/includes/store/sql/SqlEntityInfoBuilder.php +++ b/lib/includes/store/sql/SqlEntityInfoBuilder.php @@ -5,6 +5,7 @@ use ResultWrapper; use Wikibase\DataModel\Entity\EntityIdParser; use Wikibase\DataModel\Entity\PropertyId; +use Wikibase\DataModel\Entity\EntityId; /** * Class EntityInfoBuilder implementation relying on database access. diff --git a/lib/includes/store/sql/TermSqlIndex.php b/lib/includes/store/sql/TermSqlIndex.php index bdc8e9f..e6459cc 100644 --- a/lib/includes/store/sql/TermSqlIndex.php +++ b/lib/includes/store/sql/TermSqlIndex.php @@ -8,6 +8,7 @@ use MWException; use ResultWrapper; use Wikibase\DataModel\Entity\BasicEntityIdParser; +use Wikibase\DataModel\Entity\EntityId; /** * Term lookup cache. diff --git a/lib/tests/phpunit/MockPropertyLabelResolver.php b/lib/tests/phpunit/MockPropertyLabelResolver.php index 4b53471..9160fe5 100644 --- a/lib/tests/phpunit/MockPropertyLabelResolver.php +++ b/lib/tests/phpunit/MockPropertyLabelResolver.php @@ -2,7 +2,7 @@ namespace Wikibase\Test; -use Wikibase\EntityId; +use Wikibase\DataModel\Entity\EntityId; use Wikibase\PropertyLabelResolver; /** diff --git a/lib/tests/phpunit/MockRepository.php b/lib/tests/phpunit/MockRepository.php index 35db9d9..76a91dc 100644 --- a/lib/tests/phpunit/MockRepository.php +++ b/lib/tests/phpunit/MockRepository.php @@ -8,7 +8,7 @@ use Wikibase\DataModel\Entity\PropertyId; use Wikibase\DataModel\SimpleSiteLink; use Wikibase\Entity; -use Wikibase\EntityId; +use Wikibase\DataModel\Entity\EntityId; use Wikibase\EntityInfoBuilder; use Wikibase\EntityLookup; use Wikibase\EntityRevision; diff --git a/lib/tests/phpunit/ReferencedUrlFinderTest.php b/lib/tests/phpunit/ReferencedUrlFinderTest.php index d781ee6..da0a08d 100644 --- a/lib/tests/phpunit/ReferencedUrlFinderTest.php +++ b/lib/tests/phpunit/ReferencedUrlFinderTest.php @@ -4,7 +4,7 @@ use DataValues\StringValue; use Wikibase\DataModel\Entity\PropertyId; -use Wikibase\EntityId; +use Wikibase\DataModel\Entity\EntityId; use Wikibase\Lib\InMemoryDataTypeLookup; use Wikibase\PropertyNoValueSnak; use Wikibase\PropertySomeValueSnak; diff --git a/lib/tests/phpunit/store/MockTermIndex.php b/lib/tests/phpunit/store/MockTermIndex.php index 200a8e0..ebf4c89 100644 --- a/lib/tests/phpunit/store/MockTermIndex.php +++ b/lib/tests/phpunit/store/MockTermIndex.php @@ -4,7 +4,7 @@ use Exception; use Wikibase\Entity; -use Wikibase\EntityId; +use Wikibase\DataModel\Entity\EntityId; use Wikibase\Term; use Wikibase\TermIndex; diff --git a/repo/includes/SummaryFormatter.php b/repo/includes/SummaryFormatter.php index
[MediaWiki-commits] [Gerrit] migrate monitor_fatals.rb to puppet repo - change (qa/browsertests)
Cmcmahon has submitted this change and it was merged.
Change subject: migrate monitor_fatals.rb to puppet repo
..
migrate monitor_fatals.rb to puppet repo
I have moved the monitor_fatals.rb script under puppet so we can get it
installed on the beta cluster and harnessed with an hourly cronjob.
See also puppet change https://gerrit.wikimedia.org/r/108039
Change-Id: I442330ccca602e1f385fa0eebdbb73091785b2fd
---
D monitoring/monitor_fatals.rb
1 file changed, 0 insertions(+), 26 deletions(-)
Approvals:
Cmcmahon: Looks good to me, approved
Zfilipin: Looks good to me, but someone else must approve
diff --git a/monitoring/monitor_fatals.rb b/monitoring/monitor_fatals.rb
deleted file mode 100644
index 0ba041e..000
--- a/monitoring/monitor_fatals.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'net/smtp'
-
-fatals_file=/data/project/logs/fatals.log
-seconds_since_last_run=3600
-
-def send_email
-message = MESSAGE_END
-From: Beta fatals q...@lists.wikimedia.org
-To: Software quality q...@lists.wikimedia.org
-Subject: New fatal errors on beta labs
-
-The file at /data/project/logs/fatal.log on the deployment cluster
has a new entry within the last hour. You should check it out.
-MESSAGE_END
-
- Net::SMTP.start('mchenry.wikimedia.org') do |smtp|
-smtp.send_message message, 'q...@lists.wikimedia.org',
-'q...@lists.wikimedia.org'
- end
-end
-
-if File.exist?(fatals_file)
- last_modified_time=File.mtime(fatals_file)
- if Time.now.to_i - last_modified_time.to_i seconds_since_last_run
-send_email
- end
-end
--
To view, visit https://gerrit.wikimedia.org/r/108042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I442330ccca602e1f385fa0eebdbb73091785b2fd
Gerrit-PatchSet: 2
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Jhall jh...@wikimedia.org
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] emery: move api logs to erbium - change (operations/puppet)
Ottomata has submitted this change and it was merged. Change subject: emery: move api logs to erbium .. emery: move api logs to erbium RT #6143 and comments from otto on IRC Change-Id: Ibfe63424e55cb8b7adfc2f0d3029add113054778 --- M templates/udp2log/filters.erbium.erb 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/templates/udp2log/filters.erbium.erb b/templates/udp2log/filters.erbium.erb index dfafefe..58e2013 100644 --- a/templates/udp2log/filters.erbium.erb +++ b/templates/udp2log/filters.erbium.erb @@ -19,3 +19,7 @@ # apergos running on snapshot1. # gadolinium.wikimedia.org:3815 should be the webstats collector process. pipe 1 /usr/local/bin/filter | /usr/bin/log2udp -h gadolinium.wikimedia.org -p 3815 + +### API Usage +pipe 100 /usr/bin/udp-filter -F '\t' -p /w/api.php %= log_directory %/api-usage.tsv.log + -- To view, visit https://gerrit.wikimedia.org/r/110139 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibfe63424e55cb8b7adfc2f0d3029add113054778 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Matanya mata...@foss.co.il Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixing api-usage write location - change (operations/puppet)
Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/110185 Change subject: Fixing api-usage write location .. Fixing api-usage write location Change-Id: I9ad87a01dccc23801ec00baaedce3719e7ee9f41 --- M templates/udp2log/filters.erbium.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/85/110185/1 diff --git a/templates/udp2log/filters.erbium.erb b/templates/udp2log/filters.erbium.erb index 58e2013..96558c2 100644 --- a/templates/udp2log/filters.erbium.erb +++ b/templates/udp2log/filters.erbium.erb @@ -21,5 +21,5 @@ pipe 1 /usr/local/bin/filter | /usr/bin/log2udp -h gadolinium.wikimedia.org -p 3815 ### API Usage -pipe 100 /usr/bin/udp-filter -F '\t' -p /w/api.php %= log_directory %/api-usage.tsv.log +pipe 100 /usr/bin/udp-filter -F '\t' -p /w/api.php %= webrequest_log_directory %/api-usage.tsv.log -- To view, visit https://gerrit.wikimedia.org/r/110185 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9ad87a01dccc23801ec00baaedce3719e7ee9f41 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Drive-by lint! - change (operations...wikimetrics)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110188
Change subject: Drive-by lint!
..
Drive-by lint!
- the module parametrizes the user/group name, but the upstart config
hard-coded 'wikimetrics' for both.
- user resources autorequire their group, if Puppet is managing both resources.
- SysV-style init.d compatibility for Upstart jobs has been obsolete for years.
- The if !defined trick is not a true workaround for duplication definitions,
since they only work if the other definition is conditional too, because the
order in which resources are evaluated is undefined.
Change-Id: I1c343eb41c11f2e1a04cc3c6b3769be5157c5dc7
---
M manifests/init.pp
M manifests/queue.pp
M manifests/web/daemon.pp
M templates/upstart.wikimetrics.conf.erb
4 files changed, 11 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/wikimetrics
refs/changes/88/110188/1
diff --git a/manifests/init.pp b/manifests/init.pp
index 8dd109a..cc7a460 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -111,22 +111,17 @@
$service_start_on = 'started network-services',
)
{
-if !defined(Group[$group]) {
-group { $group:
- ensure = present,
- system = true,
-}
+group { $group:
+ ensure = present,
+ system = true,
}
-if !defined(User[$user]) {
-user { $user:
-ensure = present,
-gid= $group,
-home = $path,
-managehome = false,
-system = true,
-require= Group[$group],
-}
+user { $user:
+ensure = present,
+gid= $group,
+home = $path,
+managehome = false,
+system = true,
}
$owner = $repository_owner ? {
diff --git a/manifests/queue.pp b/manifests/queue.pp
index 42a0b54..1e08514 100644
--- a/manifests/queue.pp
+++ b/manifests/queue.pp
@@ -26,10 +26,6 @@
content = template('wikimetrics/upstart.wikimetrics.conf.erb'),
require = Class['::wikimetrics'],
}
-file { '/etc/init.d/wikimetrics-queue':
-ensure = 'link',
-target = '/lib/init/upstart-job',
-}
service { 'wikimetrics-queue':
ensure = 'running',
diff --git a/manifests/web/daemon.pp b/manifests/web/daemon.pp
index 2ce3274..a28728f 100644
--- a/manifests/web/daemon.pp
+++ b/manifests/web/daemon.pp
@@ -14,10 +14,6 @@
content = template('wikimetrics/upstart.wikimetrics.conf.erb'),
require = Class['::wikimetrics'],
}
-file { '/etc/init.d/wikimetrics-web':
-ensure = 'link',
-target = '/lib/init/upstart-job',
-}
$service_ensure = $ensure ? {
'absent' = 'stopped',
diff --git a/templates/upstart.wikimetrics.conf.erb
b/templates/upstart.wikimetrics.conf.erb
index aceac3c..5b839fa 100644
--- a/templates/upstart.wikimetrics.conf.erb
+++ b/templates/upstart.wikimetrics.conf.erb
@@ -1,7 +1,7 @@
start on %= @service_start_on %
-setuid wikimetrics
-setgid wikimetrics
+setuid %= scope.lookupvar(wikimetrics::user) %
+setgid %= scope.lookupvar(wikimetrics::group) %
script
wikimetrics --mode %= @mode % --db-config %= @config_directory
%/db_config.yaml --queue-config %= @config_directory %/queue_config.yaml
--web-config %= @config_directory %/web_config.yaml
--
To view, visit https://gerrit.wikimedia.org/r/110188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c343eb41c11f2e1a04cc3c6b3769be5157c5dc7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Track versions of the index for easier maintenance - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Track versions of the index for easier maintenance
..
Track versions of the index for easier maintenance
Change-Id: Iec6a96e48d635360a3343e4d41d105b7554d7238
---
M CirrusSearch.php
M includes/AnalysisConfigBuilder.php
M includes/MappingConfigBuilder.php
M maintenance/updateOneSearchIndexConfig.php
A maintenance/updateVersionIndex.php
5 files changed, 148 insertions(+), 0 deletions(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CirrusSearch.php b/CirrusSearch.php
index e4e934c..40a9a59 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -231,6 +231,7 @@
$wgAutoloadClasses['CirrusSearch\TextFormatter'] = $includes .
'TextFormatter.php';
$wgAutoloadClasses['CirrusSearch\TitleResultsType'] = $includes .
'ResultsType.php';
$wgAutoloadClasses['CirrusSearch\UpdateSearchIndexConfig'] = __DIR__ .
'/maintenance/updateSearchIndexConfig.php';
+$wgAutoloadClasses['CirrusSearch\UpdateVersionIndex'] = __DIR__ .
'/maintenance/updateVersionIndex.php';
$wgAutoloadClasses['CirrusSearch\Updater'] = $includes . 'Updater.php';
/**
diff --git a/includes/AnalysisConfigBuilder.php
b/includes/AnalysisConfigBuilder.php
index 515421a..89b4556 100644
--- a/includes/AnalysisConfigBuilder.php
+++ b/includes/AnalysisConfigBuilder.php
@@ -22,6 +22,14 @@
*/
class AnalysisConfigBuilder {
/**
+* Version number for the core analysis. Increment the major
+* version when the analysis changes in an incompatible way,
+* and change the minor version when it changes but isn't
+* incompatible
+*/
+ const VERSION = 0.1;
+
+ /**
* Language code we're building analysis for
* @var string
*/
diff --git a/includes/MappingConfigBuilder.php
b/includes/MappingConfigBuilder.php
index b1d263e..a16b714 100644
--- a/includes/MappingConfigBuilder.php
+++ b/includes/MappingConfigBuilder.php
@@ -22,6 +22,14 @@
*/
class MappingConfigBuilder {
/**
+* Version number for the core analysis. Increment the major
+* version when the analysis changes in an incompatible way,
+* and change the minor version when it changes but isn't
+* incompatible
+*/
+ const VERSION = 0.1;
+
+ /**
* Whether to allow prefix searches to match on any word
* @var bool
*/
diff --git a/maintenance/updateOneSearchIndexConfig.php
b/maintenance/updateOneSearchIndexConfig.php
index 27a81f2..23d7b1c 100644
--- a/maintenance/updateOneSearchIndexConfig.php
+++ b/maintenance/updateOneSearchIndexConfig.php
@@ -174,6 +174,7 @@
$this-validateAnalyzers();
$this-validateMapping();
$this-validateAlias();
+ $this-updateVersions();
if ( $this-closed ) {
$this-getIndex()-open();
@@ -190,6 +191,14 @@
}
}
+ private function updateVersions() {
+ $child = $this-runChild( 'CirrusSearch\UpdateVersionIndex' );
+ $child-mOptions['baseName'] = $this-indexBaseName;
+ $child-mOptions['update'] = true;
+ $child-mOptions['indent'] = \t;
+ $child-execute();
+ }
+
private function validateIndex() {
if ( $this-startOver ) {
$this-output( $this-indent . Blowing away index to
start over... );
diff --git a/maintenance/updateVersionIndex.php
b/maintenance/updateVersionIndex.php
new file mode 100644
index 000..b221838
--- /dev/null
+++ b/maintenance/updateVersionIndex.php
@@ -0,0 +1,122 @@
+?php
+
+namespace CirrusSearch;
+use \Maintenance;
+
+/**
+ * Update and check the CirrusSearch version index.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+$IP = getenv( 'MW_INSTALL_PATH' );
+if( $IP === false ) {
+ $IP = __DIR__ . '/../../..';
+}
+require_once( $IP/maintenance/Maintenance.php );
+
+class UpdateVersionIndex extends Maintenance {
+ public function __construct() {
+ parent::__construct();
[MediaWiki-commits] [Gerrit] Fixing api-usage write location - change (operations/puppet)
Ottomata has submitted this change and it was merged. Change subject: Fixing api-usage write location .. Fixing api-usage write location Change-Id: I9ad87a01dccc23801ec00baaedce3719e7ee9f41 --- M templates/udp2log/filters.erbium.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/templates/udp2log/filters.erbium.erb b/templates/udp2log/filters.erbium.erb index 58e2013..96558c2 100644 --- a/templates/udp2log/filters.erbium.erb +++ b/templates/udp2log/filters.erbium.erb @@ -21,5 +21,5 @@ pipe 1 /usr/local/bin/filter | /usr/bin/log2udp -h gadolinium.wikimedia.org -p 3815 ### API Usage -pipe 100 /usr/bin/udp-filter -F '\t' -p /w/api.php %= log_directory %/api-usage.tsv.log +pipe 100 /usr/bin/udp-filter -F '\t' -p /w/api.php %= webrequest_log_directory %/api-usage.tsv.log -- To view, visit https://gerrit.wikimedia.org/r/110185 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9ad87a01dccc23801ec00baaedce3719e7ee9f41 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata o...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Source: Subheading styling - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Source: Subheading styling
..
Source: Subheading styling
Change-Id: I01be35eb46a789d3b9e85e9671d8d9481369e003
---
M Resources.php
M modules/source/ext.cx.source.js
A modules/source/styles/ext.cx.source.less
3 files changed, 28 insertions(+), 4 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
Objections:
Amire80: There's a problem with this change, please improve
diff --git a/Resources.php b/Resources.php
index ce99bd5..987fa0c 100644
--- a/Resources.php
+++ b/Resources.php
@@ -48,6 +48,9 @@
$wgResourceModules['ext.cx.source'] = array(
'scripts' = 'source/ext.cx.source.js',
+ 'styles' = array(
+ 'source/styles/ext.cx.source.less',
+ ),
'dependencies' = array(
'jquery.uls.data',
'mediawiki.Uri',
diff --git a/modules/source/ext.cx.source.js b/modules/source/ext.cx.source.js
index 617bfe9..ff16200 100644
--- a/modules/source/ext.cx.source.js
+++ b/modules/source/ext.cx.source.js
@@ -55,10 +55,12 @@
.text( $.uls.data.getAutonym(
contentLanguage ) ),
$( 'span' )
.addClass(
'cx-column__sub-heading__view-page' )
- .html( 'nbsp;' + mw.message(
- 'cx-source-view-page',
- mw.util.getUrl(
this.page )
- ).parse() )
+ .html(
+ mw.message(
+
'cx-source-view-page',
+ mw.util.getUrl(
this.page )
+ ).parse()
+ )
)
);
diff --git a/modules/source/styles/ext.cx.source.less
b/modules/source/styles/ext.cx.source.less
new file mode 100644
index 000..d175493
--- /dev/null
+++ b/modules/source/styles/ext.cx.source.less
@@ -0,0 +1,19 @@
+@import ../../base/styles/grid/agora-grid;
+
+.cx-column--source {
+ .cx-column__sub-heading {
+ .mw-ui-item;
+ .mw-ui-one-whole;
+ padding-bottom: 10px;
+ }
+
+ .cx-column__language-label {
+ .mw-ui-item;
+ .mw-ui-one-third;
+ }
+
+ .cx-column__sub-heading__view-page {
+ .mw-ui-item;
+ .mw-ui-one-third;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/108943
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I01be35eb46a789d3b9e85e9671d8d9481369e003
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Perform topic length validation with mb_strlen - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Perform topic length validation with mb_strlen
..
Perform topic length validation with mb_strlen
Bug: 57933
Change-Id: I128c9b8d0c60cb66718646e68b971db71deceab7
---
M includes/Block/Topic.php
M includes/Block/TopicList.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Siebrand: Looks good to me, but someone else must approve
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Block/Topic.php b/includes/Block/Topic.php
index 2a0feed..697363d 100644
--- a/includes/Block/Topic.php
+++ b/includes/Block/Topic.php
@@ -121,7 +121,7 @@
return;
}
$this-submitted['content'] = trim( $this-submitted['content']
);
- $len = strlen( $this-submitted['content'] );
+ $len = mb_strlen( $this-submitted['content'] );
if ( $len === 0 ) {
$this-addError( 'content', wfMessage(
'flow-error-missing-title' ) );
return;
diff --git a/includes/Block/TopicList.php b/includes/Block/TopicList.php
index 346e30c..1528b9d 100644
--- a/includes/Block/TopicList.php
+++ b/includes/Block/TopicList.php
@@ -54,7 +54,7 @@
$this-submitted['topic'] = trim(
$this-submitted['topic'] );
if ( strlen( $this-submitted['topic'] ) === 0 ) {
$this-addError( 'topic', wfMessage(
'flow-error-missing-title' ) );
- } elseif ( strlen( $this-submitted['topic'] )
PostRevision::MAX_TOPIC_LENGTH ) {
+ } elseif ( mb_strlen( $this-submitted['topic'] )
PostRevision::MAX_TOPIC_LENGTH ) {
$this-addError( 'topic', wfMessage(
'flow-error-title-too-long', PostRevision::MAX_TOPIC_LENGTH ) );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/110141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I128c9b8d0c60cb66718646e68b971db71deceab7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 55022) Add casechecker.py to i18n system - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 55022) Add casechecker.py to i18n system
..
(bug 55022) Add casechecker.py to i18n system
Change-Id: Ia3d6e97fff44d04966fc9179653b6274667f720b
---
M casechecker.py
1 file changed, 19 insertions(+), 43 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/casechecker.py b/casechecker.py
index 100d33c..ea790ff 100644
--- a/casechecker.py
+++ b/casechecker.py
@@ -15,6 +15,7 @@
import query
import re
import codecs
+import i18n
import wikipedia as pywikibot
@@ -78,25 +79,6 @@
class CaseChecker(object):
-msgRename = {
-'ar': u'تغيير اسم لحالة مخلوطة',
-'en': u'mixed case rename',
-'ru': u'[[ВП:КЛ]]',
-}
-msgDeleteRedirect = {
-'en': u'This redirect contains identical looking Cyrillic and Latin
letters in its title',
-'ru': u'[[ВП:КЛ]] Перенаправление содержит смесь кириллицы и латиницы
в названии',
-}
-textDeleteRedirect = {
-'en': u'{{db-r3|bot=CaseChecker}}\n\nThis redirect used to point to
%s',
-'ru': u'{{Db-redirtypo|[[ВП:КЛ]] Перенаправление на %s содержало смесь
кириллицы и латиницы в названии}}',
-}
-msgLinkReplacement = {
-'en': u'Case Replacements',
-'ar': u'استبدالات الحالة',
-'ru': u'[[ВП:КЛ]]',
-}
-
# These words are always in one language, even though they could be typed
# in both
alwaysInLocal = [u'СССР', u'Как', u'как']
@@ -157,7 +139,8 @@
if arg.startswith('-from:'):
self.apfrom = arg[6:]
else:
-self.apfrom = pywikibot.input(u'Which page to start from:
')
+self.apfrom = pywikibot.input(
+u'Which page to start from: ')
elif arg.startswith('-reqsize:'):
self.aplimit = int(arg[9:])
elif arg == '-links':
@@ -393,44 +376,37 @@
if self.replace:
if len(err[1]) == 1:
newTitle = err[1][0]
-##choice = pywikibot.inputChoice(u'Move %s to %s?'
-## % (title,
newTitle),
-## ['Yes', 'No'],
-## ['y', 'n'])
-editSummary = pywikibot.translate(self.site,
- self.msgRename)
+editSummary = i18n.twtranslate(
+self.site, casechecker-rename)
dst = self.Page(newTitle)
-
if 'redirect' in page:
src = self.Page(title)
redir = src.getRedirectTarget()
-redirTitle = redir.title(asLink=True,
- textlink=True)
-
+redirTitle = redir.title(
+asLink=True, textlink=True)
if not dst.exists():
-src.move(newTitle, editSummary,
- movesubpages=True)
+src.move(
+newTitle, editSummary,
movesubpages=True)
changed = True
-
replErrors = False
for p in src.getReferences(
follow_redirects=False):
if p.namespace() == 2:
continue
oldText = p.get(get_redirect=True)
-newText = self.ReplaceLink(oldText, title,
- newTitle)
+newText = self.ReplaceLink(
+oldText, title, newTitle)
if not self.PutNewPage(
p, newText, [
self.MakeMoveSummary(title,
newTitle)]):
replErrors = True
if not replErrors:
-editSummary = pywikibot.translate(
-self.site, self.msgDeleteRedirect)
-newText = pywikibot.translate(
+editSummary = i18n.twtranslate(
+
[MediaWiki-commits] [Gerrit] Improve OutputPage::showErrorPage method documentation - change (mediawiki/core)
Dereckson has uploaded a new change for review. https://gerrit.wikimedia.org/r/110189 Change subject: Improve OutputPage::showErrorPage method documentation .. Improve OutputPage::showErrorPage method documentation - Adding the most usual case of call - fixing the incoherence between -Object and -Obj Change-Id: I81207f4ef46a43529974e3ada194f2948a1e9017 --- M includes/OutputPage.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/89/110189/1 diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 9866e2c..04792cf 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -2130,9 +2130,10 @@ /** * Output a standard error page * +* showErrorPage( 'titlemsg', 'pagetextmsg' ); * showErrorPage( 'titlemsg', 'pagetextmsg', array( 'param1', 'param2' ) ); * showErrorPage( 'titlemsg', $messageObject ); -* showErrorPage( $titleMessageObj, $messageObject ); +* showErrorPage( $titleMessageObject, $messageObject ); * * @param $title Mixed: message key (string) for page title, or a Message object * @param $msg Mixed: message key (string) for page text, or a Message object -- To view, visit https://gerrit.wikimedia.org/r/110189 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81207f4ef46a43529974e3ada194f2948a1e9017 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Dereckson dereck...@espace-win.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] OutputPage::showErrorPage raises a notice if arguments are i... - change (mediawiki/core)
Dereckson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110190
Change subject: OutputPage::showErrorPage raises a notice if arguments are
incoherent
..
OutputPage::showErrorPage raises a notice if arguments are incoherent
The method has the following signature:
OutputPage::showErrorPage( $title, $msg, $params = array() )
$msg can be a string or a Message object.
If it's a string, a Message object is built, with $params as parameters.
If it's a Message object, $params is ignored.
The core now triggers a notice in the case a call is made with $msg an instance
of Message object, and a (non-empty array) $params argument is given.
Change-Id: I227a416f088fc1acd6a04345ed0e24d06f967ecc
---
M RELEASE-NOTES-1.23
M includes/OutputPage.php
2 files changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/90/110190/1
diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 10caf6f..1ed8ea6 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -201,6 +201,7 @@
* (bug 52813) Preference Show table of contents (for pages with more than
3 headings) was removed.
* (bug 52810) Preference Justify paragraphs was removed.
+* OutputPage::showErrorPage raises a notice if arguments are incoherent
Removed classes
* FakeMemCachedClient (deprecated in 1.18)
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 04792cf..6d06693 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2147,6 +2147,9 @@
$this-prepareErrorPage( $title );
if ( $msg instanceof Message ) {
+ if ( $params !== array() ) {
+ trigger_error( 'Argument ignored: $params. The
message parameters argument is discarded when the $msg argument is a Message
object instead of a string.', E_USER_NOTICE );
+ }
$this-addHTML( $msg-parseAsBlock() );
} else {
$this-addWikiMsgArray( $msg, $params );
--
To view, visit https://gerrit.wikimedia.org/r/110190
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I227a416f088fc1acd6a04345ed0e24d06f967ecc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Dereckson dereck...@espace-win.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Start building the Cirrus index for huwiki - change (operations/mediawiki-config)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/110192 Change subject: Start building the Cirrus index for huwiki .. Start building the Cirrus index for huwiki Add huwiki with shard counts of cawiki because they have similar page counts. Update some notes. Change-Id: Ic23cc94599922f906816bc7a6bf5f15d15760760 --- M wmf-config/InitialiseSettings.php 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/92/110192/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 9bb01bc..95af569 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12731,6 +12731,7 @@ 'eswiki' = true, 'frwiki' = true, 'guwiki' = true, + 'huwiki' = true, 'nlwiki' = true, 'ptwiki' = true, 'ruwiki' = true, @@ -12745,6 +12746,7 @@ 'wmgCirrusIsBuilding' = array( 'default' = false, 'enwiki' = true, + 'huwiki' = true, ), 'wmgCirrusSearchPreferRecentDefaultDecayPortion' = array( @@ -12760,7 +12762,7 @@ ), // Shard each wiki to be about 2gb of index per shard. Changing this for a wiki -// requires an in place reindex. Last full review 2013-12-13. See +// requires an in place reindex. Last full review 2014-01-27. See // https://wikitech.wikimedia.org/wiki/Search/New#Estimating_the_number_of_shards_required // for estimation methodology. At this point I'm declaring we should have no more than // 20 shards per index. We might go higher but that is a tradeoff for easier maintenance @@ -12784,6 +12786,7 @@ 'frwiki' = array( 'content' = 14, 'general' = 13 ), 'frwikisource' = array( 'content' = 12, 'general' = 1 ), 'frwikitionary' = array( 'content' = 2, 'general' = 1 ), + 'huwiki' = array( 'content' = 6, 'general' = 1 ), // Sized before deployment 'itwiki' = array( 'content' = 13, 'general' = 9 ), 'mgwiktionary' = array( 'content' = 2, 'general' = 1 ), 'nlwiki' = array( 'content' = 8, 'general' = 4 ), -- To view, visit https://gerrit.wikimedia.org/r/110192 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic23cc94599922f906816bc7a6bf5f15d15760760 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ChangesListSpecialPage: Implement buildMainQueryConds() - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: ChangesListSpecialPage: Implement buildMainQueryConds()
..
ChangesListSpecialPage: Implement buildMainQueryConds()
This also involved adding some default options to getDefaultOptions()
and a new method getDB().
Change-Id: I7389a72bfcf176480bfc36f9d6efc467e1a5e76a
---
M includes/specialpage/ChangesListSpecialPage.php
M includes/specials/SpecialRecentchanges.php
M includes/specials/SpecialWatchlist.php
M tests/phpunit/includes/specials/SpecialRecentchangesTest.php
4 files changed, 111 insertions(+), 130 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specialpage/ChangesListSpecialPage.php
b/includes/specialpage/ChangesListSpecialPage.php
index 1d17394..c088adb 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -127,12 +127,19 @@
/**
* Get a FormOptions object containing the default options. By default
returns some basic options,
-* you might not call parent method and discard them.
+* you might want to not call parent method and discard them, or to
override default values.
*
* @return FormOptions
*/
public function getDefaultOptions() {
$opts = new FormOptions();
+
+ $opts-add( 'hideminor', false );
+ $opts-add( 'hidebots', false );
+ $opts-add( 'hideanons', false );
+ $opts-add( 'hideliu', false );
+ $opts-add( 'hidepatrolled', false );
+ $opts-add( 'hidemyself', false );
$opts-add( 'namespace', '', FormOptions::INTNULL );
$opts-add( 'invert', false );
@@ -185,12 +192,80 @@
/**
* Return an array of conditions depending of options set in $opts
-* @todo This should build some basic conditions here…
+* @todo Wh is this mutating $opts…
*
* @param FormOptions $opts
* @return array
*/
- abstract public function buildMainQueryConds( FormOptions $opts );
+ public function buildMainQueryConds( FormOptions $opts ) {
+ $dbr = $this-getDB();
+ $user = $this-getUser();
+ $conds = array();
+
+ // It makes no sense to hide both anons and logged-in users
+ // Where this occurs, force anons to be shown
+ $botsOnly = false;
+ if ( $opts['hideanons'] $opts['hideliu'] ) {
+ // Check if the user wants to show bots only
+ if ( $opts['hidebots'] ) {
+ $opts['hideanons'] = false;
+ } else {
+ $botsOnly = true;
+ }
+ }
+
+ // Toggles
+ if ( $opts['hideminor'] ) {
+ $conds['rc_minor'] = 0;
+ }
+ if ( $opts['hidebots'] ) {
+ $conds['rc_bot'] = 0;
+ }
+ if ( $user-useRCPatrol() $opts['hidepatrolled'] ) {
+ $conds['rc_patrolled'] = 0;
+ }
+ if ( $botsOnly ) {
+ $conds['rc_bot'] = 1;
+ } else {
+ if ( $opts['hideliu'] ) {
+ $conds[] = 'rc_user = 0';
+ }
+ if ( $opts['hideanons'] ) {
+ $conds[] = 'rc_user != 0';
+ }
+ }
+ if ( $opts['hidemyself'] ) {
+ if ( $user-getId() ) {
+ $conds[] = 'rc_user != ' . $dbr-addQuotes(
$user-getId() );
+ } else {
+ $conds[] = 'rc_user_text != ' .
$dbr-addQuotes( $user-getName() );
+ }
+ }
+
+ // Namespace filtering
+ if ( $opts['namespace'] !== '' ) {
+ $selectedNS = $dbr-addQuotes( $opts['namespace'] );
+ $operator = $opts['invert'] ? '!=' : '=';
+ $boolean = $opts['invert'] ? 'AND' : 'OR';
+
+ // Namespace association (bug 2429)
+ if ( !$opts['associated'] ) {
+ $condition = rc_namespace $operator
$selectedNS;
+ } else {
+ // Also add the associated namespace
+ $associatedNS = $dbr-addQuotes(
+ MWNamespace::getAssociated(
$opts['namespace'] )
+ );
+ $condition = (rc_namespace $operator
$selectedNS
+
[MediaWiki-commits] [Gerrit] Math now strips spaces in resulting page - change (qa/browsertests)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/110193 Change subject: Math now strips spaces in resulting page .. Math now strips spaces in resulting page Change-Id: I26d40b262e567a292be228328829969f662ff124 --- M features/math.feature 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests refs/changes/93/110193/1 diff --git a/features/math.feature b/features/math.feature index 6d2e8f7..a20a9ff 100644 --- a/features/math.feature +++ b/features/math.feature @@ -18,5 +18,5 @@ When I type math3 + 2/math And I click Preview Then the page should contain an img tag - And alt for that img should be 3 + 2 + And alt for that img should be 3+2 And src for that img should come from //upload -- To view, visit https://gerrit.wikimedia.org/r/110193 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I26d40b262e567a292be228328829969f662ff124 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Story 1630: Add a graph counting thanks - change (analytics/limn-mobile-data)
Milimetric has submitted this change and it was merged.
Change subject: Story 1630: Add a graph counting thanks
..
Story 1630: Add a graph counting thanks
This shows number of thanks
* Thanks from desktop history page
* Thanks from desktop diff page
* Thanks from mobile diff page
Also:
* Provides support for timeboxed daily graphs
Change-Id: I6e4b0f5219abb52ff7b9ccb60a265c967de94394
---
M dashboards/reportcard.json
A datasources/thanks-daily.json
M generate.py
A graphs/thanks-daily.json
M mobile/config.yaml
A mobile/thanks-daily.sql
6 files changed, 223 insertions(+), 5 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/dashboards/reportcard.json b/dashboards/reportcard.json
index c189417..36baa3b 100644
--- a/dashboards/reportcard.json
+++ b/dashboards/reportcard.json
@@ -37,6 +37,12 @@
successful-logins,
share-attempts
]
+},
+{
+name: Other,
+graph_ids: [
+thanks-daily
+]
}
]
}
diff --git a/datasources/thanks-daily.json b/datasources/thanks-daily.json
new file mode 100644
index 000..afa3507
--- /dev/null
+++ b/datasources/thanks-daily.json
@@ -0,0 +1,29 @@
+{
+timespan: {
+start: 2013/05/0,
+step: 1d,
+end: 2013/03/19
+},
+url:
http://stat1001.wikimedia.org/limn-public-data/mobile/datafiles/thanks-daily.csv;,
+format: csv,
+type: timeseries,
+id: thanks-daily,
+columns: [
+{
+type: date,
+label: date
+},
+{
+type: int,
+label: Desktop history
+},
+{
+type: int,
+label: Desktop diff
+},
+{
+type: int,
+label: Mobile diff
+}
+]
+}
diff --git a/generate.py b/generate.py
index dccb4fd..61209d5 100644
--- a/generate.py
+++ b/generate.py
@@ -199,23 +199,37 @@
except IOError:
pass
+if value['frequency'] == 'hourly':
+is_daily_graph = True
+date_type = 'Day'
+else:
+is_daily_graph = False
+date_type = 'Month'
+
today = datetime.date.today()
this_month = datetime.date(today.year, today.month, 1)
if to_date:
end_date = to_date
else:
-end_date = this_month
+if is_daily_graph:
+end_date = datetime.date(today.year, today.month, today.day)
+else:
+end_date = this_month
sql_path = self.get_sql_path(graph_key)
+
if os.path.exists(sql_path):
while from_date = end_date:
graph_date_key = from_date.strftime('%Y-%m-%d')
from_timestamp = from_date.strftime('%Y%m%d%H%M%S')
-from_date = from_date + relativedelta(months=1)
+if is_daily_graph:
+from_date = from_date + relativedelta(days=1)
+else:
+from_date = from_date + relativedelta(months=1)
to_timestamp = from_date.strftime('%Y%m%d%H%M%S')
# Generate a graph if not in cache or the current month
if graph_date_key not in cache or from_date = this_month:
-print 'Generating data for month %s' % graph_date_key
+print 'Generating data for timestamp %s to
%s'%(from_timestamp, to_timestamp)
db_name = value.get('db', self.config['defaults']['db'])
query = self.get_sql_string(sql_path)
# apply timeboxing
@@ -227,14 +241,14 @@
if not csv_header:
csv_header = headers
# FIXME: Support other time periods other than months?
-csv_header.insert(0, 'Month')
+csv_header.insert(0, date_type)
cache[graph_date_key] = list(rows[0])
else:
print 'Skip generation of %s' % graph_date_key
rows = []
-for month, row in cache.iteritems():
+for month, row in iter(sorted(cache.iteritems())):
row.insert(0, month)
rows.append(row)
if len(rows) 0:
diff --git a/graphs/thanks-daily.json b/graphs/thanks-daily.json
new file mode 100644
index 000..f2cc85d
--- /dev/null
+++ b/graphs/thanks-daily.json
@@ -0,0 +1,151 @@
+{
+ graph_version: 0.6.0,
+ name: Thanks,
+ root: {
+scaling: linear,
+nodeType: canvas,
+minWidth: 750,
+minHeight: 500,
+height: 500,
+disabled: false,
+width: auto,
+children: [
+ {
+disabled: false,
+nodeType: axis,
+options: {
+ tickFormat: MMM YY,
+ dimension: x,
+
[MediaWiki-commits] [Gerrit] Use InvalidDataException - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/110194 Change subject: Use InvalidDataException .. Use InvalidDataException Change-Id: I0201a21c1ebcdabe5b1f169acaf2031cd15e079e --- M includes/Block/Topic.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/94/110194/1 diff --git a/includes/Block/Topic.php b/includes/Block/Topic.php index 697363d..615c560 100644 --- a/includes/Block/Topic.php +++ b/includes/Block/Topic.php @@ -2,6 +2,7 @@ namespace Flow\Block; +use Flow\Exception\InvalidDataException; use Flow\View\History\History; use Flow\View\History\HistoryRenderer; use Flow\Data\ManagerGroup; -- To view, visit https://gerrit.wikimedia.org/r/110194 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0201a21c1ebcdabe5b1f169acaf2031cd15e079e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix flake8 errors - change (analytics/limn-mobile-data)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110196
Change subject: Fix flake8 errors
..
Fix flake8 errors
One correctness error found - using an undefined variable in debug mode
A few style errors found - inconsistent spacing mostly
This change fixes the above and adds a setup.cfg file that is used by
flake8 to ignore certain rules and modify others. Feel free to tweak
this as desired, but style rules are becoming more and more useful as
this code grows.
Change-Id: I5281ab1c5930240fa85f817483ef0fafc84711a3
---
M generate.py
A setup.cfg
2 files changed, 23 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-mobile-data
refs/changes/96/110196/1
diff --git a/generate.py b/generate.py
index 61209d5..5ab5dcb 100644
--- a/generate.py
+++ b/generate.py
@@ -80,7 +80,7 @@
if self.debug_folder:
-debug_filename = os.path.join(self.debug_folder,
os.path.basename(file_name))
+debug_filename = os.path.join(self.debug_folder, graph_key +
'.sql')
with open(debug_filename, 'wb') as debug_file:
debug_file.write(sql)
@@ -91,7 +91,7 @@
rows = cursor.fetchall()
headers = [field[0] for field in cursor.description]
except Exception, e:
-print Issue executing SQL for %s (%s)%( graph_key, e )
+print Issue executing SQL for %s (%s) % (graph_key, e)
headers = []
rows = []
finally:
@@ -105,8 +105,8 @@
res = module.execute(self)
return res
except Exception, e:
-print Issue executing Python script for %s (%s)%( graph_key, e )
-return ([],[])
+print Issue executing Python script for %s (%s) % (graph_key, e)
+return ([], [])
def save_history(self, data):
dump = json.dumps(data)
@@ -168,7 +168,7 @@
to_date = None
ok = self.generate_graph_timeboxed(key, value, from_date,
to_date)
else:
-ok = self.generate_graph_full( key, value )
+ok = self.generate_graph_full(key, value)
if ok:
try:
@@ -181,7 +181,7 @@
else:
print('Skipping generation of {0}: not enough time has
passed'.format(value['title']))
-def generate_graph_timeboxed( self, graph_key, value, from_date,
to_date=None ):
+def generate_graph_timeboxed(self, graph_key, value, from_date,
to_date=None):
csv_filename = self.get_csv_filename(graph_key)
cache = {}
# load existing values from csv
@@ -229,7 +229,7 @@
to_timestamp = from_date.strftime('%Y%m%d%H%M%S')
# Generate a graph if not in cache or the current month
if graph_date_key not in cache or from_date = this_month:
-print 'Generating data for timestamp %s to
%s'%(from_timestamp, to_timestamp)
+print 'Generating data for timestamp %s to %s' %
(from_timestamp, to_timestamp)
db_name = value.get('db', self.config['defaults']['db'])
query = self.get_sql_string(sql_path)
# apply timeboxing
@@ -246,7 +246,6 @@
else:
print 'Skip generation of %s' % graph_date_key
-
rows = []
for month, row in iter(sorted(cache.iteritems())):
row.insert(0, month)
@@ -258,7 +257,7 @@
else:
print 'Bad SQL given'
-def generate_graph_full( self, key, value ):
+def generate_graph_full(self, key, value):
Runs python or sql to generate csv. Returns:
True - something was generated
@@ -270,26 +269,26 @@
sql_path = self.get_sql_path(key)
if os.path.exists(sql_path):
query = self.get_sql_string(sql_path)
-headers, rows = self.execute_sql(query, db_name, key )
+headers, rows = self.execute_sql(query, db_name, key)
elif os.path.exists(os.path.join(self.folder, key + '.py')):
file_path = os.path.join(self.folder, key + '.py')
headers, rows = self.execute_python(key, file_path, key)
else:
raise ValueError('Can not find SQL or Python for {0}'.format(key))
-self.save_graph_as_csv( key, headers, rows )
+self.save_graph_as_csv(key, headers, rows)
return not(headers is None or rows is None or len(headers) == 0 or
len(rows) == 0)
-def get_sql_path( self, key ):
+def get_sql_path(self, key):
return os.path.join(self.folder, key + '.sql')
-def get_csv_filename( self, key ):
+def get_csv_filename(self, key):
output_path = self.config['output']['path']
if not
[MediaWiki-commits] [Gerrit] justify preference is removed - change (qa/browsertests)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/110195 Change subject: justify preference is removed .. justify preference is removed see https://gerrit.wikimedia.org/r/#/c/99322/ Change-Id: I7c7db777c4bd3273ff0db238b7c25577fbd8acd9 --- M features/step_definitions/preferences_appearance_steps.rb M features/support/pages/preferences_appearance_page.rb 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests refs/changes/95/110195/1 diff --git a/features/step_definitions/preferences_appearance_steps.rb b/features/step_definitions/preferences_appearance_steps.rb index ad09b0b..1ef8bba 100644 --- a/features/step_definitions/preferences_appearance_steps.rb +++ b/features/step_definitions/preferences_appearance_steps.rb @@ -44,7 +44,6 @@ Then(/^I have advanced options checkboxes$/) do on(PreferencesAppearancePage) do |page| page.hidden_categories_check_element.should exist -page.justify_paragraphs_check_element.should exist page.auto_number_check_element.should exist end end diff --git a/features/support/pages/preferences_appearance_page.rb b/features/support/pages/preferences_appearance_page.rb index 522584b..41f71cc 100644 --- a/features/support/pages/preferences_appearance_page.rb +++ b/features/support/pages/preferences_appearance_page.rb @@ -24,7 +24,6 @@ checkbox(:exclude_from_experiments_check, id: mw-input-wpvector-noexperiments) checkbox(:hidden_categories_check, id: mw-input-wpshowhiddencats) a(:javascript_link, text: Custom JavaScript) - checkbox(:justify_paragraphs_check, id: mw-input-wpjustify) radio_button(:leave_as_tex_radio, id: mw-input-wpmath-3) radio_button(:mathjax_radio, id: mw-input-wpmath-6) radio_button(:modern, id: mw-input-wpskin-modern) -- To view, visit https://gerrit.wikimedia.org/r/110195 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c7db777c4bd3273ff0db238b7c25577fbd8acd9 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve OutputPage::showErrorPage method documentation - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Improve OutputPage::showErrorPage method documentation .. Improve OutputPage::showErrorPage method documentation - Added the most usual case of call - Fixed the incoherence between -Object and -Obj Change-Id: I81207f4ef46a43529974e3ada194f2948a1e9017 --- M includes/OutputPage.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 9866e2c..04792cf 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -2130,9 +2130,10 @@ /** * Output a standard error page * +* showErrorPage( 'titlemsg', 'pagetextmsg' ); * showErrorPage( 'titlemsg', 'pagetextmsg', array( 'param1', 'param2' ) ); * showErrorPage( 'titlemsg', $messageObject ); -* showErrorPage( $titleMessageObj, $messageObject ); +* showErrorPage( $titleMessageObject, $messageObject ); * * @param $title Mixed: message key (string) for page title, or a Message object * @param $msg Mixed: message key (string) for page text, or a Message object -- To view, visit https://gerrit.wikimedia.org/r/110189 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I81207f4ef46a43529974e3ada194f2948a1e9017 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Dereckson dereck...@espace-win.org Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com Gerrit-Reviewer: IAlex coderev...@emsenhuber.ch Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Test to check our addition to Special:Version - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110197
Change subject: Test to check our addition to Special:Version
..
Test to check our addition to Special:Version
This test is really more to make sure we don't cause the page to crash
but while we're there we should make sure that we add our row.
Bug: 60098
Change-Id: If042968c970f94934c20155a0140968f477c77c1
---
A tests/browser/features/elasticsearch_on_special_version.feature
M tests/browser/features/step_definitions/page_steps.rb
A tests/browser/features/support/pages/special_version.rb
3 files changed, 21 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/97/110197/1
diff --git a/tests/browser/features/elasticsearch_on_special_version.feature
b/tests/browser/features/elasticsearch_on_special_version.feature
new file mode 100644
index 000..8132cce
--- /dev/null
+++ b/tests/browser/features/elasticsearch_on_special_version.feature
@@ -0,0 +1,4 @@
+Feature: Elasticsearch version in Special:Version
+ Scenario: Elasticsearch version is in Special:Version
+When I go to Special:Version
+Then there is a software version row for Elasticsearch
diff --git a/tests/browser/features/step_definitions/page_steps.rb
b/tests/browser/features/step_definitions/page_steps.rb
index 2a6cb27..2a31d61 100644
--- a/tests/browser/features/step_definitions/page_steps.rb
+++ b/tests/browser/features/step_definitions/page_steps.rb
@@ -34,7 +34,13 @@
page.change_visibility_of_selected
end
end
+When(/^I go to (.*)$/) do |title|
+ visit(ArticlePage, using_params: {page_name: title})
+end
+Then(/^there is a software version row for (.+)$/) do |name|
+ on(SpecialVersion).software_table_row(name).exists?
+end
def edit_page(title, text, add)
if text.start_with?(@)
diff --git a/tests/browser/features/support/pages/special_version.rb
b/tests/browser/features/support/pages/special_version.rb
new file mode 100644
index 000..8a4ff2c
--- /dev/null
+++ b/tests/browser/features/support/pages/special_version.rb
@@ -0,0 +1,11 @@
+class SpecialVersion
+ include PageObject
+
+ page_url URL.url(/wiki/Special:Version)
+
+ table(:software_table, id: sv-software)
+
+ def software_table_row(name)
+software_table_element.cell_element(:text = name)
+ end
+end
--
To view, visit https://gerrit.wikimedia.org/r/110197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If042968c970f94934c20155a0140968f477c77c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles never...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix GetClaimsTest, datatype is expected in results - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110102
Change subject: Fix GetClaimsTest, datatype is expected in results
..
Fix GetClaimsTest, datatype is expected in results
Change-Id: I7a15628b121cd8bd12100da5f63a6ab45f30c02d
---
M repo/tests/phpunit/includes/api/GetClaimsTest.php
1 file changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/02/110102/3
diff --git a/repo/tests/phpunit/includes/api/GetClaimsTest.php
b/repo/tests/phpunit/includes/api/GetClaimsTest.php
index 8209ae4..03a875b 100644
--- a/repo/tests/phpunit/includes/api/GetClaimsTest.php
+++ b/repo/tests/phpunit/includes/api/GetClaimsTest.php
@@ -148,7 +148,20 @@
if( !$groupedByProperty ) {
$options-setOption(
SerializationOptions::OPT_GROUP_BY_PROPERTIES, array() );
}
- $serializerFactory = new SerializerFactory();
+
+ $dataTypeLookup = $this-getMockBuilder(
'Wikibase\Lib\PropertyInfoDataTypeLookup' )
+ -disableOriginalConstructor()
+ -getMock();
+
+ $dataTypeLookup-expects( $this-any() )
+ -method( 'getDataTypeIdForProperty' )
+ -will( $this-returnValue( 'string' ) );
+
+ $serializerFactory = new SerializerFactory(
+ null,
+ $dataTypeLookup
+ );
+
$serializer = $serializerFactory-newSerializerForObject(
$claims );
$serializer-setOptions( $options );
$expected = $serializer-getSerialized( $claims );
--
To view, visit https://gerrit.wikimedia.org/r/110102
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a15628b121cd8bd12100da5f63a6ab45f30c02d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix dependencies for wikibase.formatters.api - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/110198 Change subject: Fix dependencies for wikibase.formatters.api .. Fix dependencies for wikibase.formatters.api Change-Id: I88595bf6c24d0a44d7f93e440e9b234afeafc356 --- M lib/resources/Resources.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/98/110198/1 diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php index 1b20432..dc89aee 100644 --- a/lib/resources/Resources.php +++ b/lib/resources/Resources.php @@ -125,6 +125,8 @@ 'formatters/wikibase.formatters.api.js', ), 'dependencies' = array( + 'mediawiki.api', + 'dataTypes', 'wikibase', ), ), -- To view, visit https://gerrit.wikimedia.org/r/110198 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I88595bf6c24d0a44d7f93e440e9b234afeafc356 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Hoo man h...@online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
