[MediaWiki-commits] [Gerrit] Enable processing fromer featured articles with featured.py - change (pywikibot/core)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112195
Change subject: Enable processing fromer featured articles with featured.py
..
Enable processing fromer featured articles with featured.py
Core version is wikidata based.
Now we retrieve former featured articles categories from wikidata
and process it like the others.
Change-Id: Ia79913644322a9037a090912b4a8b4369705bd00
---
M scripts/featured.py
1 file changed, 14 insertions(+), 52 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/95/112195/1
diff --git a/scripts/featured.py b/scripts/featured.py
index 56c121e..cf186a6 100644
--- a/scripts/featured.py
+++ b/scripts/featured.py
@@ -94,10 +94,12 @@
except pywikibot.PageNotFound:
return
cat = pywikibot.Category(site, title)
+if type(hide) == dict:
+hide = hide.get(site.code)
for article in cat.articles(endsort=hide):
yield article
if hide:
-for article in cat.articles(startFrom=unichr(ord(hide) + 1)):
+for article in cat.articles(startsort=unichr(ord(hide) + 1)):
yield article
@@ -195,17 +197,7 @@
# Third parameter is the sort key indicating articles to hide from the given
# list
former_name = {
-'ca': (CAT, u"Arxiu de propostes de la retirada de la distinció"),
-'en': (CAT, u"Wikipedia former featured articles", "#"),
-'es': (CAT, u"Wikipedia:Artículos anteriormente destacados"),
-'fa': (CAT, u"مقالههای برگزیده پیشین"),
-'hu': (CAT, u"Korábbi kiemelt cikkek"),
-'pl': (CAT, u"Byłe artykuły na medal"),
-'pt': (CAT, u"!Ex-Artigos_destacados"),
-'ru': (CAT, u"Википедия:Устаревшие избранные статьи"),
-'th': (CAT, u"บทความคัดสรรในอดีต"),
-'tr': (CAT, u"Vikipedi eski seçkin maddeler"),
-'zh': (CAT, u"已撤销的特色条目"),
+'wikidata': (DATA, 'Q7045853', {'en': '#'})
}
@@ -246,6 +238,8 @@
item_no = good_name['wikidata'][1]
elif task == 'featured':
item_no = featured_name['wikidata'][1]
+elif task == 'former':
+item_no = former_name['wikidata'][1]
dp = pywikibot.ItemPage(pywikibot.Site().data_repository(), item_no)
dp.get()
### Quick and dirty hack - any ideas?
@@ -310,48 +304,15 @@
def run(self):
done = False
-if self.getOption('good'):
-self.run_good()
-done = True
-if self.getOption('lists'):
-self.run_list()
-done = True
-if self.getOption('former'):
-self.run_former()
-done = True
-if self.getOption('featured') or not done:
-self.run_featured()
+for task in ('featured', 'good', 'lists', 'former'):
+if self.getOption(task):
+self.run_task(task)
+done = True
+if not done:
+self.run_task('featured')
pywikibot.output(u'%d pages written.' % self.editcounter)
-def run_good(self):
-task = 'good'
-if not self.hastemplate(task):
-pywikibot.output(u'\nNOTE: %s arcticles are not implemented at %s.'
- % (task, self.site))
-return
-
-self.readcache(task)
-for code in self.itercode(task):
-try:
-self.treat(code, task)
-except KeyboardInterrupt:
-pywikibot.output('\nQuitting featured treat...')
-break
-except pywikibot.NoSuchSite:
-pywikibot.output('"%s" is not a valid site. Skipping...' %
code)
-continue
-self.writecache()
-
-# not implemented yet
-def run_list(self):
-return
-
-# not implemented yet
-def run_former(self):
-return
-
-def run_featured(self):
-task = 'featured'
+def run_task(self, task):
if not self.hastemplate(task):
pywikibot.output(u'\nNOTE: %s arcticles are not implemented at %s.'
% (task, self.site))
@@ -382,6 +343,7 @@
code = 'wikidata'
elif task == 'former':
info = former_name
+code = 'wikidata'
elif task == 'list':
info = lists_name
else:
--
To view, visit https://gerrit.wikimedia.org/r/112195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia79913644322a9037a090912b4a8b4369705bd00
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 61084) replace deprecate_arg "startFrom" by "startsort" - change (pywikibot/core)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112194
Change subject: (bug 61084) replace deprecate_arg "startFrom" by "startsort"
..
(bug 61084) replace deprecate_arg "startFrom" by "startsort"
"startFrom" parameter is depecated for Category.articles() but it
can be replaced by "startsort"
Change-Id: Ie03ed8cf62f80b735607be269a0a72c23e4d7285
---
M pywikibot/page.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/94/112194/1
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 91d2038..b75bbc3 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -1806,7 +1806,7 @@
if not total:
return
-@deprecate_arg("startFrom", None)
+@deprecate_arg("startFrom", "startsort")
def articles(self, recurse=False, step=None, total=None,
content=False, namespaces=None, sortby="",
starttime=None, endtime=None, startsort=None,
--
To view, visit https://gerrit.wikimedia.org/r/112194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie03ed8cf62f80b735607be269a0a72c23e4d7285
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix the i18n source string for the chunked preference - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix the i18n source string for the chunked preference
..
Fix the i18n source string for the chunked preference
Seemed like a good idea to have the chunk size defined in one
place while I was at it.
Bug: 59906
Change-Id: I9a430e9c06f9efd8a22f5632951025a4cc12a0a8
---
M UploadWizard.config.php
M UploadWizard.i18n.php
M UploadWizardHooks.php
M resources/mw.FormDataTransport.js
4 files changed, 15 insertions(+), 4 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UploadWizard.config.php b/UploadWizard.config.php
index 383f7f4..7a87a9c 100644
--- a/UploadWizard.config.php
+++ b/UploadWizard.config.php
@@ -602,6 +602,9 @@
// set to "opt-in" to control via experimental user preference under
'Uploads' tab
'enableChunked' => false,
+ // If chunked uploads are enabled, what size, in bytes, should each
chunk be?
+ 'chunkSize' => 5 * 1024 * 1024,
+
// Should feature to copy metadata across a batch of uploads be enabled?
'copyMetadataFeature' => true,
diff --git a/UploadWizard.i18n.php b/UploadWizard.i18n.php
index 6c1ff54..7561bc4 100644
--- a/UploadWizard.i18n.php
+++ b/UploadWizard.i18n.php
@@ -419,7 +419,7 @@
'mwe-upwiz-prefs-def-license-def' => 'Use whatever the default is',
'mwe-upwiz-prefs-license-own' => 'Own work - $1',
'mwe-upwiz-prefs-license-thirdparty' => "Someone else's work - $1",
- 'mwe-upwiz-prefs-chunked' => 'Chunked uploads for files over 1MB in
Upload Wizard',
+ 'mwe-upwiz-prefs-chunked' => 'Chunked uploads for files over $1 in
Upload Wizard',
'mwe-upwiz-prefs-skiptutorial' => 'Skip introductory licensing
tutorial',
'mwe-upwiz-prefs-maxsimultaneous-upload' => 'Maximum number of
concurrent uploads',
@@ -1200,6 +1200,8 @@
* $1 - license message. e.g. {{msg-mw|Mwe-upwiz-license-cc-by-sa-3.0}}
See also:
* {{msg-mw|Mwe-upwiz-prefs-license-own}}',
+ 'mwe-upwiz-prefs-chunked' => 'Preference that enables chunked
uploading. Parameters:
+* $1 - size of each chunk, as configured on this wiki',
'mwe-upwiz-prefs-skiptutorial' => 'Preference which enables the user to
permanently skip the licensing tutorial at the beginning. This is the same
licensing tutorial as is mentioned in
{{msg-mw|Mwe-upwiz-campaign-conf-skipTutorial}}',
'mwe-upwiz-prefs-maxsimultaneous-upload' => 'Preference which sets the
maximum number of concurrent upload requests',
'campaigns' => '{{doc-special|Campaigns}}
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index a75398c..dadb468 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -558,6 +558,7 @@
* @return true
*/
public static function onGetPreferences( User $user, array
&$preferences ) {
+ global $wgLang;
$config = UploadWizardConfig::getConfig();
@@ -609,7 +610,10 @@
if ( UploadWizardConfig::getSetting( 'enableChunked' )
=== 'opt-in' ) {
$preferences['upwiz-chunked'] = array(
'type' => 'check',
- 'label-message' =>
'mwe-upwiz-prefs-chunked',
+ 'label-message' => array(
+ 'mwe-upwiz-prefs-chunked',
+ $wgLang->formatSize(
UploadWizardConfig::getSetting( 'chunkSize' ) )
+ ),
'section' =>
'uploads/upwiz-experimental'
);
}
diff --git a/resources/mw.FormDataTransport.js
b/resources/mw.FormDataTransport.js
index 89f6e4f..70d5298 100644
--- a/resources/mw.FormDataTransport.js
+++ b/resources/mw.FormDataTransport.js
@@ -16,8 +16,10 @@
this.uploadObject = uploadObject;
this.postUrl = postUrl;
-//set chunk size to 5MB or max php size
-this.chunkSize = Math.min(5 * 1024 * 1024,
mw.UploadWizard.config.maxPhpUploadSize);
+// Set chunk size to configured chunk size or max php size,
+// whichever is smaller.
+this.chunkSize = Math.min( mw.UploadWizard.config.chunkSize,
+mw.UploadWizard.config.maxPhpUploadSize );
this.maxRetries = 2;
this.retries = 0;
this.firstPoll = false;
--
To view, visit https://gerrit.wikimedia.org/r/106711
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a430e9c06f9efd8a22f5632951025a4cc12a0a8
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Gilles
Gerrit-Reviewer: Aarcos
Gerrit-Reviewer: Amire80
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: Divec
Gerrit-Reviewer: Gergő Tisza
[MediaWiki-commits] [Gerrit] Various clean up - change (mediawiki...UniversalLanguageSelector)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112193
Change subject: Various clean up
..
Various clean up
Files:
* Consistently have one (1) new line at EOF
(.gitignore, *.css, *.sh)
JSHint:
* Separate the common (general Wikimedia code conventions) from
the local more stricter rules (nice work!).
Maintenance:
* Use simplified $IP definition where getenv is only called once.
Based on http://git.io/ve-mw-36fc3b59-makeStaticLoader
JavaScript:
* Use the same closure in all files:
- No need for "undefined".
- One linebreak between license header and start of closure
(sometimes there were 1 or 2 empty lines).
- ext.uls.ime.js: No need for "document" (redundant in general,
but especially as it wasn't used anywhere in this file).
- Use "$, mw" for all ext.* modules (one of them used "mw, $").
Change-Id: Iba5dab14bbc3fbfc9f8fe96dd2d95529587a69aa
---
M .gitignore
M .jshintrc
M data/LanguageNameIndexer.php
M resources/css/ext.uls.css
M resources/js/ext.uls.displaysettings.js
M resources/js/ext.uls.eventlogger.js
M resources/js/ext.uls.geoclient.js
M resources/js/ext.uls.i18n.js
M resources/js/ext.uls.ime.js
M resources/js/ext.uls.init.js
M resources/js/ext.uls.inputsettings.js
M resources/js/ext.uls.interface.js
M resources/js/ext.uls.languagesettings.js
M resources/js/ext.uls.preferences.js
M resources/js/ext.uls.webfonts.js
M scripts/update-jquery-i18n.sh
M scripts/update-jquery-ime.sh
M scripts/update-jquery-uls.sh
M scripts/update-jquery-webfonts.sh
19 files changed, 31 insertions(+), 32 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/93/112193/1
diff --git a/.gitignore b/.gitignore
index 00cf291..6465a1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,3 @@
.*.swp
.idea
.bundle/
-
diff --git a/.jshintrc b/.jshintrc
index d7649a3..0c987cd 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,4 +1,7 @@
{
+ /* Common */
+
+ // Enforcing
"camelcase": true,
"curly": true,
"eqeqeq": true,
@@ -12,15 +15,23 @@
"trailing": true,
"undef": true,
"unused": true,
- "onevar": true,
+
+ /* Local */
+
+ // Enforcing
"bitwise": true,
"forin": false,
"regexp": false,
"strict": true,
+ // Relaxing
"laxbreak": true,
"smarttabs": true,
"multistr": true,
+ // Environment
"browser": true,
+ // Legacy
+ "onevar": true,
+
"predef": [
"mediaWiki",
"jQuery",
diff --git a/data/LanguageNameIndexer.php b/data/LanguageNameIndexer.php
index 6c4f19a..9fb5f57 100644
--- a/data/LanguageNameIndexer.php
+++ b/data/LanguageNameIndexer.php
@@ -18,19 +18,16 @@
* @licence MIT License
*/
-// Standard boilerplate to define $IP
-if ( getenv( 'MW_INSTALL_PATH' ) !== false ) {
- $IP = getenv( 'MW_INSTALL_PATH' );
-} else {
- $dir = __DIR__;
- $IP = "$dir/../../..";
+$IP = getenv( 'MW_INSTALL_PATH' );
+if ( $IP === false ) {
+ $IP = __DIR__ . '/../../..';
}
require_once "$IP/maintenance/Maintenance.php";
class LanguageNameIndexer extends Maintenance {
public function __construct() {
parent::__construct();
- $this->addDescription( "Script to create language names index."
);
+ $this->addDescription( 'Script to create language names index.'
);
}
public function execute() {
diff --git a/resources/css/ext.uls.css b/resources/css/ext.uls.css
index f831c0b..bb7c1a0 100644
--- a/resources/css/ext.uls.css
+++ b/resources/css/ext.uls.css
@@ -43,4 +43,4 @@
div.display-settings-block:hover .settings-text {
color: #252525;
-}
\ No newline at end of file
+}
diff --git a/resources/js/ext.uls.displaysettings.js
b/resources/js/ext.uls.displaysettings.js
index db70e41..704c32b 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -16,8 +16,7 @@
* @licence GNU General Public Licence 2.0 or later
* @licence MIT License
*/
-
-( function ( $, mw, undefined ) {
+( function ( $, mw ) {
'use strict';
var template = ''
diff --git a/resources/js/ext.uls.eventlogger.js
b/resources/js/ext.uls.eventlogger.js
index d49dca7..8f9a863 100644
--- a/resources/js/ext.uls.eventlogger.js
+++ b/resources/js/ext.uls.eventlogger.js
@@ -16,7 +16,6 @@
* @licence GNU General Public Licence 2.0 or later
* @licence MIT License
*/
-
( function ( $, mw ) {
'use strict';
diff --git a/resources/js/ext.uls.geoclient.js
b/resources/js/ext.uls.geoclient.js
index 3a66b0c..21d0d29 100644
--- a/resources/js/ext.uls.geoclient.js
+++ b/resources/js/ext.uls.geoclient.js
@@ -16,8 +16,7 @@
* @licence GNU General Public Licence 2.0 or later
* @licence MIT License
*/
-
-( function ( mw, $ ) {
+( function (
[MediaWiki-commits] [Gerrit] Set up eth4.1118 on labnet1001 - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Set up eth4.1118 on labnet1001
..
Set up eth4.1118 on labnet1001
Change-Id: Ie141a20471189b68d83cdfe7e51e81932f5951f7
---
M manifests/role/nova.pp
1 file changed, 12 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 1305be2..4949946 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -339,6 +339,18 @@
}
}
+ if ($::site == "eqiad") {
+ interface::ip {
"openstack::network_service_public_dynamic_snat": interface => "lo", address =>
$site ? { "pmtpa" => "208.80.153.192", "eqiad" => "208.80.155.255" } }
+
+ interface::tagged { "eth4.1118":
+ base_interface => "eth4",
+ vlan_id => "1118",
+ method => "manual",
+ up => 'ip link set $IFACE up',
+ down => 'ip link set $IFACE down',
+ }
+ }
+
class { "openstack::network-service": openstack_version =>
$openstack_version, novaconfig => $novaconfig }
}
--
To view, visit https://gerrit.wikimedia.org/r/112192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie141a20471189b68d83cdfe7e51e81932f5951f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set up eth4.1118 on labnet1001 - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112192
Change subject: Set up eth4.1118 on labnet1001
..
Set up eth4.1118 on labnet1001
Change-Id: Ie141a20471189b68d83cdfe7e51e81932f5951f7
---
M manifests/role/nova.pp
1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/92/112192/1
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 1305be2..4949946 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -339,6 +339,18 @@
}
}
+ if ($::site == "eqiad") {
+ interface::ip {
"openstack::network_service_public_dynamic_snat": interface => "lo", address =>
$site ? { "pmtpa" => "208.80.153.192", "eqiad" => "208.80.155.255" } }
+
+ interface::tagged { "eth4.1118":
+ base_interface => "eth4",
+ vlan_id => "1118",
+ method => "manual",
+ up => 'ip link set $IFACE up',
+ down => 'ip link set $IFACE down',
+ }
+ }
+
class { "openstack::network-service": openstack_version =>
$openstack_version, novaconfig => $novaconfig }
}
--
To view, visit https://gerrit.wikimedia.org/r/112192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie141a20471189b68d83cdfe7e51e81932f5951f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use 10g interface for labnet1001 - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Use 10g interface for labnet1001
..
Use 10g interface for labnet1001
Change-Id: I4662d24173f687f6c891bd79dfcb4770643fb7d5
---
M manifests/role/nova.pp
1 file changed, 9 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 89d1ccc..1305be2 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -208,7 +208,15 @@
keystone_auth_protocol => $keystoneconfig["auth_protocol"],
keystone_auth_port => $keystoneconfig["auth_port"],
}
- $novaconfig = merge( $eqiadnovaconfig, $commonnovaconfig )
+ if ( $::hostname == "labnet1001" ) {
+ $networkconfig = {
+ network_flat_interface => "eth4.1118",
+ network_flat_interface_name => "eth4",
+ }
+ $novaconfig = merge( $eqiadnovaconfig, $commonnovaconfig,
$networkconfig )
+ } else {
+ $novaconfig = merge( $eqiadnovaconfig, $commonnovaconfig )
+ }
}
class role::nova::common {
--
To view, visit https://gerrit.wikimedia.org/r/112191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4662d24173f687f6c891bd79dfcb4770643fb7d5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
Gerrit-Reviewer: Andrew Bogott
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 10g interface for labnet1001 - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112191
Change subject: Use 10g interface for labnet1001
..
Use 10g interface for labnet1001
Change-Id: I4662d24173f687f6c891bd79dfcb4770643fb7d5
---
M manifests/role/nova.pp
1 file changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/91/112191/1
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 89d1ccc..1305be2 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -208,7 +208,15 @@
keystone_auth_protocol => $keystoneconfig["auth_protocol"],
keystone_auth_port => $keystoneconfig["auth_port"],
}
- $novaconfig = merge( $eqiadnovaconfig, $commonnovaconfig )
+ if ( $::hostname == "labnet1001" ) {
+ $networkconfig = {
+ network_flat_interface => "eth4.1118",
+ network_flat_interface_name => "eth4",
+ }
+ $novaconfig = merge( $eqiadnovaconfig, $commonnovaconfig,
$networkconfig )
+ } else {
+ $novaconfig = merge( $eqiadnovaconfig, $commonnovaconfig )
+ }
}
class role::nova::common {
--
To view, visit https://gerrit.wikimedia.org/r/112191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4662d24173f687f6c891bd79dfcb4770643fb7d5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add role::nova::network to labnet1001 - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Add role::nova::network to labnet1001
..
Add role::nova::network to labnet1001
Change-Id: Iab39eb38402ca2c8d20e147501bc710866fb578e
---
M manifests/site.pp
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index f371fbb..b747d2c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2613,6 +2613,8 @@
if $use_neutron == true {
include role::neutron::nethost
+} else {
+include role::nova::network
}
}
--
To view, visit https://gerrit.wikimedia.org/r/112190
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab39eb38402ca2c8d20e147501bc710866fb578e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
Gerrit-Reviewer: Andrew Bogott
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 role::nova::network to labnet1001 - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112190
Change subject: Add role::nova::network to labnet1001
..
Add role::nova::network to labnet1001
Change-Id: Iab39eb38402ca2c8d20e147501bc710866fb578e
---
M manifests/site.pp
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/90/112190/1
diff --git a/manifests/site.pp b/manifests/site.pp
index f371fbb..b747d2c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2613,6 +2613,8 @@
if $use_neutron == true {
include role::neutron::nethost
+} else {
+include role::nova::network
}
}
--
To view, visit https://gerrit.wikimedia.org/r/112190
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab39eb38402ca2c8d20e147501bc710866fb578e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix timestamp validation - change (mediawiki...FeaturedFeeds)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix timestamp validation
..
Fix timestamp validation
Bug: 61058
Change-Id: Icc19da3626a090bed04eb9773c748e90223ab3f4
---
M SpecialFeedItem.php
1 file changed, 14 insertions(+), 6 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialFeedItem.php b/SpecialFeedItem.php
index de2d3a1..fff6a0b 100644
--- a/SpecialFeedItem.php
+++ b/SpecialFeedItem.php
@@ -21,12 +21,8 @@
return;
}
$feed = $feeds[$feedName];
- $ts = new MWTimestamp( $date );
- $timestamp = $ts->getTimestamp();
- if ( !$timestamp
- || strlen( $timestamp ) !== 14 ) // @fixme: hack until
Language::sprintfDate() learns to handle
-// timestamps >= Y10k
- {
+ $timestamp = $this->parseTimestamp( $date );
+ if ( !$timestamp ) {
$out->showErrorPage( 'error', 'ffeed-invalid-timestamp'
);
return;
}
@@ -57,6 +53,18 @@
}
}
+ private function parseTimestamp( $date ) {
+ if ( strlen( $date ) !== 14 ) {
+ return false;
+ }
+ try {
+ $ts = new MWTimestamp( $date );
+ } catch( MWException $ex ) {
+ return false;
+ };
+ return $ts->getTimestamp();
+ }
+
private function displayItem( FeaturedFeedItem $item ) {
$out = $this->getOutput();
$out->setPageTitle( $item->getRawTitle() );
--
To view, visit https://gerrit.wikimedia.org/r/112139
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc19da3626a090bed04eb9773c748e90223ab3f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FeaturedFeeds
Gerrit-Branch: master
Gerrit-Owner: MaxSem
Gerrit-Reviewer: Awjrichards
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Ori.livneh
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 the use_neutron switch. - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Add the use_neutron switch.
..
Add the use_neutron switch.
- Wrap neutron-specific code in nova roles and classes with use_neutron
- Turn neutron OFF in eqiad.
- Replace (optional) nova-network settings in havana nova.conf
Change-Id: I5ca96c867b6cc04cf9a0c03192d5b414647eb427
---
M manifests/role/nova.pp
M manifests/site.pp
M templates/openstack/havana/nova/nova.conf.erb
3 files changed, 37 insertions(+), 13 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index d13a2ef..89d1ccc 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -19,6 +19,7 @@
metadata_pass =>
$passwords::openstack::nova::nova_metadata_pass,
neutron_ldap_user_pass =>
$passwords::openstack::neutron::neutron_ldap_user_pass,
my_ip => $ipaddress_eth0,
+ use_neutron => $use_neutron,
ldap_base_dn => "dc=wikimedia,dc=org",
ldap_user_dn => "uid=novaadmin,ou=people,dc=wikimedia,dc=org",
ldap_user_pass =>
$passwords::openstack::nova::nova_ldap_user_pass,
@@ -374,8 +375,8 @@
include role::nova::wikiupdates,
role::nova::common
-# Havana uses neutron -- neutron roles configure their own interfaces.
- if ( $openstack_version != "havana" ) {
+# Neutron roles configure their own interfaces.
+ if ( $use_neutron == false ) {
interface::tagged { $novaconfig["network_flat_interface"]:
base_interface =>
$novaconfig["network_flat_interface_name"],
vlan_id => $novaconfig["network_flat_interface_vlan"],
diff --git a/manifests/site.pp b/manifests/site.pp
index 64ffbba..f371fbb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2532,6 +2532,7 @@
$is_puppet_master = "true"
$is_labs_puppet_master = "true"
$openstack_version = "havana"
+$use_neutron = false
include admins::labs
@@ -2541,8 +2542,12 @@
ldap::role::client::labs,
role::nova::controller,
role::salt::masters::labs,
-role::deployment::salt_masters::labs,
-role::neutron::controller
+role::deployment::salt_masters::labs
+
+if $use_neutron == true {
+include role::neutron::controller
+}
+
}
node "virt0.wikimedia.org" {
@@ -2552,6 +2557,7 @@
$is_puppet_master = "true"
$is_labs_puppet_master = "true"
$openstack_version = "folsom"
+$use_neutron = false
include admins::labs
@@ -2569,6 +2575,7 @@
node 'virt2.pmtpa.wmnet' {
$cluster = "virt"
$openstack_version = "folsom"
+$use_neutron = false
include admins::labs
@@ -2585,6 +2592,7 @@
}
$openstack_version = "folsom"
+$use_neutron = false
include admins::labs
@@ -2595,23 +2603,31 @@
node "labnet1001.eqiad.wmnet" {
$cluster = "virt"
$openstack_version = "havana"
+$use_neutron = false
+
$ganglia_aggregator = true
include standard,
-role::neutron::nethost,
-role::nova::api
+role::nova::api,
+admins::labs
-include admins::labs
+if $use_neutron == true {
+include role::neutron::nethost
+}
}
node /virt1001.eqiad.wmnet/ {
$cluster = "virt"
$openstack_version = "havana"
+$use_neutron = false
include standard,
-role::nova::compute,
-role::neutron::computenode
+role::nova::compute
+
+if $use_neutron == true {
+include role::neutron::computenode
+}
}
node /virt100[2-9].eqiad.wmnet/ {
diff --git a/templates/openstack/havana/nova/nova.conf.erb
b/templates/openstack/havana/nova/nova.conf.erb
index b86acc5..bab0a68 100644
--- a/templates/openstack/havana/nova/nova.conf.erb
+++ b/templates/openstack/havana/nova/nova.conf.erb
@@ -43,6 +43,7 @@
fixed_ip_disassociate_timeout=172800
iscsi_helper=tgtadm
+<% if novaconfig["use_neutron"] -%>
# network/neutron settings
network_api_class = nova.network.neutronv2.api.API
neutron_url = http://<%= novaconfig['controller_hostname'] %>:9696
@@ -53,9 +54,18 @@
neutron_admin_auth_url = http://<%= novaconfig['controller_hostname']
%>:35357/v2.0
linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver
firewall_driver = nova.virt.libvirt.firewall.IptablesFirewallDriver
-
neutron_metadata_proxy_shared_secret = <%= novaconfig["metadata_pass"] %>
service_neutron_metadata_proxy = true
+<% else -%>
+flat_network_dhcp_start=<%= novaconfig["dhcp_start"] %>
+network_manager=nova.network.manager.FlatDHCPManager
+flat_interface=<%= novaconfig["network_flat_interface"] %>
+flat_injected=False
+flat_network_bridge=<%= novaconfig["flat_network_bridge"] %>
+fixed_range=<%= novaconfig["fixed_range"] %>
+public_i
[MediaWiki-commits] [Gerrit] New GWToolest namespace for commons - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged.
Change subject: New GWToolest namespace for commons
..
New GWToolest namespace for commons
Change-Id: Ic6cf0d3c61d72a3cc19c23313de231f6000d4a02
---
M families/commons_family.py
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/families/commons_family.py b/families/commons_family.py
index 8f83c2c..dc597f3 100644
--- a/families/commons_family.py
+++ b/families/commons_family.py
@@ -51,6 +51,12 @@
self.namespaces[461] = {
'_default': [u'Campaign talk'],
}
+self.namespaces[490] = {
+'_default': [u'GWToolset'],
+}
+self.namespaces[491] = {
+'_default': [u'GWToolset talk'],
+}
self.namespaces[1198] = {
'_default': u'Translations',
}
--
To view, visit https://gerrit.wikimedia.org/r/112188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6cf0d3c61d72a3cc19c23313de231f6000d4a02
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt
Gerrit-Reviewer: Xqt
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace some nova-network configs for eqiad. - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Replace some nova-network configs for eqiad.
..
Replace some nova-network configs for eqiad.
There was no need to chop this in the first place, it's
activated by switchable code elsewhere anyway.
This is a partial revert of abd0ded4213e94a822d448c3c53f75e1ba5f02a2
Change-Id: If3b72498aa98a080feb9bd167234871a06ea6f62
---
M manifests/role/nova.pp
1 file changed, 11 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 1215686..d13a2ef 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -148,6 +148,17 @@
glance_host => $controller_hostname,
rabbit_host => $controller_hostname,
cc_host => $controller_hostname,
+ network_flat_interface => $realm ? {
+ "production" => "eth1.1118",
+ "labs" => "eth0.1118",
+ },
+ network_flat_interface_name => $realm ? {
+ "production" => "eth1",
+ "labs" => "eth0",
+ },
+ network_flat_interface_vlan => "1118",
+ flat_network_bridge => "br1118",
+ network_public_interface => "eth0",
network_host => $realm ? {
"production" => "10.64.20.13",
"labs" => "127.0.0.1",
--
To view, visit https://gerrit.wikimedia.org/r/112186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If3b72498aa98a080feb9bd167234871a06ea6f62
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] new mw release 1.23wmf12 - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged.
Change subject: new mw release 1.23wmf12
..
new mw release 1.23wmf12
Change-Id: I233b229b45a1c2d3d450469b7cd3a70564814d11
---
M family.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/family.py b/family.py
index f7d99a7..6c01761 100644
--- a/family.py
+++ b/family.py
@@ -4942,7 +4942,7 @@
"""Return Wikimedia projects version number as a string."""
# Don't use this, use versionnumber() instead. This only exists
# to not break family files.
-return '1.23wmf11'
+return '1.23wmf12'
def shared_image_repository(self, code):
return ('commons', 'commons')
--
To view, visit https://gerrit.wikimedia.org/r/112039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I233b229b45a1c2d3d450469b7cd3a70564814d11
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Xqt
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update language_by_size - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged. Change subject: update language_by_size .. update language_by_size Change-Id: Ie451a7826fddd3a6bc1248bc0a3b72e4a700d4c7 --- M families/wikibooks_family.py M families/wikipedia_family.py M families/wikiquote_family.py M families/wikisource_family.py M families/wiktionary_family.py 5 files changed, 32 insertions(+), 32 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/families/wikibooks_family.py b/families/wikibooks_family.py index 61959fa..7dc9fda 100644 --- a/families/wikibooks_family.py +++ b/families/wikibooks_family.py @@ -12,8 +12,8 @@ self.languages_by_size = [ 'en', 'de', 'fr', 'hu', 'ja', 'it', 'es', 'pt', 'nl', 'pl', 'he', -'vi', 'id', 'sq', 'ca', 'fi', 'ru', 'cs', 'zh', 'sv', 'da', 'hr', -'tr', 'fa', 'no', 'th', 'sr', 'gl', 'ko', 'ta', 'ar', 'mk', 'tl', +'vi', 'id', 'sq', 'ca', 'fi', 'ru', 'cs', 'zh', 'sv', 'fa', 'da', +'hr', 'tr', 'no', 'th', 'sr', 'gl', 'ko', 'ta', 'ar', 'mk', 'tl', 'ro', 'is', 'tt', 'lt', 'az', 'ka', 'eo', 'uk', 'bg', 'sk', 'el', 'sl', 'hy', 'ms', 'si', 'li', 'la', 'ml', 'ang', 'ur', 'ia', 'cv', 'et', 'mr', 'bn', 'hi', 'oc', 'kk', 'km', 'eu', 'fy', 'ie', 'ne', diff --git a/families/wikipedia_family.py b/families/wikipedia_family.py index fdf6d91..3b509eb 100644 --- a/families/wikipedia_family.py +++ b/families/wikipedia_family.py @@ -13,32 +13,32 @@ self.languages_by_size = [ 'en', 'nl', 'de', 'sv', 'fr', 'it', 'ru', 'es', 'pl', 'war', 'ja', 'ceb', 'vi', 'pt', 'zh', 'uk', 'ca', 'no', 'fa', 'fi', 'id', 'cs', -'ko', 'ar', 'hu', 'sr', 'ms', 'ro', 'tr', 'min', 'kk', 'eo', 'sk', +'ko', 'ar', 'hu', 'ms', 'sr', 'ro', 'tr', 'min', 'kk', 'eo', 'sk', 'da', 'eu', 'lt', 'bg', 'he', 'hr', 'sl', 'uz', 'et', 'vo', 'nn', -'hi', 'gl', 'simple', 'hy', 'la', 'sh', 'az', 'el', 'oc', 'th', +'hi', 'gl', 'hy', 'simple', 'la', 'sh', 'az', 'el', 'oc', 'th', 'ka', 'mk', 'new', 'be', 'pms', 'tl', 'ta', 'tt', 'te', 'ht', 'cy', 'lv', 'be-x-old', 'sq', 'bs', 'br', 'jv', 'mg', 'lb', 'mr', 'is', -'ml', 'ba', 'my', 'yo', 'pnb', 'af', 'an', 'lmo', 'fy', 'tg', 'ga', +'ml', 'ba', 'my', 'yo', 'pnb', 'af', 'an', 'fy', 'lmo', 'tg', 'ga', 'bn', 'zh-yue', 'ky', 'ur', 'sw', 'io', 'ne', 'gu', 'bpy', 'scn', -'ce', 'nds', 'sco', 'cv', 'ku', 'ast', 'qu', 'su', 'als', 'kn', -'ia', 'bug', 'nap', 'bat-smg', 'am', 'ckb', 'wa', 'map-bms', 'gd', -'mn', 'hif', 'arz', 'mzn', 'zh-min-nan', 'yi', 'vec', 'sah', 'sa', -'nah', 'si', 'bar', 'roa-tara', 'os', 'pa', 'pam', 'hsb', 'fo', +'ce', 'nds', 'sco', 'cv', 'ku', 'ast', 'qu', 'su', 'als', 'am', +'kn', 'ia', 'bug', 'nap', 'bat-smg', 'ckb', 'wa', 'map-bms', 'mn', +'gd', 'hif', 'arz', 'mzn', 'zh-min-nan', 'yi', 'vec', 'sah', 'si', +'sa', 'nah', 'bar', 'roa-tara', 'os', 'pa', 'pam', 'hsb', 'fo', 'se', 'li', 'mi', 'ilo', 'co', 'gan', 'frr', 'bo', 'glk', 'rue', 'bcl', 'nds-nl', 'or', 'fiu-vro', 'mrj', 'ps', 'tk', 'vls', 'xmf', 'gv', 'diq', 'zea', 'kv', 'km', 'mhr', 'pag', 'csb', 'vep', 'hak', -'dv', 'nrm', 'so', 'rm', 'koi', 'udm', 'ay', 'stq', 'lad', 'sc', -'wuu', 'lij', 'zh-classical', 'ug', 'fur', 'mt', 'pi', 'nov', 'bh', -'eml', 'as', 'ksh', 'gn', 'kw', 'pcd', 'gag', 'ang', 'ace', 'szl', +'dv', 'so', 'nrm', 'rm', 'koi', 'udm', 'ay', 'stq', 'lad', 'sc', +'wuu', 'ug', 'zh-classical', 'lij', 'fur', 'mt', 'pi', 'eml', 'nov', +'bh', 'as', 'ksh', 'gn', 'pcd', 'kw', 'gag', 'ang', 'ace', 'szl', 'nv', 'ext', 'frp', 'ie', 'mwl', 'ln', 'sn', 'pfl', 'lez', 'krc', -'haw', 'xal', 'pdc', 'crh', 'rw', 'dsb', 'kab', 'to', 'myv', 'arc', +'haw', 'xal', 'crh', 'pdc', 'dsb', 'rw', 'kab', 'to', 'myv', 'arc', 'kl', 'bjn', 'pap', 'kbd', 'lo', 'tpi', 'lbe', 'wo', 'jbo', 'mdf', -'cbk-zam', 'av', 'srn', 'ty', 'bxr', 'kg', 'ab', 'na', 'tet', 'ig', +'cbk-zam', 'av', 'srn', 'bxr', 'ty', 'kg', 'ab', 'na', 'tet', 'ig', 'ltg', 'nso', 'za', 'kaa', 'zu', 'chy', 'rmy', 'cu', 'chr', 'tn', -'cdo', 'roa-rup', 'bi', 'pih', 'got', 'sm', 'bm', 'iu', 'ss', 'sd', -'pnt', 'ki', 'ha', 'tyv', 'rn', 'ee', 'om', 'ak', 'fj', 'ti', 'ts', -'tw', 'ks', 'ff', 'sg', 've', 'st', 'cr', 'dz', 'tum', 'ik', 'xh', -'ny', 'lg', 'ch', +'cdo', 'roa-rup', 'bi', 'pih', 'got', 'sm', 'bm', 'iu', 'ss', 'ha', +'sd', 'pnt', 'ki', 'tyv', 'rn', 'ee', 'om', 'ak', 'fj', 'ti', 'ts', +'tw', 'ks', 'ff', 'sg', 've', 'st', 'cr', 'dz', 'xh', 'tum', 'ik'
[MediaWiki-commits] [Gerrit] update language_by_size - change (pywikibot/compat)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/112189 Change subject: update language_by_size .. update language_by_size Change-Id: Ie451a7826fddd3a6bc1248bc0a3b72e4a700d4c7 --- M families/wikibooks_family.py M families/wikipedia_family.py M families/wikiquote_family.py M families/wikisource_family.py M families/wiktionary_family.py 5 files changed, 32 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat refs/changes/89/112189/1 diff --git a/families/wikibooks_family.py b/families/wikibooks_family.py index 61959fa..7dc9fda 100644 --- a/families/wikibooks_family.py +++ b/families/wikibooks_family.py @@ -12,8 +12,8 @@ self.languages_by_size = [ 'en', 'de', 'fr', 'hu', 'ja', 'it', 'es', 'pt', 'nl', 'pl', 'he', -'vi', 'id', 'sq', 'ca', 'fi', 'ru', 'cs', 'zh', 'sv', 'da', 'hr', -'tr', 'fa', 'no', 'th', 'sr', 'gl', 'ko', 'ta', 'ar', 'mk', 'tl', +'vi', 'id', 'sq', 'ca', 'fi', 'ru', 'cs', 'zh', 'sv', 'fa', 'da', +'hr', 'tr', 'no', 'th', 'sr', 'gl', 'ko', 'ta', 'ar', 'mk', 'tl', 'ro', 'is', 'tt', 'lt', 'az', 'ka', 'eo', 'uk', 'bg', 'sk', 'el', 'sl', 'hy', 'ms', 'si', 'li', 'la', 'ml', 'ang', 'ur', 'ia', 'cv', 'et', 'mr', 'bn', 'hi', 'oc', 'kk', 'km', 'eu', 'fy', 'ie', 'ne', diff --git a/families/wikipedia_family.py b/families/wikipedia_family.py index fdf6d91..3b509eb 100644 --- a/families/wikipedia_family.py +++ b/families/wikipedia_family.py @@ -13,32 +13,32 @@ self.languages_by_size = [ 'en', 'nl', 'de', 'sv', 'fr', 'it', 'ru', 'es', 'pl', 'war', 'ja', 'ceb', 'vi', 'pt', 'zh', 'uk', 'ca', 'no', 'fa', 'fi', 'id', 'cs', -'ko', 'ar', 'hu', 'sr', 'ms', 'ro', 'tr', 'min', 'kk', 'eo', 'sk', +'ko', 'ar', 'hu', 'ms', 'sr', 'ro', 'tr', 'min', 'kk', 'eo', 'sk', 'da', 'eu', 'lt', 'bg', 'he', 'hr', 'sl', 'uz', 'et', 'vo', 'nn', -'hi', 'gl', 'simple', 'hy', 'la', 'sh', 'az', 'el', 'oc', 'th', +'hi', 'gl', 'hy', 'simple', 'la', 'sh', 'az', 'el', 'oc', 'th', 'ka', 'mk', 'new', 'be', 'pms', 'tl', 'ta', 'tt', 'te', 'ht', 'cy', 'lv', 'be-x-old', 'sq', 'bs', 'br', 'jv', 'mg', 'lb', 'mr', 'is', -'ml', 'ba', 'my', 'yo', 'pnb', 'af', 'an', 'lmo', 'fy', 'tg', 'ga', +'ml', 'ba', 'my', 'yo', 'pnb', 'af', 'an', 'fy', 'lmo', 'tg', 'ga', 'bn', 'zh-yue', 'ky', 'ur', 'sw', 'io', 'ne', 'gu', 'bpy', 'scn', -'ce', 'nds', 'sco', 'cv', 'ku', 'ast', 'qu', 'su', 'als', 'kn', -'ia', 'bug', 'nap', 'bat-smg', 'am', 'ckb', 'wa', 'map-bms', 'gd', -'mn', 'hif', 'arz', 'mzn', 'zh-min-nan', 'yi', 'vec', 'sah', 'sa', -'nah', 'si', 'bar', 'roa-tara', 'os', 'pa', 'pam', 'hsb', 'fo', +'ce', 'nds', 'sco', 'cv', 'ku', 'ast', 'qu', 'su', 'als', 'am', +'kn', 'ia', 'bug', 'nap', 'bat-smg', 'ckb', 'wa', 'map-bms', 'mn', +'gd', 'hif', 'arz', 'mzn', 'zh-min-nan', 'yi', 'vec', 'sah', 'si', +'sa', 'nah', 'bar', 'roa-tara', 'os', 'pa', 'pam', 'hsb', 'fo', 'se', 'li', 'mi', 'ilo', 'co', 'gan', 'frr', 'bo', 'glk', 'rue', 'bcl', 'nds-nl', 'or', 'fiu-vro', 'mrj', 'ps', 'tk', 'vls', 'xmf', 'gv', 'diq', 'zea', 'kv', 'km', 'mhr', 'pag', 'csb', 'vep', 'hak', -'dv', 'nrm', 'so', 'rm', 'koi', 'udm', 'ay', 'stq', 'lad', 'sc', -'wuu', 'lij', 'zh-classical', 'ug', 'fur', 'mt', 'pi', 'nov', 'bh', -'eml', 'as', 'ksh', 'gn', 'kw', 'pcd', 'gag', 'ang', 'ace', 'szl', +'dv', 'so', 'nrm', 'rm', 'koi', 'udm', 'ay', 'stq', 'lad', 'sc', +'wuu', 'ug', 'zh-classical', 'lij', 'fur', 'mt', 'pi', 'eml', 'nov', +'bh', 'as', 'ksh', 'gn', 'pcd', 'kw', 'gag', 'ang', 'ace', 'szl', 'nv', 'ext', 'frp', 'ie', 'mwl', 'ln', 'sn', 'pfl', 'lez', 'krc', -'haw', 'xal', 'pdc', 'crh', 'rw', 'dsb', 'kab', 'to', 'myv', 'arc', +'haw', 'xal', 'crh', 'pdc', 'dsb', 'rw', 'kab', 'to', 'myv', 'arc', 'kl', 'bjn', 'pap', 'kbd', 'lo', 'tpi', 'lbe', 'wo', 'jbo', 'mdf', -'cbk-zam', 'av', 'srn', 'ty', 'bxr', 'kg', 'ab', 'na', 'tet', 'ig', +'cbk-zam', 'av', 'srn', 'bxr', 'ty', 'kg', 'ab', 'na', 'tet', 'ig', 'ltg', 'nso', 'za', 'kaa', 'zu', 'chy', 'rmy', 'cu', 'chr', 'tn', -'cdo', 'roa-rup', 'bi', 'pih', 'got', 'sm', 'bm', 'iu', 'ss', 'sd', -'pnt', 'ki', 'ha', 'tyv', 'rn', 'ee', 'om', 'ak', 'fj', 'ti', 'ts', -'tw', 'ks', 'ff', 'sg', 've', 'st', 'cr', 'dz', 'tum', 'ik', 'xh', -'ny', 'lg', 'ch', +'cdo', 'roa-rup', 'bi', 'pih', 'got', 'sm', 'bm', 'iu', 'ss', 'ha', +'sd', 'pnt', 'ki', 'tyv', 'rn', 'ee', 'om', 'ak', 'fj', 'ti', 'ts', +'tw', 'ks', 'ff', 'sg',
[MediaWiki-commits] [Gerrit] New GWToolest namespace for commons - change (pywikibot/compat)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112188
Change subject: New GWToolest namespace for commons
..
New GWToolest namespace for commons
Change-Id: Ic6cf0d3c61d72a3cc19c23313de231f6000d4a02
---
M families/commons_family.py
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat
refs/changes/88/112188/1
diff --git a/families/commons_family.py b/families/commons_family.py
index 8f83c2c..dc597f3 100644
--- a/families/commons_family.py
+++ b/families/commons_family.py
@@ -51,6 +51,12 @@
self.namespaces[461] = {
'_default': [u'Campaign talk'],
}
+self.namespaces[490] = {
+'_default': [u'GWToolset'],
+}
+self.namespaces[491] = {
+'_default': [u'GWToolset talk'],
+}
self.namespaces[1198] = {
'_default': u'Translations',
}
--
To view, visit https://gerrit.wikimedia.org/r/112188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6cf0d3c61d72a3cc19c23313de231f6000d4a02
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix profiling error - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix profiling error
..
Fix profiling error
Start profiling where it actually matters
Change-Id: I85fff08f937abb3f8a42949fb97e29032b961b86
---
M includes/Updater.php
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Updater.php b/includes/Updater.php
index b6a10e7..8e2eb6d 100644
--- a/includes/Updater.php
+++ b/includes/Updater.php
@@ -228,13 +228,12 @@
* Elasticsearch's time format.
*/
private function sendDocuments( $indexType, $documents, $shardTimeout )
{
- wfProfileIn( __METHOD__ );
-
$documentCount = count( $documents );
if ( $documentCount === 0 ) {
return;
}
+ wfProfileIn( __METHOD__ );
$exception = null;
try {
$pageType = Connection::getPageType( wfWikiId(),
$indexType );
--
To view, visit https://gerrit.wikimedia.org/r/112185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I85fff08f937abb3f8a42949fb97e29032b961b86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Chad
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Manybubbles
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace some nova-network configs for eqiad. - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112186
Change subject: Replace some nova-network configs for eqiad.
..
Replace some nova-network configs for eqiad.
There was no need to chop this in the first place, it's
activated by switchable code elsewhere anyway.
This is a partial revert of abd0ded4213e94a822d448c3c53f75e1ba5f02a2
Change-Id: If3b72498aa98a080feb9bd167234871a06ea6f62
---
M manifests/role/nova.pp
1 file changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/112186/1
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 1215686..d13a2ef 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -148,6 +148,17 @@
glance_host => $controller_hostname,
rabbit_host => $controller_hostname,
cc_host => $controller_hostname,
+ network_flat_interface => $realm ? {
+ "production" => "eth1.1118",
+ "labs" => "eth0.1118",
+ },
+ network_flat_interface_name => $realm ? {
+ "production" => "eth1",
+ "labs" => "eth0",
+ },
+ network_flat_interface_vlan => "1118",
+ flat_network_bridge => "br1118",
+ network_public_interface => "eth0",
network_host => $realm ? {
"production" => "10.64.20.13",
"labs" => "127.0.0.1",
--
To view, visit https://gerrit.wikimedia.org/r/112186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3b72498aa98a080feb9bd167234871a06ea6f62
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add the use_neutron switch. - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112187
Change subject: Add the use_neutron switch.
..
Add the use_neutron switch.
- Wrap neutron-specific code in nova roles and classes with use_neutron
- Turn neutron OFF in eqiad.
- Replace (optional) nova-network settings in havana nova.conf
Change-Id: I5ca96c867b6cc04cf9a0c03192d5b414647eb427
---
M manifests/role/nova.pp
M manifests/site.pp
M templates/openstack/havana/nova/nova.conf.erb
3 files changed, 34 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/112187/1
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index d13a2ef..89d1ccc 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -19,6 +19,7 @@
metadata_pass =>
$passwords::openstack::nova::nova_metadata_pass,
neutron_ldap_user_pass =>
$passwords::openstack::neutron::neutron_ldap_user_pass,
my_ip => $ipaddress_eth0,
+ use_neutron => $use_neutron,
ldap_base_dn => "dc=wikimedia,dc=org",
ldap_user_dn => "uid=novaadmin,ou=people,dc=wikimedia,dc=org",
ldap_user_pass =>
$passwords::openstack::nova::nova_ldap_user_pass,
@@ -374,8 +375,8 @@
include role::nova::wikiupdates,
role::nova::common
-# Havana uses neutron -- neutron roles configure their own interfaces.
- if ( $openstack_version != "havana" ) {
+# Neutron roles configure their own interfaces.
+ if ( $use_neutron == false ) {
interface::tagged { $novaconfig["network_flat_interface"]:
base_interface =>
$novaconfig["network_flat_interface_name"],
vlan_id => $novaconfig["network_flat_interface_vlan"],
diff --git a/manifests/site.pp b/manifests/site.pp
index 64ffbba..a368b99 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2532,6 +2532,7 @@
$is_puppet_master = "true"
$is_labs_puppet_master = "true"
$openstack_version = "havana"
+$use_neutron = false
include admins::labs
@@ -2542,7 +2543,11 @@
role::nova::controller,
role::salt::masters::labs,
role::deployment::salt_masters::labs,
-role::neutron::controller
+
+if $use_neutron == true {
+include role::neutron::controller
+}
+
}
node "virt0.wikimedia.org" {
@@ -2597,21 +2602,29 @@
$openstack_version = "havana"
$ganglia_aggregator = true
-include standard,
-role::neutron::nethost,
-role::nova::api
+$use_neutron = false
-include admins::labs
+include standard,
+role::nova::api,
+admins::labs
+
+if $use_neutron == true {
+include role::neutron::nethost
+}
}
node /virt1001.eqiad.wmnet/ {
$cluster = "virt"
$openstack_version = "havana"
+$use_neutron = false
include standard,
-role::nova::compute,
-role::neutron::computenode
+role::nova::compute
+
+if $use_neutron == true {
+include role::neutron::computenode
+}
}
node /virt100[2-9].eqiad.wmnet/ {
diff --git a/templates/openstack/havana/nova/nova.conf.erb
b/templates/openstack/havana/nova/nova.conf.erb
index b86acc5..04fabe8 100644
--- a/templates/openstack/havana/nova/nova.conf.erb
+++ b/templates/openstack/havana/nova/nova.conf.erb
@@ -43,6 +43,7 @@
fixed_ip_disassociate_timeout=172800
iscsi_helper=tgtadm
+<% if <%= novaconfig["use_neutron"] %> -%>
# network/neutron settings
network_api_class = nova.network.neutronv2.api.API
neutron_url = http://<%= novaconfig['controller_hostname'] %>:9696
@@ -53,9 +54,18 @@
neutron_admin_auth_url = http://<%= novaconfig['controller_hostname']
%>:35357/v2.0
linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver
firewall_driver = nova.virt.libvirt.firewall.IptablesFirewallDriver
-
neutron_metadata_proxy_shared_secret = <%= novaconfig["metadata_pass"] %>
service_neutron_metadata_proxy = true
+<% else -%>
+flat_network_dhcp_start=<%= novaconfig["dhcp_start"] %>
+network_manager=nova.network.manager.FlatDHCPManager
+flat_interface=<%= novaconfig["network_flat_interface"] %>
+flat_injected=False
+flat_network_bridge=<%= novaconfig["flat_network_bridge"] %>
+fixed_range=<%= novaconfig["fixed_range"] %>
+public_interface=<%= novaconfig["network_public_interface"] %>
+routing_source_ip=<%= novaconfig["network_public_ip"] %>
+<% end -%>
# novnc stuff
novncproxy_base_url=<%= novaconfig['controller_hostname'] %>:6080/vnc_auto.html
@@ -67,7 +77,6 @@
vncserver_listen=0.0.0.0
vncserver_proxyclient_address=<%= novaconfig['my_ip'] %>
-
# Settings for wikistatus, the plugin that updates OSM with instance status:
wiki_host=<%= instance_status_wiki_host %>
wiki_domain=<%= instance_status_wiki_domain %>
@@ -77,5 +86,3 @@
wiki_password=<
[MediaWiki-commits] [Gerrit] Fix profiling error - change (mediawiki...CirrusSearch)
Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112185
Change subject: Fix profiling error
..
Fix profiling error
Start profiling where it actually matters
Change-Id: I85fff08f937abb3f8a42949fb97e29032b961b86
---
M includes/Updater.php
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/85/112185/1
diff --git a/includes/Updater.php b/includes/Updater.php
index b6a10e7..8e2eb6d 100644
--- a/includes/Updater.php
+++ b/includes/Updater.php
@@ -228,13 +228,12 @@
* Elasticsearch's time format.
*/
private function sendDocuments( $indexType, $documents, $shardTimeout )
{
- wfProfileIn( __METHOD__ );
-
$documentCount = count( $documents );
if ( $documentCount === 0 ) {
return;
}
+ wfProfileIn( __METHOD__ );
$exception = null;
try {
$pageType = Connection::getPageType( wfWikiId(),
$indexType );
--
To view, visit https://gerrit.wikimedia.org/r/112185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I85fff08f937abb3f8a42949fb97e29032b961b86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Chad
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix HTML output arround HTMLForm's submit buttons when in vform - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix HTML output arround HTMLForm's submit buttons when in vform
..
Fix HTML output arround HTMLForm's submit buttons when in vform
$html in HTMLForm::getButtons() is vrapped in a when in
vform mode but it contains a tag without its closing
counterpart, thus making the HTML invalid.
And while I'm at it: put line breaks at better places.
Change-Id: I7ffa1bdd72d95188320c1b29d1c46a5f6f434cbe
---
M includes/htmlform/HTMLForm.php
1 file changed, 19 insertions(+), 18 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
Bartosz Dziewoński: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index 5621b01..6af2f5f 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -787,7 +787,7 @@
* @return String HTML.
*/
function getButtons() {
- $html = '';
+ $buttons = '';
if ( $this->mShowSubmit ) {
$attribs = array();
@@ -812,24 +812,17 @@
array_push( $attribs['class'], 'mw-ui-button',
'mw-ui-big', 'mw-ui-primary', 'mw-ui-block' );
}
- $html .= Xml::submitButton( $this->getSubmitText(),
$attribs ) . "\n";
-
- // Buttons are top-level form elements in table and div
layouts,
- // but vform wants all elements inside divs to get
spaced-out block
- // styling.
- if ( $this->isVForm() ) {
- $html = Html::rawElement( 'div', null,
"\n$html\n" );
- }
+ $buttons .= Xml::submitButton( $this->getSubmitText(),
$attribs ) . "\n";
}
if ( $this->mShowReset ) {
- $html .= Html::element(
- 'input',
- array(
- 'type' => 'reset',
- 'value' => $this->msg(
'htmlform-reset' )->text()
- )
- ) . "\n";
+ $buttons .= Html::element(
+ 'input',
+ array(
+ 'type' => 'reset',
+ 'value' => $this->msg( 'htmlform-reset'
)->text()
+ )
+ ) . "\n";
}
foreach ( $this->mButtons as $button ) {
@@ -847,10 +840,18 @@
$attrs['id'] = $button['id'];
}
- $html .= Html::element( 'input', $attrs );
+ $buttons .= Html::element( 'input', $attrs ) . "\n";
}
- $html .= '';
+ $html = Html::rawElement( 'span',
+ array( 'class' => 'mw-htmlform-submit-buttons' ),
"\n$buttons" ) . "\n";
+
+ // Buttons are top-level form elements in table and div layouts,
+ // but vform wants all elements inside divs to get spaced-out
block
+ // styling.
+ if ( $this->mShowSubmit && $this->isVForm() ) {
+ $html = Html::rawElement( 'div', null, "\n$html" ) .
"\n";
+ }
return $html;
}
--
To view, visit https://gerrit.wikimedia.org/r/96704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ffa1bdd72d95188320c1b29d1c46a5f6f434cbe
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Daniel Friesen
Gerrit-Reviewer: IAlex
Gerrit-Reviewer: Mattflaschen
Gerrit-Reviewer: Spage
Gerrit-Reviewer: Swalling
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Document SkinVectorStyleModules hooks - change (mediawiki/core)
Mattflaschen has uploaded a new change for review. https://gerrit.wikimedia.org/r/112184 Change subject: Document SkinVectorStyleModules hooks .. Document SkinVectorStyleModules hooks Change-Id: I746e5c734aff3c84cc56358dd52736d872c9b030 --- M docs/hooks.txt 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/84/112184/1 diff --git a/docs/hooks.txt b/docs/hooks.txt index a638703..5d110ca 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -2236,6 +2236,10 @@ dummy parameter with "$dummy=false" in their code and return without echoing any HTML to avoid creating duplicate toolbox items. +'SkinVectorStyleModules': Called immediately before adding Vector's CSS-only modules to the Outputpage. +$skinVector: the instance of SkinVector +&$styles: the array of CSS-only modules + 'SoftwareInfo': Called by Special:Version for returning information about the software. $software: The array of software in format 'name' => 'version'. See -- To view, visit https://gerrit.wikimedia.org/r/112184 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I746e5c734aff3c84cc56358dd52736d872c9b030 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Mattflaschen ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove incorrect leading text mentioning Semantic... - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Remove incorrect leading text mentioning Semantic... .. Remove incorrect leading text mentioning Semantic... Change-Id: Ifce3557c2235fe39e4e229285c1833ffa6425dc3 --- M COPYING 1 file changed, 0 insertions(+), 8 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/COPYING b/COPYING index f1537d1..d159169 100644 --- a/COPYING +++ b/COPYING @@ -1,11 +1,3 @@ -The license text below "" applies to all files within this distribution, other -than those that are in a directory which contains files named "LICENSE" or -"COPYING", or a subdirectory thereof. For those files, the license text contained in -said file overrides any license information contained in directories of smaller depth. -Alternative licenses are typically used for software that is provided by external -parties, and merely packaged with the Semantic MediaWiki release for convenience. - - GNU GENERAL PUBLIC LICENSE Version 2, June 1991 -- To view, visit https://gerrit.wikimedia.org/r/112181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifce3557c2235fe39e4e229285c1833ffa6425dc3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Reedy Gerrit-Reviewer: Legoktm 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 COPYING - change (mediawiki...OpenStackManager)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/112183 Change subject: Add COPYING .. Add COPYING Change-Id: Ia343ca94e82b8011943fdc6c38c56e0fc313767f --- A COPYING 1 file changed, 339 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager refs/changes/83/112183/1 diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any ot
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...LdapAuthentication)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/112182 Change subject: Add COPYING .. Add COPYING Change-Id: I49130c29b88b4345f596d2933a375a633678aef4 --- A COPYING 1 file changed, 339 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LdapAuthentication refs/changes/82/112182/1 diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any
[MediaWiki-commits] [Gerrit] Remove incorrect leading text mentioning Semantic... - change (mediawiki...MobileFrontend)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/112181 Change subject: Remove incorrect leading text mentioning Semantic... .. Remove incorrect leading text mentioning Semantic... Change-Id: Ifce3557c2235fe39e4e229285c1833ffa6425dc3 --- M COPYING 1 file changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/81/112181/1 diff --git a/COPYING b/COPYING index f1537d1..d159169 100644 --- a/COPYING +++ b/COPYING @@ -1,11 +1,3 @@ -The license text below "" applies to all files within this distribution, other -than those that are in a directory which contains files named "LICENSE" or -"COPYING", or a subdirectory thereof. For those files, the license text contained in -said file overrides any license information contained in directories of smaller depth. -Alternative licenses are typically used for software that is provided by external -parties, and merely packaged with the Semantic MediaWiki release for convenience. - - GNU GENERAL PUBLIC LICENSE Version 2, June 1991 -- To view, visit https://gerrit.wikimedia.org/r/112181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifce3557c2235fe39e4e229285c1833ffa6425dc3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Reedy ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...Oversight)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/112180 Change subject: Add COPYING .. Add COPYING Change-Id: I3a9857bdb66ab22f66b6aa774d7bedbc038f3e7e --- A COPYING 1 file changed, 339 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Oversight refs/changes/80/112180/1 diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other reci
[MediaWiki-commits] [Gerrit] Minor cleanup, add COPYING - change (mediawiki...MobileApp)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/112179 Change subject: Minor cleanup, add COPYING .. Minor cleanup, add COPYING Change-Id: I9e0ccb4dcb970130653061d9e45da3783917973d --- A COPYING M MobileApp.php M i18n/qqq.json 3 files changed, 341 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileApp refs/changes/79/112179/1 diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this Lic
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...SecurePoll)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/112178 Change subject: Add COPYING .. Add COPYING Change-Id: Ic3de260ba73f01ba570f24350c6bf6f22389638b --- A COPYING 1 file changed, 339 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll refs/changes/78/112178/1 diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other rec
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...OpenSearchXml)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/112177 Change subject: Add COPYING .. Add COPYING Change-Id: I0f8cb8ed25d8dd7009f8953141280fd98d772e15 --- A COPYING 1 file changed, 339 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenSearchXml refs/changes/77/112177/1 diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...SiteMatrix)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/112175 Change subject: Add COPYING .. Add COPYING Change-Id: Idb56f52095f0e1be14d1edb2feb3e3bafe284ea1 --- A COPYING 1 file changed, 339 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SiteMatrix refs/changes/75/112175/1 diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other rec
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...AccountAudit)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/112176 Change subject: Add COPYING .. Add COPYING Change-Id: I8506b82794b03f1f13dd33b24df62c5a69a3bb3a --- A COPYING 1 file changed, 339 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AccountAudit refs/changes/76/112176/1 diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other r
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...ExtensionDistributor)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/112174 Change subject: Add COPYING .. Add COPYING Change-Id: I4d7dc1025b29f79fbbe7e8f681479579aa126cb0 --- A COPYING 1 file changed, 339 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExtensionDistributor refs/changes/74/112174/1 diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give an
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...ConfirmAccount)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/112172 Change subject: Add COPYING .. Add COPYING Change-Id: I49d984047875daef4268a3ce2b0985adf3eb12f3 --- A COPYING 1 file changed, 339 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmAccount refs/changes/72/112172/1 diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other
[MediaWiki-commits] [Gerrit] Add COPYING - change (mediawiki...ConfirmEdit)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/112173 Change subject: Add COPYING .. Add COPYING Change-Id: I3591a9ced5d6b1866123d6dbcf11b0f3e6529229 --- A COPYING 1 file changed, 339 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit refs/changes/73/112173/1 diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other re
[MediaWiki-commits] [Gerrit] decom 'harmon' - rm from site/dsh/partman/dhcp - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112171
Change subject: decom 'harmon' - rm from site/dsh/partman/dhcp
..
decom 'harmon' - rm from site/dsh/partman/dhcp
RT #6267
Change-Id: Idc44f926f3bf1ccda9065e3fb685672fb051604a
---
M files/dsh/group/misc_pmtpa
M manifests/site.pp
M modules/install-server/files/autoinstall/netboot.cfg
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
4 files changed, 1 insertion(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/112171/1
diff --git a/files/dsh/group/misc_pmtpa b/files/dsh/group/misc_pmtpa
index 08ebc92..7552d28 100644
--- a/files/dsh/group/misc_pmtpa
+++ b/files/dsh/group/misc_pmtpa
@@ -6,7 +6,6 @@
ersch
fenari
formey
-harmon
hume
kaulen
linne
diff --git a/manifests/site.pp b/manifests/site.pp
index 86177e6..64d56d4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -994,13 +994,6 @@
}
}
-node "harmon.pmtpa.wmnet" {
-$cluster = "misc"
-
-include standard,
-admins::roots
-}
-
node "helium.eqiad.wmnet" {
include standard,
role::poolcounter,
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index c982dd6..82c9463 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -70,7 +70,7 @@
search[0-9]*) echo partman/search.cfg ;; \
snapshot[1-4]|snapshot100[1-4]) echo partman/snapshot.cfg ;; \
stat1002) echo partman/lvm-noraid-large.a.cfg ;; \
-
bast4001|cerium|copper|emery|harmon|neon|praseodymium|ruthenium|ssl[1-3]0[0-9][0-9]|ssl[0-9]|ytterbium|xenon|zirconium)
echo partman/raid1-lvm.cfg ;; \
+
bast4001|cerium|copper|emery|neon|praseodymium|ruthenium|ssl[1-3]0[0-9][0-9]|ssl[0-9]|ytterbium|xenon|zirconium)
echo partman/raid1-lvm.cfg ;; \
solr[1-3]|solr100[1-3]) echo partman/lvm.cfg ;; \
virt[5-9]|virt1[0-6]) echo partman/virt-raid10-cisco.cfg ;; \
virt100[1-9]) echo partman/virt-raid10-cisco.cfg ;; \
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 6d00475..542874f 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1290,11 +1290,6 @@
fixed-address hafnium.wikimedia.org;
}
-host harmon {
- hardware ethernet 84:2b:2b:06:36:4f;
- fixed-address harmon.pmtpa.wmnet;
-}
-
host helium {
hardware ethernet 78:2b:cb:09:0f:c8;
fixed-address helium.eqiad.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/112171
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc44f926f3bf1ccda9065e3fb685672fb051604a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bumped patch version to 0.2.1 - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged. Change subject: Bumped patch version to 0.2.1 .. Bumped patch version to 0.2.1 Releasing the gem. Change-Id: I39176f5826e1a185d1468ecbe405d17b21bdefa1 --- M lib/mediawiki_selenium/version.rb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jhall: Looks good to me, but someone else must approve Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/mediawiki_selenium/version.rb b/lib/mediawiki_selenium/version.rb index 00d8a17..67be243 100644 --- a/lib/mediawiki_selenium/version.rb +++ b/lib/mediawiki_selenium/version.rb @@ -10,5 +10,5 @@ =end module MediawikiSelenium - VERSION = "0.2.0" + VERSION = "0.2.1" end -- To view, visit https://gerrit.wikimedia.org/r/112138 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I39176f5826e1a185d1468ecbe405d17b21bdefa1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin Gerrit-Reviewer: Cmcmahon Gerrit-Reviewer: Jhall Gerrit-Reviewer: Manybubbles Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated mediawiki_selenium to 0.2.1 - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged. Change subject: Updated mediawiki_selenium to 0.2.1 .. Updated mediawiki_selenium to 0.2.1 This version has automatic screen shots. Change-Id: I17cac4c2da50c1d6ded906bd8726b264320bda5a --- M tests/browser/Gemfile.lock 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock index debc830..1a6578f 100644 --- a/tests/browser/Gemfile.lock +++ b/tests/browser/Gemfile.lock @@ -22,15 +22,15 @@ headless (1.0.1) i18n (0.6.9) json (1.8.1) -mediawiki_selenium (0.2.0) - cucumber (~> 1.3.10) - headless (~> 1.0.1) - json (~> 1.8.1) - net-http-persistent (~> 2.9.1) - page-object (~> 0.9.5) - rest-client (~> 1.6.7) - rspec-expectations (~> 2.14.4) - syntax (~> 1.2.0) +mediawiki_selenium (0.2.1) + cucumber (~> 1.3, >= 1.3.10) + headless (~> 1.0, >= 1.0.1) + json (~> 1.8, >= 1.8.1) + net-http-persistent (~> 2.9, >= 2.9.1) + page-object (~> 0.9, >= 0.9.5) + rest-client (~> 1.6, >= 1.6.7) + rspec-expectations (~> 2.14, >= 2.14.4) + syntax (~> 1.2, >= 1.2.0) mime-types (2.1) multi_json (1.8.4) multi_test (0.0.3) -- To view, visit https://gerrit.wikimedia.org/r/112140 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I17cac4c2da50c1d6ded906bd8726b264320bda5a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Zfilipin Gerrit-Reviewer: Cmcmahon Gerrit-Reviewer: Jhall Gerrit-Reviewer: Manybubbles Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Regression: Style nearby/language button correctly in alpha - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Regression: Style nearby/language button correctly in alpha
..
Regression: Style nearby/language button correctly in alpha
Add the appropriate classes from mediawiki.ui
Change-Id: Iaad6fcbb24ebf747c2236723f83709e855be5f18
---
M includes/skins/MinervaTemplateBeta.php
M javascripts/modules/nearbypages.js
M templates/page.html
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/MinervaTemplateBeta.php
b/includes/skins/MinervaTemplateBeta.php
index c7d18f1..dc56ed8 100644
--- a/includes/skins/MinervaTemplateBeta.php
+++ b/includes/skins/MinervaTemplateBeta.php
@@ -22,7 +22,7 @@
$languageLabel = wfMessage(
'mobile-frontend-language-article-heading' )->text();
echo Html::element( 'a', array(
- 'class' => 'button languageSelector',
+ 'class' => 'mw-ui-button mw-ui-progressive
button languageSelector',
'href' => $languageUrl
), $languageLabel );
}
diff --git a/javascripts/modules/nearbypages.js
b/javascripts/modules/nearbypages.js
index e5ddd7c..02d1bb5 100644
--- a/javascripts/modules/nearbypages.js
+++ b/javascripts/modules/nearbypages.js
@@ -21,10 +21,10 @@
var $btn;
if ( M.router.isSupported() ) {
- $btn = $( '' ).attr( 'href',
'#geonotahack' );
+ $btn = $( '' ).attr( 'href', '#geonotahack' );
M.router.route( /^geonotahack$/, loadGeoNotAHack );
} else {
- $btn = $( '' ).on( 'click',
loadGeoNotAHack );
+ $btn = $( '' ).on( 'click', loadGeoNotAHack );
}
$btn.text( mw.msg( 'mobile-frontend-geonotahack' ) ).appendTo(
'#page-secondary-actions' );
}
diff --git a/templates/page.html b/templates/page.html
index 0381347..3d89b39 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -26,7 +26,7 @@
{{#inBetaOrAlpha}}
{{#hasLanguages}}
- {{languageLabel}}
+ {{languageLabel}}
{{/hasLanguages}}
{{/inBetaOrAlpha}}
--
To view, visit https://gerrit.wikimedia.org/r/111836
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaad6fcbb24ebf747c2236723f83709e855be5f18
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Restore time bar - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Restore time bar .. Restore time bar Note: untested Based on app.ft.com which exhibits behaviour Moiz suggested is correct. Bug: 60851 Change-Id: Ib21ca95c01b1fd32b4c4067f97be1d89eab7b511 --- M includes/skins/SkinMinerva.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: JGonera: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index cf38926..b7cab18 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -32,7 +32,7 @@ Html::element( 'meta', array( 'name' => 'apple-mobile-web-app-capable', 'content' => 'yes' ) ) ); $out->addHeadItem( 'apple-mobile-web-app-status-bar-style', - Html::element( 'meta', array( 'name' => 'apple-mobile-web-app-status-bar-style', 'content' => 'default' ) ) + Html::element( 'meta', array( 'name' => 'apple-mobile-web-app-status-bar-style', 'content' => 'black' ) ) ); $out->addHeadItem( 'loadingscript', Html::inlineScript( "document.documentElement.className += ' page-loading';" -- To view, visit https://gerrit.wikimedia.org/r/112167 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib21ca95c01b1fd32b4c4067f97be1d89eab7b511 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson Gerrit-Reviewer: JGonera 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 the header buttons on watchlist - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix the header buttons on watchlist
..
Fix the header buttons on watchlist
Also split up the mediawiki-ui-group rules so it is clearer for
what purpose they serve.
Bug: 60923
Change-Id: I3c5e922913a5964f1dfd4fe903edd29367b69f56
---
M less/common/uiNew.less
M less/specials/watchlist.less
2 files changed, 21 insertions(+), 9 deletions(-)
Approvals:
JGonera: Looks good to me, approved
jenkins-bot: Verified
diff --git a/less/common/uiNew.less b/less/common/uiNew.less
index 508ec12..4348291 100644
--- a/less/common/uiNew.less
+++ b/less/common/uiNew.less
@@ -26,20 +26,17 @@
}
}
-// FIXME [mediawiki ui] These rules should not be needed and are specifically
for Watchlist and
-// the CTADrawer
-.mw-ui-button-group {
+// FIXME [mediawiki ui] These rules should not be needed in the mobile context
+.alpha .mw-ui-button-group {
text-align: center;
- a:visited,
- a:hover,
- a {
- color: inherit;
- text-decoration: none;
- }
+
* {
float: none !important;
}
+
+ // For talk and CTA drawer
.mw-ui-block {
width: auto;
}
}
+
diff --git a/less/specials/watchlist.less b/less/specials/watchlist.less
index 18f9b21..6bdb73b 100644
--- a/less/specials/watchlist.less
+++ b/less/specials/watchlist.less
@@ -1,7 +1,22 @@
@import "minerva.variables";
@import "minerva.mixins";
+// FIXME [mediawiki ui] These rules should not be needed and are specifically
for Watchlist
+// This should use another MediaWiki UI widget
+.alpha .content-header .mw-ui-button-group {
+ li.mw-ui-button {
+ padding: 0;
+ }
+ a:visited,
+ a:hover,
+ a {
+ padding: .5em 1em;
+ display: block;
+ color: inherit;
+ text-decoration: none;
+ }
+}
.page-header-bar {
--
To view, visit https://gerrit.wikimedia.org/r/111908
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c5e922913a5964f1dfd4fe903edd29367b69f56
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: JGonera
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Make 'make clean' clean up all existing documentation - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Make 'make clean' clean up all existing documentation .. Hygiene: Make 'make clean' clean up all existing documentation Helps when I need to grep.. Change-Id: I82f0e80b4e21a175fe8f0b6c1610cadacc3df893 --- M Makefile 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Kaldari: Looks good to me, approved jenkins-bot: Verified diff --git a/Makefile b/Makefile index 2f7e956..096c811 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ clean: rm -Rf scripts/remotes + rm -Rf docs remotes: @scripts/remotecheck.sh -- To view, visit https://gerrit.wikimedia.org/r/111618 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I82f0e80b4e21a175fe8f0b6c1610cadacc3df893 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson Gerrit-Reviewer: Kaldari Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 6907654..b12445f - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 6907654..b12445f .. Syncronize VisualEditor: 6907654..b12445f Change-Id: I6d5ab29e94cb6ae1c2de9efa3537be83d70e3bbc --- 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 6907654..b12445f 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 6907654de1f80a0d9b8911649305dab79c00d701 +Subproject commit b12445f81b3cfa5ebaa3088355de06a29da81091 -- To view, visit https://gerrit.wikimedia.org/r/112170 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6d5ab29e94cb6ae1c2de9efa3537be83d70e3bbc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 6907654..b12445f - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/112170 Change subject: Syncronize VisualEditor: 6907654..b12445f .. Syncronize VisualEditor: 6907654..b12445f Change-Id: I6d5ab29e94cb6ae1c2de9efa3537be83d70e3bbc --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/70/112170/1 diff --git a/VisualEditor b/VisualEditor index 6907654..b12445f 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 6907654de1f80a0d9b8911649305dab79c00d701 +Subproject commit b12445f81b3cfa5ebaa3088355de06a29da81091 -- To view, visit https://gerrit.wikimedia.org/r/112170 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d5ab29e94cb6ae1c2de9efa3537be83d70e3bbc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pluralise visualeditor-linkinspector-suggest-(matching|redir... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Pluralise
visualeditor-linkinspector-suggest-(matching|redirect|disambig)-page
..
Pluralise visualeditor-linkinspector-suggest-(matching|redirect|disambig)-page
Bug: 61071
Change-Id: Ia9893b8bfb80aa5d8a2bab9ecfe9ca1b6c85afbe
---
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
3 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index bff41b0..5dbcfcb 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -115,9 +115,9 @@
"visualeditor-languages-tool": "Languages",
"visualeditor-linkinspector-illegal-title": "Invalid page title",
"visualeditor-linkinspector-suggest-external-link": "External link",
-"visualeditor-linkinspector-suggest-matching-page": "Matching page",
-"visualeditor-linkinspector-suggest-disambig-page": "Disambiguation page",
-"visualeditor-linkinspector-suggest-redirect-page": "Redirect page",
+"visualeditor-linkinspector-suggest-matching-page": "{{PLURAL:$1|Matching
page|Matching pages}}",
+"visualeditor-linkinspector-suggest-disambig-page":
"{{PLURAL:$1|Disambiguation page|Disambiguation pages}}",
+"visualeditor-linkinspector-suggest-redirect-page": "{{PLURAL:$1|Redirect
page|Redirect pages}}",
"visualeditor-linkinspector-suggest-new-page": "New page",
"visualeditor-loadwarning": "Error loading data from server: $1. Would you
like to retry?",
"visualeditor-loadwarning-token": "Error loading edit token from server:
$1. Would you like to retry?",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 09c22a6..079650e 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -120,9 +120,9 @@
"visualeditor-languages-tool": "Tool for opening the languages links
section of the meta dialog.\n{{Identical|Language}}",
"visualeditor-linkinspector-illegal-title": "Warning that the entered text
is not a valid page title.",
"visualeditor-linkinspector-suggest-external-link": "Label for an external
(Web) link in the link inspector.\n{{Identical|External link}}",
-"visualeditor-linkinspector-suggest-matching-page": "Label for suggested
matching local wiki page or pages in the link inspector",
-"visualeditor-linkinspector-suggest-disambig-page": "Label for suggested
disambiguation pages in the link inspector",
-"visualeditor-linkinspector-suggest-redirect-page": "Label for suggested
redirect pages in the link inspector",
+"visualeditor-linkinspector-suggest-matching-page": "Label for suggested
matching local wiki page or pages in the link inspector\nParams:\n* $1 - number
of matching pages, used for plural",
+"visualeditor-linkinspector-suggest-disambig-page": "Label for suggested
disambiguation pages in the link inspector\nParams:\n* $1 - number of
disambiguation pages, used for plural",
+"visualeditor-linkinspector-suggest-redirect-page": "Label for suggested
redirect pages in the link inspector\nParams:\n* $1 - number of redirect pages,
used for plural",
"visualeditor-linkinspector-suggest-new-page": "Label for a new page in
the link inspector.\n{{Identical|New page}}",
"visualeditor-loadwarning": "Text (JavaScript confirm()) shown when the
editor fails to load properly.\n\nParameters:\n* $1 - the error message from
the server, in English. e.g. \"parsoidserver-http-bad-status: 404\"",
"visualeditor-loadwarning-token": "Text (JavaScript confirm()) shown when
the editor fails to load properly.\n\nParameters:\n* $1 - the error message
from the server.",
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
index 87db8e5..da32ec9 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
@@ -178,7 +178,7 @@
if ( matchingPages && matchingPages.length ) {
items.push( new OO.ui.MenuSectionItemWidget(
'matchingPages',
- { '$': menu$, 'label': ve.msg(
'visualeditor-linkinspector-suggest-matching-page' ) }
+ { '$': menu$, 'label': ve.msg(
'visualeditor-linkinspector-suggest-matching-page', matchingPages.length ) }
) );
// Offer the exact text as a suggestion if the page exists
if ( pageExists && !pageExistsExact ) {
@@ -196,7 +196,7 @@
if ( disambigPages.length ) {
items.push( new OO.ui.MenuSectionItemWidget(
'disambigPages',
- { '$': menu$, 'label': ve.msg(
'visualeditor-linkinspector-suggest-disambig-page' )
[MediaWiki-commits] [Gerrit] Add some more details to RC tables - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112169
Change subject: Add some more details to RC tables
..
Add some more details to RC tables
Change-Id: Ic2ca3f024120745affb17c97f388624c891551c4
---
M includes/Data/RecentChanges.php
1 file changed, 24 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/69/112169/1
diff --git a/includes/Data/RecentChanges.php b/includes/Data/RecentChanges.php
index f03144f..36b04b0 100644
--- a/includes/Data/RecentChanges.php
+++ b/includes/Data/RecentChanges.php
@@ -2,8 +2,8 @@
namespace Flow\Data;
+use Flow\Model\AbstractRevision;
use Flow\Model\PostRevision;
-use Flow\Model\UUID;
use Flow\Model\Workflow;
use Flow\Repository\TreeRepository;
use Language;
@@ -44,25 +44,24 @@
}
/**
-* @param string $action Action name (as defined in FlowActions)
+* @param AbstractRevision $revision Revision object
* @param string $block The block object's ->getName()
* @param string $revisionType Classname of the Revision object
-* @param string $revisionId Revision id (in hex)
* @param array $row Revision row
* @param Workflow $workflow
-* @param $timestamp
* @param array $changes
*/
- protected function insert( $action, $block, $revisionType, $revisionId,
array $row, Workflow $workflow, $timestamp, array $changes ) {
+ protected function insert( AbstractRevision $revision, $block,
$revisionType, array $row, Workflow $workflow, array $changes ) {
+ $action = $revision->getChangeType();
+ $revisionId = $revision->getRevisionId()->getHex();
+ $timestamp = $revision->getRevisionId()->getTimestamp();
+
if ( $action === 'suppress-topic' || $action ===
'suppress-post' ) {
// @todo: should be move this into FlowActions.php
somehow?
// Suppression log entries should not go to
recentchanges (bug 60814)
return;
}
- if ( $timestamp instanceof UUID ) {
- $timestamp = $timestamp->getTimestamp();
- }
$title = $workflow->getArticleTitle();
// Very hackish - allows CheckUser access to the basic
information without rc_params
@@ -70,6 +69,16 @@
$comment = $action . ',' . $workflow->getId()->getHex();
if ( isset( $changes['post'] ) ) {
$comment .= ',' . $changes['post'];
+ }
+
+ $revisionable = $revision->getRevisionable();
+
+ // get content of both this & the current revision
+ $content = $revision->getContentRaw();
+ $previousContent = '';
+ $previousRevision = $revisionable->getPreviousRevision(
$revision );
+ if ( $previousRevision ) {
+ $previousContent = $previousRevision->getContentRaw();
}
$attribs = array(
@@ -82,10 +91,10 @@
'rc_minor' => 0,
'rc_bot' => 0, // TODO: is revision by bot
'rc_patrolled' => 0,
- 'rc_old_len' => 0,
- 'rc_new_len' => 0,
- 'rc_this_oldid' => 0,
- 'rc_last_oldid' => 0,
+ 'rc_old_len' => strlen( $previousContent ),
+ 'rc_new_len' => strlen( $content ),
+ 'rc_this_oldid' => $revision->getRevisionId()->getHex(),
+ 'rc_last_oldid' =>
$previousRevision->getRevisionId()->getHex(),
'rc_log_type' => null,
'rc_params' => serialize( array(
'flow-workflow-change' => array(
@@ -97,7 +106,7 @@
'definition' =>
$workflow->getDefinitionId()->getHex(),
) + $changes,
) ),
- 'rc_cur_id' => 0, // TODO: wtf do we do with uuid's?
+ 'rc_cur_id' => $revisionable->getId( $revision ),
'rc_comment' => $comment,
'rc_timestamp' => $timestamp,
'rc_cur_time' => $timestamp,
@@ -135,13 +144,11 @@
}
$this->insert(
- $object->getChangeType(),
+ $object,
'header',
'Header',
- $object->getRevisionId()->getHex(),
$row,
$workflow,
- $object->getRevisionId(),
array(
'content
[MediaWiki-commits] [Gerrit] add shell account for hoo, admins restricted - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112168
Change subject: add shell account for hoo, admins restricted
..
add shell account for hoo, admins restricted
RT #6731
labs user: hoo
UID: 2133
real name: Marius Hoch
requested/approved: csteipp, Eloquence
requested: accessing the DB (investigating bugs),
possibly: general Wikidata deploys, debugging and config
please continue the discussion from
the ticket here on Gerrit if you like,
to find out which exact type of access is requested,
this starts out by creating an account,
and suggests admin::restricted
Change-Id: I225f6d54d9bbf948639a301456b76a682fa8bb4c
---
M manifests/admins.pp
1 file changed, 21 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/68/112168/1
diff --git a/manifests/admins.pp b/manifests/admins.pp
index fa259c2..a49a857 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -3362,6 +3362,26 @@
}
}
+# RT 6731
+class hoo inherits baseaccount {
+$username = 'hoo'
+$realname = 'Marius Hoch'
+$uid = 2133
+
+unixaccount { $realname: username => $username, uid => $uid, gid =>
$gid }
+
+if $manage_home {
+Ssh_authorized_key { require => Unixaccount[$realname] }
+
+ssh_authorized_key { 'hooman-wmf-production':
+ensure => present,
+user => $username,
+type => 'ssh-rsa',
+key=> 'XXX',
+}
+}
+}
+
# FIXME: not an admin. This is more like a system account.
class l10nupdate inherits baseaccount {
$username = "l10nupdate"
@@ -3497,6 +3517,7 @@
include accounts::dsc # access revoked
include accounts::erik
include accounts::ezachte
+ include accounts::hoo # RT 6731
include accounts::jamesofur
include accounts::khorn
include accounts::mgrover # RT 4600
--
To view, visit https://gerrit.wikimedia.org/r/112168
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I225f6d54d9bbf948639a301456b76a682fa8bb4c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Restore time bar - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/112167 Change subject: Restore time bar .. Restore time bar Note: untested Based on app.ft.com which exhibits behaviour Moiz suggested is correct. Bug: 60851 Change-Id: Ib21ca95c01b1fd32b4c4067f97be1d89eab7b511 --- M includes/skins/SkinMinerva.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/67/112167/1 diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index cf38926..b7cab18 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -32,7 +32,7 @@ Html::element( 'meta', array( 'name' => 'apple-mobile-web-app-capable', 'content' => 'yes' ) ) ); $out->addHeadItem( 'apple-mobile-web-app-status-bar-style', - Html::element( 'meta', array( 'name' => 'apple-mobile-web-app-status-bar-style', 'content' => 'default' ) ) + Html::element( 'meta', array( 'name' => 'apple-mobile-web-app-status-bar-style', 'content' => 'black' ) ) ); $out->addHeadItem( 'loadingscript', Html::inlineScript( "document.documentElement.className += ' page-loading';" -- To view, visit https://gerrit.wikimedia.org/r/112167 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib21ca95c01b1fd32b4c4067f97be1d89eab7b511 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 604d522..6907654 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/112166 Change subject: Syncronize VisualEditor: 604d522..6907654 .. Syncronize VisualEditor: 604d522..6907654 Change-Id: I7f8e79d51ef54543f0dfe721f27333b900fdfff5 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/66/112166/1 diff --git a/VisualEditor b/VisualEditor index 604d522..6907654 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 604d52244dac6aa2db9632ae9852930031a68b59 +Subproject commit 6907654de1f80a0d9b8911649305dab79c00d701 -- To view, visit https://gerrit.wikimedia.org/r/112166 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f8e79d51ef54543f0dfe721f27333b900fdfff5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 604d522..6907654 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 604d522..6907654 .. Syncronize VisualEditor: 604d522..6907654 Change-Id: I7f8e79d51ef54543f0dfe721f27333b900fdfff5 --- 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 604d522..6907654 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 604d52244dac6aa2db9632ae9852930031a68b59 +Subproject commit 6907654de1f80a0d9b8911649305dab79c00d701 -- To view, visit https://gerrit.wikimedia.org/r/112166 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7f8e79d51ef54543f0dfe721f27333b900fdfff5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add image type change to media edit dialog - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Add image type change to media edit dialog
..
Add image type change to media edit dialog
Adding a type change to the media edit dialog. Also changing SelectWidgets
to ButtonSelectWidgets for consistency.
Bug: 38129
Change-Id: I9c855e6381d970b5f08460822366f6333af24f82
---
M VisualEditor.php
M modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
5 files changed, 71 insertions(+), 6 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.php b/VisualEditor.php
index df8e6ae..97cc95a 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -651,6 +651,11 @@
'visualeditor-dialog-media-page-advanced',
'visualeditor-dialog-media-page-general',
'visualeditor-dialog-media-position-center',
+ 'visualeditor-dialog-media-type-border',
+ 'visualeditor-dialog-media-type-frame',
+ 'visualeditor-dialog-media-type-frameless',
+ 'visualeditor-dialog-media-type-section',
+ 'visualeditor-dialog-media-type-thumb',
'visualeditor-dialog-media-position-left',
'visualeditor-dialog-media-position-none',
'visualeditor-dialog-media-position-right',
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
index 39f1795..0828184 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
@@ -121,7 +121,10 @@
var model, view,
type = this.model.getAttribute( 'type' );
- this.captionVisible = type !== 'none' && type !== 'frameless' &&
this.model.children.length === 1;
+ this.captionVisible = type !== 'none' &&
+ type !== 'frameless' &&
+ type !== 'border' &&
+ this.model.children.length === 1;
if ( this.captionVisible ) {
// Only create a caption if we need it
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 598394f..be2bc7b 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -44,6 +44,11 @@
"visualeditor-dialog-media-page-advanced": "Advanced settings",
"visualeditor-dialog-media-page-general": "General settings",
"visualeditor-dialog-media-position-center": "Center",
+"visualeditor-dialog-media-type-border": "Border",
+"visualeditor-dialog-media-type-frame": "Frame",
+"visualeditor-dialog-media-type-frameless": "Frameless",
+"visualeditor-dialog-media-type-section": "Image type",
+"visualeditor-dialog-media-type-thumb": "Thumbnail",
"visualeditor-dialog-media-position-left": "Left",
"visualeditor-dialog-media-position-none": "None",
"visualeditor-dialog-media-position-right": "Right",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 75804de..ead4274 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -54,6 +54,11 @@
"visualeditor-dialog-media-position-right": "Label for the image position
option for aligning to the right.",
"visualeditor-dialog-media-position-section": "Label for the image
position sub-section.",
"visualeditor-dialog-media-size-originalsize-error": "Error message for
failing to retrieve original file size from the API.",
+"visualeditor-dialog-media-type-border": "Label for the image type option
for bordered image.",
+"visualeditor-dialog-media-type-frame": "Label for the image type option
for framed image.",
+"visualeditor-dialog-media-type-frameless": "Label for the image type
option for frameless.",
+"visualeditor-dialog-media-type-section": "Label for the image type
sub-section.",
+"visualeditor-dialog-media-type-thumb": "Label for the image type option
for thumbnail.",
"visualeditor-dialog-media-size-section": "Label for the image size
sub-section.\n{{Identical|Image size}}",
"visualeditor-dialog-media-title": "Title for the editing dialog to set
how a media item is displayed on the page",
"visualeditor-dialog-meta-categories-category": "Title of popup for
editing category options.\n{{Identical|Category}}",
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index 1584ae0..bbb2f9c 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -174,17 +174,51 @@
'label': ve.msg( 'visualeditor-dialog-media-position-section' ),
'icon': 'parameter'
} );
- this.p
[MediaWiki-commits] [Gerrit] [WIP] Run recurring reports using the scheduler - change (analytics/wikimetrics)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112165
Change subject: [WIP] Run recurring reports using the scheduler
..
[WIP] Run recurring reports using the scheduler
Change-Id: I1260a6690c145aaa084f33a110a758d3a88d3823
Card: analytics 1378
---
M wikimetrics/models/persistent_report.py
M wikimetrics/models/report_nodes/run_report.py
M wikimetrics/schedules/daily.py
M wikimetrics/utils.py
4 files changed, 115 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/65/112165/1
diff --git a/wikimetrics/models/persistent_report.py
b/wikimetrics/models/persistent_report.py
index 2414490..1cf 100644
--- a/wikimetrics/models/persistent_report.py
+++ b/wikimetrics/models/persistent_report.py
@@ -1,5 +1,5 @@
import celery
-from sqlalchemy import Column, Integer, String, DateTime, Boolean, func
+from sqlalchemy import Column, Integer, String, DateTime, Boolean, func,
ForeignKey
from sqlalchemy.orm import Session
from wikimetrics.configurables import db
@@ -24,6 +24,8 @@
name = Column(String(2000))
show_in_ui = Column(Boolean)
parameters = Column(String(4000))
+recurrent = Column(Boolean, default=False, nullable=False)
+recurring_parent = Column(Integer, ForeignKey('report.id'))
def update_status(self):
# if we don't have the result key leave as is
diff --git a/wikimetrics/models/report_nodes/run_report.py
b/wikimetrics/models/report_nodes/run_report.py
index 843bfbf..302736e 100644
--- a/wikimetrics/models/report_nodes/run_report.py
+++ b/wikimetrics/models/report_nodes/run_report.py
@@ -1,12 +1,16 @@
+import json
+import celery
+from copy import deepcopy
from sqlalchemy.orm.exc import NoResultFound
+from datetime import timedelta
from wikimetrics.configurables import db
-from wikimetrics.models.cohort_user import CohortUserRole
-from wikimetrics.models.cohort import Cohort
-from wikimetrics.models.user import User
-from wikimetrics.models.cohort_user import CohortUser
+from wikimetrics.models import CohortUserRole, Cohort, User, CohortUser,
PersistentReport
from wikimetrics.metrics import metric_classes
-from wikimetrics.utils import deduplicate, stringify
+from wikimetrics.utils import (
+deduplicate, stringify,
+diff_datewise, timestamps_to_now, strip_time, to_datetime, thirty_days_ago,
+)
from report import ReportNode
from aggregate_report import AggregateReport
from validate_report import ValidateReport
@@ -41,6 +45,72 @@
)
self.parse_request(desired_responses, recurrent_run)
+@classmethod
+def create_reports_for_missing_days(cls, report, session):
+"""
+Find which runs of a recurrent report were missed and create one
report for each
+of those runs. This method considers at most the last 30 days when
searching for
+missed runs, due to performance reasons. For reports on timeseries
metrics, this
+method will set the end_date to midnight, today. For non-timeseries
metrics, it
+will set the start_date to yesterday and end_date to today.
+
+Parameters:
+report : the parent recurrent report
+session : a database session to the wikimetrics database
+
+Returns:
+An array of RunReport instances that each represent a missed run
of the
+parent report passed in. The current day's run is considered a
missed run for
+simplicity. However, truly missed runs may be flagged so
maintainers
+can troubleshoot reports that may have systemic problems.
+"""
+# get the report parameters
+desired_responses = json.loads(report.parameters)['responses']
+
+# get the days the report needs to be run for
+days_missing = cls.days_missing(report, session)
+
+for day in days_missing:
+new_run = cls(
+desired_responses,
+user_id=report.user_id,
+recurrent_run=True,
+)
+# TODO: keep implementing here :)
+return new_run
+
+@classmethod
+def days_missing(cls, report, session):
+"""
+Examine the past runs of a recurring report, for up to 30 days.
+Find any missing runs, including today's run. Raise an exception if
there
+are more runs than expected.
+
+Parameters:
+report : the recurring report to examine
+session : session to the database
+
+Returns:
+An array of datetimes representing the days when the report did
not run
+"""
+search_from = strip_time(report.created)
+look_at_most_this_far = to_datetime(thirty_days_ago())
+if search_from < look_at_most_this_far:
+search_from = look_at_most_this_far
+
[MediaWiki-commits] [Gerrit] Pluralise visualeditor-linkinspector-suggest-(matching|redir... - change (mediawiki...VisualEditor)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112164
Change subject: Pluralise
visualeditor-linkinspector-suggest-(matching|redirect|disambig)-page
..
Pluralise visualeditor-linkinspector-suggest-(matching|redirect|disambig)-page
Bug: 61071
Change-Id: Ia9893b8bfb80aa5d8a2bab9ecfe9ca1b6c85afbe
---
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
3 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/64/112164/1
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index bff41b0..5dbcfcb 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -115,9 +115,9 @@
"visualeditor-languages-tool": "Languages",
"visualeditor-linkinspector-illegal-title": "Invalid page title",
"visualeditor-linkinspector-suggest-external-link": "External link",
-"visualeditor-linkinspector-suggest-matching-page": "Matching page",
-"visualeditor-linkinspector-suggest-disambig-page": "Disambiguation page",
-"visualeditor-linkinspector-suggest-redirect-page": "Redirect page",
+"visualeditor-linkinspector-suggest-matching-page": "{{PLURAL:$1|Matching
page|Matching pages}}",
+"visualeditor-linkinspector-suggest-disambig-page":
"{{PLURAL:$1|Disambiguation page|Disambiguation pages}}",
+"visualeditor-linkinspector-suggest-redirect-page": "{{PLURAL:$1|Redirect
page|Redirect pages}}",
"visualeditor-linkinspector-suggest-new-page": "New page",
"visualeditor-loadwarning": "Error loading data from server: $1. Would you
like to retry?",
"visualeditor-loadwarning-token": "Error loading edit token from server:
$1. Would you like to retry?",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 09c22a6..079650e 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -120,9 +120,9 @@
"visualeditor-languages-tool": "Tool for opening the languages links
section of the meta dialog.\n{{Identical|Language}}",
"visualeditor-linkinspector-illegal-title": "Warning that the entered text
is not a valid page title.",
"visualeditor-linkinspector-suggest-external-link": "Label for an external
(Web) link in the link inspector.\n{{Identical|External link}}",
-"visualeditor-linkinspector-suggest-matching-page": "Label for suggested
matching local wiki page or pages in the link inspector",
-"visualeditor-linkinspector-suggest-disambig-page": "Label for suggested
disambiguation pages in the link inspector",
-"visualeditor-linkinspector-suggest-redirect-page": "Label for suggested
redirect pages in the link inspector",
+"visualeditor-linkinspector-suggest-matching-page": "Label for suggested
matching local wiki page or pages in the link inspector\nParams:\n* $1 - number
of matching pages, used for plural",
+"visualeditor-linkinspector-suggest-disambig-page": "Label for suggested
disambiguation pages in the link inspector\nParams:\n* $1 - number of
disambiguation pages, used for plural",
+"visualeditor-linkinspector-suggest-redirect-page": "Label for suggested
redirect pages in the link inspector\nParams:\n* $1 - number of redirect pages,
used for plural",
"visualeditor-linkinspector-suggest-new-page": "Label for a new page in
the link inspector.\n{{Identical|New page}}",
"visualeditor-loadwarning": "Text (JavaScript confirm()) shown when the
editor fails to load properly.\n\nParameters:\n* $1 - the error message from
the server, in English. e.g. \"parsoidserver-http-bad-status: 404\"",
"visualeditor-loadwarning-token": "Text (JavaScript confirm()) shown when
the editor fails to load properly.\n\nParameters:\n* $1 - the error message
from the server.",
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
index 87db8e5..da32ec9 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
@@ -178,7 +178,7 @@
if ( matchingPages && matchingPages.length ) {
items.push( new OO.ui.MenuSectionItemWidget(
'matchingPages',
- { '$': menu$, 'label': ve.msg(
'visualeditor-linkinspector-suggest-matching-page' ) }
+ { '$': menu$, 'label': ve.msg(
'visualeditor-linkinspector-suggest-matching-page', matchingPages.length ) }
) );
// Offer the exact text as a suggestion if the page exists
if ( pageExists && !pageExistsExact ) {
@@ -196,7 +196,7 @@
if ( disambigPages.length ) {
items.push( new OO.ui.MenuSectionItemWidget(
'disambigPages',
- { '$': menu$, 'label': v
[MediaWiki-commits] [Gerrit] Make history entries also check previous revisions if restored - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112163
Change subject: Make history entries also check previous revisions if restored
..
Make history entries also check previous revisions if restored
If the restore was on a suppress, the restore action should not be
displayed (unless the user has those permissions)
Meanwhile cleaned up some of the history code in Topic/Header.php:
permission checks automatically happen against the most recent
permission now already.
Change-Id: I0fda960a96af03cd04045088f06a49da79258859
---
M FlowActions.php
M includes/Block/Header.php
M includes/Block/Topic.php
3 files changed, 101 insertions(+), 111 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/63/112163/1
diff --git a/FlowActions.php b/FlowActions.php
index 408e308..1e35e73 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -451,7 +451,31 @@
'performs-writes' => false,
'log_type' => false,
'permissions' => array(
- PostRevision::MODERATED_NONE => '',
+ PostRevision::MODERATED_NONE => function(
AbstractRevision $revision, RevisionActionPermissions $permissions ) {
+ // @todo: well, this does screw things up a bit
because we're
+ // also checking against the most recent
revision
+ // if that one was a restore, we still want all
previous non-
+ // suppress-related stuff to show up...
+
+
+ // if a revision was the result of a
restore-action, we have
+ // to look at the previous revision what the
original moderation
+ // status was; permissions for the
restore-actions visibility
+ // is the same as the moderation (e.g. if user
can't see
+ // suppress actions, he can't see restores from
suppress
+ if ( $revision->getChangeType() ==
'restore-post' ) {
+ $revisionable =
$revision->getRevisionable();
+ $previous =
$revisionable->getPreviousRevision( $revision );
+
+ if ( $previous->getModerationState()
=== AbstractRevision::MODERATED_NONE ) {
+ return '';
+ }
+
+ return $permissions->getPermission(
$previous, 'topic-history' );
+ }
+
+ return '';
+ },
PostRevision::MODERATED_HIDDEN => '',
PostRevision::MODERATED_DELETED => '',
PostRevision::MODERATED_SUPPRESSED => 'flow-suppress',
@@ -463,7 +487,25 @@
'performs-writes' => false,
'log_type' => false,
'permissions' => array(
- PostRevision::MODERATED_NONE => '',
+ PostRevision::MODERATED_NONE => function(
AbstractRevision $revision, RevisionActionPermissions $permissions ) {
+ // if a revision was the result of a
restore-action, we have
+ // to look at the previous revision what the
original moderation
+ // status was; permissions for the
restore-actions visibility
+ // is the same as the moderation (e.g. if user
can't see
+ // suppress actions, he can't see restores from
suppress
+ if ( $revision->getChangeType() ==
'restore-post' ) {
+ $revisionable =
$revision->getRevisionable();
+ $previous =
$revisionable->getPreviousRevision( $revision );
+
+ if ( $previous->getModerationState()
=== AbstractRevision::MODERATED_NONE ) {
+ return '';
+ }
+
+ return $permissions->getPermission(
$previous, 'topic-history' );
+ }
+
+ return '';
+ },
PostRevision::MODERATED_HIDDEN => '',
PostRevision::MODERATED_DELETED => '',
PostRevision::MODERATED_SUPPRESSED => 'flow-suppress',
@@ -475,7 +517,25 @@
'performs-writes' => false,
'log_type' => false,
'permissions' => array(
- PostRevision::MODERATED_NONE => '',
+
[MediaWiki-commits] [Gerrit] Some permission fixes - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112161
Change subject: Some permission fixes
..
Some permission fixes
'view' is checked against Header objects too.
We currently have no moderation for those, so this wasn't called,
but it should really be more general than just PostRevision ;)
Also pretty sure that all users can see log excerpts for hidden/deleted
stuff, at least that's how it works in other parts of MW (deletion
log is accessible to all)
Change-Id: I62413fc89422d8d98842e0f2b03ab0bdc093c343
---
M FlowActions.php
1 file changed, 7 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/61/112161/1
diff --git a/FlowActions.php b/FlowActions.php
index c284c4c..408e308 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -1,5 +1,6 @@
false,
'permissions' => array(
PostRevision::MODERATED_NONE => '',
- PostRevision::MODERATED_HIDDEN => function(
PostRevision $post, RevisionActionPermissions $permissions ) {
- // visible for logged in users (or
anyone with hide permission)
- return
$permissions->getUser()->isLoggedIn() ? '' : 'flow-hide';
- },
- PostRevision::MODERATED_DELETED => array(
'flow-delete', 'flow-suppress' ),
+ PostRevision::MODERATED_HIDDEN => '',
+ PostRevision::MODERATED_DELETED => '',
PostRevision::MODERATED_SUPPRESSED => 'flow-suppress',
),
'button-method' => 'GET',
@@ -490,10 +488,10 @@
'log_type' => false, // don't log views
'permissions' => array(
PostRevision::MODERATED_NONE => '',
- PostRevision::MODERATED_HIDDEN => function(
PostRevision $post, RevisionActionPermissions $permissions ) {
- // visible for logged in users (or
anyone with hide permission)
- return
$permissions->getUser()->isLoggedIn() ? '' : 'flow-hide';
- },
+ PostRevision::MODERATED_HIDDEN => function(
AbstractRevision $post, RevisionActionPermissions $permissions ) {
+ // visible for logged in users (or anyone with
hide permission)
+ return $permissions->getUser()->isLoggedIn() ?
'' : 'flow-hide';
+ },
PostRevision::MODERATED_DELETED => array(
'flow-delete', 'flow-suppress' ),
PostRevision::MODERATED_SUPPRESSED => 'flow-suppress',
),
--
To view, visit https://gerrit.wikimedia.org/r/112161
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I62413fc89422d8d98842e0f2b03ab0bdc093c343
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make a method to check permissions against only the specific... - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112162
Change subject: Make a method to check permissions against only the specific
revision
..
Make a method to check permissions against only the specific revision
While it's generally ok to check against both the given revision and
the most recent, for history entries, we'll want to only check the
given revision.
Change-Id: Ia47fa864a0d85e06b0479810ba44c0f2562780a7
---
M includes/RevisionActionPermissions.php
1 file changed, 67 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/62/112162/1
diff --git a/includes/RevisionActionPermissions.php
b/includes/RevisionActionPermissions.php
index c55c4d3..eda6e19 100644
--- a/includes/RevisionActionPermissions.php
+++ b/includes/RevisionActionPermissions.php
@@ -53,25 +53,12 @@
* @return bool
*/
public function isAllowed( AbstractRevision $revision = null, $action )
{
- // Users must have the core 'edit' permission to perform any
write action in flow
- $performsWrites = $this->actions->getValue( $action,
'performs-writes' );
- if ( $performsWrites && ( !$this->user->isAllowed( 'edit' ) ||
$this->user->isBlocked() ) ) {
- return false;
+ $allowed = $this->isRevisionAllowed( $revision, $action );
+
+ // if there was no revision object, it's pointless to find last
revision
+ if ( !$revision instanceof AbstractRevision ) {
+ return $allowed;
}
-
- $permission = $this->getPermission( $revision, $action );
-
- // If no permission is defined for this state, then the action
is not allowed
- // check if permission is set for this action
- if ( $permission === null ) {
- return false;
- }
-
- // Check if user is allowed to perform action against this
revision
- $allowed = call_user_func_array(
- array( $this->user, 'isAllowedAny' ),
- (array) $permission
- );
// Also check if the user would be allowed to perform this
against
// against the most recent revision (unless it's already the
most recent
@@ -79,10 +66,10 @@
// checking against a revision at one point in time alone isn't
enough.
$last = $revision->getRevisionable()->getLastRevision();
- // check if $revision is not already the most recent, to prevent
- // infinite recursion in this method
+ // check if $revision is not already the most recent, in which
case the
+ // additional check is pointless
$isLastRevision = $last->getRevisionId()->getHex() ==
$revision->getRevisionId()->getHex();
- return $allowed && ( $isLastRevision || $this->isAllowed(
$last, $action ) );
+ return $allowed && ( $isLastRevision ||
$this->isRevisionAllowed( $last, $action ) );
}
/**
@@ -112,6 +99,65 @@
}
/**
+* Check if a user is allowed to perform a certain action, only against
1
+* specific revision (whereas the default isAllowed() will check if the
+* given $action is allowed for both given and the most current
revision)
+*
+* @param AbstractRevision[optional] $revision
+* @param string $action
+* @return bool
+*/
+ public function isRevisionAllowed( AbstractRevision $revision = null,
$action ) {
+ // Users must have the core 'edit' permission to perform any
write action in flow
+ $performsWrites = $this->actions->getValue( $action,
'performs-writes' );
+ if ( $performsWrites && ( !$this->user->isAllowed( 'edit' ) ||
$this->user->isBlocked() ) ) {
+ return false;
+ }
+
+ $permission = $this->getPermission( $revision, $action );
+
+ // If no permission is defined for this state, then the action
is not allowed
+ // check if permission is set for this action
+ if ( $permission === null ) {
+ return false;
+ }
+
+ // Check if user is allowed to perform action against this
revision
+ return call_user_func_array(
+ array( $this->user, 'isAllowedAny' ),
+ (array) $permission
+ );
+ }
+
+ /**
+* Check if a user is allowed to perform certain actions, only against 1
+* specific revision (whereas the default isAllowed() will check if the
+* given $action is allowed for both given and the most current
revis
[MediaWiki-commits] [Gerrit] Split permission-logic into separate method - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112158
Change subject: Split permission-logic into separate method
..
Split permission-logic into separate method
Change-Id: I81618dd2aa9a1cbbefb0ce494b86db3ccd18051a
---
M includes/RevisionActionPermissions.php
1 file changed, 27 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/58/112158/1
diff --git a/includes/RevisionActionPermissions.php
b/includes/RevisionActionPermissions.php
index 2121fda..7cab0b0 100644
--- a/includes/RevisionActionPermissions.php
+++ b/includes/RevisionActionPermissions.php
@@ -59,24 +59,12 @@
return false;
}
- // $revision may be null if the revision has yet to be created
- $moderationState = AbstractRevision::MODERATED_NONE;
- if ( $revision instanceof AbstractRevision ) {
- $moderationState = $revision->getModerationState();
- }
- $permission = $this->actions->getValue( $action, 'permissions',
$moderationState );
+ $permission = $this->getPermission( $revision, $action );
// If no permission is defined for this state, then the action
is not allowed
// check if permission is set for this action
if ( $permission === null ) {
return false;
- }
-
- // Some permissions may be more complex to be defined as simple
array
- // values, in which case they're a Closure (which will accept
- // AbstractRevision & FlowActionPermissions as arguments)
- if ( $permission instanceof Closure ) {
- $permission = $permission( $revision, $this );
}
// check if user is allowed to perform action
@@ -113,6 +101,32 @@
}
/**
+* Returns the permission specified in FlowActions for the given action
+* against the given revision's moderation state.
+*
+* @param AbstractRevision[optional] $revision
+* @param string $action
+* @return Closure|string
+*/
+ public function getPermission( AbstractRevision $revision = null,
$action ) {
+ // $revision may be null if the revision has yet to be created
+ $moderationState = AbstractRevision::MODERATED_NONE;
+ if ( $revision instanceof AbstractRevision ) {
+ $moderationState = $revision->getModerationState();
+ }
+ $permission = $this->actions->getValue( $action, 'permissions',
$moderationState );
+
+ // Some permissions may be more complex to be defined as simple
array
+ // values, in which case they're a Closure (which will accept
+ // AbstractRevision & FlowActionPermissions as arguments)
+ if ( $permission instanceof Closure ) {
+ $permission = $permission( $revision, $this );
+ }
+
+ return $permission;
+ }
+
+ /**
* @return User
*/
public function getUser() {
--
To view, visit https://gerrit.wikimedia.org/r/112158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I81618dd2aa9a1cbbefb0ce494b86db3ccd18051a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make sure permission checks also check against current revis... - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/112160 Change subject: Make sure permission checks also check against current revisions .. Make sure permission checks also check against current revisions Change-Id: I4b63b5ab3f428b499dc5318298238b50b17978e8 --- M includes/RevisionActionPermissions.php 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/60/112160/1 diff --git a/includes/RevisionActionPermissions.php b/includes/RevisionActionPermissions.php index 7cab0b0..c55c4d3 100644 --- a/includes/RevisionActionPermissions.php +++ b/includes/RevisionActionPermissions.php @@ -67,11 +67,22 @@ return false; } - // check if user is allowed to perform action - return call_user_func_array( + // Check if user is allowed to perform action against this revision + $allowed = call_user_func_array( array( $this->user, 'isAllowedAny' ), (array) $permission ); + + // Also check if the user would be allowed to perform this against + // against the most recent revision (unless it's already the most recent + // revision) - the last revision is the current state of a revision, so + // checking against a revision at one point in time alone isn't enough. + $last = $revision->getRevisionable()->getLastRevision(); + + // check if $revision is not already the most recent, to prevent + // infinite recursion in this method + $isLastRevision = $last->getRevisionId()->getHex() == $revision->getRevisionId()->getHex(); + return $allowed && ( $isLastRevision || $this->isAllowed( $last, $action ) ); } /** -- To view, visit https://gerrit.wikimedia.org/r/112160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4b63b5ab3f428b499dc5318298238b50b17978e8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add path from Revision object to Revisionable object - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112159
Change subject: Add path from Revision object to Revisionable object
..
Add path from Revision object to Revisionable object
Change-Id: Ida4c819a29ee99df1c9b43541c8ad0c3c0499aaa
---
M includes/Model/AbstractRevision.php
M includes/Model/Header.php
M includes/Model/PostRevision.php
3 files changed, 19 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/59/112159/1
diff --git a/includes/Model/AbstractRevision.php
b/includes/Model/AbstractRevision.php
index 0942bac..cedca3c 100644
--- a/includes/Model/AbstractRevision.php
+++ b/includes/Model/AbstractRevision.php
@@ -519,4 +519,9 @@
}
abstract public function getRevisionType();
+
+ /**
+* @return AbstractRevisionable
+*/
+ abstract public function getRevisionable();
}
diff --git a/includes/Model/Header.php b/includes/Model/Header.php
index 22408bf..d33 100644
--- a/includes/Model/Header.php
+++ b/includes/Model/Header.php
@@ -42,4 +42,11 @@
public function getWorkflowId() {
return $this->workflowId;
}
+
+ /**
+* @return HeaderRevisionable
+*/
+ public function getRevisionable() {
+ return HeaderRevisionable::newFromRevision( $this );
+ }
}
diff --git a/includes/Model/PostRevision.php b/includes/Model/PostRevision.php
index 023d602..6005f2f 100644
--- a/includes/Model/PostRevision.php
+++ b/includes/Model/PostRevision.php
@@ -458,4 +458,11 @@
}
return $user->getId() == $this->getCreatorId();
}
+
+ /**
+* @return PostRevisionable
+*/
+ public function getRevisionable() {
+ return PostRevisionable::newFromRevision( $this );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/112159
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida4c819a29ee99df1c9b43541c8ad0c3c0499aaa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: c5157ac..604d522 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: c5157ac..604d522 .. Syncronize VisualEditor: c5157ac..604d522 Change-Id: Ie3687ef3f8e8ba7b112c5881ba58378608c80cde --- 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 c5157ac..604d522 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit c5157ac79a547282c846a976667552c3f932857c +Subproject commit 604d52244dac6aa2db9632ae9852930031a68b59 -- To view, visit https://gerrit.wikimedia.org/r/112157 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie3687ef3f8e8ba7b112c5881ba58378608c80cde Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: c5157ac..604d522 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/112157 Change subject: Syncronize VisualEditor: c5157ac..604d522 .. Syncronize VisualEditor: c5157ac..604d522 Change-Id: Ie3687ef3f8e8ba7b112c5881ba58378608c80cde --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/57/112157/1 diff --git a/VisualEditor b/VisualEditor index c5157ac..604d522 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit c5157ac79a547282c846a976667552c3f932857c +Subproject commit 604d52244dac6aa2db9632ae9852930031a68b59 -- To view, visit https://gerrit.wikimedia.org/r/112157 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3687ef3f8e8ba7b112c5881ba58378608c80cde Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make this.loading abortable - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Make this.loading abortable
..
Make this.loading abortable
.then() removes the .abort() method from the promise, even though
we had return jqxhr; in the then() callback. So store xhr in
a variable and put the abort method back.
This fixes a JS error upon calling this.loading.abort();
Change-Id: I50460782e58399198bacc02d028984682ddbed56
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 5c246a4..fde8391 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -756,7 +756,7 @@
* @returns {boolean} Loading has been started
*/
ve.init.mw.Target.prototype.load = function ( additionalModules ) {
- var data, start;
+ var data, start, xhr;
// Prevent duplicate requests
if ( this.loading ) {
return false;
@@ -785,8 +785,8 @@
// Load DOM
start = ve.now();
- this.loading = this.constructor.static.apiRequest( data )
- .then( function ( data, status, jqxhr ) {
+ xhr = this.constructor.static.apiRequest( data );
+ this.loading = xhr.then( function ( data, status, jqxhr ) {
ve.track( 'performance.system.domLoad', {
'bytes': $.byteLength( jqxhr.responseText ),
'duration': ve.now() - start,
@@ -796,7 +796,8 @@
return jqxhr;
} )
.done( ve.bind( ve.init.mw.Target.onLoad, this ) )
- .fail( ve.bind( ve.init.mw.Target.onLoadError, this ) );
+ .fail( ve.bind( ve.init.mw.Target.onLoadError, this ) )
+ .promise( { 'abort': xhr.abort } );
return true;
};
--
To view, visit https://gerrit.wikimedia.org/r/111666
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I50460782e58399198bacc02d028984682ddbed56
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable wgTemplateDataUseGUI on MediaWiki.org - change (operations/mediawiki-config)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/112156 Change subject: Enable wgTemplateDataUseGUI on MediaWiki.org .. Enable wgTemplateDataUseGUI on MediaWiki.org Change-Id: Ic31958f53cbef470a7d31da1ad420e3e81b223ea --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/56/112156/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 14d32e9..2fbc917 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10663,6 +10663,7 @@ 'wmgTemplateDataUseGUI' => array( 'default' => false, + 'mediawikiwiki' => true, ), // Bug 5 - Disable for logged-out users if wmgVisualEditorDefault is true -- To view, visit https://gerrit.wikimedia.org/r/112156 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic31958f53cbef470a7d31da1ad420e3e81b223ea Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add hook SkinMinerva::getDefaultModules - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112155
Change subject: Add hook SkinMinerva::getDefaultModules
..
Add hook SkinMinerva::getDefaultModules
To allow Zero and other extensions to tweak default
modules before they are served.
Created getModeDefaultModules so that hook runs after beta
and alpha modules have been added.
Change-Id: I8addf6b0aba64c95944653656b9a9addee218e93
---
M includes/skins/SkinMinerva.php
M includes/skins/SkinMinervaAlpha.php
M includes/skins/SkinMinervaBeta.php
3 files changed, 10 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/55/112155/1
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index cf38926..51a3179 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -632,7 +632,7 @@
return $vars;
}
- public function getDefaultModules() {
+ protected function getModeDefaultModules() {
$modules = parent::getDefaultModules();
// flush unnecessary modules
$modules['content'] = array();
@@ -676,6 +676,11 @@
);
}
}
+ }
+
+ public function getDefaultModules() {
+ $modules = $this->getModeDefaultModules();
+ wfRunHooks( 'SkinMinervaGetDefaultModules', array( &$modules )
);
return $modules;
}
diff --git a/includes/skins/SkinMinervaAlpha.php
b/includes/skins/SkinMinervaAlpha.php
index e49a8b5..dac0eec 100644
--- a/includes/skins/SkinMinervaAlpha.php
+++ b/includes/skins/SkinMinervaAlpha.php
@@ -8,8 +8,8 @@
return wfMessage( 'mobile-frontend-placeholder-alpha' )->text();
}
- public function getDefaultModules() {
- $modules = parent::getDefaultModules();
+ protected function getModeDefaultModules() {
+ $modules = parent::getModeDefaultModules();
$modules['alpha'] = array( 'mobile.alpha' );
return $modules;
}
diff --git a/includes/skins/SkinMinervaBeta.php
b/includes/skins/SkinMinervaBeta.php
index 4b0ebba..15364bb 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -55,8 +55,8 @@
return $vars;
}
- public function getDefaultModules() {
- $modules = parent::getDefaultModules();
+ protected function getModeDefaultModules() {
+ $modules = parent::getModeDefaultModules();
$modules['mobile'][] = 'mobile.head.beta';
$modules['beta'] = array( 'mobile.beta' );
$modules['beta'][] = 'mobile.geonotahack';
--
To view, visit https://gerrit.wikimedia.org/r/112155
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8addf6b0aba64c95944653656b9a9addee218e93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 50b6de4..c5157ac - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 50b6de4..c5157ac .. Syncronize VisualEditor: 50b6de4..c5157ac Change-Id: Ia44a25afc20962b84473adf89d3803185bceb41d --- 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 50b6de4..c5157ac 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 50b6de4866961847928d2e25bee1f67157f0394f +Subproject commit c5157ac79a547282c846a976667552c3f932857c -- To view, visit https://gerrit.wikimedia.org/r/112154 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia44a25afc20962b84473adf89d3803185bceb41d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 50b6de4..c5157ac - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/112154 Change subject: Syncronize VisualEditor: 50b6de4..c5157ac .. Syncronize VisualEditor: 50b6de4..c5157ac Change-Id: Ia44a25afc20962b84473adf89d3803185bceb41d --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/54/112154/1 diff --git a/VisualEditor b/VisualEditor index 50b6de4..c5157ac 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 50b6de4866961847928d2e25bee1f67157f0394f +Subproject commit c5157ac79a547282c846a976667552c3f932857c -- To view, visit https://gerrit.wikimedia.org/r/112154 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia44a25afc20962b84473adf89d3803185bceb41d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixes for 239bae7512 (mobile toolbar) - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixes for 239bae7512 (mobile toolbar)
..
Fixes for 239bae7512 (mobile toolbar)
* Use correct class name for setUpToolbar() in MobileViewTarget
* Move shared setUpToolbar() code into ve.init.mw.Target
* Fix iconModuleStyles documentation, remove leading space
Change-Id: Icf5ed36fd817837c0434db8202bef8a78e6cb898
---
M modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
3 files changed, 31 insertions(+), 24 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
index a47a916..1a1c556 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
@@ -58,17 +58,15 @@
};
/**
- * Show the toolbar.
- *
- * This also transplants the toolbar to a new location.
- *
- * @method
+ * @inheritdoc
*/
-ve.init.mw.Target.prototype.setUpToolbar = function () {
- this.toolbar = new ve.ui.TargetToolbar( this, this.surface, { 'shadow':
true, 'actions': true } );
- this.toolbar.setup( this.constructor.static.toolbarGroups );
- this.surface.addCommands( this.constructor.static.surfaceCommands );
+ve.init.mw.MobileViewTarget.prototype.setUpToolbar = function () {
+ // Parent method
+ ve.init.mw.Target.prototype.setUpToolbar.call( this );
+
this.toolbar.$element
+ // FIXME shouldn't be using viewPageTarget styles
.addClass( 've-init-mw-viewPageTarget-toolbar' )
+ // Move the toolbar to the overlay header
.appendTo( '.overlay-header > .toolbar' );
};
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 98f45ca..eb602e9 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -154,15 +154,21 @@
/* Methods */
-/** */
+/**
+ * @inheritdoc
+ */
ve.init.mw.ViewPageTarget.prototype.setUpToolbar = function () {
- this.toolbar = new ve.ui.TargetToolbar( this, this.surface, { 'shadow':
true, 'actions': true } );
- this.toolbar.setup( this.constructor.static.toolbarGroups );
- this.surface.addCommands( this.constructor.static.surfaceCommands );
+ var $firstHeading = $( '#firstHeading' );
+ // Parent method
+ ve.init.mw.Target.prototype.setUpToolbar.call( this );
+
this.toolbar.enableFloatable();
this.toolbar.$element
- .addClass( 've-init-mw-viewPageTarget-toolbar' )
- .insertBefore( $( '#firstHeading' ).length > 0 ?
'#firstHeading' : this.surface.$element );
+ .addClass( 've-init-mw-viewPageTarget-toolbar' );
+ // Move the toolbar to before #firstHeading if it exists
+ if ( $firstHeading.length ) {
+ this.toolbar.$element.insertBefore( $firstHeading );
+ }
this.toolbar.$bar.slideDown( 'fast', ve.bind( function () {
// Check the surface wasn't torn down while the toolbar was
animating
if ( this.surface ) {
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index aa1b5ee..ac17c96 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -216,11 +216,13 @@
/**
* Defines modules needed to style icons.
*
- * @type {Object}
- * @property {string[]} vector An array of module names that should be loaded
when SVG supported.
- * @property {string[]} raster An array of module names that should be loaded
when SVG is not supported.
+ * @static
+ * @inheritable
+ * @property {Object} iconModuleStyles
+ * @property {string[]} iconModuleStyles.vector Modules that should be loaded
when SVG supported
+ * @property {string[]} iconModuleStyles.raster Modules that should be loaded
when SVG is not supported
*/
- ve.init.mw.Target.static.iconModuleStyles = {
+ve.init.mw.Target.static.iconModuleStyles = {
'vector': ['ext.visualEditor.viewPageTarget.icons-vector',
'ext.visualEditor.icons-vector'],
'raster': ['ext.visualEditor.viewPageTarget.icons-raster',
'ext.visualEditor.icons-raster']
};
@@ -1176,14 +1178,15 @@
};
/**
- * Show the toolbar.
+ * Set up the toolbar and insert it into the DOM.
*
- * @abstract
- * @method
- * @throws {Error} If abstract method has not been implemented.
+ * The default implementation inserts it before the surface, but subclasses
can override this.
*/
ve.init.mw.Target.prototype.setUpToolbar = function () {
- throw new Error( 've.init.mw.Target subclass must implement
setUpToolbar' );
+
[MediaWiki-commits] [Gerrit] Mark disambiguation and redirect pages in the link inspector - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Mark disambiguation and redirect pages in the link inspector
..
Mark disambiguation and redirect pages in the link inspector
Bug: 50240
Change-Id: If975398e4d6b13eea6207ee80b33067e65acd724
---
M VisualEditor.php
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/styles/ve.ui.MWWidget.css
M modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
5 files changed, 87 insertions(+), 17 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.php b/VisualEditor.php
index d94213e..7bddaf7 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -719,6 +719,8 @@
'visualeditor-linkinspector-illegal-title',
'visualeditor-linkinspector-suggest-external-link',
'visualeditor-linkinspector-suggest-matching-page',
+ 'visualeditor-linkinspector-suggest-disambig-page',
+ 'visualeditor-linkinspector-suggest-redirect-page',
'visualeditor-linkinspector-suggest-new-page',
'visualeditor-media-input-placeholder',
'visualeditor-meta-tool',
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index c924dde..7309ecc 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -110,6 +110,8 @@
"visualeditor-linkinspector-illegal-title": "Invalid page title",
"visualeditor-linkinspector-suggest-external-link": "External link",
"visualeditor-linkinspector-suggest-matching-page": "Matching page",
+"visualeditor-linkinspector-suggest-disambig-page": "Disambiguation page",
+"visualeditor-linkinspector-suggest-redirect-page": "Redirect page",
"visualeditor-linkinspector-suggest-new-page": "New page",
"visualeditor-loadwarning": "Error loading data from server: $1. Would you
like to retry?",
"visualeditor-loadwarning-token": "Error loading edit token from server:
$1. Would you like to retry?",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index b3a7ae5..aead46a 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -115,6 +115,8 @@
"visualeditor-linkinspector-illegal-title": "Warning that the entered text
is not a valid page title.",
"visualeditor-linkinspector-suggest-external-link": "Label for an external
(Web) link in the link inspector.\n{{Identical|External link}}",
"visualeditor-linkinspector-suggest-matching-page": "Label for suggested
matching local wiki page or pages in the link inspector",
+"visualeditor-linkinspector-suggest-disambig-page": "Label for suggested
disambiguation pages in the link inspector",
+"visualeditor-linkinspector-suggest-redirect-page": "Label for suggested
redirect pages in the link inspector",
"visualeditor-linkinspector-suggest-new-page": "Label for a new page in
the link inspector.\n{{Identical|New page}}",
"visualeditor-loadwarning": "Text (JavaScript confirm()) shown when the
editor fails to load properly.\n\nParameters:\n* $1 - the error message from
the server, in English. e.g. \"parsoidserver-http-bad-status: 404\"",
"visualeditor-loadwarning-token": "Text (JavaScript confirm()) shown when
the editor fails to load properly.\n\nParameters:\n* $1 - the error message
from the server.",
@@ -186,4 +188,4 @@
"visualeditor-wikitext-warning": "Contents of notification displayed when
Wikitext has been detected.\n\nRefers to:\n*
{{msg-mw|Visualeditor-wikitext-warning-link}}\n*
{{msg-mw|Visualeditor-ca-editsource}}",
"visualeditor-wikitext-warning-link": "Link to page describing what
Wikitext is.\n\nUsed in:\n* {{msg-mw|Visualeditor-wikitext-warning}}.",
"visualeditor-wikitext-warning-title": "Title of notification displayed
when Wikitext has been detected"
-}
\ No newline at end of file
+}
diff --git a/modules/ve-mw/ui/styles/ve.ui.MWWidget.css
b/modules/ve-mw/ui/styles/ve.ui.MWWidget.css
index 3e361f9..82487f9 100644
--- a/modules/ve-mw/ui/styles/ve.ui.MWWidget.css
+++ b/modules/ve-mw/ui/styles/ve.ui.MWWidget.css
@@ -23,6 +23,8 @@
.ve-ui-mwLinkTargetInputWidget-menu .oo-ui-menuItemWidget[rel=existingPage],
.ve-ui-mwLinkTargetInputWidget-menu .oo-ui-menuItemWidget[rel=matchingPage],
+.ve-ui-mwLinkTargetInputWidget-menu .oo-ui-menuItemWidget[rel=disambigPage],
+.ve-ui-mwLinkTargetInputWidget-menu .oo-ui-menuItemWidget[rel=redirectPage],
.ve-ui-mwLinkTargetInputWidget-menu .oo-ui-menuItemWidget[rel=externalLink] {
color: #0645AD;
}
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
index 94599be..87db8e5 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTarg
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 01e8dac..50b6de4 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/112153 Change subject: Syncronize VisualEditor: 01e8dac..50b6de4 .. Syncronize VisualEditor: 01e8dac..50b6de4 Change-Id: I90799ebe2095e35ea2d2ff75e36651086391bdc0 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/53/112153/1 diff --git a/VisualEditor b/VisualEditor index 01e8dac..50b6de4 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 01e8dac42bf470febd105c8d81745798097aca1f +Subproject commit 50b6de4866961847928d2e25bee1f67157f0394f -- To view, visit https://gerrit.wikimedia.org/r/112153 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I90799ebe2095e35ea2d2ff75e36651086391bdc0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 01e8dac..50b6de4 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 01e8dac..50b6de4 .. Syncronize VisualEditor: 01e8dac..50b6de4 Change-Id: I90799ebe2095e35ea2d2ff75e36651086391bdc0 --- 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 01e8dac..50b6de4 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 01e8dac42bf470febd105c8d81745798097aca1f +Subproject commit 50b6de4866961847928d2e25bee1f67157f0394f -- To view, visit https://gerrit.wikimedia.org/r/112153 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I90799ebe2095e35ea2d2ff75e36651086391bdc0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix undefined variable - change (mediawiki...BookManagerv2)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112152
Change subject: Fix undefined variable
..
Fix undefined variable
Change-Id: I4a10f3355d2e76f6f50b9970056db8831ce26005
---
M includes/JsonContent.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BookManagerv2
refs/changes/52/112152/1
diff --git a/includes/JsonContent.php b/includes/JsonContent.php
index 5095dbb..82096d5 100644
--- a/includes/JsonContent.php
+++ b/includes/JsonContent.php
@@ -142,7 +142,7 @@
* @return string: HTML representation
*/
function getHighlightHtml() {
- $schema = $this->getJsonData();
+ $block = $this->getJsonData();
return is_array( $block ) ? self::objectTable( $block ) : '';
}
}
--
To view, visit https://gerrit.wikimedia.org/r/112152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a10f3355d2e76f6f50b9970056db8831ce26005
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BookManagerv2
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Removed "Justify paragraphs" from MW user Preference." - change (mediawiki/core)
Parent5446 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112151
Change subject: Revert "Removed "Justify paragraphs" from MW user Preference."
..
Revert "Removed "Justify paragraphs" from MW user Preference."
Consensus seems to have determined that users actually want this
user preference.
This reverts commit 2f9cfa3d26fd11e4d816502df9f3e4a68b5bc4c4.
Change-Id: Id86ff80350944d0db395cf63d9fdb9043242b7a1
---
M RELEASE-NOTES-1.23
M includes/DefaultSettings.php
M includes/Preferences.php
M includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
M languages/messages/MessagesEn.php
M maintenance/language/messages.inc
6 files changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/51/112151/1
diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 6b70ce6..fdefa0b 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -193,7 +193,6 @@
* (bug 52811) Preference "Enable section editing via [edit] links" was removed.
* (bug 52813) Preference "Show table of contents (for pages with more than
3 headings)" was removed.
-* (bug 52810) Preference "Justify paragraphs" was removed.
Removed classes
* FakeMemCachedClient (deprecated in 1.18)
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 63883ab..9264947 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3989,6 +3989,7 @@
'hideminor' => 0,
'hidepatrolled' => 0,
'imagesize' => 2,
+ 'justify' => 0,
'math' => 1,
'minordefault' => 0,
'newpageshidepatrolled' => 0,
diff --git a/includes/Preferences.php b/includes/Preferences.php
index dbf4346..04e9114 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -761,6 +761,14 @@
'label-message' => 'tog-showhiddencats'
);
+ if ( $wgAllowUserCssPrefs ) {
+ $defaultPreferences['justify'] = array(
+ 'type' => 'toggle',
+ 'section' => 'rendering/advancedrendering',
+ 'label-message' => 'tog-justify',
+ );
+ }
+
$defaultPreferences['numberheadings'] = array(
'type' => 'toggle',
'section' => 'rendering/advancedrendering',
diff --git a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
index 8ce0ca7..424afce 100644
--- a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
@@ -74,6 +74,9 @@
$rules[] = 'a:lang(ar), a:lang(kk-arab), a:lang(mzn), '
.
'a:lang(ps), a:lang(ur) { text-decoration: none; }';
}
+ if ( $options['justify'] ) {
+ $rules[] = "#article, #bodyContent, #mw_content {
text-align: justify; }\n";
+ }
if ( $options['editfont'] !== 'default' ) {
// Double-check that $options['editfont'] consists of
safe characters only
if ( preg_match( '/^[a-zA-Z0-9_, -]+$/',
$options['editfont'] ) ) {
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index ca1e2b2..21f73cc 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -658,6 +658,7 @@
# User preference toggles
'tog-underline' => 'Link underlining:',
+'tog-justify' => 'Justify paragraphs',
'tog-hideminor' => 'Hide minor edits in recent changes',
'tog-hidepatrolled' => 'Hide patrolled edits in recent changes',
'tog-newpageshidepatrolled' => 'Hide patrolled pages from new page list',
diff --git a/maintenance/language/messages.inc
b/maintenance/language/messages.inc
index 8fbb778..ea45ee6 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -28,6 +28,7 @@
),
'toggles' => array(
'tog-underline',
+ 'tog-justify',
'tog-hideminor',
'tog-hidepatrolled',
'tog-newpageshidepatrolled',
--
To view, visit https://gerrit.wikimedia.org/r/112151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id86ff80350944d0db395cf63d9fdb9043242b7a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Parent5446
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add shell account for phuedx and add to mortals - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112150
Change subject: add shell account for phuedx and add to mortals
..
add shell account for phuedx and add to mortals
RT #6785
username: phuedx
real name: Sam Smith
email: samsmith@wm
labs user/IRC user: phuedx
team: Growth
requested: tin, deploy mediawiki-config,
extensions/GettingStarted
extensions/GuidedTours deployment
works with: Matt Flaschen
manager/approved: Terry Chay
Change-Id: I42075d6828f287ec51a9b36588e2702a48f95ece
key:
https://office.wikimedia.org/w/index.php?title=User:SDSmith_%28WMF%29&oldid=106746
---
M manifests/admins.pp
1 file changed, 21 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/112150/1
diff --git a/manifests/admins.pp b/manifests/admins.pp
index fa259c2..6e167ac 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -3362,6 +3362,26 @@
}
}
+# RT 6785
+class phuedx inherits baseaccount {
+$username = 'phuedx'
+$realname = 'Sam Smith'
+$uid = 3926
+
+unixaccount { $realname: username => $username, uid => $uid, gid =>
$gid }
+
+if $manage_home {
+Ssh_authorized_key { require => Unixaccount[$realname] }
+
+ssh_authorized_key { 'samsm...@wikimedia.org':
+ensure => present,
+user => $username,
+type => 'ssh-rsa',
+key=>
'B3NzaC1yc2EDAQABAAABAQC9+TJfrksUVwMxt5Oj6NZxacj3UyKQNN+J48r7nF2SSVoH3hOLpXLB5Vep09X2bxyH+1AsqGQKGLW8a5DSTcEhLQ5Rc01GmaV461e51lxJoRRlDtCI6+sqBJRstZVWUrxYeAjAhaif0CWmepySMWytrFrLJuTQ08L+R4XH9uXxWfE+qY6KBjrrOGKS+98E13vYlxegxpctz729ZC0jDrikSNX47lu5us5OTMotaYPOu/lFYO8RUmqQnGNMjoKJjKQJclDZUp9fV3YWPW9XtJR6z1CACJIqng0501bWulMsjw/nWySoJLrh4H99KeLUVSiEWibupoTI6FKO2PC0vrzF',
+}
+}
+}
+
# FIXME: not an admin. This is more like a system account.
class l10nupdate inherits baseaccount {
$username = "l10nupdate"
@@ -3468,6 +3488,7 @@
include accounts::olivneh # renamed to 'ori'
include accounts::pdhanda # access revoked
include accounts::pgehres
+ include accounts::phuedx # igranted per RT 6785
include accounts::raindrift # access revoked per RT 3088
include accounts::reedy
include accounts::rmoen
--
To view, visit https://gerrit.wikimedia.org/r/112150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I42075d6828f287ec51a9b36588e2702a48f95ece
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] logstash: Add normalized_message field to all events - change (operations/puppet)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112149
Change subject: logstash: Add normalized_message field to all events
..
logstash: Add normalized_message field to all events
Copy the message of all events destined for storage in Elasticsearch
into a "normalized_message" field that is truncated to 255 characters.
This can be used in dashboards as a term search to correlate common
messages.
Change-Id: I01c50456cf0e334075acacbe2aebe5d8fc941d31
---
A files/logstash/filter-add-normalized-message.conf
M manifests/role/logstash.pp
2 files changed, 40 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/112149/1
diff --git a/files/logstash/filter-add-normalized-message.conf
b/files/logstash/filter-add-normalized-message.conf
new file mode 100644
index 000..b77662a
--- /dev/null
+++ b/files/logstash/filter-add-normalized-message.conf
@@ -0,0 +1,34 @@
+# vim:set sw=2 ts=2 sts=2 et
+# Add normalized_message field to events bound for logstash
+filter {
+
+ if "es" in [tags] and ![normalized_message] {
+mutate {
+ # Create a copy of message field that can be normalized
+ add_field => [ "normalized_message", "%{message}" ]
+}
+# Remove documentation anchor tags
+mutate {
+ gsub => [
+"normalized_message",
+" \[[^<]*\]",
+""
+ ]
+}
+# Trim the normalized_message to a maximum of 255 characters
+# This is done because our Elasticsearch schema doesn't store raw fields
+# for strings longer than 255 characters and we want something to show
+# in terms queries even if it's shortened.
+grok {
+ match => [
+"normalized_message",
+"^(?.{255}).*$"
+ ]
+ overwrite => [ "normalized_message" ]
+ named_captures_only => true
+ add_tag => [ "normalized_message_trimmed" ]
+ tag_on_failure => [ "normalized_message_untrimmed" ]
+}
+ }
+
+}
diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp
index d17f25a..2ad37d2 100644
--- a/manifests/role/logstash.pp
+++ b/manifests/role/logstash.pp
@@ -57,7 +57,7 @@
logstash::conf { 'filter_strip_ansi_color':
source => 'puppet:///files/logstash/filter-strip-ansi-color.conf',
-priority => 50,
+priority => 40,
}
logstash::conf { 'filter_syslog':
@@ -70,6 +70,11 @@
priority => 50,
}
+logstash::conf { 'filter_add_normalized_message':
+source =>
'puppet:///files/logstash/filter-add-normalized-message.conf',
+priority => 60,
+}
+
class { '::logstash::output::elasticsearch':
host=> '127.0.0.1',
replication => 'async',
--
To view, visit https://gerrit.wikimedia.org/r/112149
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I01c50456cf0e334075acacbe2aebe5d8fc941d31
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] core: Add a 'super' property to inheriting classes - change (oojs/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112148
Change subject: core: Add a 'super' property to inheriting classes
..
core: Add a 'super' property to inheriting classes
* Fix typo in example where it said ".prop" (doesn't exist)
instead of ".static".
* Show usage example for the new super property.
* Add unit tests for super.
* Improve existing unit tests to test that instance properties
added by the constructor are being set as expected.
Change-Id: Ic301140d2e0ad99eddc83f9031e12a7641fd10ae
---
M src/core.js
M test/oo.core.test.js
2 files changed, 30 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/48/112148/1
diff --git a/src/core.js b/src/core.js
index 1e4d026..8e3d1da 100644
--- a/src/core.js
+++ b/src/core.js
@@ -50,23 +50,27 @@
* multiple constructors consider storing an instance of the other
constructor in a
* property instead, or perhaps use a mixin (see oo.mixinClass).
*
- * function Foo() {}
- * Foo.prototype.jump = function () {};
+ * function Thing() {}
+ * Thing.prototype.exists = function () {};
*
- * function FooBar() {}
- * oo.inheritClass( FooBar, Foo );
- * FooBar.prop.feet = 2;
- * FooBar.prototype.walk = function () {};
+ * function Person() {
+ * this.constructor.super.apply( this, arguments );
+ * }
+ * oo.inheritClass( Person, Thing );
+ * Person.static.defaultEyeCount = 2;
+ * Person.prototype.walk = function () {};
*
- * function FooBarQuux() {}
- * OO.inheritClass( FooBarQuux, FooBar );
- * FooBarQuux.prototype.jump = function () {};
+ * function Jumper() {
+ * this.constructor.super.apply( this, arguments );
+ * }
+ * OO.inheritClass( Jumper, Person );
+ * Jumper.prototype.jump = function () {};
*
- * FooBarQuux.prop.feet === 2;
- * var fb = new FooBar();
- * fb.jump();
- * fb.walk();
- * fb instanceof Foo && fb instanceof FooBar && fb instanceof FooBarQuux;
+ * Jumper.static.defaultExtremities === 2;
+ * var x = new Jumper();
+ * x.jump();
+ * x.walk();
+ * x instanceof Thing && x instanceof Person && x instanceof Jumper;
*
* @method
* @param {Function} targetFn
@@ -80,6 +84,7 @@
var targetConstructor = targetFn.prototype.constructor;
+ targetFn.super = originFn;
targetFn.prototype = Object.create( originFn.prototype, {
// Restore constructor property of targetFn
constructor: {
diff --git a/test/oo.core.test.js b/test/oo.core.test.js
index 3609bf9..f1f6cb9 100644
--- a/test/oo.core.test.js
+++ b/test/oo.core.test.js
@@ -86,7 +86,7 @@
} );
}
-QUnit.test( 'inheritClass', 19, function ( assert ) {
+QUnit.test( 'inheritClass', 26, function ( assert ) {
var foo, bar, key, enumKeys;
function Foo() {
@@ -107,6 +107,7 @@
foo = new Foo();
function Bar() {
+ this.constructor.super.call( this );
this.constructedBar = true;
}
oo.inheritClass( Bar, Foo );
@@ -171,12 +172,21 @@
'bar instance of Bar'
);
+ assert.equal( foo.constructor, Foo, 'original constructor is unchanged'
);
+ assert.equal( foo.constructedFoo, true, 'original constructor ran' );
+ assert.equal( foo.constructedBar, undefined, 'subclass did not modify
parent class' );
+
assert.equal( bar.constructor, Bar, 'constructor property is restored'
);
+ assert.equal( bar.constructor.super, Foo, 'super property points to
parent class' );
+ assert.equal( bar.constructedFoo, true, 'parent class ran through
this.constructor.super' );
+ assert.equal( bar.constructedBar, true, 'original constructor ran' );
assert.equal( bar.b, 'proto of Bar', 'own methods go first' );
assert.equal( bar.bFn(), 'proto of Bar', 'own properties go first' );
assert.equal( bar.c, 'proto of Foo', 'prototype properties are
inherited' );
assert.equal( bar.cFn(), 'proto of Foo', 'prototype methods are
inherited' );
+ assert.equal( bar.constructor.super, Foo, 'super property points to
parent class' );
+
enumKeys = [];
for ( key in bar ) {
enumKeys.push( key );
--
To view, visit https://gerrit.wikimedia.org/r/112148
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic301140d2e0ad99eddc83f9031e12a7641fd10ae
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't dump globals to stdout during a unit test - change (mediawiki/core)
Chad has uploaded a new change for review. https://gerrit.wikimedia.org/r/112147 Change subject: Don't dump globals to stdout during a unit test .. Don't dump globals to stdout during a unit test Change-Id: I6060f92b4c97def9a291a1a8e26dbbcc4dbb8a58 --- M tests/phpunit/maintenance/getSlaveServerTest.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/47/112147/1 diff --git a/tests/phpunit/maintenance/getSlaveServerTest.php b/tests/phpunit/maintenance/getSlaveServerTest.php index bb678af..589ac3b 100644 --- a/tests/phpunit/maintenance/getSlaveServerTest.php +++ b/tests/phpunit/maintenance/getSlaveServerTest.php @@ -49,7 +49,6 @@ $gss = new GetSlaveServer(); $gss->loadParamsAndArgs(); $gss->execute(); - $gss->globals(); // The main answer $output = $this->getActualOutput(); -- To view, visit https://gerrit.wikimedia.org/r/112147 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6060f92b4c97def9a291a1a8e26dbbcc4dbb8a58 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add license to test images - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged.
Change subject: Add license to test images
..
Add license to test images
Requested by Commons image patrollers, see
https://commons.wikimedia.org/wiki/User_talk:Jarekt#Test_images_from_User:Selenium_user
for details.
Change-Id: I7118e93b3b6d3f4e5f0dae9e3ac5b9366a526d24
---
M tests/api/upload-wizard_tests.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Cmcmahon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/api/upload-wizard_tests.py b/tests/api/upload-wizard_tests.py
index 2c2de94..363cd05 100644
--- a/tests/api/upload-wizard_tests.py
+++ b/tests/api/upload-wizard_tests.py
@@ -100,7 +100,7 @@
"ignorewarnings": "true",
"filename": final_remote_filename,
"comment": "Test image uploaded via python script.",
-"text": "[[Category:Test images]]",
+"text": "{{pd-ineligible}}[[Category:Test images]]",
}
req = wikitools.api.APIRequest(wiki, params)
data = req.query()
--
To view, visit https://gerrit.wikimedia.org/r/112137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7118e93b3b6d3f4e5f0dae9e3ac5b9366a526d24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
Gerrit-Reviewer: Cmcmahon
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] Split out the guts of MediaEditDialog into separate pa... - change (mediawiki...VisualEditor)
Trevor Parscal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112146
Change subject: [WIP] Split out the guts of MediaEditDialog into separate page
classes
..
[WIP] Split out the guts of MediaEditDialog into separate page classes
These are the skeleton classes, the real work needs doing still.
Change-Id: Ideb3d9728b80b6ce9addf4ea8b1694aedf461d36
---
A modules/ve-mw/ui/pages/ve.ui.MWAdvancedMediaSettingsPage.js
A modules/ve-mw/ui/pages/ve.ui.MWGeneralMediaSettingsPage.js
2 files changed, 126 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/46/112146/1
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedMediaSettingsPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedMediaSettingsPage.js
new file mode 100644
index 000..b272396
--- /dev/null
+++ b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedMediaSettingsPage.js
@@ -0,0 +1,63 @@
+/*!
+ * VisualEditor user interface MWAdvancedMediaSettingsPage class.
+ *
+ * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+/**
+ * MediaWiki media dialog advanced settings page.
+ *
+ * @class
+ * @extends OO.ui.PageLayout
+ *
+ * @constructor
+ * @param {ve.ui.Surface} surface Surface being worked on
+ * @param {string} name Unique symbolic name of page
+ * @param {Object} [config] Configuration options
+ */
+ve.ui.MWAdvancedMediaSettingsPage = function VeUiMWAdvancedMediaSettingsPage(
surface, name, config ) {
+ // Parent constructor
+ OO.ui.PageLayout.call( this, name, config );
+
+ // Initialization
+ // TODO: Append content: this.$element.append( ... );
+};
+
+/* Inheritance */
+
+OO.inheritClass( ve.ui.MWAdvancedMediaSettingsPage, OO.ui.PageLayout );
+
+/* Methods */
+
+/**
+ * @inheritdoc
+ */
+ve.ui.MWAdvancedMediaSettingsPage.prototype.setOutlineItem = function (
outlineItem ) {
+ // Parent method
+ OO.ui.PageLayout.prototype.setOutlineItem.call( this, outlineItem );
+
+ this.outlineItem
+ .setIcon( 'parameter' )
+ .setLabel( ve.msg( 'visualeditor-dialog-media-page-advanced' )
);
+};
+
+/**
+ * Setup settings page.
+ *
+ * @param {Object} [data] Dialog setup data
+ */
+ve.ui.MWAdvancedMediaSettingsPage.prototype.setup = function () {
+
+};
+
+/**
+ * Tear down settings page.
+ *
+ * @param {Object} [data] Dialog tear down data
+ */
+ve.ui.MWAdvancedMediaSettingsPage.prototype.teardown = function ( data ) {
+ // Data initialization
+ data = data || {};
+
+};
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWGeneralMediaSettingsPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWGeneralMediaSettingsPage.js
new file mode 100644
index 000..618559f
--- /dev/null
+++ b/modules/ve-mw/ui/pages/ve.ui.MWGeneralMediaSettingsPage.js
@@ -0,0 +1,63 @@
+/*!
+ * VisualEditor user interface MWGeneralMediaSettingsPage class.
+ *
+ * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+/**
+ * MediaWiki media dialog General settings page.
+ *
+ * @class
+ * @extends OO.ui.PageLayout
+ *
+ * @constructor
+ * @param {ve.ui.Surface} surface Surface being worked on
+ * @param {string} name Unique symbolic name of page
+ * @param {Object} [config] Configuration options
+ */
+ve.ui.MWGeneralMediaSettingsPage = function VeUiMWGeneralMediaSettingsPage(
surface, name, config ) {
+ // Parent constructor
+ OO.ui.PageLayout.call( this, name, config );
+
+ // Initialization
+ // TODO: Append content: this.$element.append( ... );
+};
+
+/* Inheritance */
+
+OO.inheritClass( ve.ui.MWGeneralMediaSettingsPage, OO.ui.PageLayout );
+
+/* Methods */
+
+/**
+ * @inheritdoc
+ */
+ve.ui.MWGeneralMediaSettingsPage.prototype.setOutlineItem = function (
outlineItem ) {
+ // Parent method
+ OO.ui.PageLayout.prototype.setOutlineItem.call( this, outlineItem );
+
+ this.outlineItem
+ .setIcon( 'parameter' )
+ .setLabel( ve.msg( 'visualeditor-dialog-media-page-general' ) );
+};
+
+/**
+ * Setup settings page.
+ *
+ * @param {Object} [data] Dialog setup data
+ */
+ve.ui.MWGeneralMediaSettingsPage.prototype.setup = function () {
+
+};
+
+/**
+ * Tear down settings page.
+ *
+ * @param {Object} [data] Dialog tear down data
+ */
+ve.ui.MWGeneralMediaSettingsPage.prototype.teardown = function ( data ) {
+ // Data initialization
+ data = data || {};
+
+};
--
To view, visit https://gerrit.wikimedia.org/r/112146
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ideb3d9728b80b6ce9addf4ea8b1694aedf461d36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal
___
MediaWiki-commits mailing
[MediaWiki-commits] [Gerrit] Update use of OO.ui.PageLayout to work with changes in OOUI - change (mediawiki...VisualEditor)
Trevor Parscal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112145
Change subject: Update use of OO.ui.PageLayout to work with changes in OOUI
..
Update use of OO.ui.PageLayout to work with changes in OOUI
Change-Id: Ib5063db055a63082d08b2858bffb9f854d76c01b
See: I58a279dd949a867a4698a791103d5a6f2bd4b67f
---
M lib/ve
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
M modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
M modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
M modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
M modules/ve-mw/ui/styles/ve.ui.MWDialog.css
10 files changed, 105 insertions(+), 52 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/45/112145/1
diff --git a/lib/ve b/lib/ve
index 08083de..b96a98b 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 08083de071847735f095afacfcb7d17b3c1ec349
+Subproject commit b96a98b9fb94786292c88c5f9e3ac85b9a4340ac
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index cc73830..51ed477 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -128,21 +128,17 @@
'outlined': true
} );
- this.generalSettingsPage = new OO.ui.PageLayout( 'general', {
- '$': this.$,
- 'label': ve.msg( 'visualeditor-dialog-media-page-general' ),
- 'icon': 'parameter'
- } );
-
- this.advancedSettingsPage = new OO.ui.PageLayout( 'advanced', {
- '$': this.$,
- 'label': ve.msg( 'visualeditor-dialog-media-page-advanced' ),
- 'icon': 'parameter'
- } );
-
+ this.generalSettingsPage = new OO.ui.PageLayout( 'general', { '$':
this.$ } );
+ this.advancedSettingsPage = new OO.ui.PageLayout( 'advanced', { '$':
this.$ } );
this.bookletLayout.addPages( [
this.generalSettingsPage, this.advancedSettingsPage
] );
+ this.generalSettingsPage.getOutlineItem()
+ .setIcon( 'parameter' )
+ .setLabel( ve.msg( 'visualeditor-dialog-media-page-general' ) );
+ this.advancedSettingsPage.getOutlineItem()
+ .setIcon( 'parameter' )
+ .setLabel( ve.msg( 'visualeditor-dialog-media-page-advanced' )
);
// Define fieldsets for image settings
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
index 86b9eb8..b256b15 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
@@ -21,7 +21,7 @@
*/
ve.ui.MWCategoriesPage = function VeUiMWCategoriesPage( surface, name, config
) {
// Configuration initialization
- config = ve.extendObject( { 'icon': 'tag' }, config );
+ config = config || {};
// Parent constructor
OO.ui.PageLayout.call( this, name, config );
@@ -30,7 +30,6 @@
this.metaList = surface.getModel().metaList;
this.defaultSortKeyTouched = false;
this.fallbackDefaultSortKey = mw.config.get( 'wgTitle' );
- this.label = ve.msg( 'visualeditor-dialog-meta-categories-section' );
this.categoriesFieldset = new OO.ui.FieldsetLayout( {
'$': this.$,
'label': ve.msg(
'visualeditor-dialog-meta-categories-data-label' ),
@@ -83,6 +82,18 @@
/* Methods */
/**
+ * @inheritdoc
+ */
+ve.ui.MWCategoriesPage.prototype.setOutlineItem = function ( outlineItem ) {
+ // Parent method
+ OO.ui.PageLayout.prototype.setOutlineItem.call( this, outlineItem );
+
+ this.outlineItem
+ .setIcon( 'tag' )
+ .setLabel( ve.msg(
'visualeditor-dialog-meta-categories-section' ) );
+};
+
+/**
* Handle category default sort change events.
*
* @param {string} value Default sort value
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
index 7f652dd..2dcd48b 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
@@ -18,14 +18,10 @@
* @param {Object} [config] Configuration options
*/
ve.ui.MWLanguagesPage = function VeUiMWLanguagesPage( name, config ) {
- // Configuration initialization
- config = ve.extendObject( { 'icon': 'language' }, config );
-
// Parent constructor
OO.ui.PageLayout.call( this, name, config );
// Properties
- this.label = ve.msg( 'visualeditor-dialog-meta-languages-section' );
this.languagesFieldset = new OO.ui.Field
[MediaWiki-commits] [Gerrit] Only populate lookup widget menus asynchronously - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Only populate lookup widget menus asynchronously
..
Only populate lookup widget menus asynchronously
Problems:
* The previous design was to clear the menu while waiting for data from
the server, so we would "populate" immediately while there were no
matching items, and then again when the data came back. This cause the
menu to flash open and closed as you typed, which was really annoying
and buggy looking.
Solutions:
* Return a deferred object when getting menu items instead of an array,
and always resolve it asynchronously, event in cases where the result
can be pulled from cache.
Change-Id: Ic94fb1c1a888c99a4376504abffb0ac0f3aa7791
---
M src/widgets/OO.ui.LookupInputWidget.js
1 file changed, 32 insertions(+), 16 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/widgets/OO.ui.LookupInputWidget.js
b/src/widgets/OO.ui.LookupInputWidget.js
index d77deb8..f17108d 100644
--- a/src/widgets/OO.ui.LookupInputWidget.js
+++ b/src/widgets/OO.ui.LookupInputWidget.js
@@ -27,6 +27,7 @@
this.lookupCache = {};
this.lookupQuery = null;
this.lookupRequest = null;
+ this.populating = false;
// Events
this.$overlay.append( this.lookupMenu.$element );
@@ -100,6 +101,7 @@
this.lookupMenu.show();
}
} else {
+ this.lookupMenu.clearItems();
this.lookupMenu.hide();
}
@@ -113,16 +115,25 @@
* @chainable
*/
OO.ui.LookupInputWidget.prototype.populateLookupMenu = function () {
- var items = this.getLookupMenuItems();
-
- this.lookupMenu.clearItems();
-
- if ( items.length ) {
- this.lookupMenu.show();
- this.lookupMenu.addItems( items );
- this.initializeLookupMenuSelection();
- } else {
- this.lookupMenu.hide();
+ if ( !this.populating ) {
+ this.populating = true;
+ this.getLookupMenuItems()
+ .done( OO.ui.bind( function ( items ) {
+ this.lookupMenu.clearItems();
+ if ( items.length ) {
+ this.lookupMenu.show();
+ this.lookupMenu.addItems( items );
+ this.initializeLookupMenuSelection();
+ this.openLookupMenu();
+ } else {
+ this.lookupMenu.hide();
+ }
+ this.populating = false;
+ }, this ) )
+ .fail( OO.ui.bind( function () {
+ this.lookupMenu.clearItems();
+ this.populating = false;
+ }, this ) );
}
return this;
@@ -145,10 +156,12 @@
* Get lookup menu items for the current query.
*
* @method
- * @returns {OO.ui.MenuItemWidget[]} Menu items
+ * @returns {jQuery.Promise} Promise object which will be passed menu items as
the first argument
+ * of the done event
*/
OO.ui.LookupInputWidget.prototype.getLookupMenuItems = function () {
- var value = this.lookupInput.getValue();
+ var value = this.lookupInput.getValue(),
+ deferred = $.Deferred();
if ( value && value !== this.lookupQuery ) {
// Abort current request if query has changed
@@ -158,7 +171,7 @@
this.lookupRequest = null;
}
if ( value in this.lookupCache ) {
- return this.getLookupMenuItemsFromData(
this.lookupCache[value] );
+ deferred.resolve( this.getLookupMenuItemsFromData(
this.lookupCache[value] ) );
} else {
this.lookupQuery = value;
this.lookupRequest = this.getLookupRequest()
@@ -168,15 +181,18 @@
}, this ) )
.done( OO.ui.bind( function ( data ) {
this.lookupCache[value] =
this.getLookupCacheItemFromData( data );
- this.openLookupMenu();
- }, this ) );
+ deferred.resolve(
this.getLookupMenuItemsFromData( this.lookupCache[value] ) );
+ }, this ) )
+ .fail( function () {
+ deferred.reject();
+ } );
this.pushPending();
this.lookupRequest.always( OO.ui.bind( function () {
this.p
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (2d0ae07022) - change (VisualEditor/VisualEditor)
Trevor Parscal has uploaded a new change for review. https://gerrit.wikimedia.org/r/112144 Change subject: Update OOjs UI to v0.1.0-pre (2d0ae07022) .. Update OOjs UI to v0.1.0-pre (2d0ae07022) Invert dependencies for OutlineItemWidget and PageLayout Change-Id: I4337257afcce7e8d69381cb5472ad11f2951848a --- M lib/oojs-ui/i18n/ace.json M lib/oojs-ui/i18n/ast.json M lib/oojs-ui/i18n/bn.json M lib/oojs-ui/i18n/cy.json M lib/oojs-ui/i18n/da.json M lib/oojs-ui/i18n/de.json M lib/oojs-ui/i18n/diq.json M lib/oojs-ui/i18n/dsb.json M lib/oojs-ui/i18n/eml.json M lib/oojs-ui/i18n/eo.json M lib/oojs-ui/i18n/es.json M lib/oojs-ui/i18n/fa.json M lib/oojs-ui/i18n/fi.json M lib/oojs-ui/i18n/fo.json M lib/oojs-ui/i18n/fr.json M lib/oojs-ui/i18n/frr.json M lib/oojs-ui/i18n/fur.json M lib/oojs-ui/i18n/gl.json M lib/oojs-ui/i18n/he.json M lib/oojs-ui/i18n/id.json M lib/oojs-ui/i18n/ie.json M lib/oojs-ui/i18n/ilo.json M lib/oojs-ui/i18n/it.json M lib/oojs-ui/i18n/ja.json M lib/oojs-ui/i18n/kk-cyrl.json M lib/oojs-ui/i18n/ko.json M lib/oojs-ui/i18n/lb.json M lib/oojs-ui/i18n/lmo.json M lib/oojs-ui/i18n/mk.json M lib/oojs-ui/i18n/ml.json M lib/oojs-ui/i18n/mr.json M lib/oojs-ui/i18n/nb.json M lib/oojs-ui/i18n/nds.json M lib/oojs-ui/i18n/ne.json M lib/oojs-ui/i18n/nl.json M lib/oojs-ui/i18n/om.json M lib/oojs-ui/i18n/pms.json M lib/oojs-ui/i18n/ps.json M lib/oojs-ui/i18n/pt-br.json M lib/oojs-ui/i18n/pt.json M lib/oojs-ui/i18n/qqq.json M lib/oojs-ui/i18n/qu.json M lib/oojs-ui/i18n/ro.json M lib/oojs-ui/i18n/ru.json M lib/oojs-ui/i18n/sq.json M lib/oojs-ui/i18n/sr-ec.json M lib/oojs-ui/i18n/sv.json M lib/oojs-ui/i18n/sw.json M lib/oojs-ui/i18n/ug-arab.json M lib/oojs-ui/i18n/uk.json M lib/oojs-ui/i18n/vi.json M lib/oojs-ui/i18n/yo.json M lib/oojs-ui/i18n/zh-hans.json M lib/oojs-ui/i18n/zh-hant.json M lib/oojs-ui/i18n/zh-hk.json M lib/oojs-ui/i18n/zh-tw.json M lib/oojs-ui/oojs-ui.js M lib/oojs-ui/oojs-ui.svg.css 58 files changed, 70 insertions(+), 202 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/44/112144/1 diff --git a/lib/oojs-ui/i18n/ace.json b/lib/oojs-ui/i18n/ace.json index baa097c..554ae57 100644 --- a/lib/oojs-ui/i18n/ace.json +++ b/lib/oojs-ui/i18n/ace.json @@ -7,7 +7,5 @@ "ooui-dialog-action-close": "Tôp", "ooui-outline-control-move-down": "Pinah item u yup", "ooui-outline-control-move-up": "Pinah item u ateuëh", -"ooui-toggle-on": "Udép", -"ooui-toggle-off": "Len", "ooui-toolbar-more": "Lom" } \ No newline at end of file diff --git a/lib/oojs-ui/i18n/ast.json b/lib/oojs-ui/i18n/ast.json index c1f4023..959ea23 100644 --- a/lib/oojs-ui/i18n/ast.json +++ b/lib/oojs-ui/i18n/ast.json @@ -9,7 +9,5 @@ "ooui-dialog-action-close": "Zarrar", "ooui-outline-control-move-down": "Mover abaxo l'elementu", "ooui-outline-control-move-up": "Mover arriba l'elementu", -"ooui-toggle-on": "Activáu", -"ooui-toggle-off": "Desactiváu", "ooui-toolbar-more": "Más" } \ No newline at end of file diff --git a/lib/oojs-ui/i18n/bn.json b/lib/oojs-ui/i18n/bn.json index bcbd6b6..c321ab1 100644 --- a/lib/oojs-ui/i18n/bn.json +++ b/lib/oojs-ui/i18n/bn.json @@ -12,7 +12,5 @@ "ooui-dialog-action-close": "বন্ধ", "ooui-outline-control-move-down": "আইটেম নিচে স্থানান্তর", "ooui-outline-control-move-up": "আইটেম উপরে স্থানান্তর", -"ooui-toggle-on": "চালু", -"ooui-toggle-off": "বন্ধ", "ooui-toolbar-more": "আরও" } \ No newline at end of file diff --git a/lib/oojs-ui/i18n/cy.json b/lib/oojs-ui/i18n/cy.json index f12900a..d37912d 100644 --- a/lib/oojs-ui/i18n/cy.json +++ b/lib/oojs-ui/i18n/cy.json @@ -9,7 +9,5 @@ "ooui-dialog-action-close": "Caeer", "ooui-outline-control-move-down": "Symud yr eitem lawr", "ooui-outline-control-move-up": "Symud yr eitem lan", -"ooui-toggle-on": "Ymlaen", -"ooui-toggle-off": "Bant", "ooui-toolbar-more": "Rhagor" } \ No newline at end of file diff --git a/lib/oojs-ui/i18n/da.json b/lib/oojs-ui/i18n/da.json index 143e6ea..bf47bcb 100644 --- a/lib/oojs-ui/i18n/da.json +++ b/lib/oojs-ui/i18n/da.json @@ -13,7 +13,5 @@ "ooui-dialog-action-close": "Luk", "ooui-outline-control-move-down": "Flyt ned", "ooui-outline-control-move-up": "Flyt op", -"ooui-toggle-on": "Til", -"ooui-toggle-off": "Fra", "ooui-toolbar-more": "Mere" } \ No newline at end of file diff --git a/lib/oojs-ui/i18n/de.json b/lib/oojs-ui/i18n/de.json index cf6ce24..3a66648 100644 --- a/lib/oojs-ui/i18n/de.json +++ b/lib/oojs-ui/i18n/de.json @@ -16,7 +16,5 @@ "ooui-dialog-action-close": "Schließen", "ooui-outline-control-move-down": "Element nach unten verschieben", "ooui-outline-control-move-up": "Element nach oben verschieben", -"ooui-toggle-on": "An", -"ooui-toggle-off": "Aus", "ooui-toolbar-more": "Mehr" } \ No newline at end of file diff --git a/lib/oojs-ui/i18n/diq.json b/lib/o
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: fd6fb32..01e8dac - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: fd6fb32..01e8dac .. Syncronize VisualEditor: fd6fb32..01e8dac Change-Id: Iefd8ed3c313ac1aef8588945fa4130d9b6c0e80e --- 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 fd6fb32..01e8dac 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit fd6fb32db21458e16b348c37ccb2c71d33d477f6 +Subproject commit 01e8dac42bf470febd105c8d81745798097aca1f -- To view, visit https://gerrit.wikimedia.org/r/112143 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iefd8ed3c313ac1aef8588945fa4130d9b6c0e80e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: fd6fb32..01e8dac - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/112143 Change subject: Syncronize VisualEditor: fd6fb32..01e8dac .. Syncronize VisualEditor: fd6fb32..01e8dac Change-Id: Iefd8ed3c313ac1aef8588945fa4130d9b6c0e80e --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/43/112143/1 diff --git a/VisualEditor b/VisualEditor index fd6fb32..01e8dac 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit fd6fb32db21458e16b348c37ccb2c71d33d477f6 +Subproject commit 01e8dac42bf470febd105c8d81745798097aca1f -- To view, visit https://gerrit.wikimedia.org/r/112143 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iefd8ed3c313ac1aef8588945fa4130d9b6c0e80e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix-up offset when transplanting transclusion parts - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix-up offset when transplanting transclusion parts
..
Fix-up offset when transplanting transclusion parts
Symptoms:
* When adding a transclusion part that already exists, if the item is
being moved to the right it will inserted at a position one place too
far
Diagnoses:
* When an index is provided with an item in a queue given to
TransclusionModel's process method, the part is automatically removed,
but the index, if given, is never adjusted accordingly
Prognosis:
* Cautiously optimistic
Treatment:
* Decrement the insertion index, if given and after the existing index
Change-Id: If321df8f63dae07c76663e76e14864e2f4518920
---
M modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
1 file changed, 9 insertions(+), 4 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
index abd1df1..33a501f 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
@@ -98,7 +98,7 @@
* @fires change
*/
ve.dm.MWTransclusionModel.prototype.process = function ( queue ) {
- var i, len, item, title, index, remove;
+ var i, len, item, title, index, remove, existing;
for ( i = 0, len = queue.length; i < len; i++ ) {
remove = 0;
@@ -111,11 +111,16 @@
}
}
- // Auto-remove if already existing
- this.removePart( item.add );
-
// Use specified index
index = item.index;
+ // Auto-remove if already existing, preserving index
+ existing = ve.indexOf( item.add, this.parts );
+ if ( existing !== -1 ) {
+ this.removePart( item.add );
+ if ( index && index > existing ) {
+ index--;
+ }
+ }
// Derive index from removal if given
if ( index === undefined && item.remove ) {
index = ve.indexOf( item.remove, this.parts );
--
To view, visit https://gerrit.wikimedia.org/r/111501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If321df8f63dae07c76663e76e14864e2f4518920
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Invert dependencies for OutlineItemWidget and PageLayout - change (oojs/ui)
Trevor Parscal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112142
Change subject: Invert dependencies for OutlineItemWidget and PageLayout
..
Invert dependencies for OutlineItemWidget and PageLayout
Problem:
* Properties for OutlineItemWidget were being set at instantiation in the page
and then copied over though getters, making it a one-way trip and a lot of
messy maintenance when adding new features
* BookletOutlineItemWidget was superfluous since it only copied page properties
and didn't even keep a reference to the page
* OutlineItemWidget movability property was not settable
* OutlineItemWidget was not flaggable, so additional styling was difficult or
impossible
Solution:
* Add missing movability setter to OutlineItemWidget
* Mix FlaggableWidget into OutlineItemWidget
* Remove BookletOutlineItemWidget
* Add some basic flag styles to OutlineItemWidget
* Remove OutlineItemWidget property shuffling in PageLayout
* Add methods to set, get and clear an OutlineItemWidget to PageLayout
* Adjust BookletLayout to set and clear OutlineItemWidget on PageLayout
* Fix bug in FlaggableElement which caused setting with object not to work
Change-Id: I58a279dd949a867a4698a791103d5a6f2bd4b67f
---
M build/modules.json
M src/elements/OO.ui.FlaggableElement.js
M src/layouts/OO.ui.BookletLayout.js
M src/layouts/OO.ui.PageLayout.js
M src/styles/OO.ui.Widget.css
D src/widgets/OO.ui.BookletOutlineItemWidget.js
M src/widgets/OO.ui.OptionWidget.js
M src/widgets/OO.ui.OutlineItemWidget.js
8 files changed, 60 insertions(+), 87 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/42/112142/1
diff --git a/build/modules.json b/build/modules.json
index 8caa0f8..22eb6aa 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -49,7 +49,6 @@
"src/widgets/OO.ui.OutlineWidget.js",
"src/widgets/OO.ui.OutlineControlsWidget.js",
"src/widgets/OO.ui.OutlineItemWidget.js",
- "src/widgets/OO.ui.BookletOutlineItemWidget.js",
"src/widgets/OO.ui.ButtonOptionWidget.js",
"src/widgets/OO.ui.ButtonSelectWidget.js",
"src/widgets/OO.ui.PopupWidget.js",
diff --git a/src/elements/OO.ui.FlaggableElement.js
b/src/elements/OO.ui.FlaggableElement.js
index ee8fe58..8adb731 100644
--- a/src/elements/OO.ui.FlaggableElement.js
+++ b/src/elements/OO.ui.FlaggableElement.js
@@ -63,7 +63,7 @@
}
} else if ( OO.isPlainObject( flags ) ) {
for ( flag in flags ) {
- if ( flags[flags] ) {
+ if ( flags[flag] ) {
// Set
this.flags[flag] = true;
this.$element.addClass( classPrefix + flag );
diff --git a/src/layouts/OO.ui.BookletLayout.js
b/src/layouts/OO.ui.BookletLayout.js
index a4be7a0..2065a4e 100644
--- a/src/layouts/OO.ui.BookletLayout.js
+++ b/src/layouts/OO.ui.BookletLayout.js
@@ -220,7 +220,7 @@
* @chainable
*/
OO.ui.BookletLayout.prototype.addPages = function ( pages, index ) {
- var i, len, name, page,
+ var i, len, name, page, item,
items = [],
remove = [];
@@ -233,7 +233,9 @@
}
this.pages[page.getName()] = page;
if ( this.outlined ) {
- items.push( new OO.ui.BookletOutlineItemWidget( name,
page, { '$': this.$ } ) );
+ item = new OO.ui.OutlineItemWidget( name, page, { '$':
this.$ } );
+ page.setOutlineItem( item );
+ items.push( item );
}
}
if ( remove.length ) {
@@ -267,6 +269,7 @@
delete this.pages[name];
if ( this.outlined ) {
items.push( this.outlineWidget.getItemFromData( name )
);
+ page.clearOutlineItem();
}
}
if ( this.outlined && items.length ) {
@@ -287,12 +290,16 @@
* @chainable
*/
OO.ui.BookletLayout.prototype.clearPages = function () {
- var pages = this.stackLayout.getItems();
+ var i, len,
+ pages = this.stackLayout.getItems();
this.pages = {};
this.currentPageName = null;
if ( this.outlined ) {
this.outlineWidget.clearItems();
+ for ( i = 0, len = pages.length; i < len; i++ ) {
+ pages[i].clearOutlineItem();
+ }
}
this.stackLayout.clearItems();
diff --git a/src/layouts/OO.ui.PageLayout.js b/src/layouts/OO.ui.PageLayout.js
index b330d99..19aad63 100644
--- a/src/layouts/OO.ui.PageLayout.js
+++ b/src/layouts/OO.ui.PageLayout.js
@@ -7,12 +7,7 @@
* @constructor
* @param {string} name Unique symbolic name of pag
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 8145131..fd6fb32 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/112141 Change subject: Syncronize VisualEditor: 8145131..fd6fb32 .. Syncronize VisualEditor: 8145131..fd6fb32 Change-Id: If2fa6461705dffa65e097545d31fde6d5c30965d --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/41/112141/1 diff --git a/VisualEditor b/VisualEditor index 8145131..fd6fb32 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 814513113a8625f5978729b22d65159b2c42239d +Subproject commit fd6fb32db21458e16b348c37ccb2c71d33d477f6 -- To view, visit https://gerrit.wikimedia.org/r/112141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If2fa6461705dffa65e097545d31fde6d5c30965d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 8145131..fd6fb32 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 8145131..fd6fb32 .. Syncronize VisualEditor: 8145131..fd6fb32 Change-Id: If2fa6461705dffa65e097545d31fde6d5c30965d --- 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 8145131..fd6fb32 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 814513113a8625f5978729b22d65159b2c42239d +Subproject commit fd6fb32db21458e16b348c37ccb2c71d33d477f6 -- To view, visit https://gerrit.wikimedia.org/r/112141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2fa6461705dffa65e097545d31fde6d5c30965d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Auto-select first auto-added required param and fix param order - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Auto-select first auto-added required param and fix param order
..
Auto-select first auto-added required param and fix param order
Symptoms:
* When adding a template with required parameters, the last parameter
is initially focused
* Parameters and parts appear out of order, and adding/remove/moving
them shows them in almost random placement
Diagnoses:
* Parameters are auto-focused when added, and parameters are auto-added
in forward order
* TransclusionModel's process method had a bug in which the code to
derive an offset from the item being removed would not be reachable
due to an inverted logic statement
Prognosis:
* Fatal, with a 10% chance of survival
Treatment:
* Set focus on the first parameter after auto-adding required
parameters to a template
* Invert the logic in TransclusionModel's process method, so that if
the index IS undefined we will proceed to define it
Change-Id: I299053b63045ec933747831f1b4aa63493760f8b
---
M modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
M modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
3 files changed, 11 insertions(+), 4 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
index 7cbfbeb..abd1df1 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
@@ -114,17 +114,20 @@
// Auto-remove if already existing
this.removePart( item.add );
- // Add at index, or end if none was given
+ // Use specified index
index = item.index;
- if ( index !== undefined && item.remove ) {
+ // Derive index from removal if given
+ if ( index === undefined && item.remove ) {
index = ve.indexOf( item.remove, this.parts );
if ( index !== -1 ) {
remove = 1;
}
}
+ // Use last index as a last resort
if ( index === undefined || index === -1 ) {
index = this.parts.length;
}
+
this.parts.splice( index, remove, item.add );
if ( item.add ) {
item.add.connect( this, { 'change': [ 'emit', 'change'
] } );
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
index a4ba58a..663d9ec 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
@@ -92,6 +92,11 @@
// Add required params to user created templates
if ( added instanceof ve.dm.MWTemplateModel &&
this.loaded ) {
added.addRequiredParameters();
+ names = added.getParameterNames();
+ params = added.getParameters();
+ if ( names.length ) {
+ this.setPageByName(
params[names[0]].getId() );
+ }
}
}
}
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
index a59270b..8298c0f 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
@@ -71,10 +71,9 @@
ve.ui.MWTemplatePlaceholderPage.prototype.onAddTemplate = function () {
var transclusion = this.placeholder.getTransclusion(),
- parts = this.placeholder.getTransclusion().getParts(),
part = ve.dm.MWTemplateModel.newFromName( transclusion,
this.addTemplateInput.getValue() );
- transclusion.replacePart( this.placeholder, part, ve.indexOf(
this.placeholder, parts ) );
+ transclusion.replacePart( this.placeholder, part );
this.addTemplateInput.pushPending();
this.addTemplateButton.setDisabled( true );
this.removeButton.setDisabled( true );
--
To view, visit https://gerrit.wikimedia.org/r/111389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I299053b63045ec933747831f1b4aa63493760f8b
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https:/
[MediaWiki-commits] [Gerrit] Updated mediawiki_selenium to 0.2.1 - change (mediawiki...CirrusSearch)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/112140 Change subject: Updated mediawiki_selenium to 0.2.1 .. Updated mediawiki_selenium to 0.2.1 This version has automatic screen shots. Change-Id: I17cac4c2da50c1d6ded906bd8726b264320bda5a --- M tests/browser/Gemfile.lock 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/40/112140/1 diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock index debc830..1a6578f 100644 --- a/tests/browser/Gemfile.lock +++ b/tests/browser/Gemfile.lock @@ -22,15 +22,15 @@ headless (1.0.1) i18n (0.6.9) json (1.8.1) -mediawiki_selenium (0.2.0) - cucumber (~> 1.3.10) - headless (~> 1.0.1) - json (~> 1.8.1) - net-http-persistent (~> 2.9.1) - page-object (~> 0.9.5) - rest-client (~> 1.6.7) - rspec-expectations (~> 2.14.4) - syntax (~> 1.2.0) +mediawiki_selenium (0.2.1) + cucumber (~> 1.3, >= 1.3.10) + headless (~> 1.0, >= 1.0.1) + json (~> 1.8, >= 1.8.1) + net-http-persistent (~> 2.9, >= 2.9.1) + page-object (~> 0.9, >= 0.9.5) + rest-client (~> 1.6, >= 1.6.7) + rspec-expectations (~> 2.14, >= 2.14.4) + syntax (~> 1.2, >= 1.2.0) mime-types (2.1) multi_json (1.8.4) multi_test (0.0.3) -- To view, visit https://gerrit.wikimedia.org/r/112140 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17cac4c2da50c1d6ded906bd8726b264320bda5a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix documented salt lifespan - change (mediawiki...EventLogging)
jenkins-bot has submitted this change and it was merged. Change subject: Fix documented salt lifespan .. Fix documented salt lifespan Change-Id: I8521e7eca533467502c31ad27a79d73852ca1b21 --- M server/eventlogging/parse.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/server/eventlogging/parse.py b/server/eventlogging/parse.py index 17c0247..3e867b9 100644 --- a/server/eventlogging/parse.py +++ b/server/eventlogging/parse.py @@ -101,7 +101,7 @@ #: A crytographic hash function for hashing client IPs. Produces HMAC SHA1 #: hashes by using the client IP as the message and a 64-byte byte string as -#: the key. The key is generated at runtime and is refreshed every 24 hours. +#: the key. The key is generated at runtime and is refreshed every 90 days. #: It is not written anywhere. The hash value is useful for detecting spam #: (large volume of events sharing a common origin). hash_ip = keyhasher(rotating_key(size=64, period=KEY_LIFESPAN.total_seconds())) -- To view, visit https://gerrit.wikimedia.org/r/112129 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8521e7eca533467502c31ad27a79d73852ca1b21 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EventLogging Gerrit-Branch: master Gerrit-Owner: QChris Gerrit-Reviewer: Ori.livneh 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 timestamp validation - change (mediawiki...FeaturedFeeds)
MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112139
Change subject: Fix timestamp validation
..
Fix timestamp validation
Bug: 61058
Change-Id: Icc19da3626a090bed04eb9773c748e90223ab3f4
---
M SpecialFeedItem.php
1 file changed, 14 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FeaturedFeeds
refs/changes/39/112139/1
diff --git a/SpecialFeedItem.php b/SpecialFeedItem.php
index de2d3a1..fff6a0b 100644
--- a/SpecialFeedItem.php
+++ b/SpecialFeedItem.php
@@ -21,12 +21,8 @@
return;
}
$feed = $feeds[$feedName];
- $ts = new MWTimestamp( $date );
- $timestamp = $ts->getTimestamp();
- if ( !$timestamp
- || strlen( $timestamp ) !== 14 ) // @fixme: hack until
Language::sprintfDate() learns to handle
-// timestamps >= Y10k
- {
+ $timestamp = $this->parseTimestamp( $date );
+ if ( !$timestamp ) {
$out->showErrorPage( 'error', 'ffeed-invalid-timestamp'
);
return;
}
@@ -57,6 +53,18 @@
}
}
+ private function parseTimestamp( $date ) {
+ if ( strlen( $date ) !== 14 ) {
+ return false;
+ }
+ try {
+ $ts = new MWTimestamp( $date );
+ } catch( MWException $ex ) {
+ return false;
+ };
+ return $ts->getTimestamp();
+ }
+
private function displayItem( FeaturedFeedItem $item ) {
$out = $this->getOutput();
$out->setPageTitle( $item->getRawTitle() );
--
To view, visit https://gerrit.wikimedia.org/r/112139
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc19da3626a090bed04eb9773c748e90223ab3f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FeaturedFeeds
Gerrit-Branch: master
Gerrit-Owner: MaxSem
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bumped patch version to 0.2.1 - change (mediawiki/selenium)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/112138 Change subject: Bumped patch version to 0.2.1 .. Bumped patch version to 0.2.1 Releasing the gem. Change-Id: I39176f5826e1a185d1468ecbe405d17b21bdefa1 --- M lib/mediawiki_selenium/version.rb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium refs/changes/38/112138/1 diff --git a/lib/mediawiki_selenium/version.rb b/lib/mediawiki_selenium/version.rb index 00d8a17..67be243 100644 --- a/lib/mediawiki_selenium/version.rb +++ b/lib/mediawiki_selenium/version.rb @@ -10,5 +10,5 @@ =end module MediawikiSelenium - VERSION = "0.2.0" + VERSION = "0.2.1" end -- To view, visit https://gerrit.wikimedia.org/r/112138 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I39176f5826e1a185d1468ecbe405d17b21bdefa1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implement pre-commit hook running less, jshint, and phplint ... - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Implement pre-commit hook running less, jshint, and phplint
checks
..
Implement pre-commit hook running less, jshint, and phplint checks
Change-Id: I52e734e06b8ae1d4d2e8bbcf67df4408b3db77b4
---
M scripts/pre-commit
1 file changed, 53 insertions(+), 15 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/pre-commit b/scripts/pre-commit
index ece93b5..1d53688 100755
--- a/scripts/pre-commit
+++ b/scripts/pre-commit
@@ -5,23 +5,61 @@
# Code from https://gist.github.com/holysugar/1318698 , simpler than
# http://stackoverflow.com/a/6262715/451712
-function error() {
+function whitespace_error() {
echo "'$1' has trailing whitespace\n" >&2
}
-# FIXME this reads the version of the file on-disk, which may not be the
version
-# about to be committed if you made changes to it since `git add`.
-git diff --cached --name-only | (while read f; do
- ERROR=0
- if grep -n '[[:space:]]$' "$f" ; then
-error $f
-ERROR=1
- fi
-done; exit $ERROR)
+function is_vagrant() {
+ DEST='.'
+ while [ "$(realpath $DEST)" != "/" ]; do
+ if [ -f $DEST/Vagrantfile ]; then
+ return 0;
+ fi
+ DEST="$DEST/.."
+ done
+ return 1
+}
-if [ $? -eq 0 -o "$IGNORE_WHITESPACE" ]; then
- exit
-else
- echo "if you know what you are doing, use 'IGNORE_WHITESPACE=1 git commit'"
- exit 1
+function make() {
+ if is_vagrant; then
+ vagrant ssh -- cd /vagrant/mediawiki/extensions/Flow '&&' make
$* || exit 1
+ else
+ /usr/bin/env make $* || exit 1
+ fi
+}
+
+if [ "$IGNORE_WHITESPACE" != "1" ]; then
+ # FIXME this reads the version of the file on-disk, which may not be
the version
+ # about to be committed if you made changes to it since `git add`.
+ git diff --cached --name-only | (while read f; do
+ ERROR=0
+ if grep -n '[[:space:]]$' "$f" ; then
+ whitespace_error $f
+ ERROR=1
+ fi
+ done; exit $ERROR)
+
+ if [ $? -ne 0 ];then
+ echo "if you know what you are doing, use 'IGNORE_WHITESPACE=1 git
commit'"
+ exit 1
+ fi
fi
+
+COMMANDS=""
+
+if git diff --name-only --cached | grep -P '\.less$'; then
+ COMMANDS="checkless $COMMANDS"
+fi
+
+if git diff --name-only --cached | grep -P '\.js$'; then
+ COMMANDS="jshint $COMMANDS"
+fi
+
+if git diff --name-only --cached | grep -P '\.php$'; then
+ COMMANDS="phplint $COMMANDS"
+fi
+
+if [ "$COMMANDS" != "" ]; then
+ make $COMMANDS || exit 1
+fi
+
--
To view, visit https://gerrit.wikimedia.org/r/110235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I52e734e06b8ae1d4d2e8bbcf67df4408b3db77b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: EBernhardson
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 clearfix, which triggered scrollbars - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix clearfix, which triggered scrollbars
..
Fix clearfix, which triggered scrollbars
Change-Id: I6296757239e861c8af28fe9945d9ddd3b69bb945
---
M modules/base/styles/various.less
1 file changed, 12 insertions(+), 0 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/styles/various.less b/modules/base/styles/various.less
index 4e3b1e3..c0ce30f 100644
--- a/modules/base/styles/various.less
+++ b/modules/base/styles/various.less
@@ -93,3 +93,15 @@
}
}
}
+
+// For some reason, when overflow:(auto|scroll) is applied to the element where
+// .ui-helper-clearfix is applied to, the :after's height:0 rule is "ignored"
+// (some space for the :after element is preserved and causes the element's
+// scrollbar to appear.
+// This is an addition to the clearfix to make sure that this content doesn't
+// cause any scrollbars to go off by the content added in this :after.
+.ui-helper-clearfix:after {
+ overflow: hidden;
+
+ // clearfix styles are in jquery.ui.core.css
+}
--
To view, visit https://gerrit.wikimedia.org/r/111955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6296757239e861c8af28fe9945d9ddd3b69bb945
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Get rid of hyphenation - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Get rid of hyphenation .. Get rid of hyphenation What hyphenation does is break up words (with a hyphen) that are known to the dictionary and are about to go out of the container. E.g. |This is some text and my con-| |tainer ends where I added the| |pipe | Hypenation will split up all words near the end of the container length. I would prefer to actually have it like this, though - without hyphens: |This is some text and my | |container end where I added | |the pipe | I don't think it makes sense to break up every possible word that can be broken up; I think we only need to break up words that, in their entirety are too long for the container, like: |longwordlongwordlongwordlongw| |ordlongword | Yes, this will not have hyphentation, but to be fair, words over 800px are probably not words that would be in the dictionary and would get hyphenation. So in that case it doesn't really add much to have the hyphenation. Change-Id: I15fe067505c266aa18ae92b93f69b7b5f8afadd6 --- M modules/base/styles/mixins/wordbreak.less 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/base/styles/mixins/wordbreak.less b/modules/base/styles/mixins/wordbreak.less index c550b6e..7f0c162 100644 --- a/modules/base/styles/mixins/wordbreak.less +++ b/modules/base/styles/mixins/wordbreak.less @@ -3,8 +3,4 @@ /* Non standard for webkit */ word-break: break-word; - - -webkit-hyphens: auto; - -moz-hyphens: auto; - hyphens: auto; } -- To view, visit https://gerrit.wikimedia.org/r/111958 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I15fe067505c266aa18ae92b93f69b7b5f8afadd6 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Krinkle Gerrit-Reviewer: Matthias Mullie 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 license to test images - change (mediawiki...UploadWizard)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112137
Change subject: Add license to test images
..
Add license to test images
Requested by Commons image patrollers, see
https://commons.wikimedia.org/wiki/User_talk:Jarekt#Test_images_from_User:Selenium_user
for details.
Change-Id: I7118e93b3b6d3f4e5f0dae9e3ac5b9366a526d24
---
M tests/api/upload-wizard_tests.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/37/112137/1
diff --git a/tests/api/upload-wizard_tests.py b/tests/api/upload-wizard_tests.py
index 2c2de94..363cd05 100644
--- a/tests/api/upload-wizard_tests.py
+++ b/tests/api/upload-wizard_tests.py
@@ -100,7 +100,7 @@
"ignorewarnings": "true",
"filename": final_remote_filename,
"comment": "Test image uploaded via python script.",
-"text": "[[Category:Test images]]",
+"text": "{{pd-ineligible}}[[Category:Test images]]",
}
req = wikitools.api.APIRequest(wiki, params)
data = req.query()
--
To view, visit https://gerrit.wikimedia.org/r/112137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7118e93b3b6d3f4e5f0dae9e3ac5b9366a526d24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: ae5e922..8145131 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: ae5e922..8145131 .. Syncronize VisualEditor: ae5e922..8145131 Change-Id: Ib1490b77c77e19a6a2baf995537361e6e222c0e2 --- 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 ae5e922..8145131 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit ae5e922837f66091f42bf813513c5e97cd3585d7 +Subproject commit 814513113a8625f5978729b22d65159b2c42239d -- To view, visit https://gerrit.wikimedia.org/r/112136 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib1490b77c77e19a6a2baf995537361e6e222c0e2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: ae5e922..8145131 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/112136 Change subject: Syncronize VisualEditor: ae5e922..8145131 .. Syncronize VisualEditor: ae5e922..8145131 Change-Id: Ib1490b77c77e19a6a2baf995537361e6e222c0e2 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/36/112136/1 diff --git a/VisualEditor b/VisualEditor index ae5e922..8145131 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit ae5e922837f66091f42bf813513c5e97cd3585d7 +Subproject commit 814513113a8625f5978729b22d65159b2c42239d -- To view, visit https://gerrit.wikimedia.org/r/112136 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1490b77c77e19a6a2baf995537361e6e222c0e2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
