[MediaWiki-commits] [Gerrit] Use $.when() in MediaSearchWidget - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Use $.when() in MediaSearchWidget
..


Use $.when() in MediaSearchWidget

Use $.when() to check if there were results to the search. This
also makes sure that the 'results not found' message only appears
when it actually should.

Bug: 65321
Bug: 67438
Change-Id: I437ef639918ace1041bb8c9f7fdd04a4e83885eb
---
M modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
1 file changed, 12 insertions(+), 20 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js 
b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
index c31f82f..6a1f9ba 100755
--- a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
@@ -36,6 +36,7 @@
this.$noItemsMessage = this.$( 'div' )
.addClass( 've-ui-mwMediaSearchWidget-noresults' )
.text( ve.msg( 'visualeditor-dialog-media-noresults' ) )
+   .hide()
.appendTo( this.$query );
 
// Events
@@ -100,7 +101,8 @@
  * @method
  */
 ve.ui.MWMediaSearchWidget.prototype.queryMediaSources = function () {
-   var i, len, source,
+   var i, len, source, request,
+   promises = [],
ajaxOptions = {},
value = this.query.getValue();
 
@@ -144,7 +146,7 @@
};
}
this.query.pushPending();
-   source.request = 
ve.init.target.constructor.static.apiRequest( {
+   request = ve.init.target.constructor.static.apiRequest( 
{
'action': 'query',
'generator': 'search',
'gsrsearch': value,
@@ -155,10 +157,13 @@
'iiprop': 'dimensions|url|mediatype',
'iiurlheight': this.size
}, ajaxOptions )
-   .done( this.onMediaQueryDone.bind( this, source 
) )
-   .always( this.onMediaQueryAlways.bind( this, 
source ) );
+   .done( this.onMediaQueryDone.bind( this, source 
) );
source.value = value;
+   promises.push( request );
}
+
+   // When all sources are done, check to see if there are results
+   $.when.apply( $, promises ).done( 
this.onAllMediaQueriesDone.bind( this ) );
}
 };
 
@@ -168,25 +173,12 @@
  * @method
  * @param {Object} source Media query source
  */
-ve.ui.MWMediaSearchWidget.prototype.onMediaQueryAlways = function ( source ) {
+ve.ui.MWMediaSearchWidget.prototype.onAllMediaQueriesDone = function ( source 
) {
source.request = null;
this.query.popPending();
 
-   // Count this source as done
-   this.sourceCounter++;
-
-   // Check if all sources are done
-   // TODO use $.when() instead (bug 65321)
-   if ( this.sourceCounter = this.sources.length ) {
-   if ( this.results.getItems().length === 0 ) {
-   this.$noItemsMessage.show();
-   }
-   }
-
-   // Even if the whole list of sources didn't finish yet
-   // if there are results, make the message go away
-   if ( this.results.getItems().length  0 ) {
-   this.$noItemsMessage.hide();
+   if ( this.results.getItems().length === 0 ) {
+   this.$noItemsMessage.show();
}
 };
 

-- 
To view, visit https://gerrit.wikimedia.org/r/150001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I437ef639918ace1041bb8c9f7fdd04a4e83885eb
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo mor...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 678cad0..e095b77 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 678cad0..e095b77
..


Syncronize VisualEditor: 678cad0..e095b77

Change-Id: Ie7437e980a9f9ef901af64dd72249545e3660210
---
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 678cad0..e095b77 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 678cad00bddd046278f2ae4944d517305f50b971
+Subproject commit e095b773b9acc263d0b51dee189ff55884170b94

-- 
To view, visit https://gerrit.wikimedia.org/r/150767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7437e980a9f9ef901af64dd72249545e3660210
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org
Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 678cad0..e095b77 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150767

Change subject: Syncronize VisualEditor: 678cad0..e095b77
..

Syncronize VisualEditor: 678cad0..e095b77

Change-Id: Ie7437e980a9f9ef901af64dd72249545e3660210
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/67/150767/1

diff --git a/VisualEditor b/VisualEditor
index 678cad0..e095b77 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 678cad00bddd046278f2ae4944d517305f50b971
+Subproject commit e095b773b9acc263d0b51dee189ff55884170b94

-- 
To view, visit https://gerrit.wikimedia.org/r/150767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7437e980a9f9ef901af64dd72249545e3660210
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] fix dependencies for mw/ext/PhpTagsWiki - change (integration/jenkins-job-builder-config)

[Pastakhov (Code Review)]

Pastakhov has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150768

Change subject: fix dependencies for mw/ext/PhpTagsWiki
..

fix dependencies for mw/ext/PhpTagsWiki

Change-Id: I9311ff7d81aa15c05c623ac620bb5879cfa0b59c
---
M mediawiki-extensions.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/68/150768/1

diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index b5ea8e3..dbec6ec 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -1072,7 +1072,7 @@
  - '{name}-{ext-name}-testextensions-{mwbranch}':
 name: mwext
 ext-name: PhpTagsWiki
-dependencies: 'PhpTags'
+dependencies: 'PhpTags,PhpTagsFunctions'
  - '{name}-{ext-name}-testextensions-{mwbranch}':
 name: mwext
 ext-name: ProofreadPage

-- 
To view, visit https://gerrit.wikimedia.org/r/150768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9311ff7d81aa15c05c623ac620bb5879cfa0b59c
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Pastakhov pastak...@yandex.ru

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] fix phpunit tests - change (mediawiki...PhpTagsFunctions)

[Pastakhov (Code Review)]

Pastakhov has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150769

Change subject: fix phpunit tests
..

fix phpunit tests

Change-Id: I313e69b8f2e9d2d6e71559d1a28a6f5ea1022e11
---
M tests/phpunit/PhpTagsFunctions_DateTime_Test.php
1 file changed, 42 insertions(+), 27 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PhpTagsFunctions 
refs/changes/69/150769/1

diff --git a/tests/phpunit/PhpTagsFunctions_DateTime_Test.php 
b/tests/phpunit/PhpTagsFunctions_DateTime_Test.php
index fe3abb2..7041bd9 100644
--- a/tests/phpunit/PhpTagsFunctions_DateTime_Test.php
+++ b/tests/phpunit/PhpTagsFunctions_DateTime_Test.php
@@ -22,6 +22,12 @@
array('true')
);
}
+   public function testRun_checkdate_3() {
+   $this-assertEquals(
+   Runtime::runSource('$func = checkdate; echo 
$func(2, 29, 2001) === false ? true : false;'),
+   array('true')
+   );
+   }
 
public function testRun_date_create_1() {
$this-assertEquals(
@@ -32,19 +38,18 @@
public function testRun_DateTime_exception_1() {
$this-assertEquals(
Runtime::runSource('$date = DateTime(5);', 
array('Page') ),
-   array( new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::FATAL_CALL_TO_UNDEFINED_FUNCTION, 'DateTime', 1, 
'Page' ) )
+   array( (string) new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::FATAL_CALL_TO_UNDEFINED_FUNCTION, 'DateTime', 1, 
'Page' ) )
);
}
public function testRun_DateTime_exception_2() {
$this-assertEquals(
Runtime::runSource('$date = new 
DateTimeUndefined(5);', array('Page') ),
-   array( new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::FATAL_CLASS_NOT_FOUND, 'DateTimeUndefined', 1, 
'Page' ) )
+   array( (string) new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::FATAL_CLASS_NOT_FOUND, 'DateTimeUndefined', 1, 
'Page' ) )
);
}
public function testRun_DateTime_exception_3() {
$return = Runtime::runSource('$date = new DateTime(5);', 
array('Page') );
-   $this-assertInstanceOf( '\PhpTags\PhpTagsException', 
$return[0] );
-   $this-assertEquals( 
\PhpTags\PhpTagsException::FATAL_OBJECT_NOT_CREATED, $return[0]-getCode() );
+   $this-assertStringStartsWith('span class=error', 
$return[0] );
}
public function testRun_DateTime_exception_4() {
$this-assertEquals(
@@ -55,48 +60,48 @@
public function testRun_DateTime_exception_5() {
$this-assertEquals(
Runtime::runSource('$date = 
date_create_undefined();', array('Page') ),
-   array( new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::FATAL_CALL_TO_UNDEFINED_FUNCTION, 
'date_create_undefined', 1, 'Page' ) )
+   array( (string) new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::FATAL_CALL_TO_UNDEFINED_FUNCTION, 
'date_create_undefined', 1, 'Page' ) )
);
}
public function testRun_DateTime_exception_6() {
$this-assertEquals(
Runtime::runSource('new DateTime() + 5;', 
array('Page') ),
-   array( new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::NOTICE_OBJECT_CONVERTED, array('DateTime', 'int'), 
1, 'Page' ) )
+   array( (string) new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::NOTICE_OBJECT_CONVERTED, array('DateTime', 'int'), 
1, 'Page' ) )
);
}
public function testRun_DateTime_exception_7() {
$this-assertEquals(
Runtime::runSource('5 + new 
DateInterval(P2Y4DT6H8M);', array('Page') ),
-   array( new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::NOTICE_OBJECT_CONVERTED, array('DateInterval', 
'int'), 1, 'Page' ) )
+   array( (string) new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::NOTICE_OBJECT_CONVERTED, array('DateInterval', 
'int'), 1, 'Page' ) )
);
}
public function testRun_DateTime_exception_8() {
$this-assertEquals(
Runtime::runSource('new DateTime() + new 
DateInterval(P2Y4DT6H8M);', array('Page') ),
array(
-   new \PhpTags\PhpTagsException( 

[MediaWiki-commits] [Gerrit] fix phpunit tests - change (mediawiki...PhpTagsFunctions)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: fix phpunit tests
..


fix phpunit tests

Change-Id: I313e69b8f2e9d2d6e71559d1a28a6f5ea1022e11
---
M tests/phpunit/PhpTagsFunctions_DateTime_Test.php
1 file changed, 42 insertions(+), 27 deletions(-)

Approvals:
  Pastakhov: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/phpunit/PhpTagsFunctions_DateTime_Test.php 
b/tests/phpunit/PhpTagsFunctions_DateTime_Test.php
index fe3abb2..7041bd9 100644
--- a/tests/phpunit/PhpTagsFunctions_DateTime_Test.php
+++ b/tests/phpunit/PhpTagsFunctions_DateTime_Test.php
@@ -22,6 +22,12 @@
array('true')
);
}
+   public function testRun_checkdate_3() {
+   $this-assertEquals(
+   Runtime::runSource('$func = checkdate; echo 
$func(2, 29, 2001) === false ? true : false;'),
+   array('true')
+   );
+   }
 
public function testRun_date_create_1() {
$this-assertEquals(
@@ -32,19 +38,18 @@
public function testRun_DateTime_exception_1() {
$this-assertEquals(
Runtime::runSource('$date = DateTime(5);', 
array('Page') ),
-   array( new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::FATAL_CALL_TO_UNDEFINED_FUNCTION, 'DateTime', 1, 
'Page' ) )
+   array( (string) new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::FATAL_CALL_TO_UNDEFINED_FUNCTION, 'DateTime', 1, 
'Page' ) )
);
}
public function testRun_DateTime_exception_2() {
$this-assertEquals(
Runtime::runSource('$date = new 
DateTimeUndefined(5);', array('Page') ),
-   array( new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::FATAL_CLASS_NOT_FOUND, 'DateTimeUndefined', 1, 
'Page' ) )
+   array( (string) new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::FATAL_CLASS_NOT_FOUND, 'DateTimeUndefined', 1, 
'Page' ) )
);
}
public function testRun_DateTime_exception_3() {
$return = Runtime::runSource('$date = new DateTime(5);', 
array('Page') );
-   $this-assertInstanceOf( '\PhpTags\PhpTagsException', 
$return[0] );
-   $this-assertEquals( 
\PhpTags\PhpTagsException::FATAL_OBJECT_NOT_CREATED, $return[0]-getCode() );
+   $this-assertStringStartsWith('span class=error', 
$return[0] );
}
public function testRun_DateTime_exception_4() {
$this-assertEquals(
@@ -55,48 +60,48 @@
public function testRun_DateTime_exception_5() {
$this-assertEquals(
Runtime::runSource('$date = 
date_create_undefined();', array('Page') ),
-   array( new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::FATAL_CALL_TO_UNDEFINED_FUNCTION, 
'date_create_undefined', 1, 'Page' ) )
+   array( (string) new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::FATAL_CALL_TO_UNDEFINED_FUNCTION, 
'date_create_undefined', 1, 'Page' ) )
);
}
public function testRun_DateTime_exception_6() {
$this-assertEquals(
Runtime::runSource('new DateTime() + 5;', 
array('Page') ),
-   array( new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::NOTICE_OBJECT_CONVERTED, array('DateTime', 'int'), 
1, 'Page' ) )
+   array( (string) new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::NOTICE_OBJECT_CONVERTED, array('DateTime', 'int'), 
1, 'Page' ) )
);
}
public function testRun_DateTime_exception_7() {
$this-assertEquals(
Runtime::runSource('5 + new 
DateInterval(P2Y4DT6H8M);', array('Page') ),
-   array( new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::NOTICE_OBJECT_CONVERTED, array('DateInterval', 
'int'), 1, 'Page' ) )
+   array( (string) new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::NOTICE_OBJECT_CONVERTED, array('DateInterval', 
'int'), 1, 'Page' ) )
);
}
public function testRun_DateTime_exception_8() {
$this-assertEquals(
Runtime::runSource('new DateTime() + new 
DateInterval(P2Y4DT6H8M);', array('Page') ),
array(
-   new \PhpTags\PhpTagsException( 
\PhpTags\PhpTagsException::NOTICE_OBJECT_CONVERTED, array('DateTime', 'int'), 
1, 'Page' ),
-

[MediaWiki-commits] [Gerrit] Add FAQ and links - change (wikimedia/TransparencyReport)

[MSyed (Code Review)]

MSyed has submitted this change and it was merged.

Change subject: Add FAQ and links
..


Add FAQ and links

Change-Id: I71c9d3ea172c4c22106392d859ae75b36c56371d
---
M source/faq.html.erb
1 file changed, 73 insertions(+), 25 deletions(-)

Approvals:
  MSyed: Verified; Looks good to me, approved



diff --git a/source/faq.html.erb b/source/faq.html.erb
index 345e54c..e20f6a7 100644
--- a/source/faq.html.erb
+++ b/source/faq.html.erb
@@ -9,43 +9,91 @@
 div class=col-md-3/div
 
 div class=col-md-9
-   h2What else are you transparent about?/h2
-   pWhat we have done, what we are doing, and what we hope to do. Anyone 
can see how a Wikipedia article was created and developed over time, read about 
what the Wikimedia Foundation is working on, and even contribute to the 
software that the Wikimedia projects are built upon. We publish annual reports, 
which highlight our accomplishments over the previous fiscal year, as well as 
monthly reports detailing our day-to-day activities. We also publish our plans 
for the future through our annual plan, which details our goals for the next 
fiscal year, and our strategic plan, which outlines how we will address 
critical challenges and opportunities facing the Wikimedia movement over longer 
periods of time. /p
+   h2What sort of information gets requested?/h2
+   pAll sorts of identifying information, public and nonpublic, gets 
requested. Requests tend to be broad in nature, in order to capture as much 
information as possible. However, because we collect relatively a 
href=https://wikimediafoundation.org/wiki/Privacy_policy#Types_of_Information_We_Receive_From_You.2C_How_We_Get_It.2C_.26_How_We_Use_It;small
 amounts of information/a and retain it for a 
href=https://meta.wikimedia.org/wiki/Data_retention_guidelines;limited 
amounts of time/a, we frequently have little to disclose./p
 
-   pemCore financial information./em On the financial reports page, 
you will find audited financial statements, detailed financial plans, and our 
form 990./p
+   h2Does WMF have different standards depending on who is requesting? 
/h2
+   pNo. Regardless of who is requesting user data—be it an individual, a 
government, or a law enforcement officer—we typically do not produce 
information as a result of a request unless we have received proper legal 
process. More information can be found in our a 
href=https://wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines;Requests
 for User Information Procedure  Guidelines/a./p
 
-   pemBoard meeting minutes and outcomes./em The Wikimedia Board of 
Trustees is the ultimate corporate authority in the Wikimedia Foundation. On 
the meetings and resolutions pages, you will find information about its 
decisions./p
+   h2What happens when you receive a request from abroad?/h2
+   pPer our a 
href=https://wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines;Requests
 for User Information Procedure  Guidelines/a, we require that requests 
originating from outside of the United States to follow the a 
href=https://en.wikipedia.org/wiki/Mutual_Legal_Assistance_Treaty;mutual 
legal assistance treaty/a (MLAT) process or a 
href=https://en.wikipedia.org/wiki/Letter_rogatory;letters rogatory/a 
process so that a U.S. court will issue the required U.S. legal process to the 
Wikimedia Foundation./p
 
-   pemPolicies and procedures./em Beyond key policies like the 
privacy policy, donor privacy policy, and trademark policy, we publish all 
other key policies and procedures governing Wikimedia operations./p
+   h2When would you not tell a user that his or her nonpublic personal 
information is being disclosed as a result of a legal process, such as a 
subpoena? /h2
+   pWe are committed to notifying users if we plan on disclosing 
nonpublic personal information. However, we cannot notify a user if we are 
legally restrained from doing so (e.g. by a gag order), if a credible threat to 
life or limb is present, or if the user has not provided us with an e-mail 
address or valid contact information./p
 
-   pemFundraising activities./em Our fundraising work is public and 
community-driven as well. You can learn more on the community fundraising 
landing page./p
+   h2Help! My personal information is being sought because of something 
I did on the Wikimedia projects. What should I do? /h2
+   pIf you are the subject of a subpoena, it is highly recommended that 
you consult your own lawyer immediately. There are a number of organizations 
that will fight on a user's behalf, like the a 
href=https://www.aclu.org/;American Civil Liberties Union/a (ACLU) or the 
a href=https://www.eff.org/;Electronic Frontier Foundation/a (EFF). If you 
need help finding an attorney, WMF may be able to put you in touch with some of 
these organizations or help you secure an attorney at 

[MediaWiki-commits] [Gerrit] Temporarily disable broken test due to Password API changes - change (mediawiki...MassMessage)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150770

Change subject: Temporarily disable broken test due to Password API changes
..

Temporarily disable broken test due to Password API changes

Change-Id: Ib848d6cc834c9f87d817350167e906b383f1ea65
---
M tests/MassMessageTest.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage 
refs/changes/70/150770/1

diff --git a/tests/MassMessageTest.php b/tests/MassMessageTest.php
index 4135aa5..c70ebfa 100644
--- a/tests/MassMessageTest.php
+++ b/tests/MassMessageTest.php
@@ -83,7 +83,9 @@
$user = MassMessage::getMessengerUser();
$this-assertEquals( $user-getName(), $name );
$this-assertTrue( in_array( 'bot' , $user-getGroups() ) );
-   $this-assertEquals( $user-mPassword, '' );
+   // FIXME: temporarily disabled to not block ongoing
+   // development, see bug 68843
+   //$this-assertEquals( $user-mPassword, '' );
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/150770
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib848d6cc834c9f87d817350167e906b383f1ea65
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: contenthandler
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Temporarily disable broken test due to Password API changes - change (mediawiki...MassMessage)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Temporarily disable broken test due to Password API changes
..


Temporarily disable broken test due to Password API changes

Change-Id: Ib848d6cc834c9f87d817350167e906b383f1ea65
---
M tests/MassMessageTest.php
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/MassMessageTest.php b/tests/MassMessageTest.php
index 4135aa5..c70ebfa 100644
--- a/tests/MassMessageTest.php
+++ b/tests/MassMessageTest.php
@@ -83,7 +83,9 @@
$user = MassMessage::getMessengerUser();
$this-assertEquals( $user-getName(), $name );
$this-assertTrue( in_array( 'bot' , $user-getGroups() ) );
-   $this-assertEquals( $user-mPassword, '' );
+   // FIXME: temporarily disabled to not block ongoing
+   // development, see bug 68843
+   //$this-assertEquals( $user-mPassword, '' );
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/150770
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib848d6cc834c9f87d817350167e906b383f1ea65
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: contenthandler
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Don't reuse $result - change (mediawiki...MassMessage)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Don't reuse $result
..


Don't reuse $result

Fix repurposing of variable.

Change-Id: Ie565a190ff1ea7d47633cba464bac555be80bb8a
---
M includes/ApiEditMassMessageList.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/ApiEditMassMessageList.php 
b/includes/ApiEditMassMessageList.php
index b879894..7e8aa97 100644
--- a/includes/ApiEditMassMessageList.php
+++ b/includes/ApiEditMassMessageList.php
@@ -63,14 +63,14 @@
'MassMessageListContentHandler::compareTargets' 
) );
}
 
-   $result = MassMessageListContentHandler::edit(
+   $editResult = MassMessageListContentHandler::edit(
$spamlist,
$description,
$newTargets,
'massmessage-api-editsummary',
$this // APIs implement IContextSource
);
-   if ( !$result-isGood() ) {
+   if ( !$editResult-isGood() ) {
$this-dieStatus( $result );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/150481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie565a190ff1ea7d47633cba464bac555be80bb8a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: contenthandler
Gerrit-Owner: Wctaiwan wctai...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Wctaiwan wctai...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove global functions deprecated since 1.22 - change (mediawiki/core)

[Withoutaname (Code Review)]

Withoutaname has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150771

Change subject: Remove global functions deprecated since 1.22
..

Remove global functions deprecated since 1.22

Specifically functions wfArrayLookup(), wfArrayMerge(),
wfDebugDieBacktrace() and wfTime() from GlobalFunctions.php.

Change-Id: I9339cb2d8da41953a0e2a051452298f480256ebc
---
M RELEASE-NOTES-1.24
M includes/GlobalFunctions.php
2 files changed, 2 insertions(+), 59 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/71/150771/1

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 37a6950..76ccd8a 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -288,6 +288,8 @@
   userNotLoggedInPage() from EditPage.php. (deprecated since 1.19)
 * Removed functions getContent(), getPreloadedText(), mergeChangesInto() and
   setPreloadedText() from EditPage.php. (deprecated since 1.21)
+* Removed global functions wfArrayLookup(), wfArrayMerge(), 
wfDebugDieBacktrace()
+  and wfTime(). (deprecated since 1.22)
 
  Renamed classes 
 * CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index b40b007..7d54dbc 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -177,21 +177,6 @@
 }
 
 /**
- * Array lookup
- * Returns an array where the values in array $b are replaced by the
- * values in array $a with the corresponding keys
- *
- * @deprecated since 1.22; use array_intersect_key()
- * @param array $a
- * @param array $b
- * @return array
- */
-function wfArrayLookup( $a, $b ) {
-   wfDeprecated( __FUNCTION__, '1.22' );
-   return array_flip( array_intersect( array_flip( $a ), array_keys( $b ) 
) );
-}
-
-/**
  * Appends to second array if $value differs from that in $default
  *
  * @param string|int $key
@@ -207,27 +192,6 @@
if ( $default[$key] !== $value ) {
$changed[$key] = $value;
}
-}
-
-/**
- * Backwards array plus for people who haven't bothered to read the PHP manual
- * XXX: will not darn your socks for you.
- *
- * @deprecated since 1.22; use array_replace()
- *
- * @param array $array1 Initial array to merge.
- * @param array $array2,... Variable list of arrays to merge.
- * @return array
- */
-function wfArrayMerge( $array1 /*...*/ ) {
-   wfDeprecated( __FUNCTION__, '1.22' );
-   $args = func_get_args();
-   $args = array_reverse( $args, true );
-   $out = array();
-   foreach ( $args as $arg ) {
-   $out += $arg;
-   }
-   return $out;
 }
 
 /**
@@ -1808,19 +1772,6 @@
 }
 
 /**
- * Throw a debugging exception. This function previously once exited the 
process,
- * but now throws an exception instead, with similar results.
- *
- * @deprecated since 1.22; just throw an MWException yourself
- * @param string $msg Message shown when dying.
- * @throws MWException
- */
-function wfDebugDieBacktrace( $msg = '' ) {
-   wfDeprecated( __FUNCTION__, '1.22' );
-   throw new MWException( $msg );
-}
-
-/**
  * Fetch server name for use in error reporting etc.
  * Use real server name if available, so we know which machine
  * in a server farm generated the current page.
@@ -2114,16 +2065,6 @@
$text = substr( strtr( \n$text, $repl ), 1 );
$text = preg_replace( $repl2, '$1#58;', $text );
return $text;
-}
-
-/**
- * Get the current unix timestamp with microseconds.  Useful for profiling
- * @deprecated since 1.22; call microtime() directly
- * @return float
- */
-function wfTime() {
-   wfDeprecated( __FUNCTION__, '1.22' );
-   return microtime( true );
 }
 
 /**

-- 
To view, visit https://gerrit.wikimedia.org/r/150771
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9339cb2d8da41953a0e2a051452298f480256ebc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Withoutaname drevit...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix the functionality of the restore button - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix the functionality of the restore button
..


Fix the functionality of the restore button

In pairing with David.

Change-Id: I7b4c69a0afd20d25f1ab1bfde63abd29a8984703
---
M modules/tools/ext.cx.tools.mt.js
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Divec: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index d827a76..dde3b3c 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -218,6 +218,12 @@
 * Show the restore button.
 */
MTControlCard.prototype.showRestore = function () {
+   // TODO Investigate why isn't it initialized sometimes.
+   // It should always be initialized by the time this runs.
+   if ( !this.$section ) {
+   return;
+   }
+
MTControlCard.enableRestore[ this.$section.prop( 'id' ) ] = 
true;
this.$restore.removeClass( 'hidden' );
};

-- 
To view, visit https://gerrit.wikimedia.org/r/150559
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b4c69a0afd20d25f1ab1bfde63abd29a8984703
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Divec da...@sheetmusic.org.uk
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ve.ui.MWMetaDialog: Really *ALWAYS* return to normal trackin... - change (mediawiki...VisualEditor)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150772

Change subject: ve.ui.MWMetaDialog: Really *ALWAYS* return to normal tracking 
behavior
..

ve.ui.MWMetaDialog: Really *ALWAYS* return to normal tracking behavior

This #getActionProcess method is kinda weird… introduced in fbdff762.

Bug: 68901
Change-Id: I5007a379445b286884814557a85c6efea5e5d4cc
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/72/150772/1

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
index d446362..34aa034 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
@@ -124,10 +124,10 @@
// Undo everything done in the dialog and 
prevent redoing those changes
surfaceModel.undo();
surfaceModel.truncateUndoStack();
-
-   // ALWAYS return to normal tracking behavior
-   surfaceModel.startHistoryTracking();
}
+
+   // ALWAYS return to normal tracking behavior
+   surfaceModel.startHistoryTracking();
}, this );
 };
 

-- 
To view, visit https://gerrit.wikimedia.org/r/150772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5007a379445b286884814557a85c6efea5e5d4cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add tox job (flake8) for labs/tools/gblrenamemon - change (integration/jenkins-job-builder-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add tox job (flake8) for labs/tools/gblrenamemon
..


Add tox job (flake8) for labs/tools/gblrenamemon

Change-Id: Ie44930daeb72809cd3f34d82262086af57060f2c
---
M labs.yaml
1 file changed, 7 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/labs.yaml b/labs.yaml
index 9e9331a..8edf5e9 100644
--- a/labs.yaml
+++ b/labs.yaml
@@ -28,6 +28,13 @@
  - '{name}-tox-{toxenv}'
 
 - project:
+name: 'labs-tools-gblrenamemon'
+toxenv:
+ - flake8
+jobs:
+ - '{name}-tox-{toxenv}'
+
+- project:
 name: 'labs-tools-grrrit'
 jobs:
  - '{name}-jslint'

-- 
To view, visit https://gerrit.wikimedia.org/r/150758
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie44930daeb72809cd3f34d82262086af57060f2c
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
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 tox job for labs/tools/gblrenamemon - change (integration/zuul-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add tox job for labs/tools/gblrenamemon
..


Add tox job for labs/tools/gblrenamemon

Change-Id: Id7ca070426ca6348fa29a856d3e5cd58ff3806d1
---
M layout.yaml
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/layout.yaml b/layout.yaml
index 4e25b66..6a96f43 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -1166,6 +1166,12 @@
 gate-and-submit:
   - labs-tools-extdist-tox-flake8
 
+  - name: labs/tools/gblrenamemon
+test:
+  - labs-tools-gblrenamemon-tox-flake8
+gate-and-submit:
+  - labs-tools-gblrenamemon-tox-flake8
+
   - name: labs/tools/grrrit
 check-voter:
  - labs-tools-grrrit-jslint

-- 
To view, visit https://gerrit.wikimedia.org/r/150757
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7ca070426ca6348fa29a856d3e5cd58ff3806d1
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (labs...gblrenamemon)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150773

Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I672574386c11979398da6c52baac0dabf4064e89
---
A JENKINS
A jenkins-testfile.py
A jenkins.erb
A jenkins.js
A jenkins.php
A jenkins.pp
A jenkins.rb
7 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/gblrenamemon 
refs/changes/73/150773/1

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/jenkins-testfile.py b/jenkins-testfile.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins-testfile.py
diff --git a/jenkins.erb b/jenkins.erb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.erb
diff --git a/jenkins.js b/jenkins.js
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.js
diff --git a/jenkins.php b/jenkins.php
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.php
diff --git a/jenkins.pp b/jenkins.pp
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.pp
diff --git a/jenkins.rb b/jenkins.rb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.rb

-- 
To view, visit https://gerrit.wikimedia.org/r/150773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I672574386c11979398da6c52baac0dabf4064e89
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/gblrenamemon
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Facelift for BS223 - change (mediawiki...BlueSpiceExtensions)

[Tweichart (Code Review)]

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150774

Change subject: Facelift for BS223
..

Facelift for BS223

* changed icon from +- to text with menu
* changed display
* changed floating for details view

Change-Id: Icead68e557e7f9a46e0a22bcfcdb2e5fd49a6517
---
M StateBar/i18n/de.json
M StateBar/i18n/en.json
M StateBar/i18n/qqq.json
M StateBar/resources/bluespice.StateBar.css
M StateBar/views/view.StateBar.php
5 files changed, 29 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/74/150774/1

diff --git a/StateBar/i18n/de.json b/StateBar/i18n/de.json
index ef60805..033dcbf 100644
--- a/StateBar/i18n/de.json
+++ b/StateBar/i18n/de.json
@@ -11,7 +11,7 @@
bs-statebar-pref-sortbodyvars: Body Reihenfolge:,
bs-statebar-pref-sorttopvars: Top Reihenfolge:,
bs-statebar-pref-show: Statusleiste anzeigen,
-   bs-statebar-viewtoggler: [+/-],
+   bs-statebar-viewtoggler: details,
bs-statebar-viewtoggler-tooltip: Detailierte Informationen anzeigen,
bs-statebar-switch-description: Blendet die Statusleiste auf dieser 
Seite aus.,
bs-statebar-ajax-nobodyviews: Keine Informationen verfügbar.
diff --git a/StateBar/i18n/en.json b/StateBar/i18n/en.json
index 65437cf..e171d47 100644
--- a/StateBar/i18n/en.json
+++ b/StateBar/i18n/en.json
@@ -9,7 +9,7 @@
 bs-statebar-pref-sortbodyvars: Body order:,
 bs-statebar-pref-sorttopvars: Top order:,
 bs-statebar-pref-show: Display status bar,
-bs-statebar-viewtoggler: [+/-],
+bs-statebar-viewtoggler: details,
 bs-statebar-viewtoggler-tooltip: Show detailed information,
 bs-statebar-switch-description: Hides the status bar on this page.,
 bs-statebar-ajax-nobodyviews: No information available.
diff --git a/StateBar/i18n/qqq.json b/StateBar/i18n/qqq.json
index 28de1c5..25d347d 100644
--- a/StateBar/i18n/qqq.json
+++ b/StateBar/i18n/qqq.json
@@ -10,7 +10,7 @@
bs-statebar-pref-sortbodyvars: Option in 
[{{canonicalurl:Special:WikiAdmin|mode=Preferences}} 
Special:WikiAdmin?mode=Preferences], label for sorting order of body items:,
bs-statebar-pref-sorttopvars: Option in 
[{{canonicalurl:Special:WikiAdmin|mode=Preferences}} 
Special:WikiAdmin?mode=Preferences], label for sorting order of top items:,
bs-statebar-pref-show: Option in 
[{{canonicalurl:Special:WikiAdmin|mode=Preferences}} 
Special:WikiAdmin?mode=Preferences], checkbox label for display of status bar,
-   bs-statebar-viewtoggler: Image title with toggle functionality 
[+/-],
+   bs-statebar-viewtoggler: Image title with toggle functionality,
bs-statebar-viewtoggler-tooltip: Span title for show detailed 
information,
bs-statebar-switch-description: Behaviour switch __NOSTATEBAR__ 
description for hiding the status bar on this page shown in InsertMagic.,
bs-statebar-ajax-nobodyviews: Text if no information available about 
this page shown in folded out status bar.
diff --git a/StateBar/resources/bluespice.StateBar.css 
b/StateBar/resources/bluespice.StateBar.css
index f6d8687..4994c0a 100644
--- a/StateBar/resources/bluespice.StateBar.css
+++ b/StateBar/resources/bluespice.StateBar.css
@@ -12,8 +12,29 @@
  * @filesource
  */
 
-.bs-statebar-viewtoggler {
-   cursor: pointer;
+#bs-statebar-viewtoggler {
+   float: right;
+   height: 48px;
+   display: table;
+   box-sizing: border-box;
+   padding: 0 10px;
+}
+#bs-statebar-viewtoggler span{
+   text-transform: uppercase;
+   padding-right: 10px;
+}
+#bs-statebar-viewtoggler span, #bs-statebar-viewtoggler.icon-menu2:after{
+   display: table-cell;
+   vertical-align: middle;
+}
+#bs-statebar-viewtoggler.icon-menu2:before{
+   display: none;
+}
+#bs-statebar-viewtoggler.icon-menu2:after{
+   content: \e6b8;
+}
+#bs-statebar-viewtoggler.open{
+   color: #3e5389;
 }
 
 #bs-statebar-view {
diff --git a/StateBar/views/view.StateBar.php b/StateBar/views/view.StateBar.php
index 045cf57..f9895eb 100644
--- a/StateBar/views/view.StateBar.php
+++ b/StateBar/views/view.StateBar.php
@@ -41,14 +41,15 @@
$aOut = array();
$aOut[] = 'div id=bs-statebar';
 
-   $aOut[] = ' a id=bs-statebar-viewtoggler href=# 
title='.wfMessage( 'bs-statebar-viewtoggler-tooltip' )-plain().' 
class=icon-plus';
-   $aOut[] = 'span[+/-]/span';
+   $aOut[] = ' a id=bs-statebar-viewtoggler href=# title=' . 
wfMessage('bs-statebar-viewtoggler-tooltip')-plain() . ' class=icon-menu2';
+   $aOut[] = 'span' . 
wfMessage('bs-statebar-viewtoggler')-plain() . '/span';
$aOut[] = ' /a';
 
foreach( $this-mStateBarTopViews as $oStateBarTopView ) {
$aOut[] = $oStateBarTopView-execute();
}
 
+   

[MediaWiki-commits] [Gerrit] Autocomplete - change (mediawiki...MassMessage)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Autocomplete
..


Autocomplete

* Split title autocomplete into its own module and add it to list
  creation and list view.
* Add autocomplete for site name to list view.
* Wrap ext.MassMessage.special.js in a callback for document.ready.
* Split getDBName into two functions to accomodate autocomplete.

Change-Id: I1fa1c811d55c0d631a8d57a046f40cda8b854e5f
---
M MassMessage.php
M includes/ApiEditMassMessageList.php
A includes/ApiQueryMMSites.php
M includes/MassMessage.php
M modules/ext.MassMessage.autocomplete.js
M modules/ext.MassMessage.content.js
M modules/ext.MassMessage.create.js
M modules/ext.MassMessage.special.js
8 files changed, 178 insertions(+), 69 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/MassMessage.php b/MassMessage.php
index c6bb176..2f074bc 100644
--- a/MassMessage.php
+++ b/MassMessage.php
@@ -69,6 +69,7 @@
 $wgAutoloadClasses['MassMessageHooks'] = $dir/MassMessage.hooks.php;
 $wgAutoloadClasses['ApiMassMessage'] = $dir/includes/ApiMassMessage.php;
 $wgAutoloadClasses['ApiEditMassMessageList'] = 
$dir/includes/ApiEditMassMessageList.php;
+$wgAutoloadClasses['ApiQueryMMSites'] = $dir/includes/ApiQueryMMSites.php;
 $wgAutoloadClasses['MassMessage'] = $dir/includes/MassMessage.php;
 $wgAutoloadClasses['MassMessageTargets'] = 
$dir/includes/MassMessageTargets.php;
 $wgAutoloadClasses['SpecialMassMessage'] = 
$dir/includes/SpecialMassMessage.php;
@@ -89,6 +90,7 @@
 // API modules
 $wgAPIModules['massmessage'] = 'ApiMassMessage';
 $wgAPIModules['editmassmessagelist'] = 'ApiEditMassMessageList';
+$wgAPIListModules['mmsites'] = 'ApiQueryMMSites';
 
 // Job classes
 $wgJobClasses['MassMessageJob'] = 'MassMessageJob';
@@ -111,10 +113,15 @@
 $wgSpecialPages['EditMassMessageList'] = 'SpecialEditMassMessageList';
 
 // ResourceLoader
+$wgResourceModules['ext.MassMessage.autocomplete'] = array(
+   'scripts' = 'ext.MassMessage.autocomplete.js',
+   'dependencies' = 'jquery.ui.autocomplete',
+   'localBasePath' = $dir . '/modules',
+   'remoteExtPath' = 'MassMessage/modules',
+);
 $wgResourceModules['ext.MassMessage.special.js'] = array(
'scripts' = array(
'ext.MassMessage.special.js',
-   'ext.MassMessage.autocomplete.js',
'ext.MassMessage.badhtml.js',
),
'messages' = array(
@@ -122,8 +129,8 @@
'massmessage-parse-badpage'
),
'dependencies' = array(
+   'ext.MassMessage.autocomplete',
'jquery.byteLimit',
-   'jquery.ui.autocomplete',
'jquery.throttle-debounce',
'mediawiki.jqueryMsg',
),
@@ -154,6 +161,7 @@
'massmessage-content-adderror',
),
'dependencies' = array(
+   'ext.MassMessage.autocomplete',
'mediawiki.api',
'mediawiki.util',
'mediawiki.jqueryMsg',
@@ -173,6 +181,7 @@
 );
 $wgResourceModules['ext.MassMessage.create'] = array(
'scripts' = 'ext.MassMessage.create.js',
+   'dependencies' = 'ext.MassMessage.autocomplete',
'localBasePath' = $dir . '/modules',
'remoteExtPath' = 'MassMessage/modules',
 );
diff --git a/includes/ApiEditMassMessageList.php 
b/includes/ApiEditMassMessageList.php
index 7e8aa97..886caa0 100644
--- a/includes/ApiEditMassMessageList.php
+++ b/includes/ApiEditMassMessageList.php
@@ -1,5 +1,9 @@
 ?php
-
+/**
+ * API module to edit a MassMessage delivery list
+ *
+ * @ingroup API
+ */
 class ApiEditMassMessageList extends ApiBase {
 
public function execute() {
diff --git a/includes/ApiQueryMMSites.php b/includes/ApiQueryMMSites.php
new file mode 100644
index 000..5b6851a
--- /dev/null
+++ b/includes/ApiQueryMMSites.php
@@ -0,0 +1,59 @@
+?php
+/**
+ * API module to serve autocomplete requests for the site field in MassMessage
+ *
+ * @ingroup API
+ */
+class ApiQueryMMSites extends ApiQueryBase {
+
+   public function execute() {
+   $params = $this-extractRequestParams();
+   $term = strtolower( $params['term'] );
+
+   $sites = array_keys( MassMessage::getDatabases() );
+   sort( $sites );
+   $matches = array();
+   foreach ( $sites as $site ) {
+   if ( strpos( $site, $term ) === 0 ) {
+   $matches[] = $site;
+   if ( count( $matches ) = 10 ) {
+   break;
+   }
+   }
+   }
+
+   $result = $this-getResult();
+   $result-setIndexedTagName( $matches, 'site' );
+   $result-addValue( 'query', $this-getModuleName(), $matches );
+   }
+
+   public function getCacheMode( 

[MediaWiki-commits] [Gerrit] ve.ui.MWMetaDialog: Really *ALWAYS* return to normal trackin... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: ve.ui.MWMetaDialog: Really *ALWAYS* return to normal tracking 
behavior
..


ve.ui.MWMetaDialog: Really *ALWAYS* return to normal tracking behavior

This #getActionProcess method is kinda weird… introduced in fbdff762.

Bug: 68901
Change-Id: I5007a379445b286884814557a85c6efea5e5d4cc
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
index d446362..34aa034 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
@@ -124,10 +124,10 @@
// Undo everything done in the dialog and 
prevent redoing those changes
surfaceModel.undo();
surfaceModel.truncateUndoStack();
-
-   // ALWAYS return to normal tracking behavior
-   surfaceModel.startHistoryTracking();
}
+
+   // ALWAYS return to normal tracking behavior
+   surfaceModel.startHistoryTracking();
}, this );
 };
 

-- 
To view, visit https://gerrit.wikimedia.org/r/150772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5007a379445b286884814557a85c6efea5e5d4cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: e095b77..06e883f - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: e095b77..06e883f
..


Syncronize VisualEditor: e095b77..06e883f

Change-Id: Ic37e30d87124838a3eaf745426d07d7c361977cd
---
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 e095b77..06e883f 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit e095b773b9acc263d0b51dee189ff55884170b94
+Subproject commit 06e883f66b360dc6b774747c2c4a54d9e161bf42

-- 
To view, visit https://gerrit.wikimedia.org/r/150775
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic37e30d87124838a3eaf745426d07d7c361977cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org
Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: e095b77..06e883f - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150775

Change subject: Syncronize VisualEditor: e095b77..06e883f
..

Syncronize VisualEditor: e095b77..06e883f

Change-Id: Ic37e30d87124838a3eaf745426d07d7c361977cd
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/75/150775/1

diff --git a/VisualEditor b/VisualEditor
index e095b77..06e883f 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit e095b773b9acc263d0b51dee189ff55884170b94
+Subproject commit 06e883f66b360dc6b774747c2c4a54d9e161bf42

-- 
To view, visit https://gerrit.wikimedia.org/r/150775
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic37e30d87124838a3eaf745426d07d7c361977cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] nginx - remove cipher kEDH+AESGCM - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: nginx - remove cipher kEDH+AESGCM
..


nginx - remove cipher kEDH+AESGCM

follow-up to I39b389b63ae6b8
and I830bec497338

also remove cipher kEDH+AESGCM

kDHE, kEDH: cipher suites using ephemeral DH key agreement, including 
anonymous cipher suites.

(https://www.openssl.org/docs/apps/ciphers.html)

we just wanted ECDHE, and not DHE/kDHE

Change-Id: Ie9badde555d3e919571d92029492779da7c5ee53
---
M templates/nginx/nginx.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/nginx/nginx.conf.erb b/templates/nginx/nginx.conf.erb
index 0d3565f..2ad93e8 100644
--- a/templates/nginx/nginx.conf.erb
+++ b/templates/nginx/nginx.conf.erb
@@ -66,7 +66,7 @@
 ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
 # Limit ciphers allowed
 # We strongly prefer forward-secret chiphers using ECDHE and GCM for 
encrypting data, for performance reasons.
-ssl_ciphers 
ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:ECDHE-RSA-RC4-SHA:ECDHE-ECDSA-RC4-SHA:AES128:AES256:RC4-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!DH;
+ssl_ciphers 
ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:ECDHE-RSA-RC4-SHA:ECDHE-ECDSA-RC4-SHA:AES128:AES256:RC4-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!DH;
 # Prefer server ciphers
 ssl_prefer_server_ciphers on;
 % end %

-- 
To view, visit https://gerrit.wikimedia.org/r/146806
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9badde555d3e919571d92029492779da7c5ee53
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (perf) Parse ItemPage title once - change (pywikibot/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: (perf) Parse ItemPage title once
..


(perf) Parse ItemPage title once

ItemPage may be constructed without a page title, as it is
delay loaded from the wikibase_item of a page on another site.

Optimise ItemPage.title() so it does not reparse the Link title
every invocation.

Add test case for instantiating an empty ItemPage and setting .id to
a valid Qxx, and another case for altering .id highlighting a bug
yet to be fixed.

Split from: If7ca06adbb4b9932bba0abffc7588afcb320e934

Change-Id: I95a053a1ea17611498fcb5601c09a83d82f91fe8
---
M pywikibot/page.py
M tests/wikibase_tests.py
2 files changed, 49 insertions(+), 3 deletions(-)

Approvals:
  John Vandenberg: Looks good to me, but someone else must approve
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/pywikibot/page.py b/pywikibot/page.py
index 4675a72..7a0d1bd 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -2580,10 +2580,16 @@
 self._isredir = False  # Wikibase pages cannot be a redirect
 
 def title(self, **kwargs):
- Page title. 
+ Page title.
+
+If the item was instantiated without an ID,
+fetch the ID and reparse the title.
+
 if self.namespace() == 0:
-self._link._text = self.getID()
-del self._link._title
+self.getID()
+if self._link._text != self.id:
+self._link._text = self.id
+del self._link._title
 return Page(self).title(**kwargs)
 
 @deprecated(_defined_by)
diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py
index 4059c4a..aca60b3 100644
--- a/tests/wikibase_tests.py
+++ b/tests/wikibase_tests.py
@@ -167,6 +167,46 @@
 item.get()
 self.assertEquals(hasattr(item, '_content'), True)
 
+def test_load_item_set_id(self):
+Test setting item.id attribute on empty item.
+item = pywikibot.ItemPage(wikidata, '-1')
+self.assertEquals(item._link._title, '-1')
+item.id = 'Q60'
+self.assertEquals(hasattr(item, '_content'), False)
+self.assertEquals(item.getID(), 'Q60')
+self.assertEquals(hasattr(item, '_content'), False)
+item.get()
+self.assertEquals(hasattr(item, '_content'), True)
+self.assertTrue('en' in item.labels)
+self.assertEquals(item.labels['en'], 'New York City')
+self.assertEquals(item.title(), 'Q60')
+
+def test_reuse_item_set_id(self):
+
+Test modifying item.id attribute.
+
+Some scripts are using item.id = 'Q60' semantics, which does work
+but modifying item.id does not currently work, and this test
+highlights that it breaks silently.
+
+item = pywikibot.ItemPage(wikidata, 'Q60')
+item.get()
+self.assertEquals(item.labels['en'], 'New York City')
+
+# When the id attribute is modified, the ItemPage goes into
+# an inconsistent state.
+item.id = 'Q5296'
+# The title is updated correctly
+self.assertEquals(item.title(), 'Q5296')
+
+# This del has no effect on the test; it is here to demonstrate that
+# it doesnt help to clear this piece of saved state.
+del item._content
+# The labels are not updated; assertion showing undesirable behaviour:
+self.assertEquals(item.labels['en'], 'New York City')
+# TODO: This is the assertion that this test should be using:
+#self.assertTrue(item.labels['en'].lower().endswith('main page'))
+
 def test_empty_item(self):
 # should not raise an error as the constructor only requires
 # the site parameter, with the title parameter defaulted to None

-- 
To view, visit https://gerrit.wikimedia.org/r/137562
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I95a053a1ea17611498fcb5601c09a83d82f91fe8
Gerrit-PatchSet: 4
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Bthfan bth-...@mcsmurf.de
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Multichill maar...@mdammers.nl
Gerrit-Reviewer: Ricordisamoa ricordisa...@openmailbox.org
Gerrit-Reviewer: Underlying lk a375...@drdrb.net
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Special page Special:PagePreparation for translate page prep... - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Special page Special:PagePreparation for translate page 
preparation
..


Special page Special:PagePreparation for translate page preparation

The script ext.translate.pagepreparation.js is now invoked on a button click
at Special:PagePreparation by taking the page name as input from user. The diff
between the current revision and the prepared text is shown. The user can then
click on the 'Save' button to Save the page with the prepared text. A link to 
edit
the page is provided after saving is done.

Change-Id: I42a06acc6cc15c3c06bb74964a525eacca910a3b
---
M Autoload.php
M Resources.php
M Translate.alias.php
M TranslateHooks.php
M i18n/pagetranslation/en.json
M i18n/pagetranslation/qqq.json
M resources/js/ext.translate.pagepreparation.js
A specials/SpecialPagePreparation.php
8 files changed, 164 insertions(+), 18 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  Siebrand: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/Autoload.php b/Autoload.php
index bb857d2..7422926 100644
--- a/Autoload.php
+++ b/Autoload.php
@@ -44,6 +44,7 @@
 $al['SpecialMessageGroupStats'] = $dir/specials/SpecialMessageGroupStats.php;
 $al['SpecialMyLanguage'] = $dir/specials/SpecialMyLanguage.php;
 $al['SpecialPageMigration'] = $dir/specials/SpecialPageMigration.php;
+$al['SpecialPagePreparation'] = $dir/specials/SpecialPagePreparation.php;
 $al['SpecialSearchTranslations'] = 
$dir/specials/SpecialSearchTranslations.php;
 $al['SpecialSupportedLanguages'] = 
$dir/specials/SpecialSupportedLanguages.php;
 $al['SpecialTranslate'] = $dir/specials/SpecialTranslate.php;
diff --git a/Resources.php b/Resources.php
index 2208f6a..2aaa96d 100644
--- a/Resources.php
+++ b/Resources.php
@@ -235,11 +235,20 @@
 
 $wgResourceModules['ext.translate.pagepreparation'] = array(
'scripts' = 'resources/js/ext.translate.pagepreparation.js',
-   'messages' = array( 'pp-save-summary' ),
+   'messages' = array(
+   'pp-save-summary',
+   'pp-save-message',
+   'pp-save-button-label',
+   'pp-prepare-message',
+   'pp-already-prepared-message',
+   'pp-pagename-missing'
+   ),
'dependencies' = array(
'mediawiki.api',
'mediawiki.api.edit',
'jquery.mwExtension',
+   'mediawiki.action.history.diff',
+   'mediawiki.jqueryMsg',
),
 ) + $resourcePaths;
 
diff --git a/Translate.alias.php b/Translate.alias.php
index 7597e5c..dc7798c 100644
--- a/Translate.alias.php
+++ b/Translate.alias.php
@@ -28,6 +28,7 @@
'TranslationStats' = array( 'TranslationStats', 
'TranslationStatistics' ),
'Translations' = array( 'Translations' ),
'PageMigration' = array( 'PageMigration' ),
+   'PagePreparation' = array( 'PagePreparation' ),
 );
 
 /** Afrikaans (Afrikaans) */
@@ -1173,4 +1174,4 @@
'TranslationStats' = array( '翻譯統計' ),
'Translations' = array( '譯文' ),
'PageMigration' = array( '頁面轉移' ),
-);
\ No newline at end of file
+);
diff --git a/TranslateHooks.php b/TranslateHooks.php
index a160bd1..8309939 100644
--- a/TranslateHooks.php
+++ b/TranslateHooks.php
@@ -57,6 +57,8 @@
if ( $wgTranslatePageMigration ) {
$wgSpecialPages['PageMigration'] = 
'SpecialPageMigration';
$wgSpecialPageGroups['PageMigration'] = 'wiki';
+   $wgSpecialPages['PagePreparation'] = 
'SpecialPagePreparation';
+   $wgSpecialPageGroups['PagePreparation'] = 
'wiki';
}
 
global $wgLogActionsHandlers, $wgLogTypes;
diff --git a/i18n/pagetranslation/en.json b/i18n/pagetranslation/en.json
index ce6f6cb..e9dbf1a 100644
--- a/i18n/pagetranslation/en.json
+++ b/i18n/pagetranslation/en.json
@@ -178,5 +178,15 @@
 pm-swap-icon-hover-text: Swap with unit below,
 pm-delete-icon-hover-text: Delete unit,
 tpt-translate-title: Allow translation of page title,
-pp-save-summary: Prepared the page for translation
+pp-save-summary: Prepared the page for translation,
+pagepreparation: Prepare page for translation,
+pp-pagename-placeholder: Enter the page name,
+pp-prepare-button-label: Prepare,
+pp-save-button-label: Save,
+pp-save-message: The page was saved. You can [$1 edit] it.,
+pp-prepare-message: The page was prepared for translation. See the diff 
below. Click the \{{int:pp-save-button-label}}\ button if okay!,
+pp-already-prepared-message: It seems the page has already been 
prepared for translation. There are no changes compared to the previous 
version.,
+pp-pagename-missing: Please enter the page name.,
+pp-diff-old-header: Source text,
+

[MediaWiki-commits] [Gerrit] Minor readme updates - change (mediawiki/selenium)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150776

Change subject: Minor readme updates
..

Minor readme updates

Change-Id: Ia950108e522d8b14b9dd6e5034613ee20100
---
M README.md
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/76/150776/1

diff --git a/README.md b/README.md
index 228f774..cf5306d 100644
--- a/README.md
+++ b/README.md
@@ -91,10 +91,10 @@
 
 ### Gems
 
-1. mediawiki_selenium gem: 
[Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/selenium), 
[GitHub](https://github.com/wikimedia/mediawiki-selenium), 
[RubyGems](https://rubygems.org/gems/mediawiki_selenium), [Code 
Climate](https://codeclimate.com/github/wikimedia/mediawiki-selenium)
-1. mediawiki_api gem: 
[Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/ruby/api), 
[GitHub](https://github.com/wikimedia/mediawiki-ruby-api), 
[RubyGems](https://rubygems.org/gems/mediawiki_api), [Code 
Climate](https://codeclimate.com/github/wikimedia/mediawiki-ruby-api)
+1. mediawiki_selenium: 
[Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/selenium), 
[GitHub](https://github.com/wikimedia/mediawiki-selenium), 
[RubyGems](https://rubygems.org/gems/mediawiki_selenium), [Code 
Climate](https://codeclimate.com/github/wikimedia/mediawiki-selenium)
+1. mediawiki_api: 
[Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/ruby/api), 
[GitHub](https://github.com/wikimedia/mediawiki-ruby-api), 
[RubyGems](https://rubygems.org/gems/mediawiki_api), [Code 
Climate](https://codeclimate.com/github/wikimedia/mediawiki-ruby-api)
 
-# Repositories
+### Repositories
 
 If not stated differently, Selenium tests are in `/tests/browser` folder and 
Jenkins jobs are at 
[integration.wikimedia.org/ci/view/BrowserTests](https://integration.wikimedia.org/ci/view/BrowserTests/).
 

-- 
To view, visit https://gerrit.wikimedia.org/r/150776
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia950108e522d8b14b9dd6e5034613ee20100
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Content changes - change (wikimedia/TransparencyReport)

[MSyed (Code Review)]

MSyed has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150777

Change subject: Content changes
..

Content changes

Minor CSS changes
Added images
Content update

Change-Id: Ibc7059b96dbacb12fd3640cb998f91ad87c32f76
---
M source/content.html.erb
M source/images/logo.png
M source/images/l...@2x.png
A source/images/quote_brandeis.png
A source/images/quote_brand...@2x.png
A source/images/quote_jay.png
A source/images/quote_...@2x.png
A source/images/quote_samuelson.png
A source/images/quote_samuel...@2x.png
A source/images/quote_wilde.png
A source/images/quote_wi...@2x.png
M source/index.html.erb
M source/privacy.html.erb
M source/stylesheets/master.css.scss
14 files changed, 117 insertions(+), 80 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport 
refs/changes/77/150777/1

diff --git a/source/content.html.erb b/source/content.html.erb
index bbf5575..332e1d0 100644
--- a/source/content.html.erb
+++ b/source/content.html.erb
@@ -12,76 +12,40 @@
 h2January – June 2014/h2
 dl
   dtTotal Number of Requests/dt
-  dd90/dd
+  dd304/dd
 /dl
   /section
 
   brbr
 
-  section class=scorecard
-h2January – June 2014/h2
-dl
-  dtNumber of Requests Granted/dt
-  dd0/dd
-/dl
-  /section
-
-br /br /
-  section class=scorecard
-h2January – June 2014/h2
-dl
-  dtTotal Number of DMCA Takedown Requests/dt
-  dd10/dd
-/dl
-  /section
-  brbr
   section class=scorecard
 h2January – June 2014/h2
 dl
   dtPercentage of Requests Granted/dt
-  dd40small%/small/dd
+  dd0small%/small/dd
 /dl
   /section
-
 /div
 
-div class=col-md-9
-  h2Imagine a world in which every single human being can freely share in 
the sum of all knowledge./h2
+div class=col-md-8
+  h2Imagine a world in which span class=blackoutevery single human being 
can freely share in the sum of all knowledge./span/h2
   p
-The Wikimedia projects make up the world's largest repository of human 
knowledge. With that much freely available information, someone is bound to get 
upset by some of the content from time to time. Every year, we receive requests 
to remove or change material that has been posted onto a Wikimedia project.
+The Wikimedia projects make up one of the world's largest repositories of 
human knowledge. With that much information, someone is bound to get upset by 
some of the content from time to time. While the vast majority of content 
disputes are resolved by users themselves, in some extreme cases the Wikimedia 
Foundation may receive a legal demand to override our users.
   /p
 
   p
-But the Wikimedia projects are yours, not ours. People just like you from 
around the world write, upload, edit, and curate all of the content. Therefore, 
we believe users should decide what belongs on Wikimedia projects.
+The Wikimedia projects are yours, not ours. People just like you from 
around the world write, upload, edit, and curate all of the content. Therefore, 
we believe users should decide what belongs on Wikimedia projects whenever 
legally possible.
   /p
 
   p
-Below, you will find more information about the number of requests we 
receive, where they come from, and how they could impact free knowledge. You 
can also learn more about how we fight for freedom of speech through our 
defense of user programs in the FAQ.
+Below, you will find more information about the number of requests we 
receive, where they come from, and how they could impact free knowledge. You 
can also learn more about how we fight for freedom of speech through our user 
assistance programs in the a href=/faqFAQ/a.
   /p
 
   blockquote
 pWe change people through conversation, not through censorship./p
 footer
-  img src=http://lorempixel.com/100/100/people/;
+  img src=/images/quote_jay.png
   pJay ZsmallMusician (2010)/small/p
-/footer
-  /blockquote
-
-  h2DMCA Takedown Notices/h2
-  p
-   The Wikimedia community is made up of creators, collectors, and consumers 
of free knowledge. While most material appearing on Wikimedia projects is in 
the public domain or openly licensed, occasionally copyrighted material makes 
it way onto the projects.
- /p
-  p
-The Wikimedia Foundation is obligated under the Digital Millenium 
Copyright Act (DMCA) to remove copyright-infringing material upon receipt of a 
proper takedown request. When we receive a DMCA takedown request, we thoroughly 
evaluate the request to ensure that it is valid. If we believe it is, we remove 
the allegedly infringing content and we are transparent about that removal. If 
we do not believe it is valid, we will push back as appropriate. To learn more 
about DMCA procedures, see our DMCA policy.
-  /p
-  p
-Below, we have provided information about the DMCA takedown notices we 
have received in the past and how we responded to them.
-  /p
-  blockquote

[MediaWiki-commits] [Gerrit] update language by size - change (pywikibot/compat)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: update language by size
..


update language by size

Change-Id: I7b895f31e4ff513ebd93bf8e1979e3c6da6235d4
---
M families/wikipedia_family.py
M families/wikiquote_family.py
M families/wiktionary_family.py
3 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Xqt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/families/wikipedia_family.py b/families/wikipedia_family.py
index c6e7cee..f4eb25a 100644
--- a/families/wikipedia_family.py
+++ b/families/wikipedia_family.py
@@ -11,7 +11,7 @@
 self.name = 'wikipedia'
 
 self.languages_by_size = [
-'en', 'nl', 'sv', 'de', 'fr', 'it', 'ru', 'es', 'vi', 'war', 'pl',
+'en', 'sv', 'nl', 'de', 'fr', 'it', 'ru', 'es', 'vi', 'war', 'pl',
 'ceb', 'ja', 'pt', 'zh', 'uk', 'ca', 'no', 'fa', 'fi', 'id', 'cs',
 'ar', 'ko', 'ms', 'hu', 'ro', 'sr', 'tr', 'min', 'kk', 'sh', 'eo',
 'sk', 'da', 'eu', 'lt', 'bg', 'he', 'hr', 'sl', 'uz', 'hy', 'et',
@@ -35,9 +35,9 @@
 'to', 'arc', 'kl', 'bjn', 'kbd', 'lo', 'ha', 'pap', 'tpi', 'av',
 'lbe', 'mdf', 'jbo', 'na', 'wo', 'bxr', 'ty', 'srn', 'ig', 'nso',
 'kaa', 'kg', 'tet', 'ab', 'ltg', 'zu', 'za', 'cdo', 'tyv', 'chy',
-'rmy', 'tw', 'cu', 'tn', 'chr', 'om', 'roa-rup', 'got', 'bi', 
'pih',
+'tw', 'rmy', 'cu', 'tn', 'chr', 'om', 'roa-rup', 'got', 'bi', 
'pih',
 'rn', 'sm', 'bm', 'ss', 'iu', 'sd', 'pnt', 'ki', 'xh', 'ts', 'ee',
-'ak', 'fj', 'ti', 'lg', 'ks', 'sg', 'ny', 'ff', 've', 'cr', 'st',
+'ak', 'fj', 'ti', 'lg', 'ks', 'ff', 'sg', 'ny', 've', 'cr', 'st',
 'dz', 'tum', 'ik', 'ch',
 ]
 
diff --git a/families/wikiquote_family.py b/families/wikiquote_family.py
index a5676cb..bb448a0 100644
--- a/families/wikiquote_family.py
+++ b/families/wikiquote_family.py
@@ -12,7 +12,7 @@
 
 self.languages_by_size = [
 'pl', 'en', 'it', 'ru', 'de', 'pt', 'es', 'fr', 'cs', 'sk', 'bg',
-'bs', 'tr', 'uk', 'sl', 'he', 'fa', 'lt', 'eo', 'el', 'ca', 'zh',
+'bs', 'tr', 'uk', 'he', 'sl', 'fa', 'lt', 'eo', 'el', 'ca', 'zh',
 'id', 'hu', 'fi', 'sv', 'li', 'nl', 'hr', 'nn', 'ja', 'no', 'az',
 'sa', 'hy', 'ar', 'et', 'ko', 'gl', 'ml', 'cy', 'ka', 'sr', 'ro',
 'ku', 'te', 'th', 'da', 'eu', 'ta', 'is', 'vi', 'af', 'sq', 'hi',
diff --git a/families/wiktionary_family.py b/families/wiktionary_family.py
index 8930787..36a26d3 100644
--- a/families/wiktionary_family.py
+++ b/families/wiktionary_family.py
@@ -21,8 +21,8 @@
 'pnb', 'ka', 'sm', 'sl', 'nah', 'lv', 'tt', 'lb', 'bs', 'kk', 
'nds',
 'sk', 'tk', 'hsb', 'mk', 'ky', 'be', 'km', 'ms', 'ga', 'wo', 'sa',
 'ang', 'mn', 'co', 'tg', 'gn', 'mr', 'ug', 'csb', 'st', 'so', 'ia',
-'sd', 'si', 'kl', 'vec', 'an', 'jbo', 'ln', 'fo', 'zu', 'gv', 'kw',
-'gu', 'bn', 'rw', 'om', 'qu', 'ss', 'na', 'ie', 'mt', 'pa',
+'sd', 'si', 'vec', 'kl', 'an', 'jbo', 'ln', 'fo', 'zu', 'bn', 'gv',
+'kw', 'gu', 'rw', 'om', 'na', 'qu', 'ss', 'ie', 'mt', 'pa',
 'roa-rup', 'iu', 'su', 'am', 'mi', 'za', 'ne', 'gd', 'tpi', 'yi',
 'ti', 'sg', 'tn', 'dv', 'ts', 'ha', 'ks', 'ay',
 ]

-- 
To view, visit https://gerrit.wikimedia.org/r/150650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b895f31e4ff513ebd93bf8e1979e3c6da6235d4
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Maintenance-bot ladsgr...@gmail.com
Gerrit-Reviewer: Xqt i...@gno.de
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] update language by size - change (pywikibot/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: update language by size
..


update language by size

Change-Id: I0ea84e78115afde7c2370b97c83b42d921cf81f9
---
M pywikibot/families/wikipedia_family.py
M pywikibot/families/wikiquote_family.py
M pywikibot/families/wiktionary_family.py
3 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Xqt: Looks good to me, approved
  jenkins-bot: Verified

Objections:
  John Vandenberg: There's a problem with this change, please improve



diff --git a/pywikibot/families/wikipedia_family.py 
b/pywikibot/families/wikipedia_family.py
index 33782f2..4f7e55a 100644
--- a/pywikibot/families/wikipedia_family.py
+++ b/pywikibot/families/wikipedia_family.py
@@ -11,7 +11,7 @@
 self.name = 'wikipedia'
 
 self.languages_by_size = [
-'en', 'nl', 'sv', 'de', 'fr', 'it', 'ru', 'es', 'vi', 'war', 'pl',
+'en', 'sv', 'nl', 'de', 'fr', 'it', 'ru', 'es', 'vi', 'war', 'pl',
 'ceb', 'ja', 'pt', 'zh', 'uk', 'ca', 'no', 'fa', 'fi', 'id', 'cs',
 'ar', 'ko', 'ms', 'hu', 'ro', 'sr', 'tr', 'min', 'kk', 'sh', 'eo',
 'sk', 'da', 'eu', 'lt', 'bg', 'he', 'hr', 'sl', 'uz', 'hy', 'et',
@@ -35,9 +35,9 @@
 'to', 'arc', 'kl', 'bjn', 'kbd', 'lo', 'ha', 'pap', 'tpi', 'av',
 'lbe', 'mdf', 'jbo', 'na', 'wo', 'bxr', 'ty', 'srn', 'ig', 'nso',
 'kaa', 'kg', 'tet', 'ab', 'ltg', 'zu', 'za', 'cdo', 'tyv', 'chy',
-'rmy', 'tw', 'cu', 'tn', 'chr', 'om', 'roa-rup', 'got', 'bi', 
'pih',
+'tw', 'rmy', 'cu', 'tn', 'chr', 'om', 'roa-rup', 'got', 'bi', 
'pih',
 'rn', 'sm', 'bm', 'ss', 'iu', 'sd', 'pnt', 'ki', 'xh', 'ts', 'ee',
-'ak', 'fj', 'ti', 'lg', 'ks', 'sg', 'ny', 'ff', 've', 'cr', 'st',
+'ak', 'fj', 'ti', 'lg', 'ks', 'ff', 'sg', 'ny', 've', 'cr', 'st',
 'dz', 'tum', 'ik', 'ch',
 ]
 
diff --git a/pywikibot/families/wikiquote_family.py 
b/pywikibot/families/wikiquote_family.py
index 9a4fcec..7afa14f 100644
--- a/pywikibot/families/wikiquote_family.py
+++ b/pywikibot/families/wikiquote_family.py
@@ -12,7 +12,7 @@
 
 self.languages_by_size = [
 'pl', 'en', 'it', 'ru', 'de', 'pt', 'es', 'fr', 'cs', 'sk', 'bg',
-'bs', 'tr', 'uk', 'sl', 'he', 'fa', 'lt', 'eo', 'el', 'ca', 'zh',
+'bs', 'tr', 'uk', 'he', 'sl', 'fa', 'lt', 'eo', 'el', 'ca', 'zh',
 'id', 'hu', 'fi', 'sv', 'li', 'nl', 'hr', 'nn', 'ja', 'no', 'az',
 'sa', 'hy', 'ar', 'et', 'ko', 'gl', 'ml', 'cy', 'ka', 'sr', 'ro',
 'ku', 'te', 'th', 'da', 'eu', 'ta', 'is', 'vi', 'af', 'sq', 'hi',
diff --git a/pywikibot/families/wiktionary_family.py 
b/pywikibot/families/wiktionary_family.py
index 29d3e70..cce2323 100644
--- a/pywikibot/families/wiktionary_family.py
+++ b/pywikibot/families/wiktionary_family.py
@@ -21,8 +21,8 @@
 'pnb', 'ka', 'sm', 'sl', 'nah', 'lv', 'tt', 'lb', 'bs', 'kk', 
'nds',
 'sk', 'tk', 'hsb', 'mk', 'ky', 'be', 'km', 'ms', 'ga', 'wo', 'sa',
 'ang', 'mn', 'co', 'tg', 'gn', 'mr', 'ug', 'csb', 'st', 'so', 'ia',
-'sd', 'si', 'kl', 'vec', 'an', 'jbo', 'ln', 'fo', 'zu', 'gv', 'kw',
-'gu', 'bn', 'rw', 'om', 'qu', 'ss', 'na', 'ie', 'mt', 'pa',
+'sd', 'si', 'vec', 'kl', 'an', 'jbo', 'ln', 'fo', 'zu', 'bn', 'gv',
+'kw', 'gu', 'rw', 'om', 'na', 'qu', 'ss', 'ie', 'mt', 'pa',
 'roa-rup', 'iu', 'su', 'am', 'mi', 'za', 'ne', 'gd', 'tpi', 'yi',
 'ti', 'sg', 'tn', 'dv', 'ts', 'ha', 'ks', 'ay',
 ]

-- 
To view, visit https://gerrit.wikimedia.org/r/150653
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ea84e78115afde7c2370b97c83b42d921cf81f9
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Maintenance-bot ladsgr...@gmail.com
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Xqt i...@gno.de
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] fix dependencies for mw/ext/PhpTagsWiki - change (integration/jenkins-job-builder-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: fix dependencies for mw/ext/PhpTagsWiki
..


fix dependencies for mw/ext/PhpTagsWiki

Change-Id: I9311ff7d81aa15c05c623ac620bb5879cfa0b59c
---
M mediawiki-extensions.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index b5ea8e3..dbec6ec 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -1072,7 +1072,7 @@
  - '{name}-{ext-name}-testextensions-{mwbranch}':
 name: mwext
 ext-name: PhpTagsWiki
-dependencies: 'PhpTags'
+dependencies: 'PhpTags,PhpTagsFunctions'
  - '{name}-{ext-name}-testextensions-{mwbranch}':
 name: mwext
 ext-name: ProofreadPage

-- 
To view, visit https://gerrit.wikimedia.org/r/150768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9311ff7d81aa15c05c623ac620bb5879cfa0b59c
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Pastakhov pastak...@yandex.ru
Gerrit-Reviewer: Hashar has...@free.fr
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 the number of rows shown on Special:Watchlist - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Restore the number of rows shown on Special:Watchlist
..


Restore the number of rows shown on Special:Watchlist

This reverts the result of Iada3a93762dd25fdaf35fb707304abc40bd4a5b1.
This is a manual cherry pick of
Ie722c509a6ad1346b1624abee778f4cbdc79d457,
Ibb23838843a9a1cb8bb23347c3b2de7437861ae0 and necessary parts of
I495d19258205d8713a19aa934a7657aecbe240d4.

Contains only translations of message wlnote which was exported today
with Id59d00bd9402da7fd03a34bd6d0ceb9bd2d00024.

Bug: 62017
Change-Id: I5549e25f22f96eb69059b4d298bc50d11c72f1f1
---
M includes/specialpage/ChangesListSpecialPage.php
M includes/specials/SpecialRecentchanges.php
M includes/specials/SpecialWatchlist.php
M languages/i18n/ar.json
M languages/i18n/ast.json
M languages/i18n/be-tarask.json
M languages/i18n/bn.json
M languages/i18n/ca.json
M languages/i18n/ce.json
M languages/i18n/cs.json
M languages/i18n/cy.json
M languages/i18n/da.json
M languages/i18n/de.json
M languages/i18n/diq.json
M languages/i18n/dsb.json
M languages/i18n/en.json
M languages/i18n/eo.json
M languages/i18n/es.json
M languages/i18n/et.json
M languages/i18n/fa.json
M languages/i18n/fi.json
M languages/i18n/fr.json
M languages/i18n/frr.json
M languages/i18n/gl.json
M languages/i18n/he.json
M languages/i18n/hi.json
M languages/i18n/hsb.json
M languages/i18n/hu.json
M languages/i18n/ia.json
M languages/i18n/ilo.json
M languages/i18n/it.json
M languages/i18n/ja.json
M languages/i18n/kab.json
M languages/i18n/kk-cyrl.json
M languages/i18n/ko.json
M languages/i18n/ksh.json
M languages/i18n/lb.json
M languages/i18n/mk.json
M languages/i18n/ml.json
M languages/i18n/ms.json
M languages/i18n/nb.json
M languages/i18n/nl.json
M languages/i18n/pl.json
M languages/i18n/pms.json
M languages/i18n/pt-br.json
M languages/i18n/pt.json
M languages/i18n/qqq.json
M languages/i18n/ro.json
M languages/i18n/ru.json
M languages/i18n/sco.json
M languages/i18n/sl.json
M languages/i18n/sr-ec.json
M languages/i18n/sr-el.json
M languages/i18n/sv.json
M languages/i18n/te.json
M languages/i18n/th.json
M languages/i18n/tl.json
M languages/i18n/tr.json
M languages/i18n/uk.json
M languages/i18n/vi.json
M languages/i18n/zh-hans.json
M languages/i18n/zh-hant.json
M maintenance/language/messages.inc
63 files changed, 55 insertions(+), 72 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, but someone else must approve
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/specialpage/ChangesListSpecialPage.php 
b/includes/specialpage/ChangesListSpecialPage.php
index bc0b8ff..b03b552 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -53,7 +53,7 @@
$opts = $this-getOptions();
if ( $rows === false ) {
if ( !$this-including() ) {
-   $this-doHeader( $opts );
+   $this-doHeader( $opts, 0 );
}
 
return;
@@ -326,7 +326,7 @@
public function webOutput( $rows, $opts ) {
if ( !$this-including() ) {
$this-outputFeedLinks();
-   $this-doHeader( $opts );
+   $this-doHeader( $opts, $rows-numRows() );
}
 
$this-outputChangesList( $rows, $opts );
@@ -348,12 +348,12 @@
abstract public function outputChangesList( $rows, $opts );
 
/**
-* Return the text to be displayed above the changes
+* Set the text to be displayed above the changes
 *
 * @param FormOptions $opts
-* @return string XHTML
+* @param int $numRows Number of rows in the result to show after this 
header
 */
-   public function doHeader( $opts ) {
+   public function doHeader( $opts, $numRows ) {
$this-setTopText( $opts );
 
// @todo Lots of stuff should be done here.
diff --git a/includes/specials/SpecialRecentchanges.php 
b/includes/specials/SpecialRecentchanges.php
index f1a31a5..5a7f698 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -350,12 +350,12 @@
}
 
/**
-* Return the text to be displayed above the changes
+* Set the text to be displayed above the changes
 *
 * @param FormOptions $opts
-* @return string XHTML
+* @param int $numRows Number of rows in the result to show after this 
header
 */
-   public function doHeader( $opts ) {
+   public function doHeader( $opts, $numRows ) {
global $wgScript;
 
$this-setTopText( $opts );
diff --git a/includes/specials/SpecialWatchlist.php 
b/includes/specials/SpecialWatchlist.php
index f7024fd..b20d857 

[MediaWiki-commits] [Gerrit] Localisation changes for consistency - change (mediawiki...BlueSpiceExtensions)

[Smuggli (Code Review)]

Smuggli has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150778

Change subject: Localisation changes for consistency
..

Localisation changes for consistency

This extension does not need to be translated, so not for translatewiki

Change-Id: I835c64da3d3615b4b1d186d24121ea3a07ccb4e3
---
M BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
A BlueSpiceProjectFeedbackHelper/i18n/de-formal.json
A BlueSpiceProjectFeedbackHelper/i18n/de.json
A BlueSpiceProjectFeedbackHelper/i18n/en.json
M 
BlueSpiceProjectFeedbackHelper/languages/BlueSpiceProjectFeedbackHelper.i18n.php
5 files changed, 64 insertions(+), 33 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/78/150778/1

diff --git 
a/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php 
b/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
index 2f1168d..fa9c69d 100644
--- a/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
+++ b/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
@@ -2,6 +2,8 @@
 
 BsExtensionManager::registerExtension('BlueSpiceProjectFeedbackHelper',  
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE, BsACTION::LOAD_SPECIALPAGE);
 
+$wgMessagesDirs['BlueSpiceProjectFeedbackHelper'] = __DIR__ . '/i18n';
+
 $wgExtensionMessagesFiles['BlueSpiceProjectFeedbackHelper'] = __DIR__ . 
'/languages/BlueSpiceProjectFeedbackHelper.i18n.php';
 
 $wgResourceModules['ext.bluespice.blueSpiceprojectfeedbackhelper'] = array(
diff --git a/BlueSpiceProjectFeedbackHelper/i18n/de-formal.json 
b/BlueSpiceProjectFeedbackHelper/i18n/de-formal.json
new file mode 100644
index 000..b76ddd9
--- /dev/null
+++ b/BlueSpiceProjectFeedbackHelper/i18n/de-formal.json
@@ -0,0 +1,9 @@
+{
+   @metadata: {
+   authors: [
+   Robert Vogel vo...@hallowelt.biz
+   ]
+   },
+   bs-bluespiceprojectfeedbackhelper-hint: Wir freuen uns, dass Sie 
'''BlueSpice''' verwenden. Bitte helfen Sie uns die Software zu verbessern und 
geben Sie uns ein kurzes 
[http://sourceforge.net/p/bluespice/discussion/1249667/ Feedback]. Fehler 
teilen Sie uns am besten durch den 
[http://sourceforge.net/tracker/?func=addgroup_id=358032atid=1494709 
BugTracker] mit. Wenn Sie über aktuelle Entwicklungen, Tipps und Tricks auf dem 
Laufenden gehalten werden möchten, dann folgen Sie uns doch auf einem dieser 
Kanäle: [http://www.facebook.com/BlueSpice.for.MediaWiki Facebook], 
[http://twitter.com/BlueSpiceTweets Twitter], 
[http://www.youtube.com/BlueSpiceVideo YouTube], 
[http://plus.google.com/102189038724381341308 G+], [http://blog.blue-spice.org 
Blog]. Vielen Dank für Ihre Unterstützung!,
+   bs-bluespiceprojectfeedbackhelper-confirm: Möchten Die diesen 
Hinweis deaktivieren? Wenn Sie auf \Abbrechen\ klicken wird er in sieben 
Tagen wieder angezeigt.
+}
diff --git a/BlueSpiceProjectFeedbackHelper/i18n/de.json 
b/BlueSpiceProjectFeedbackHelper/i18n/de.json
new file mode 100644
index 000..c130f63
--- /dev/null
+++ b/BlueSpiceProjectFeedbackHelper/i18n/de.json
@@ -0,0 +1,13 @@
+{
+   @metadata: {
+   authors: [
+   Robert Vogel vo...@hallowelt.biz
+   ]
+   },
+   bs-bluespiceprojectfeedbackhelper-desc: Feedback über BlueSpice 
abgeben,
+   prefs-bluespiceprojectfeedbackhelper: Feedback,
+   bs-bluespiceprojectfeedbackhelper-hint: Wir freuen uns, dass du 
'''BlueSpice''' verwendest. Bitte hilf uns die Software zu verbessern und gib 
uns ein kurzes [http://sourceforge.net/p/bluespice/discussion/1249667/ 
Feedback]. Fehler teilst du uns am besten durch den 
[http://sourceforge.net/tracker/?func=addgroup_id=358032atid=1494709 
BugTracker] mit. Wenn du über aktuelle Entwicklungen, Tipps und Tricks auf dem 
Laufenden gehalten werden möchtest, dann folge uns doch auf einem dieser 
Kanäle: [http://www.facebook.com/BlueSpice.for.MediaWiki Facebook], 
[http://twitter.com/BlueSpiceTweets Twitter], 
[http://www.youtube.com/BlueSpiceVideo YouTube], 
[http://plus.google.com/102189038724381341308 G+], [http://blog.blue-spice.org 
Blog]. Vielen Dank für deine Unterstützung!,
+   bs-bluespiceprojectfeedbackhelper-active: Aktiv,
+   bs-bluespiceprojectfeedbackhelper-closebutton: Schließen,
+   bs-bluespiceprojectfeedbackhelper-confirm: Möchtest du diesen 
Hinweis deaktivieren? Wenn du auf \Abbrechen\ klickst wird er in sieben Tagen 
wieder angezeigt.
+}
diff --git a/BlueSpiceProjectFeedbackHelper/i18n/en.json 
b/BlueSpiceProjectFeedbackHelper/i18n/en.json
new file mode 100644
index 000..d53f16b
--- /dev/null
+++ b/BlueSpiceProjectFeedbackHelper/i18n/en.json
@@ -0,0 +1,13 @@
+{
+   @metadata: {
+   authors: [
+   Robert Vogel vo...@hallowelt.biz
+   ]
+   },
+   

[MediaWiki-commits] [Gerrit] Localisation changes for consistency - change (mediawiki...BlueSpiceExtensions)

[Smuggli (Code Review)]

Smuggli has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150779

Change subject: Localisation changes for consistency
..

Localisation changes for consistency

This extension does not need to be translated, so not for translatewiki

Change-Id: Iac3e28ecab53b4e9eca9379873eef003accc05c2
---
M BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
A BlueSpiceProjectFeedbackHelper/i18n/de-formal.json
A BlueSpiceProjectFeedbackHelper/i18n/de.json
A BlueSpiceProjectFeedbackHelper/i18n/en.json
M 
BlueSpiceProjectFeedbackHelper/languages/BlueSpiceProjectFeedbackHelper.i18n.php
5 files changed, 64 insertions(+), 33 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/79/150779/1

diff --git 
a/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php 
b/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
index 2f1168d..fa9c69d 100644
--- a/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
+++ b/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
@@ -2,6 +2,8 @@
 
 BsExtensionManager::registerExtension('BlueSpiceProjectFeedbackHelper',  
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE, BsACTION::LOAD_SPECIALPAGE);
 
+$wgMessagesDirs['BlueSpiceProjectFeedbackHelper'] = __DIR__ . '/i18n';
+
 $wgExtensionMessagesFiles['BlueSpiceProjectFeedbackHelper'] = __DIR__ . 
'/languages/BlueSpiceProjectFeedbackHelper.i18n.php';
 
 $wgResourceModules['ext.bluespice.blueSpiceprojectfeedbackhelper'] = array(
diff --git a/BlueSpiceProjectFeedbackHelper/i18n/de-formal.json 
b/BlueSpiceProjectFeedbackHelper/i18n/de-formal.json
new file mode 100644
index 000..b76ddd9
--- /dev/null
+++ b/BlueSpiceProjectFeedbackHelper/i18n/de-formal.json
@@ -0,0 +1,9 @@
+{
+   @metadata: {
+   authors: [
+   Robert Vogel vo...@hallowelt.biz
+   ]
+   },
+   bs-bluespiceprojectfeedbackhelper-hint: Wir freuen uns, dass Sie 
'''BlueSpice''' verwenden. Bitte helfen Sie uns die Software zu verbessern und 
geben Sie uns ein kurzes 
[http://sourceforge.net/p/bluespice/discussion/1249667/ Feedback]. Fehler 
teilen Sie uns am besten durch den 
[http://sourceforge.net/tracker/?func=addgroup_id=358032atid=1494709 
BugTracker] mit. Wenn Sie über aktuelle Entwicklungen, Tipps und Tricks auf dem 
Laufenden gehalten werden möchten, dann folgen Sie uns doch auf einem dieser 
Kanäle: [http://www.facebook.com/BlueSpice.for.MediaWiki Facebook], 
[http://twitter.com/BlueSpiceTweets Twitter], 
[http://www.youtube.com/BlueSpiceVideo YouTube], 
[http://plus.google.com/102189038724381341308 G+], [http://blog.blue-spice.org 
Blog]. Vielen Dank für Ihre Unterstützung!,
+   bs-bluespiceprojectfeedbackhelper-confirm: Möchten Die diesen 
Hinweis deaktivieren? Wenn Sie auf \Abbrechen\ klicken wird er in sieben 
Tagen wieder angezeigt.
+}
diff --git a/BlueSpiceProjectFeedbackHelper/i18n/de.json 
b/BlueSpiceProjectFeedbackHelper/i18n/de.json
new file mode 100644
index 000..c130f63
--- /dev/null
+++ b/BlueSpiceProjectFeedbackHelper/i18n/de.json
@@ -0,0 +1,13 @@
+{
+   @metadata: {
+   authors: [
+   Robert Vogel vo...@hallowelt.biz
+   ]
+   },
+   bs-bluespiceprojectfeedbackhelper-desc: Feedback über BlueSpice 
abgeben,
+   prefs-bluespiceprojectfeedbackhelper: Feedback,
+   bs-bluespiceprojectfeedbackhelper-hint: Wir freuen uns, dass du 
'''BlueSpice''' verwendest. Bitte hilf uns die Software zu verbessern und gib 
uns ein kurzes [http://sourceforge.net/p/bluespice/discussion/1249667/ 
Feedback]. Fehler teilst du uns am besten durch den 
[http://sourceforge.net/tracker/?func=addgroup_id=358032atid=1494709 
BugTracker] mit. Wenn du über aktuelle Entwicklungen, Tipps und Tricks auf dem 
Laufenden gehalten werden möchtest, dann folge uns doch auf einem dieser 
Kanäle: [http://www.facebook.com/BlueSpice.for.MediaWiki Facebook], 
[http://twitter.com/BlueSpiceTweets Twitter], 
[http://www.youtube.com/BlueSpiceVideo YouTube], 
[http://plus.google.com/102189038724381341308 G+], [http://blog.blue-spice.org 
Blog]. Vielen Dank für deine Unterstützung!,
+   bs-bluespiceprojectfeedbackhelper-active: Aktiv,
+   bs-bluespiceprojectfeedbackhelper-closebutton: Schließen,
+   bs-bluespiceprojectfeedbackhelper-confirm: Möchtest du diesen 
Hinweis deaktivieren? Wenn du auf \Abbrechen\ klickst wird er in sieben Tagen 
wieder angezeigt.
+}
diff --git a/BlueSpiceProjectFeedbackHelper/i18n/en.json 
b/BlueSpiceProjectFeedbackHelper/i18n/en.json
new file mode 100644
index 000..d53f16b
--- /dev/null
+++ b/BlueSpiceProjectFeedbackHelper/i18n/en.json
@@ -0,0 +1,13 @@
+{
+   @metadata: {
+   authors: [
+   Robert Vogel vo...@hallowelt.biz
+   ]
+   },
+   

[MediaWiki-commits] [Gerrit] (Bug 68112): Edge case fix setting autoInsertedStart flag fo... - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: (Bug 68112): Edge case fix setting autoInsertedStart flag for 
p
..


(Bug 68112): Edge case fix setting autoInsertedStart flag for p

* For wikitext like a\n/p, the generated HTML pa\n/p requires
  an autoInsertedStart flag for the p-tag since it gets marked as
  a HTML p-tag. This can mess up computation of DSR, because without
  the autoInsertedStart flag, the p tag is seen as occupying
  3 characters of wikitext source, whereas, in reality, it is zero.

  This also affects template encapsulation for {{echo|a\nb\n/p}}.

  Bug 68112 errors are basically situations like this.

* This patch fixes these encapsulation errors. Verifiable with:
  http://localhost:8000/yiwiki/%D7%94%27%D7%A9%D7%9B%22%D7%90

* Added a template encapsulation parser test that fails without this
  patch but passes with it.

* Unrelated blacklist change which is rather odd. This is a change
  that should have shown up with 703d86a6. Not investigating right now.

Change-Id: I6980722fa507324911d3b34307088ff3ec2ac9a4
---
M lib/dom.markTreeBuilderFixups.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 27 insertions(+), 3 deletions(-)

Approvals:
  Arlolra: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/dom.markTreeBuilderFixups.js b/lib/dom.markTreeBuilderFixups.js
index 13606ef..4ed79b9 100644
--- a/lib/dom.markTreeBuilderFixups.js
+++ b/lib/dom.markTreeBuilderFixups.js
@@ -251,8 +251,21 @@
// 
console.warn(expected.nodeName:  + expectedName + ; sibling.nodeName:  + 
sibling.nodeName);
addPlaceholderMeta(env, c, dp, 
expectedName, {end: true});
} else if ( dp.stx ) {
-   // transfer stx
-   DU.getDataParsoid( sibling 
).stx = dp.stx;
+   // Transfer stx flag
+   var siblingDP = 
DU.getDataParsoid(sibling);
+
+   // For p-tags, we have to deal 
with a special case.
+   //
+   // For wikitext like a\n/p, 
the paragraph wrapper
+   // closes the p-tag and 
generates pa\n/p. Since
+   // the closing tag is a HTML 
tag, this effectively makes
+   // the opening p-tag an 
auto-inserted tag.
+   if (dp.stx === 'html'  
DU.hasNodeName(sibling, 'p')) {
+   if (siblingDP.stx !== 
'html') {
+   
siblingDP.autoInsertedStart = true;
+   }
+   }
+   siblingDP.stx = dp.stx;
}
} else {
// Jump over this meta tag, but 
preserve it
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 2bbfa25..cbabc82 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -58,7 +58,7 @@
 add(wt2html, Definition Lists: Nesting: Test 2 (Parsoid only), dl 
data-parsoid='{\dsr\:[0,8,0,0]}'dt 
data-parsoid='{\dsr\:[0,3,1,0]}'t1/dt\ndd 
data-parsoid='{\dsr\:[4,8,1,0]}'dl data-parsoid='{\dsr\:[5,8,0,0]}'dd 
data-parsoid='{\dsr\:[5,8,1,0]}'d2/dd/dl/dd/dl);
 add(wt2html, Definition Lists: Nesting: Test 3 (Parsoid only), dl 
data-parsoid='{\dsr\:[0,11,0,0]}'dd data-parsoid='{\dsr\:[0,11,1,0]}'dl 
data-parsoid='{\dsr\:[1,11,0,0]}'dt 
data-parsoid='{\dsr\:[1,4,1,0]}'t1/dt\ndd 
data-parsoid='{\dsr\:[5,11,2,0]}'dl data-parsoid='{\dsr\:[7,11,0,0]}'dd 
data-parsoid='{\dsr\:[7,11,1,0]}'dl data-parsoid='{\dsr\:[8,11,0,0]}'dd 
data-parsoid='{\dsr\:[8,11,1,0]}'d2/dd/dl/dd/dl/dd/dl/dd/dl);
 add(wt2html, External link containing double-single-quotes in text embedded 
in italics (bug 4598 sanity check), p data-parsoid='{\dsr\:[0,60,0,0]}'i 
data-parsoid='{\dsr\:[0,60,2,2]}'Some a rel=\mw:ExtLink\ 
href=\http://example.com/\; 
data-parsoid='{\targetOff\:28,\contentOffsets\:[28,56],\dsr\:[7,57,21,1]}'pretty
 i data-parsoid='{\dsr\:[35,46,2,2]}'italics/i and stuff/a!/i/p);
-add(wt2html, Template-generated table cell attributes and cell content 
(3), table data-parsoid='{\dsr\:[0,35,2,2]}'\ntbody 
data-parsoid='{\dsr\:[3,33,0,0]}'tr 
data-parsoid='{\autoInsertedEnd\:true,\autoInsertedStart\:true,\dsr\:[3,32,0,0]}'td
 align=\center\ style=\color: red\ typeof=\mw:Transclusion\ 

[MediaWiki-commits] [Gerrit] Prefix parser tests files with 'proofreadpage_' - change (mediawiki...ProofreadPage)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Prefix parser tests files with 'proofreadpage_'
..


Prefix parser tests files with 'proofreadpage_'

The parser test suite use the name of the text file to forge a class
which in test output would show as:

Pagelist::testParserTest.testParserTest with data set #0
Pages::testParserTest.testParserTest with data set #0

Prefix the text files with 'proofreadpage_' to have classes named such
as:

 Proofreadpage_pagelist
 Proofreadpage_pages

That will let us easily find out where the tests come from.

Change-Id: I71c4c9347bb680176af63174cd6315c8127d22f2
---
M ProofreadPage.php
R tests/parser/proofreadpage_pagelist.txt
R tests/parser/proofreadpage_pages.txt
3 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Tpt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ProofreadPage.php b/ProofreadPage.php
index a204cbf..fde1474 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -237,8 +237,8 @@
 };
 
 //Parser tests
-$wgParserTestFiles[] = __DIR__ . '/tests/parser/pagelist.txt';
-$wgParserTestFiles[] = __DIR__ . '/tests/parser/pages.txt';
+$wgParserTestFiles[] = __DIR__ . '/tests/parser/proofreadpage_pagelist.txt';
+$wgParserTestFiles[] = __DIR__ . '/tests/parser/proofreadpage_pages.txt';
 
 //Handlers
 $wgContentHandlers[CONTENT_MODEL_PROOFREAD_PAGE] = 
'\ProofreadPage\Page\PageContentHandler';
diff --git a/tests/parser/pagelist.txt b/tests/parser/proofreadpage_pagelist.txt
similarity index 100%
rename from tests/parser/pagelist.txt
rename to tests/parser/proofreadpage_pagelist.txt
diff --git a/tests/parser/pages.txt b/tests/parser/proofreadpage_pages.txt
similarity index 100%
rename from tests/parser/pages.txt
rename to tests/parser/proofreadpage_pages.txt

-- 
To view, visit https://gerrit.wikimedia.org/r/150219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I71c4c9347bb680176af63174cd6315c8127d22f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Tpt thoma...@hotmail.fr
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wmflib: add ssl_ciphersuite - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150781

Change subject: wmflib: add ssl_ciphersuite
..

wmflib: add ssl_ciphersuite

We have our ssl configs in 100 places all over puppet, and converting
everything to PFS was a real pain and involved 100 commits (or more).

Changing anything at the moment would be a mess and require 100 changes
as well, so we're providing a rudimentary, simple solution to output
commonly configured apache and nginx configs for SSL within a centralized
function that will compute the string to add to your manifest/template.

The output of this functions can also be used to generate a separate include
file that will be read by the web server.

Change-Id: I9bc1104b7f770d9f0157b9f81791a534193a4915
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
A modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
1 file changed, 132 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/150781/1

diff --git a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb 
b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
new file mode 100644
index 000..b6828b8
--- /dev/null
+++ b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
@@ -0,0 +1,132 @@
+# == Function: ssl_ciphersuite
+#
+# === Description
+#
+# Takes two arguments: the first one indicating the degree of
+# compatibility we want to retain with older browsers, the second one
+# adapting the output to the specific browser.
+#
+# Whenever called, this function will output a two-lines string that
+# can be safely included in your configuration file as the ssl
+# configuration part.
+#
+# This is an attempt at unifying the configurations we use across our
+# uncountable number of systems.
+#
+# == Examples
+#
+# ssl_ciphersuite('apache-2.4', 'compat')
+# ssl_ciphersuite('nginx', 'strong')
+#
+# == License
+#
+# Author: Giuseppe Lavagetto
+# Copyright 2014 Wikimedia Foundation
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see http://www.gnu.org/licenses/.
+
+require 'puppet/util/package'
+
+module Puppet::Parser::Functions
+  ciphersuites = {
+'compat' = 
'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:ECDHE-RSA-RC4-SHA:ECDHE-ECDSA-RC4-SHA:AES128:AES256:RC4-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!DH',
+'strong' = 
'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!DH'
+  }
+  newfunction(
+  :ssl_ciphersuite,
+  :type = :rvalue,
+  :doc  = -END
+Outputs the ssl configuration part of the webserver config.
+Function parameters are:
+ servercode - either nginx, apache-2.2 or apache-2.4
+ encryption_type - either strong for PFS only, or compat for maximum 
compatibility
+ hsts_days  - how many days should the STS header live. If not expressed, HSTS 
will
+  be disabled
+
+Examples:
+
+   ssl_ciphersuite('apache-2.4', 'compat') # Compatible config for apache 2.4
+   ssl_ciphersuite('nginx', 'strong', '365') # PFS-only, use HSTS for 365 days
+END
+  ) do |args|
+
+
+if args.length  2  args.length  3
+  raise Puppet::ParseError, 'ssl_ciphersuite() requires at least 2 
arguments'
+end
+
+servercode = args.shift
+case servercode
+when 'apache-2.4' then
+  server = 'apache'
+  server_version = 24
+when 'apache-2.2' then
+  server = 'apache'
+  server_version = 22
+when 'nginx' then
+  server = 'nginx'
+  server_version = nil
+else raise Puppet::ParseError,
+  ssl_ciphersuite(): unknown server string '#{servercode}'
+end
+
+ciphersuite = args.shift
+unless ciphersuites.has_key?(ciphersuite)
+  raise Puppet::ParseError, 

[MediaWiki-commits] [Gerrit] swift: monitor object/container availability - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: swift: monitor object/container availability
..


swift: monitor object/container availability

based on the stats published by dispersion, monitor if there are objects or
containers not found.

Change-Id: Ie3b6264c598f8011e25493cc4fad70d44b5a93f1
---
M manifests/role/graphite.pp
M manifests/swift.pp
2 files changed, 23 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index 36f5926..00153ad 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -184,6 +184,7 @@
 }
 include ::mediawiki::monitoring::graphite
 include ::eventlogging::monitoring::graphite
+include ::swift::monitoring::graphite
 }
 
 file { '/etc/apache2/sites-enabled/graphite':
diff --git a/manifests/swift.pp b/manifests/swift.pp
index 8fa94b8..d097540 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -182,6 +182,28 @@
 }
 }
 
+class swift::monitoring::graphite {
+monitor_graphite_threshold { 'swift_eqiad-prod_dispersion_object':
+description = 'swift eqiad-prod object availability',
+metric  = 
'swift.eqiad-prod.dispersion.object.pct_found.value',
+from= '1hours',
+warning = 95,
+critical= 90,
+under   = true,
+nagios_critical = false
+}
+
+monitor_graphite_threshold { 'swift_eqiad-prod_dispersion_container':
+description = 'swift eqiad-prod container availability',
+metric  = 
'swift.eqiad-prod.dispersion.container.pct_found.value',
+from= '1hours',
+warning = 95,
+critical= 90,
+under   = true,
+nagios_critical = false
+}
+}
+
 class swift::storage {
 Class['swift::base'] - Class['swift::storage']
 

-- 
To view, visit https://gerrit.wikimedia.org/r/149019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3b6264c598f8011e25493cc4fad70d44b5a93f1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Attempting to fix a PHP fatal under some special circumstances. - change (mediawiki...InterwikiMagic)

[Jack Phoenix (Code Review)]

Jack Phoenix has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150782

Change subject: Attempting to fix a PHP fatal under some special circumstances.
..

Attempting to fix a PHP fatal under some special circumstances.

Bug: 68713
Change-Id: Ie89ac3679ba7b411f91dcc6b7c021510f97c5953
---
M InterwikiMagic.php
1 file changed, 19 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/InterwikiMagic 
refs/changes/82/150782/1

diff --git a/InterwikiMagic.php b/InterwikiMagic.php
index e0934ea..2d6b364 100644
--- a/InterwikiMagic.php
+++ b/InterwikiMagic.php
@@ -9,12 +9,12 @@
  *
  * @file
  * @ingroup Extensions
- * @version 1.0
- * @date 3 April 2011 (original patch dated July 12/13, 2009)
+ * @version 1.1
+ * @date 28 July 2014 (original patch dated July 12/13, 2009)
  * @author Jack Phoenix j...@countervandalism.net
- * @license http://en.wikipedia.org/wiki/Public_domain Public domain
- * @link http://www.mediawiki.org/wiki/Extension:ShoutWiki_Interwiki_Magic 
Documentation
- * @see http://bugzilla.shoutwiki.com/show_bug.cgi?id=12
+ * @license https://en.wikipedia.org/wiki/Public_domain Public domain
+ * @link https://www.mediawiki.org/wiki/Extension:ShoutWiki_Interwiki_Magic 
Documentation
+ * @see https://bugzilla.shoutwiki.com/show_bug.cgi?id=12
  */
 
 if ( !defined( 'MEDIAWIKI' ) ) {
@@ -24,7 +24,7 @@
 // Extension credits that will show up on Special:Version
 $wgExtensionCredits['other'][] = array(
'name' = 'ShoutWiki Interwiki Magic',
-   'version' = '1.0',
+   'version' = '1.1',
'author' = 'Jack Phoenix',
'description' = 'Handle global interwikis and local interlanguage 
links',
'url' = 
'https://www.mediawiki.org/wiki/Extension:ShoutWiki_Interwiki_Magic',
@@ -37,29 +37,31 @@
  * This function does all the magic for non-language interwikis, i.e. stuff
  * that is /not/ something like en, fr, etc.
  *
- * @param $prefix String: interwiki prefix we are looking for
- * @param $iwData Array: output array describing the interwiki with keys
+ * @param string $prefix Interwiki prefix we are looking for
+ * @param array $iwData Output array describing the interwiki with keys
  *   iw_url, iw_local, iw_trans and optionally iw_api and
  *   iw_wikiid.
- * @return Boolean: true by default, false when fetching interwikis from the
+ * @return bool True by default, false when fetching interwikis from the
  *  shared database ($wgSharedDB)
  */
 function wfShoutWikiInterwikiMagic( $prefix, $iwData ) {
global $wgContLang, $wgSharedDB;
-   if( !$wgContLang-getLanguageName( $prefix ) ) {
+   if ( !$wgContLang-getLanguageName( $prefix ) ) {
$dbr = wfGetDB( DB_SLAVE, array(), $wgSharedDB );
-   $res = $dbr-select(
+   $res = $dbr-selectRow(
'interwiki',
'*',
array( 'iw_prefix' = $prefix ),
__METHOD__
);
-   $iwData = $dbr-fetchRow( $res );
-   // docs/hooks.txt says: Return true without providing an 
interwiki to
-   // continue interwiki search.
-   // At this point, we can safely return false because we know 
that we
-   // have something
-   return false;
+   if ( $res !== false ) {
+   $iwData = $res;
+   // docs/hooks.txt says: Return true without providing 
an interwiki to
+   // continue interwiki search.
+   // At this point, we can safely return false because we 
know that we
+   // have something
+   return false;
+   }
}
return true;
 }
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/150782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie89ac3679ba7b411f91dcc6b7c021510f97c5953
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InterwikiMagic
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] WIP Make the post-edit notification handle API errors - change (mediawiki...GettingStarted)

[Phuedx (Code Review)]

Phuedx has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150783

Change subject: WIP Make the post-edit notification handle API errors
..

WIP Make the post-edit notification handle API errors

If the Suggestions API fails (the promise is rejected), then don't try
to display a suggestion. Instead, display a helpful error message.

TODO

* Write a helpful error message

Change-Id: Ibc93fa751093727ecdfed02a7af70c4efd58e6bd
---
M resources/lightbulb/lightbulb.postEdit.js
1 file changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted 
refs/changes/83/150783/1

diff --git a/resources/lightbulb/lightbulb.postEdit.js 
b/resources/lightbulb/lightbulb.postEdit.js
index e0d1e48..5de4538 100644
--- a/resources/lightbulb/lightbulb.postEdit.js
+++ b/resources/lightbulb/lightbulb.postEdit.js
@@ -86,11 +86,14 @@
thumbSize: 70
} );
 
-   suggestionsPromise.done( function ( response ) {
-   var suggestions,
+   suggestionsPromise.always( function ( response ) {
+   var suggestions = [],
$notification;
 
-   suggestions = parser.parse( response );
+   if ( suggestionsPromise.state() === resolved ) {
+   suggestions = parser.parse( response );
+   }
+
$notification = createNotification( suggestions, 
data.message );
 
// Show the notification.

-- 
To view, visit https://gerrit.wikimedia.org/r/150783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc93fa751093727ecdfed02a7af70c4efd58e6bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Phuedx g...@samsmith.io

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Take badges out of experimental mode - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Take badges out of experimental mode
..


Take badges out of experimental mode

This does not enable badges yet because it needs a config change, too.

Change-Id: Ib996197d7d49e68f478f8b7fee260a2b2a12ee9a
---
M lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SitePageInterface.js
M repo/i18n/en.json
M repo/includes/api/SetSiteLink.php
M repo/includes/specials/SpecialSetSiteLink.php
M repo/tests/phpunit/includes/View/SiteLinksViewTest.php
M repo/tests/phpunit/includes/api/SetSiteLinkTest.php
M repo/tests/phpunit/includes/specials/SpecialSetSitelinkTest.php
7 files changed, 79 insertions(+), 154 deletions(-)

Approvals:
  Hoo man: Looks good to me, approved
  Daniel Kinzler: Looks good to me, but someone else must approve
  Siebrand: Looks good to me, but someone else must approve
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git 
a/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SitePageInterface.js 
b/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SitePageInterface.js
index ab79cf5..ea9b442 100644
--- 
a/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SitePageInterface.js
+++ 
b/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SitePageInterface.js
@@ -117,11 +117,6 @@
 * that also links to Special:SetSiteLink where badges can be added.
 */
_initBadgeEditing: function() {
-   if ( !mw.config.get( 'wbExperimentalFeatures' ) ) {
-   // Badges are experimental as of 2014-07-18
-   return;
-   }
-
var setSiteLinkUrl = this._getSetSiteLinkUrl(),
$badgeSpan = this._subject.prev( '.wb-sitelinks-badges' 
);
 
@@ -153,10 +148,6 @@
 * Disable editing badges
 */
_disableBadgeEditing: function() {
-   if ( !mw.config.get( 'wbExperimentalFeatures' ) ) {
-   return;
-   }
-
var $badgeSpan = this._subject.prev( '.wb-sitelinks-badges' );
 
$badgeSpan.find( 'a  span' ).each( function( i, badge ) {
diff --git a/repo/i18n/en.json b/repo/i18n/en.json
index 994a556..34bb535 100644
--- a/repo/i18n/en.json
+++ b/repo/i18n/en.json
@@ -8,7 +8,8 @@
Anja Jentzsch,
Daniel Werner,
Michał Łazowik,
-   Adam Shorland
+   Adam Shorland,
+   Bene*
]
},
wikibase-desc: Structured data repository,
@@ -155,7 +156,7 @@
wikibase-setaliases-warning-remove: Do you really want to remove all 
aliases of [[$1]]?,
special-setsitelink: Set a site link,
wikibase-setsitelink-introfull: You are setting the site link of $2 
for [[$1]].,
-   wikibase-setsitelink-intro: This form allows you to set the site 
link of an entity. You need to provide the id of the entity (e.g. Q23), a site 
id (e.g. \enwiki\) and the site link to set to.,
+   wikibase-setsitelink-intro: This form allows you to set the site 
link of an item. You need to provide the id of the item (e.g. Q23), a site id 
(e.g. \enwiki\) and the site link to set to. Additionally you can set various 
badges for this site link which are listed below.,
wikibase-setsitelink-site: Site id:,
wikibase-setsitelink-label: Site link:,
wikibase-setsitelink-badges: Badges:,
diff --git a/repo/includes/api/SetSiteLink.php 
b/repo/includes/api/SetSiteLink.php
index f627a65..7897b3a 100644
--- a/repo/includes/api/SetSiteLink.php
+++ b/repo/includes/api/SetSiteLink.php
@@ -180,19 +180,6 @@
public function getAllowedParams() {
$sites = $this-siteLinkTargetProvider-getSiteList( 
$this-siteLinkGroups );
 
-   // Experimental setting of badges in api
-   // @todo remove experimental once JS UI is in place, (also 
remove the experimental examples below and TESTS)
-   if ( defined( 'WB_EXPERIMENTAL_FEATURES' )  
WB_EXPERIMENTAL_FEATURES ) {
-   $experimentalParams = array(
-   'badges' = array(
-   ApiBase::PARAM_TYPE = 'string',
-   ApiBase::PARAM_ISMULTI = true,
-   ),
-   );
-   } else {
-   $experimentalParams = array();
-   }
-
return array_merge(
parent::getAllowedParams(),
parent::getAllowedParamsForId(),
@@ -206,8 +193,11 @@
'linktitle' = array(
ApiBase::PARAM_TYPE = 'string',
),
-   

[MediaWiki-commits] [Gerrit] DM 1.0 compat: stop using Entity::toArray and ObjectComparer - change (mediawiki...Wikibase)

[Hoo man (Code Review)]

Hoo man has submitted this change and it was merged.

Change subject: DM 1.0 compat: stop using Entity::toArray and ObjectComparer
..


DM 1.0 compat: stop using Entity::toArray and ObjectComparer

Change-Id: I9a8764ddde511105e03285cf6264db02dee7ae68
---
M repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
1 file changed, 33 insertions(+), 31 deletions(-)

Approvals:
  Hoo man: Verified; Looks good to me, approved



diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
index cea9561..c4efeaa 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
@@ -6,7 +6,7 @@
 use Wikibase\ChangeOp\ChangeOpsMerge;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\Internal\ObjectComparer;
+use Wikibase\Repo\WikibaseRepo;
 use Wikibase\Validators\EntityConstraintProvider;
 
 /**
@@ -120,7 +120,8 @@
 * @return Item
 */
private function getItem( $id, array $data = array() ) {
-   $item = new Item( $data );
+   $deserializer = 
WikibaseRepo::getDefaultInstance()-getInternalEntityDeserializer();
+   $item = $deserializer-deserialize( $data );
$item-setId( new ItemId( $id ) );
return $item;
}
@@ -137,43 +138,36 @@
public function testCanApply( array $fromData, array $toData, 
$expectedFromData, $expectedToData, array $ignoreConflicts = array() ) {
$from = $this-getItem( 'Q111', $fromData );
$to = $this-getItem( 'Q222', $toData );
+
$changeOps = $this-makeChangeOpsMerge(
$from,
$to,
$ignoreConflicts
);
 
-   $this-assertTrue( $from-equals( new Item( $fromData ) ), 
'FromItem was not filled correctly' );
-   $this-assertTrue( $to-equals( new Item( $toData ) ), 'ToItem 
was not filled correctly' );
+   $deserializer = 
WikibaseRepo::getDefaultInstance()-getInternalEntityDeserializer();
+
+   $this-assertTrue( $from-equals( $deserializer-deserialize( 
$fromData ) ), 'FromItem was not filled correctly' );
+   $this-assertTrue( $to-equals( $deserializer-deserialize( 
$toData ) ), 'ToItem was not filled correctly' );
 
$changeOps-apply();
 
+   $expectedFrom = $deserializer-deserialize( $expectedFromData );
+   $expectedTo = $deserializer-deserialize( $expectedToData );
 
-   $fromData = $from-toArray();
-   $toData = $to-toArray();
+   $this-removeClaimsGuids( $from );
+   $this-removeClaimsGuids( $expectedFrom );
+   $this-removeClaimsGuids( $to );
+   $this-removeClaimsGuids( $expectedTo );
 
-   //Cycle through the old claims and set the guids to null (we no 
longer know what they should be)
-   $fromClaims = array();
-   foreach( $fromData['claims'] as $claim ) {
-   unset( $claim['g'] );
-   $fromClaims[] = $claim;
+   $this-assertTrue( $from-equals( $expectedFrom ) );
+   $this-assertTrue( $to-equals( $expectedTo ) );
+   }
+
+   private function removeClaimsGuids( Item $item ) {
+   foreach ( $item-getClaims() as $claim ) {
+   $claim-setGuid( null );
}
-
-   $toClaims = array();
-   foreach( $toData['claims'] as $claim ) {
-   unset( $claim['g'] );
-   $toClaims[] = $claim;
-   }
-
-   $fromData['claims'] = $fromClaims;
-   $toData['claims'] = $toClaims;
-
-   $fromData = array_intersect_key( $fromData, $expectedFromData );
-   $toData = array_intersect_key( $toData, $expectedToData );
-
-   $comparer = new ObjectComparer();
-   $this-assertTrue( $comparer-dataEquals( $expectedFromData, 
$fromData, array( 'entity' ) ) );
-   $this-assertTrue( $comparer-dataEquals( $expectedToData, 
$toData, array( 'entity' ) ) );
}
 
/**
@@ -257,7 +251,9 @@
array( 'claims' = array(
array(
'm' = array( 'novalue', 56 ),
-   'q' = array( ) )
+   'q' = array( ),
+   'g' = 
'Q111$D8404CDA-25E4-4334-AF13-A390BCD9C556'
+   )
),
),
);
@@ -274,7 +270,9 @@
array( 'claims' = array(

[MediaWiki-commits] [Gerrit] Add badgeItems setting to config vars - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add badgeItems setting to config vars
..


Add badgeItems setting to config vars

Change-Id: Ia8ba4b5e3ef34bcc91372eb281d5d3e812cfbdae
---
M repo/includes/Hook/OutputPageJsConfigHookHandler.php
M repo/includes/OutputPageJsConfigBuilder.php
M repo/tests/phpunit/includes/OutputPageJsConfigBuilderTest.php
3 files changed, 13 insertions(+), 1 deletion(-)

Approvals:
  Hoo man: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/Hook/OutputPageJsConfigHookHandler.php 
b/repo/includes/Hook/OutputPageJsConfigHookHandler.php
index 5c12ba1..e242766 100644
--- a/repo/includes/Hook/OutputPageJsConfigHookHandler.php
+++ b/repo/includes/Hook/OutputPageJsConfigHookHandler.php
@@ -51,11 +51,13 @@
private function buildConfigVars( OutputPage $out, $isExperimental ) {
$rightsUrl = $this-settings-get( 'dataRightsUrl' );
$rightsText = $this-settings-get( 'dataRightsText' );
+   $badgeItems = $this-settings-get( 'badgeItems' );
 
$configVars = $this-outputPageConfigBuilder-build(
$out,
$rightsUrl,
$rightsText,
+   $badgeItems,
$isExperimental
);
 
diff --git a/repo/includes/OutputPageJsConfigBuilder.php 
b/repo/includes/OutputPageJsConfigBuilder.php
index 1d556a8..e3486ab 100644
--- a/repo/includes/OutputPageJsConfigBuilder.php
+++ b/repo/includes/OutputPageJsConfigBuilder.php
@@ -31,11 +31,12 @@
 * @param OutputPage $out
 * @param string $rightsUrl
 * @param string $rightsText
+* @param array $badgeItems
 * @param boolean $isExperimental
 *
 * @return array
 */
-   public function build( OutputPage $out, $rightsUrl, $rightsText, 
$isExperimental ) {
+   public function build( OutputPage $out, $rightsUrl, $rightsText, 
$badgeItems, $isExperimental ) {
$user = $out-getUser();
$lang = $out-getLanguage();
$title = $out-getTitle();
@@ -46,6 +47,7 @@
 
$configVars = array_merge( $userConfigVars, $copyrightConfig );
 
+   $configVars['wbBadgeItems'] = $badgeItems;
$configVars['wbExperimentalFeatures'] = $isExperimental;
 
return $configVars;
diff --git a/repo/tests/phpunit/includes/OutputPageJsConfigBuilderTest.php 
b/repo/tests/phpunit/includes/OutputPageJsConfigBuilderTest.php
index 3efb4d4..321e267 100644
--- a/repo/tests/phpunit/includes/OutputPageJsConfigBuilderTest.php
+++ b/repo/tests/phpunit/includes/OutputPageJsConfigBuilderTest.php
@@ -28,6 +28,10 @@
$this-getOutputPage( $isBlocked, $canEdit ),
'https://creativecommons.org',
'CC-0',
+   array(
+   'Q12' = 'wb-badge-goodarticle',
+   'Q42' = 'wb-badge-featuredarticle'
+   ),
true
);
 
@@ -41,6 +45,10 @@
wfMessage( 'copyrightpage' 
)-inContentLanguage()-text() .
', a rel=nofollow class=external 
text href=https://creativecommons.org;CC-0/a)'
),
+   'wbBadgeItems' = array(
+   'Q12' = 'wb-badge-goodarticle',
+   'Q42' = 'wb-badge-featuredarticle'
+   ),
'wbExperimentalFeatures' = true
);
 

-- 
To view, visit https://gerrit.wikimedia.org/r/150734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8ba4b5e3ef34bcc91372eb281d5d3e812cfbdae
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene benestar.wikime...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Make ext.cx.model a dependency for ext.cx.util - change (mediawiki...ContentTranslation)

[Amire80 (Code Review)]

Amire80 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150784

Change subject: Make ext.cx.model a dependency for ext.cx.util
..

Make ext.cx.model a dependency for ext.cx.util

Change-Id: I8be5baa88ef4f559883ff5a6fcc5cd7e0c8bbd47
---
M Resources.php
M modules/base/ext.cx.util.js
2 files changed, 1 insertion(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/84/150784/1

diff --git a/Resources.php b/Resources.php
index cc5bb07..c2b816f 100644
--- a/Resources.php
+++ b/Resources.php
@@ -41,6 +41,7 @@
'base/ext.cx.util.js',
),
'dependencies' = array(
+   'ext.cx.model',
'mediawiki.Uri',
),
 ) + $resourcePaths;
diff --git a/modules/base/ext.cx.util.js b/modules/base/ext.cx.util.js
index 2f2c400..0c3bc2d 100644
--- a/modules/base/ext.cx.util.js
+++ b/modules/base/ext.cx.util.js
@@ -11,8 +11,6 @@
 ( function ( mw ) {
'use strict';
 
-   mw.cx = mw.cx || {};
-
/**
 * Do the content translation by going to Special:CX
 * with the given source-target title and target language

-- 
To view, visit https://gerrit.wikimedia.org/r/150784
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8be5baa88ef4f559883ff5a6fcc5cd7e0c8bbd47
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tie all jobs to UbuntuPrecise - change (integration/jenkins-job-builder-config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150785

Change subject: Tie all jobs to UbuntuPrecise
..

Tie all jobs to UbuntuPrecise

Make sure jobs never run on the new UbuntuTrusty labeled instances.
Will migrate as time allow.

Changes 3170 jobs...

Bug: 68340
Change-Id: Ia2369c3a966bb18b1b065db5746ce773fd4976c0
---
M integration.yaml
M job-templates.yaml
M mediawiki-extensions.yaml
M mediawiki.yaml
M operations-debs.yaml
M operations-misc.yaml
M operations-puppet.yaml
M parsoid.yaml
M parsoidsvc.yaml
M php-extensions.yaml
M php.yaml
M python-jobs.yaml
M pywikibot.yaml
13 files changed, 66 insertions(+), 66 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/85/150785/1

diff --git a/integration.yaml b/integration.yaml
index 2476766..e8c10c7 100644
--- a/integration.yaml
+++ b/integration.yaml
@@ -56,7 +56,7 @@
 # Job to check JJB config
 - job-template:
 name: 'integration-jjb-config-test'
-node: contintLabsSlave
+node: contintLabsSlave  UbuntuPrecise
 defaults: use-remote-zuul  # TODO does not really use it
 concurrent: true
 triggers:
@@ -79,7 +79,7 @@
 
 - job-template:
 name: 'integration-jjb-config-diff'
-node: contintLabsSlave
+node: contintLabsSlave  UbuntuPrecise
 concurrent: true
 triggers:
  - zuul
diff --git a/job-templates.yaml b/job-templates.yaml
index 4aa5e2c..65cd5be 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -2,7 +2,7 @@
 
 - job-template:
 name: '{name}-erblint-HEAD'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 logrotate:
@@ -15,7 +15,7 @@
 # Generic job to run JSHint
 - job-template:
 name: '{name}-jslint'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -36,7 +36,7 @@
 
 - job-template:
 name: '{name}-csslint'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -46,7 +46,7 @@
 
 - job-template:
 name: '{name}-npm'
-node: contintLabsSlave
+node: contintLabsSlave  UbuntuPrecise
 defaults: use-remoteonly-zuul
 concurrent: true
 triggers:
@@ -56,7 +56,7 @@
 
 - job-template:
 name: '{name}-puppetlint-lenient'
-node: contintLabsSlave
+node: contintLabsSlave  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 logrotate:
@@ -70,7 +70,7 @@
 
 - job-template:
 name: '{name}-puppetlint-strict'
-node: contintLabsSlave
+node: contintLabsSlave  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 logrotate:
@@ -84,7 +84,7 @@
 
 - job-template:
 name: '{name}-pplint-HEAD'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 logrotate:
@@ -96,7 +96,7 @@
 
 - job-template:
 name: '{name}-perllint'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -106,7 +106,7 @@
 
 - job-template:
 name: '{name}-phplint'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -117,7 +117,7 @@
 # PHP CodeSniffer on everything under the workspace
 - job-template:
 name: '{name}-phpcs'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -131,7 +131,7 @@
 # PHP CodeSniffer on changed files
 - job-template:
 name: '{name}-phpcs-HEAD'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -144,7 +144,7 @@
 
 - job-template:
 name: '{name}-phpcs-strict'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -157,7 +157,7 @@
 
 - job-template:
 name: '{name}-phpcs-strict-HEAD'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -170,7 +170,7 @@
 
 - job-template:
 name: '{name}-phpcs-lenient'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -183,7 +183,7 @@
 
 - job-template:
 name: '{name}-phpcs-lenient-HEAD'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:

[MediaWiki-commits] [Gerrit] Fixup after failed revert of Update jquery.ui Vector theme ... - change (mediawiki/core)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150786

Change subject: Fixup after failed revert of Update jquery.ui Vector theme to 
1.9.2
..

Fixup after failed revert of Update jquery.ui Vector theme to 1.9.2

Follows-up 36b8e0e10ff which claims to revert 7bb0c9a01e, but
really just made a gigantic mess of the place and managed to somehow
partially undo the jQuery UI upgrade to 1.9 (3cb2ccd87863abb8a) which
breaks in all kinds of interesting ways because the stylesheets
it added instead are from jQuery UI 1.8 and naturally incompatible.

This restores resources/lib/jquery.ui from the mediawiki-core
tree at 977b5ea0e090 (parent of 7bb0c9a01e).

Change-Id: Ie3bcd8560fe5012ed616fc341e036e8614b5208c
---
M resources/lib/jquery.ui/themes/smoothness/images/ui-icons_2e83ff_256x240.png
M resources/lib/jquery.ui/themes/smoothness/jquery.ui.accordion.css
M resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
M resources/lib/jquery.ui/themes/smoothness/jquery.ui.progressbar.css
M resources/lib/jquery.ui/themes/smoothness/jquery.ui.selectable.css
M resources/lib/jquery.ui/themes/smoothness/jquery.ui.slider.css
M resources/lib/jquery.ui/themes/smoothness/jquery.ui.tabs.css
7 files changed, 75 insertions(+), 38 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/86/150786/1

diff --git 
a/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_2e83ff_256x240.png 
b/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_2e83ff_256x240.png
index 34e38d1..84b601b 100644
--- 
a/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_2e83ff_256x240.png
+++ 
b/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_2e83ff_256x240.png
Binary files differ
diff --git a/resources/lib/jquery.ui/themes/smoothness/jquery.ui.accordion.css 
b/resources/lib/jquery.ui/themes/smoothness/jquery.ui.accordion.css
index 8d8a1a6..d429fd2 100644
--- a/resources/lib/jquery.ui/themes/smoothness/jquery.ui.accordion.css
+++ b/resources/lib/jquery.ui/themes/smoothness/jquery.ui.accordion.css
@@ -1,12 +1,16 @@
-/* Accordion
---*/
-.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; 
margin-top: 1px; zoom: 1; }
-.ui-accordion .ui-accordion-li-fix { display: inline; }
-.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
-.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; 
padding: .5em .5em .5em .7em; }
-/* IE7-/Win - Fix extra vertical space in lists */
-.ui-accordion a { zoom: 1; }
-.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; 
top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; 
margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: 
auto; display: none; zoom: 1; }
-.ui-accordion .ui-accordion-content-active { display: block; }
\ No newline at end of file
+/*!
+ * jQuery UI Accordion 1.9.2
+ * http://jqueryui.com
+ *
+ * Copyright 2012 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+.ui-accordion .ui-accordion-header { display: block; cursor: pointer; 
position: relative; margin-top: 2px; padding: .5em .5em .5em .7em; zoom: 1; }
+.ui-accordion .ui-accordion-icons { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-noicons { padding-left: .7em; }
+.ui-accordion .ui-accordion-icons .ui-accordion-icons { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-accordion-header-icon { position: 
absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; 
overflow: auto; zoom: 1; }
diff --git a/resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css 
b/resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
index 1931aad..2e088ca 100644
--- a/resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
+++ b/resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
@@ -1,20 +1,22 @@
-/*
-* jQuery UI CSS Framework
-* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) 
licenses.
-*/
+/*!
+ * jQuery UI CSS Framework 1.9.2
+ * http://jqueryui.com
+ *
+ * Copyright 2012 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
 
 /* Layout helpers
 --*/
 .ui-helper-hidden { display: none; }
 .ui-helper-hidden-accessible { border: 0; clip: rect(0 0 0 0); height: 1px; 
margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
 .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 

[MediaWiki-commits] [Gerrit] Check if badges are available in js - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Check if badges are available in js
..


Check if badges are available in js

Change-Id: Ied57a511c73e86f156efef5086f3724f2afbb917
---
M lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SitePageInterface.js
1 file changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Hoo man: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SitePageInterface.js 
b/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SitePageInterface.js
index ea9b442..bab69a1 100644
--- 
a/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SitePageInterface.js
+++ 
b/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SitePageInterface.js
@@ -117,6 +117,10 @@
 * that also links to Special:SetSiteLink where badges can be added.
 */
_initBadgeEditing: function() {
+   if ( $.isEmptyObject( mw.config.get( 'wbBadgeItems' ) ) ) {
+   return;
+   }
+
var setSiteLinkUrl = this._getSetSiteLinkUrl(),
$badgeSpan = this._subject.prev( '.wb-sitelinks-badges' 
);
 
@@ -148,6 +152,10 @@
 * Disable editing badges
 */
_disableBadgeEditing: function() {
+   if ( $.isEmptyObject( mw.config.get( 'wbBadgeItems' ) ) ) {
+   return;
+   }
+
var $badgeSpan = this._subject.prev( '.wb-sitelinks-badges' );
 
$badgeSpan.find( 'a  span' ).each( function( i, badge ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/150735
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied57a511c73e86f156efef5086f3724f2afbb917
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene benestar.wikime...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Partially undo failed revert of Update jquery.ui Vector the... - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Partially undo failed revert of Update jquery.ui Vector theme 
to 1.9.2
..


Partially undo failed revert of Update jquery.ui Vector theme to 1.9.2

Follows-up 36b8e0e10ff which claims to revert 7bb0c9a01e, but
really just made a gigantic mess of the place and managed to somehow
partially undo the jQuery UI upgrade to 1.9 (3cb2ccd87863abb8a) which
breaks in all kinds of interesting ways because the stylesheets
it added instead are from jQuery UI 1.8 and naturally incompatible.

This restores resources/lib/jquery.ui from the mediawiki-core
tree at 977b5ea0e090 (parent of 7bb0c9a01e).

Change-Id: Ie3bcd8560fe5012ed616fc341e036e8614b5208c
---
M resources/lib/jquery.ui/themes/smoothness/images/ui-icons_2e83ff_256x240.png
M resources/lib/jquery.ui/themes/smoothness/jquery.ui.accordion.css
M resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
M resources/lib/jquery.ui/themes/smoothness/jquery.ui.progressbar.css
M resources/lib/jquery.ui/themes/smoothness/jquery.ui.selectable.css
M resources/lib/jquery.ui/themes/smoothness/jquery.ui.slider.css
M resources/lib/jquery.ui/themes/smoothness/jquery.ui.tabs.css
7 files changed, 75 insertions(+), 38 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_2e83ff_256x240.png 
b/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_2e83ff_256x240.png
index 34e38d1..84b601b 100644
--- 
a/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_2e83ff_256x240.png
+++ 
b/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_2e83ff_256x240.png
Binary files differ
diff --git a/resources/lib/jquery.ui/themes/smoothness/jquery.ui.accordion.css 
b/resources/lib/jquery.ui/themes/smoothness/jquery.ui.accordion.css
index 8d8a1a6..d429fd2 100644
--- a/resources/lib/jquery.ui/themes/smoothness/jquery.ui.accordion.css
+++ b/resources/lib/jquery.ui/themes/smoothness/jquery.ui.accordion.css
@@ -1,12 +1,16 @@
-/* Accordion
---*/
-.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; 
margin-top: 1px; zoom: 1; }
-.ui-accordion .ui-accordion-li-fix { display: inline; }
-.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
-.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; 
padding: .5em .5em .5em .7em; }
-/* IE7-/Win - Fix extra vertical space in lists */
-.ui-accordion a { zoom: 1; }
-.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; 
top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; 
margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: 
auto; display: none; zoom: 1; }
-.ui-accordion .ui-accordion-content-active { display: block; }
\ No newline at end of file
+/*!
+ * jQuery UI Accordion 1.9.2
+ * http://jqueryui.com
+ *
+ * Copyright 2012 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+.ui-accordion .ui-accordion-header { display: block; cursor: pointer; 
position: relative; margin-top: 2px; padding: .5em .5em .5em .7em; zoom: 1; }
+.ui-accordion .ui-accordion-icons { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-noicons { padding-left: .7em; }
+.ui-accordion .ui-accordion-icons .ui-accordion-icons { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-accordion-header-icon { position: 
absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; 
overflow: auto; zoom: 1; }
diff --git a/resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css 
b/resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
index 1931aad..2e088ca 100644
--- a/resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
+++ b/resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
@@ -1,20 +1,22 @@
-/*
-* jQuery UI CSS Framework
-* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) 
licenses.
-*/
+/*!
+ * jQuery UI CSS Framework 1.9.2
+ * http://jqueryui.com
+ *
+ * Copyright 2012 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
 
 /* Layout helpers
 --*/
 .ui-helper-hidden { display: none; }
 .ui-helper-hidden-accessible { border: 0; clip: rect(0 0 0 0); height: 1px; 
margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
 .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 
1.3; text-decoration: none; 

[MediaWiki-commits] [Gerrit] exec_environ.pp: Install libaio1 to enable asynchronous I/O ... - change (operations/puppet)

[Hedonil (Code Review)]

Hedonil has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150787

Change subject: exec_environ.pp: Install libaio1 to enable asynchronous I/O 
system calls
..

exec_environ.pp: Install libaio1 to enable asynchronous I/O system calls

Install Linux kernel AIO access library libaio1 to enable userspace to use 
asynchronous I/O system calls.
This can improve performance for applications like databases or webservers

Bug: 68615
Change-Id: I482c530ef8b47e21f3f4a9107fd41f3b4416fd0e
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/150787/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 844b929..38dcaad 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -291,6 +291,7 @@
 'jq',  # Bug #65049.
 'ksh',
 'iotop',   # useful for labs admins to monitor 
tools
+'libaio1', # Bug 68615
 'libav-tools', # Bug #53870.
 'libdmtx0a',   # Bug #53867.
 'libfcgi0ldbl',# Bug 56995

-- 
To view, visit https://gerrit.wikimedia.org/r/150787
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I482c530ef8b47e21f3f4a9107fd41f3b4416fd0e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hedonil hedo...@action.ms

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix the OutputPageJsConfigHookHandlerTest - change (mediawiki...Wikibase)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150788

Change subject: Fix the OutputPageJsConfigHookHandlerTest
..

Fix the OutputPageJsConfigHookHandlerTest

After Ied57a511c7

Change-Id: I1f9b0486aaa548af9f7f63183b56c57289413991
---
M repo/tests/phpunit/includes/Hook/OutputPageJsConfigHookHandlerTest.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/88/150788/1

diff --git 
a/repo/tests/phpunit/includes/Hook/OutputPageJsConfigHookHandlerTest.php 
b/repo/tests/phpunit/includes/Hook/OutputPageJsConfigHookHandlerTest.php
index 546facb..a42659f 100644
--- a/repo/tests/phpunit/includes/Hook/OutputPageJsConfigHookHandlerTest.php
+++ b/repo/tests/phpunit/includes/Hook/OutputPageJsConfigHookHandlerTest.php
@@ -50,6 +50,7 @@
'wbUserIsBlocked',
'wbUserCanEdit',
'wbCopyright',
+   'wbBadgeItems',
'wbExperimentalFeatures'
);
 

-- 
To view, visit https://gerrit.wikimedia.org/r/150788
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f9b0486aaa548af9f7f63183b56c57289413991
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add badges intro to Special:SetSiteLink only when badges are... - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add badges intro to Special:SetSiteLink only when badges are 
available
..


Add badges intro to Special:SetSiteLink only when badges are available

Change-Id: Ifac17ad8647cd64d04711a2ffb7a1a7583b20cdd
---
M repo/i18n/en.json
M repo/i18n/qqq.json
M repo/includes/specials/SpecialSetSiteLink.php
3 files changed, 15 insertions(+), 6 deletions(-)

Approvals:
  Hoo man: Looks good to me, approved
  Bene: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/repo/i18n/en.json b/repo/i18n/en.json
index 34bb535..4010e75 100644
--- a/repo/i18n/en.json
+++ b/repo/i18n/en.json
@@ -156,7 +156,8 @@
wikibase-setaliases-warning-remove: Do you really want to remove all 
aliases of [[$1]]?,
special-setsitelink: Set a site link,
wikibase-setsitelink-introfull: You are setting the site link of $2 
for [[$1]].,
-   wikibase-setsitelink-intro: This form allows you to set the site 
link of an item. You need to provide the id of the item (e.g. Q23), a site id 
(e.g. \enwiki\) and the site link to set to. Additionally you can set various 
badges for this site link which are listed below.,
+   wikibase-setsitelink-intro: This form allows you to set the site 
link of an item. You need to provide the id of the item (e.g. Q23), a site id 
(e.g. \enwiki\) and the site link to set to.,
+   wikibase-setsitelink-intro-badges: Additionally you can set various 
badges for this site link which are listed below.,
wikibase-setsitelink-site: Site id:,
wikibase-setsitelink-label: Site link:,
wikibase-setsitelink-badges: Badges:,
diff --git a/repo/i18n/qqq.json b/repo/i18n/qqq.json
index 75fc0a3..bbdfdba 100644
--- a/repo/i18n/qqq.json
+++ b/repo/i18n/qqq.json
@@ -5,6 +5,7 @@
Adam Shorland,
Amire80,
Aude,
+   Bene*,
Beta16,
Daniel Werner,
DavidL,
@@ -13,8 +14,11 @@
Jeblad,
Kaganer,
Kghbln,
+   Liuxinyu970226,
Lokal Profil,
Ltrlg,
+   Mar(c),
+   Matěj Suchánek,
McDutchie,
Metalhead64,
Minh Nguyen,
@@ -29,10 +33,7 @@
Siebrand,
Stryn,
ZxxZxxZ,
-   아라,
-   Matěj Suchánek,
-   Mar(c),
-   Liuxinyu970226
+   아라
]
},
wikibase-desc: 
{{desc|name=Wikibase|url=http://www.mediawiki.org/wiki/Extension:Wikibase}}\nSee
 also [[d:Wikidata:Glossary#Wikidata|Wikidata]].,
@@ -179,6 +180,7 @@
special-setsitelink: {{doc-special|SetSiteLink}}\nThe special page 
allows the user to set a site link for an item.,
wikibase-setsitelink-introfull: Intro text when a site link is to be 
set. Parameters:\n* $1 - the ID that links to the item\n* $2 - the site id the 
site link is to be set to,
wikibase-setsitelink-intro: A short text at the top of the page that 
allows users to set the site link of an item, explaining the form.,
+   wikibase-setsitelink-intro-badges: An addition to the the text at 
the top of the page that allows users to set the site link of an item, 
explaining the badges input.,
wikibase-setsitelink-site: Label for the input field to type the 
site id to set the site link to.,
wikibase-setsitelink-label: Label for the input field to type the 
site link to set the item to.,
wikibase-setsitelink-badges: Label for the input field to type the 
badges to set the item to.\n{{Identical|Badge}},
diff --git a/repo/includes/specials/SpecialSetSiteLink.php 
b/repo/includes/specials/SpecialSetSiteLink.php
index 7d199ff..629fe6b 100644
--- a/repo/includes/specials/SpecialSetSiteLink.php
+++ b/repo/includes/specials/SpecialSetSiteLink.php
@@ -279,10 +279,16 @@
. $pageinput;
}
else {
+   $intro = $this-msg( 'wikibase-setsitelink-intro' 
)-text();
+
+   if ( !empty( $this-badgeItems ) ) {
+   $intro .= $this-msg( 'word-separator' 
)-text() . $this-msg( 'wikibase-setsitelink-intro-badges' )-text();
+   }
+
return Html::element(
'p',
array(),
-   $this-msg( 'wikibase-setsitelink-intro' 
)-parse()
+   $intro
)
. parent::getFormElements( $entity )

[MediaWiki-commits] [Gerrit] Don't require PHP 5.4+ - change (mediawiki...MediaWikiAuth)

[Jack Phoenix (Code Review)]

Jack Phoenix has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150789

Change subject: Don't require PHP 5.4+
..

Don't require PHP 5.4+

Bug: 68855
Change-Id: I723e091216fbd0f6bd16ff7403fb546664e6cca2
---
M MediaWikiAuth.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiAuth 
refs/changes/89/150789/1

diff --git a/MediaWikiAuth.php b/MediaWikiAuth.php
index 4a6b2a3..dbc0598 100644
--- a/MediaWikiAuth.php
+++ b/MediaWikiAuth.php
@@ -276,11 +276,12 @@
'format' = 'php'
);
$this-snoopy-submit( $wgMediaWikiAuthAPIURL, 
$account_vars );
+   $unserializedResults = unserialize( 
$this-snoopy-results );
# Remove formatting from API timestamp; database 
expects a plain number
$results = str_replace(
array( ':', 'T', 'Z', '-' ),
'',
-   unserialize( $this-snoopy-results 
)['query']['users'][0]['registration']
+   
$unserializedResults['query']['users'][0]['registration']
);
# Bogus time? Missing dates default to the current 
timestamp; fall back to first edit
if ( substr( $results, 0, 8 ) == gmdate( 'Ymd', time() 
) ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/150789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I723e091216fbd0f6bd16ff7403fb546664e6cca2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiAuth
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Allow explicit keys for entities in API results. - change (mediawiki...Wikibase)

[Daniel Kinzler (Code Review)]

Daniel Kinzler has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150790

Change subject: Allow explicit keys for entities in API results.
..

Allow explicit keys for entities in API results.

This adds parameters for explicitly giving a key when adding an
entity to an API result. This is needed to handle redirects correctly,
where the requested ID, which should be used as the key in the result,
is not the actual ID of the entity.

This also introduces a more compelx fallback logic for determining the
key used for missing entities.

Bug: 45509
Change-Id: Ica78bc830fed8bc61b797a0c6f9ec3bf21ecb370
---
M repo/includes/LinkedData/EntityDataSerializationService.php
M repo/includes/api/GetEntities.php
M repo/includes/api/ResultBuilder.php
M repo/tests/phpunit/includes/api/ResultBuilderTest.php
4 files changed, 88 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/90/150790/1

diff --git a/repo/includes/LinkedData/EntityDataSerializationService.php 
b/repo/includes/LinkedData/EntityDataSerializationService.php
index df7c4a1..d778bcd 100644
--- a/repo/includes/LinkedData/EntityDataSerializationService.php
+++ b/repo/includes/LinkedData/EntityDataSerializationService.php
@@ -542,7 +542,7 @@
$this-entityTitleLookup,
$this-serializerFactory
);
-   $resultBuilder-addEntityRevision( $entityRevision, $options );
+   $resultBuilder-addEntityRevision( null, $entityRevision, 
$options );
 
wfProfileOut( __METHOD__ );
return $res;
diff --git a/repo/includes/api/GetEntities.php 
b/repo/includes/api/GetEntities.php
index 6dfb4d3..00ffefb 100644
--- a/repo/includes/api/GetEntities.php
+++ b/repo/includes/api/GetEntities.php
@@ -168,7 +168,7 @@
 */
private function addMissingItemsToResult( $missingItems ){
foreach( $missingItems as $missingItem ) {
-   $this-getResultBuilder()-addMissingEntity( 
$missingItem );
+   $this-getResultBuilder()-addMissingEntity( null, 
$missingItem );
}
}
 
@@ -199,7 +199,7 @@
foreach ( $entityIds as $entityId ) {
$entityRevision = 
$this-entityRevisionLookup-getEntityRevision( $entityId );
if ( is_null( $entityRevision ) ) {
-   $this-getResultBuilder()-addMissingEntity( 
array( 'id' = $entityId-getSerialization() ) );
+   $this-getResultBuilder()-addMissingEntity( 
null, array( 'id' = $entityId-getSerialization() ) );
} else {
$revisionArray[] = $entityRevision;
}
@@ -220,7 +220,7 @@
$props = $this-getPropsFromParams( $params );
$options = $this-getSerializationOptions( $params, $props );
$siteFilterIds = $params['sitefilter'];
-   $this-getResultBuilder()-addEntityRevision( $entityRevision, 
$options, $props, $siteFilterIds );
+   $this-getResultBuilder()-addEntityRevision( null, 
$entityRevision, $options, $props, $siteFilterIds );
wfProfileOut( __METHOD__ );
}
 
diff --git a/repo/includes/api/ResultBuilder.php 
b/repo/includes/api/ResultBuilder.php
index f6bda5f..d1cadf8 100644
--- a/repo/includes/api/ResultBuilder.php
+++ b/repo/includes/api/ResultBuilder.php
@@ -274,16 +274,23 @@
/**
 * Get serialized entity for the EntityRevision and add it to the result
 *
+* @param string|null $key The key for the entity in the 'entities' 
structure.
+*Will default to the entity's serialized ID if null.
 * @param EntityRevision $entityRevision
 * @param SerializationOptions|null $options
 * @param array|string $props a list of fields to include, or all
 * @param array $siteIds A list of site IDs to filter by
-
+*
 * @since 0.5
 */
-   public function addEntityRevision( EntityRevision $entityRevision, 
SerializationOptions $options = null, $props = 'all', $siteIds = array() ) {
+   public function addEntityRevision( $key, EntityRevision 
$entityRevision, SerializationOptions $options = null, $props = 'all', $siteIds 
= array() ) {
$entity = $entityRevision-getEntity();
$entityId = $entity-getId();
+
+   if ( $key === null ) {
+   $key = $entityId-getSerialization();
+   }
+
$record = array();
 
if ( $options ) {
@@ -314,9 +321,9 @@
$entitySerialization = 
$entitySerializer-getSerialized( $entity );
 
if ( !empty( $siteIds )  array_key_exists( 
'sitelinks', $entitySerialization ) ) {
-  

[MediaWiki-commits] [Gerrit] Make WikimediaFamily.languages_by_size dynamic - change (pywikibot/core)

[John Vandenberg (Code Review)]

John Vandenberg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150791

Change subject: Make WikimediaFamily.languages_by_size dynamic
..

Make WikimediaFamily.languages_by_size dynamic

Move the list of languages to _languages and update it only
when a new language appears in languages_by_size.

Change-Id: I44cb513bb12e09162b4b6332cbe15c95d7e8087a
---
M pywikibot/families/wikibooks_family.py
M pywikibot/families/wikinews_family.py
M pywikibot/families/wikipedia_family.py
M pywikibot/families/wikiquote_family.py
M pywikibot/families/wikisource_family.py
M pywikibot/families/wikiversity_family.py
M pywikibot/families/wikivoyage_family.py
M pywikibot/families/wiktionary_family.py
M pywikibot/family.py
M scripts/maintenance/wikimedia_sites.py
10 files changed, 158 insertions(+), 111 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/91/150791/1

diff --git a/pywikibot/families/wikibooks_family.py 
b/pywikibot/families/wikibooks_family.py
index 62b88ba..3993ff5 100644
--- a/pywikibot/families/wikibooks_family.py
+++ b/pywikibot/families/wikibooks_family.py
@@ -10,15 +10,15 @@
 super(Family, self).__init__()
 self.name = 'wikibooks'
 
-self.languages_by_size = [
-'en', 'de', 'fr', 'hu', 'ja', 'it', 'es', 'pt', 'nl', 'pl', 'he',
-'vi', 'id', 'sq', 'ca', 'fi', 'ru', 'fa', 'cs', 'zh', 'sv', 'da',
-'hr', 'tr', 'no', 'th', 'sr', 'ar', 'gl', 'ko', 'ta', 'mk', 'tl',
-'ro', 'is', 'ka', 'tt', 'lt', 'az', 'eo', 'uk', 'bg', 'sk', 'sl',
-'el', 'hy', 'ms', 'si', 'li', 'la', 'ml', 'ur', 'ang', 'ia', 'cv',
-'et', 'bn', 'km', 'hi', 'mr', 'sa', 'oc', 'kk', 'eu', 'ne', 'fy',
-'ie', 'te', 'af', 'tg', 'ky', 'bs', 'pa', 'mg', 'be', 'cy',
-'zh-min-nan', 'ku', 'uz',
+self._languages = [
+'af', 'ang', 'ar', 'az', 'be', 'bg', 'bn', 'bs', 'ca', 'cs', 'cv',
+'cy', 'da', 'de', 'el', 'en', 'eo', 'es', 'et', 'eu', 'fa', 'fi',
+'fr', 'fy', 'gl', 'he', 'hi', 'hr', 'hu', 'hy', 'ia', 'id', 'ie',
+'is', 'it', 'ja', 'ka', 'kk', 'km', 'ko', 'ku', 'ky', 'la', 'li',
+'lt', 'mg', 'mk', 'ml', 'mr', 'ms', 'ne', 'nl', 'no', 'oc', 'pa',
+'pl', 'pt', 'ro', 'ru', 'sa', 'si', 'sk', 'sl', 'sq', 'sr', 'sv',
+'ta', 'te', 'tg', 'th', 'tl', 'tr', 'tt', 'uk', 'ur', 'uz', 'vi',
+'zh', 'zh-min-nan',
 ]
 
 self.langs = dict([(lang, '%s.wikibooks.org' % lang)
diff --git a/pywikibot/families/wikinews_family.py 
b/pywikibot/families/wikinews_family.py
index 9e2f2b2..1fa42ca 100644
--- a/pywikibot/families/wikinews_family.py
+++ b/pywikibot/families/wikinews_family.py
@@ -10,10 +10,10 @@
 super(Family, self).__init__()
 self.name = 'wikinews'
 
-self.languages_by_size = [
-'sr', 'en', 'fr', 'pl', 'de', 'it', 'es', 'pt', 'ru', 'ca', 'zh',
-'sv', 'ja', 'ta', 'el', 'cs', 'ar', 'uk', 'fa', 'fi', 'ro', 'tr',
-'he', 'bg', 'sq', 'no', 'ko', 'eo', 'bs',
+self._languages = [
+'ar', 'bg', 'bs', 'ca', 'cs', 'de', 'el', 'en', 'eo', 'es', 'fa',
+'fi', 'fr', 'he', 'it', 'ja', 'ko', 'no', 'pl', 'pt', 'ro', 'ru',
+'sq', 'sr', 'sv', 'ta', 'tr', 'uk', 'zh',
 ]
 
 self.langs = dict([(lang, '%s.wikinews.org' % lang)
diff --git a/pywikibot/families/wikipedia_family.py 
b/pywikibot/families/wikipedia_family.py
index 33782f2..6e430ed 100644
--- a/pywikibot/families/wikipedia_family.py
+++ b/pywikibot/families/wikipedia_family.py
@@ -10,35 +10,35 @@
 super(Family, self).__init__()
 self.name = 'wikipedia'
 
-self.languages_by_size = [
-'en', 'nl', 'sv', 'de', 'fr', 'it', 'ru', 'es', 'vi', 'war', 'pl',
-'ceb', 'ja', 'pt', 'zh', 'uk', 'ca', 'no', 'fa', 'fi', 'id', 'cs',
-'ar', 'ko', 'ms', 'hu', 'ro', 'sr', 'tr', 'min', 'kk', 'sh', 'eo',
-'sk', 'da', 'eu', 'lt', 'bg', 'he', 'hr', 'sl', 'uz', 'hy', 'et',
-'vo', 'nn', 'gl', 'simple', 'hi', 'la', 'el', 'az', 'th', 'oc',
-'ka', 'mk', 'be', 'new', 'tt', 'pms', 'tl', 'ta', 'te', 'cy', 'lv',
-'be-x-old', 'ht', 'ur', 'bs', 'sq', 'br', 'ce', 'jv', 'mg', 'lb',
-'mr', 'is', 'ml', 'pnb', 'ba', 'af', 'my', 'zh-yue', 'bn', 'ga',
-'lmo', 'yo', 'fy', 'an', 'cv', 'tg', 'ky', 'sw', 'ne', 'io', 'gu',
-'bpy', 'sco', 'scn', 'nds', 'ku', 'ast', 'qu', 'su', 'als', 'gd',
-'kn', 'am', 'ckb', 'ia', 'nap', 'bug', 'bat-smg', 'wa', 'map-bms',
-'mn', 'arz', 'mzn', 'pa', 'si', 'zh-min-nan', 'yi', 'sah', 'fo',
-'vec', 'sa', 'bar', 'nah', 'os', 'roa-tara', 'pam', 'or', 'hsb',
-'se', 'li', 'mrj', 'mi', 'ilo', 'co', 'hif', 'bcl', 'gan', 'frr',
-'bo', 'rue', 'glk', 'mhr', 'nds-nl', 'fiu-vro', 'ps', 

[MediaWiki-commits] [Gerrit] Update Wikia's MediaWiki version to 1.19.18 - change (pywikibot/core)

[Grunny (Code Review)]

Grunny has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150793

Change subject: Update Wikia's MediaWiki version to 1.19.18
..

Update Wikia's MediaWiki version to 1.19.18

Change-Id: Iae8f80d88acfd9aa7dd30094d76704b09b443bf3
---
M pywikibot/families/wikia_family.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/93/150793/1

diff --git a/pywikibot/families/wikia_family.py 
b/pywikibot/families/wikia_family.py
index b91bf45..75a699f 100644
--- a/pywikibot/families/wikia_family.py
+++ b/pywikibot/families/wikia_family.py
@@ -20,7 +20,7 @@
 return u'www.wikia.com'
 
 def version(self, code):
-return 1.19.17
+return 1.19.18
 
 def scriptpath(self, code):
 return ''

-- 
To view, visit https://gerrit.wikimedia.org/r/150793
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae8f80d88acfd9aa7dd30094d76704b09b443bf3
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Grunny mwgru...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update Wikia's MediaWiki version to 1.19.18 - change (pywikibot/compat)

[Grunny (Code Review)]

Grunny has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150792

Change subject: Update Wikia's MediaWiki version to 1.19.18
..

Update Wikia's MediaWiki version to 1.19.18

Change-Id: Ie4b8f70f0077530835427e368d7d92144c1dd02c
---
M families/wikia_family.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat 
refs/changes/92/150792/1

diff --git a/families/wikia_family.py b/families/wikia_family.py
index 2a33f15..15a9384 100644
--- a/families/wikia_family.py
+++ b/families/wikia_family.py
@@ -39,7 +39,7 @@
 return u'www.wikia.com'
 
 def version(self, code):
-return 1.19.17
+return 1.19.18
 
 def scriptpath(self, code):
 return ''

-- 
To view, visit https://gerrit.wikimedia.org/r/150792
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4b8f70f0077530835427e368d7d92144c1dd02c
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Grunny mwgru...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Removed old i18n file - change (mediawiki...BlueSpiceExtensions)

[Robert Vogel (Code Review)]

Robert Vogel has submitted this change and it was merged.

Change subject: Removed old i18n file
..


Removed old i18n file

Change-Id: I18758e32a3fe5e9d95e1019b70d1c6e00945f9b9
---
D NamespaceManager/NamespaceManager.i18n.php
1 file changed, 0 insertions(+), 138 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/NamespaceManager/NamespaceManager.i18n.php 
b/NamespaceManager/NamespaceManager.i18n.php
deleted file mode 100644
index 441df7e..000
--- a/NamespaceManager/NamespaceManager.i18n.php
+++ /dev/null
@@ -1,138 +0,0 @@
-?php
-/**
- * Internationalisation file for NamespaceManager
- *
- * Part of BlueSpice for MediaWiki
- *
- * @author Stephan Muggli mug...@hallowelt.biz
- * @version$Id' =NamespaceManager.i18n.php 6401 2012-09-06 11:03:08Z 
smuggli $
- * @packageBlueSpice_Extensions
- * @subpackage NamespaceManager
- * @copyright  Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
- * @filesource
- */
-
-$messages = array();
-
-$messages['de'] = array(
-   'bs-namespacemanager-extension-description'   = 
'Administratoren-Werkzeug, um abgegrenzte Bereiche zu definieren, zu bearbeiten 
und auch wieder zu löschen und um Benutzern hierfür definierte Rechte zu 
geben.',
-   'bs-namespacemanager-back'= 'Zurück',
-   'bs-namespacemanager-label'   = 
'Namensraumverwaltung',
-   'bs-namespacemanager-not_allowed' = 'Du bist leider 
nicht berechtigt, diese Seite zu benutzen.',
-   'bs-namespacemanager-wrong_namespace_name_format' = 'Der von Dir 
gewählte Namespace-Name enthält unzulässige Zeichen.',
-   'bs-namespacemanager-namespace_already_exists'= 'Der von Dir 
gewählte Namespace-Name existiert bereits.',
-   'bs-namespacemanager-namespace_name_length'   = 'Der von Ihnen 
eingetragene Namespace-Name muss minderstens zwei Zeichen lang sein.',
-   'bs-namespacemanager-no_valid_namespace_id'   = 'Keine zulässige 
Namespace ID',
-   'bs-namespacemanager-label-id'= 'ID',
-   'bs-namespacemanager-label-namespaces'= 'Namensräume',
-   'bs-namespacemanager-label-editable'  = 'umbenennbar',
-   'bs-namespacemanager-label-content'   = 'in Statistik',
-   'bs-namespacemanager-label-searchable'= 'in Standardsuche',
-   'bs-namespacemanager-label-subpages'  = 'mit Unterseiten',
-   'bs-namespacemanager-nsadded' = 'Der Namesraum 
wurde erfolgreich erstellt',
-   'bs-namespacemanager-nsremoved'   = 'Der Namesraum 
wurde erfolgreich gelöscht',
-   'bs-namespacemanager-nsedited'= 'Der Namensraum 
wurde erfolgreich bearbeitet',
-
-   //Javascript
-   'bs-namespacemanager-headerNamespaceId' ='ID',
-   'bs-namespacemanager-headerNamespaceName' ='Namensraum',
-   'bs-namespacemanager-headerIsUserNamespace' ='System (nicht änderbar)',
-   'bs-namespacemanager-headerIsContentNamespace' ='in Statistik',
-   'bs-namespacemanager-headerIsSearchableNamespace' ='in Standardsuche',
-   'bs-namespacemanager-headerIsSubpagesNamespace' ='mit Unterseiten',
-   'bs-namespacemanager-headerActions' ='Aktionen',
-   'bs-namespacemanager-yes' ='ja',
-   'bs-namespacemanager-no' ='nein',
-   'bs-namespacemanager-btnAddNamespace' ='Namensraum hinzufügen',
-   'bs-namespacemanager-tipEdit' ='Namensraum bearbeiten',
-   'bs-namespacemanager-tipRemove' ='Namensraum entfernen',
-   'bs-namespacemanager-msgNotEditable' ='Dieser Namensraum ist ein 
Systemnamensraum und kann nicht bearbeitet werden.',
-   'bs-namespacemanager-msgNotEditableDelete' ='Dieser Namensraum ist ein 
Systemnamensraum und kann nicht gelouml;scht werden.',
-   'bs-namespacemanager-titleNewNamespace' ='Namensraum hinzufügen',
-   'bs-namespacemanager-labelNamespaceName' ='Namensraum-Name',
-   'bs-namespacemanager-emptyMsgNamespaceName' ='Der Name des Namensraums 
kann nicht leer sein',
-   'bs-namespacemanager-labelContentNamespace' ='Namensraum statistisch 
auswerten',
-   'bs-namespacemanager-labelSearchedNamespace' ='Namensraum 
durchsuchbar',
-   'bs-namespacemanager-labelSubpagesNamespace' ='Unterseiten 
ermöglichen',
-   'bs-namespacemanager-btnSave' ='Speichern',
-   'bs-namespacemanager-btnCancel' ='Abbrechen',
-   'bs-namespacemanager-titleError' ='Fehler',
-   'bs-namespacemanager-willDelete' ='... werden gelouml;scht',
-   'bs-namespacemanager-willMove' ='... werden in (Seiten) verschoben*',
-   'bs-namespacemanager-willMoveSuffix' ='... werden mit dem Suffix (von 
span class=removeWindowNamespaceName/span) in (Seiten) verschoben',
-   

[MediaWiki-commits] [Gerrit] Specify the allowed badges as valid parameters for wbsetsite... - change (mediawiki...Wikibase)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150794

Change subject: Specify the allowed badges as valid parameters for wbsetsitelink
..

Specify the allowed badges as valid parameters for wbsetsitelink

Makes it more obvious to see which values actually are allowed.
With tests.

Change-Id: Id59fdf71d46054c8c916050345ecde041e493050
---
M repo/includes/api/SetSiteLink.php
M repo/tests/phpunit/includes/api/SetSiteLinkTest.php
2 files changed, 42 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/94/150794/1

diff --git a/repo/includes/api/SetSiteLink.php 
b/repo/includes/api/SetSiteLink.php
index 7897b3a..fb9407f 100644
--- a/repo/includes/api/SetSiteLink.php
+++ b/repo/includes/api/SetSiteLink.php
@@ -194,7 +194,7 @@
ApiBase::PARAM_TYPE = 'string',
),
'badges' = array(
-   ApiBase::PARAM_TYPE = 'string',
+   ApiBase::PARAM_TYPE = array_keys( 
$this-badgeItems ),
ApiBase::PARAM_ISMULTI = true,
),
)
diff --git a/repo/tests/phpunit/includes/api/SetSiteLinkTest.php 
b/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
index a0aae28..c93bd31 100644
--- a/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
+++ b/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
@@ -43,7 +43,7 @@
/* @var ItemId */
private static $otherItemId;
 
-   public static function provideData() {
+   public function provideData() {
return array(
array( //0 set new link using id
'p' = array( 'handle' = 'Leipzig', 'linksite' 
= 'dewiki', 'linktitle' = 'leipzig', 'badges' = '{gaItem}|{faItem}' ),
@@ -90,7 +90,7 @@
);
}
 
-   public static function provideExceptionData() {
+   public function provideExceptionData() {
return array(
array( //0 badtoken
'p' = array( 'site' = 'dewiki', 'title' = 
'Berlin', 'linksite' = 'svwiki', 'linktitle' = 'testSetLiteLinkWithNoToken' ),
@@ -113,21 +113,27 @@
array( //6 testSetLiteLinkWithBadTargetSite
'p' = array( 'site' = 'dewiki', 'title' = 
'Berlin', 'linksite' = 'enwiktionary', 'linktitle' = 'Berlin' ),
'e' = array( 'exception' = array( 'type' = 
'UsageException' ) ) ),
-   array( //7 bad badge id
-   'p' = array( 'site' = 'enwiki', 'title' = 
'Berlin', 'linksite' = 'enwiki', 'linktitle' = 'Berlin', 'badges' = 
'abc|{faItem}' ),
-   'e' = array( 'exception' = array( 'type' = 
'UsageException', 'code' = 'no-such-entity-id' ) ) ),
-   array( //8 badge id is not an item id
-   'p' = array( 'site' = 'enwiki', 'title' = 
'Berlin', 'linksite' = 'enwiki', 'linktitle' = 'Berlin', 'badges' = 
'P2|{faItem}' ),
-   'e' = array( 'exception' = array( 'type' = 
'UsageException', 'code' = 'not-item' ) ) ),
-   array( //9 badge item does not exist
+   array( //7 badge item does not exist
'p' = array( 'site' = 'enwiki', 'title' = 
'Berlin', 'linksite' = 'enwiki', 'linktitle' = 'Berlin', 'badges' = 
'Q9|{faItem}' ),
'e' = array( 'exception' = array( 'type' = 
'UsageException', 'code' = 'no-such-entity' ) ) ),
-   array( //10 badge id is not specified
-   'p' = array( 'site' = 'enwiki', 'title' = 
'Berlin', 'linksite' = 'enwiki', 'linktitle' = 'Berlin', 'badges' = 
'{faItem}|{otherItem}' ),
-   'e' = array( 'exception' = array( 'type' = 
'UsageException', 'code' = 'not-badge' ) ) ),
-   array( //11 no sitelink - cannot change badges
+   array( //8 no sitelink - cannot change badges
'p' = array( 'site' = 'enwiki', 'title' = 
'Berlin', 'linksite' = 'svwiki', 'badges' = '{gaItem}|{faItem}' ),
'e' = array( 'exception' = array( 'type' = 
'UsageException', 'code' = 'no-such-sitelink' ) ) ),
+   );
+   }
+
+   public function provideBadBadgeData() {
+   return array(
+   array( //0 bad badge id
+   'p' = array( 'site' = 'enwiki', 'title' = 
'Berlin', 'linksite' = 'enwiki', 'linktitle' = 'Berlin', 'badges' = 
'abc|{faItem}' ),
+   'e' = array( 'exception' = array( 'type' = 

[MediaWiki-commits] [Gerrit] Tie all jobs to UbuntuPrecise - change (integration/jenkins-job-builder-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Tie all jobs to UbuntuPrecise
..


Tie all jobs to UbuntuPrecise

Make sure jobs never run on the new UbuntuTrusty labeled instances.
Will migrate as time allow.

Changes 3170 jobs...

Bug: 68340
Change-Id: Ia2369c3a966bb18b1b065db5746ce773fd4976c0
---
M integration.yaml
M job-templates.yaml
M mediawiki-extensions.yaml
M mediawiki.yaml
M operations-debs.yaml
M operations-misc.yaml
M operations-puppet.yaml
M parsoid.yaml
M parsoidsvc.yaml
M php-extensions.yaml
M php.yaml
M python-jobs.yaml
M pywikibot.yaml
13 files changed, 66 insertions(+), 66 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/integration.yaml b/integration.yaml
index 2476766..e8c10c7 100644
--- a/integration.yaml
+++ b/integration.yaml
@@ -56,7 +56,7 @@
 # Job to check JJB config
 - job-template:
 name: 'integration-jjb-config-test'
-node: contintLabsSlave
+node: contintLabsSlave  UbuntuPrecise
 defaults: use-remote-zuul  # TODO does not really use it
 concurrent: true
 triggers:
@@ -79,7 +79,7 @@
 
 - job-template:
 name: 'integration-jjb-config-diff'
-node: contintLabsSlave
+node: contintLabsSlave  UbuntuPrecise
 concurrent: true
 triggers:
  - zuul
diff --git a/job-templates.yaml b/job-templates.yaml
index 4aa5e2c..65cd5be 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -2,7 +2,7 @@
 
 - job-template:
 name: '{name}-erblint-HEAD'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 logrotate:
@@ -15,7 +15,7 @@
 # Generic job to run JSHint
 - job-template:
 name: '{name}-jslint'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -36,7 +36,7 @@
 
 - job-template:
 name: '{name}-csslint'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -46,7 +46,7 @@
 
 - job-template:
 name: '{name}-npm'
-node: contintLabsSlave
+node: contintLabsSlave  UbuntuPrecise
 defaults: use-remoteonly-zuul
 concurrent: true
 triggers:
@@ -56,7 +56,7 @@
 
 - job-template:
 name: '{name}-puppetlint-lenient'
-node: contintLabsSlave
+node: contintLabsSlave  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 logrotate:
@@ -70,7 +70,7 @@
 
 - job-template:
 name: '{name}-puppetlint-strict'
-node: contintLabsSlave
+node: contintLabsSlave  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 logrotate:
@@ -84,7 +84,7 @@
 
 - job-template:
 name: '{name}-pplint-HEAD'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 logrotate:
@@ -96,7 +96,7 @@
 
 - job-template:
 name: '{name}-perllint'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -106,7 +106,7 @@
 
 - job-template:
 name: '{name}-phplint'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -117,7 +117,7 @@
 # PHP CodeSniffer on everything under the workspace
 - job-template:
 name: '{name}-phpcs'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -131,7 +131,7 @@
 # PHP CodeSniffer on changed files
 - job-template:
 name: '{name}-phpcs-HEAD'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -144,7 +144,7 @@
 
 - job-template:
 name: '{name}-phpcs-strict'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -157,7 +157,7 @@
 
 - job-template:
 name: '{name}-phpcs-strict-HEAD'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -170,7 +170,7 @@
 
 - job-template:
 name: '{name}-phpcs-lenient'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -183,7 +183,7 @@
 
 - job-template:
 name: '{name}-phpcs-lenient-HEAD'
-node: hasSlaveScripts
+node: hasSlaveScripts  UbuntuPrecise
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -196,7 +196,7 @@
 
 - job-template:
 name: 

[MediaWiki-commits] [Gerrit] Localisation changes for consistency - change (mediawiki...BlueSpiceExtensions)

[Smuggli (Code Review)]

Smuggli has submitted this change and it was merged.

Change subject: Localisation changes for consistency
..


Localisation changes for consistency

This extension does not need to be translated, so not for translatewiki

Change-Id: Iac3e28ecab53b4e9eca9379873eef003accc05c2
---
M BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
A BlueSpiceProjectFeedbackHelper/i18n/de-formal.json
A BlueSpiceProjectFeedbackHelper/i18n/de.json
A BlueSpiceProjectFeedbackHelper/i18n/en.json
M 
BlueSpiceProjectFeedbackHelper/languages/BlueSpiceProjectFeedbackHelper.i18n.php
5 files changed, 64 insertions(+), 33 deletions(-)

Approvals:
  Robert Vogel: Checked; Looks good to me, but someone else must approve
  Smuggli: Verified; Looks good to me, approved



diff --git 
a/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php 
b/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
index 2f1168d..fa9c69d 100644
--- a/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
+++ b/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
@@ -2,6 +2,8 @@
 
 BsExtensionManager::registerExtension('BlueSpiceProjectFeedbackHelper',  
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE, BsACTION::LOAD_SPECIALPAGE);
 
+$wgMessagesDirs['BlueSpiceProjectFeedbackHelper'] = __DIR__ . '/i18n';
+
 $wgExtensionMessagesFiles['BlueSpiceProjectFeedbackHelper'] = __DIR__ . 
'/languages/BlueSpiceProjectFeedbackHelper.i18n.php';
 
 $wgResourceModules['ext.bluespice.blueSpiceprojectfeedbackhelper'] = array(
diff --git a/BlueSpiceProjectFeedbackHelper/i18n/de-formal.json 
b/BlueSpiceProjectFeedbackHelper/i18n/de-formal.json
new file mode 100644
index 000..b76ddd9
--- /dev/null
+++ b/BlueSpiceProjectFeedbackHelper/i18n/de-formal.json
@@ -0,0 +1,9 @@
+{
+   @metadata: {
+   authors: [
+   Robert Vogel vo...@hallowelt.biz
+   ]
+   },
+   bs-bluespiceprojectfeedbackhelper-hint: Wir freuen uns, dass Sie 
'''BlueSpice''' verwenden. Bitte helfen Sie uns die Software zu verbessern und 
geben Sie uns ein kurzes 
[http://sourceforge.net/p/bluespice/discussion/1249667/ Feedback]. Fehler 
teilen Sie uns am besten durch den 
[http://sourceforge.net/tracker/?func=addgroup_id=358032atid=1494709 
BugTracker] mit. Wenn Sie über aktuelle Entwicklungen, Tipps und Tricks auf dem 
Laufenden gehalten werden möchten, dann folgen Sie uns doch auf einem dieser 
Kanäle: [http://www.facebook.com/BlueSpice.for.MediaWiki Facebook], 
[http://twitter.com/BlueSpiceTweets Twitter], 
[http://www.youtube.com/BlueSpiceVideo YouTube], 
[http://plus.google.com/102189038724381341308 G+], [http://blog.blue-spice.org 
Blog]. Vielen Dank für Ihre Unterstützung!,
+   bs-bluespiceprojectfeedbackhelper-confirm: Möchten Die diesen 
Hinweis deaktivieren? Wenn Sie auf \Abbrechen\ klicken wird er in sieben 
Tagen wieder angezeigt.
+}
diff --git a/BlueSpiceProjectFeedbackHelper/i18n/de.json 
b/BlueSpiceProjectFeedbackHelper/i18n/de.json
new file mode 100644
index 000..c130f63
--- /dev/null
+++ b/BlueSpiceProjectFeedbackHelper/i18n/de.json
@@ -0,0 +1,13 @@
+{
+   @metadata: {
+   authors: [
+   Robert Vogel vo...@hallowelt.biz
+   ]
+   },
+   bs-bluespiceprojectfeedbackhelper-desc: Feedback über BlueSpice 
abgeben,
+   prefs-bluespiceprojectfeedbackhelper: Feedback,
+   bs-bluespiceprojectfeedbackhelper-hint: Wir freuen uns, dass du 
'''BlueSpice''' verwendest. Bitte hilf uns die Software zu verbessern und gib 
uns ein kurzes [http://sourceforge.net/p/bluespice/discussion/1249667/ 
Feedback]. Fehler teilst du uns am besten durch den 
[http://sourceforge.net/tracker/?func=addgroup_id=358032atid=1494709 
BugTracker] mit. Wenn du über aktuelle Entwicklungen, Tipps und Tricks auf dem 
Laufenden gehalten werden möchtest, dann folge uns doch auf einem dieser 
Kanäle: [http://www.facebook.com/BlueSpice.for.MediaWiki Facebook], 
[http://twitter.com/BlueSpiceTweets Twitter], 
[http://www.youtube.com/BlueSpiceVideo YouTube], 
[http://plus.google.com/102189038724381341308 G+], [http://blog.blue-spice.org 
Blog]. Vielen Dank für deine Unterstützung!,
+   bs-bluespiceprojectfeedbackhelper-active: Aktiv,
+   bs-bluespiceprojectfeedbackhelper-closebutton: Schließen,
+   bs-bluespiceprojectfeedbackhelper-confirm: Möchtest du diesen 
Hinweis deaktivieren? Wenn du auf \Abbrechen\ klickst wird er in sieben Tagen 
wieder angezeigt.
+}
diff --git a/BlueSpiceProjectFeedbackHelper/i18n/en.json 
b/BlueSpiceProjectFeedbackHelper/i18n/en.json
new file mode 100644
index 000..d53f16b
--- /dev/null
+++ b/BlueSpiceProjectFeedbackHelper/i18n/en.json
@@ -0,0 +1,13 @@
+{
+   @metadata: {
+   authors: [
+   Robert Vogel vo...@hallowelt.biz
+   ]
+   },
+   bs-bluespiceprojectfeedbackhelper-desc: 

[MediaWiki-commits] [Gerrit] Fixed issue with installer - change (mediawiki...BlueSpiceExtensions)

[Smuggli (Code Review)]

Smuggli has submitted this change and it was merged.

Change subject: Fixed issue with installer
..


Fixed issue with installer

Installing BlueSpice via MW installer coast error because bs_settings
table does not exist at this time, so check if existent

Change-Id: Ied7c30c53b64819d995ae982bce60147820c8213
---
M SmartList/SmartList.class.php
1 file changed, 13 insertions(+), 11 deletions(-)

Approvals:
  Robert Vogel: Checked; Looks good to me, but someone else must approve
  Smuggli: Verified; Looks good to me, approved



diff --git a/SmartList/SmartList.class.php b/SmartList/SmartList.class.php
index 8527e4c..f3b7176 100644
--- a/SmartList/SmartList.class.php
+++ b/SmartList/SmartList.class.php
@@ -109,22 +109,24 @@
 */
public static function getSchemaUpdates( $updater ) {
$odbw = wfGetDB( DB_MASTER );
-   $res = $odbw-select(
-   'bs_settings',
-   $odbw-addIdentifierQuotes( 'value' ),
-   array(
-   $odbw-addIdentifierQuotes( 'key' ) = 
'MW::SmartList::Order'
-   )
-   );
-   if ( $odbw-numRows( $res ) === 1 ) {
-   $obj = $odbw-fetchObject( $res );
-   if ( $obj-value === serialize( 'time' ) || $obj-value 
=== serialize( 'title' ) ) {
-   $odbw-delete(
+   if ( $odbw-tableExists( 'bs_settings' ) === true ) {
+   $res = $odbw-select(
'bs_settings',
+   $odbw-addIdentifierQuotes( 'value' ),
array(
$odbw-addIdentifierQuotes( 'key' ) = 
'MW::SmartList::Order'
)
);
+   if ( $odbw-numRows( $res ) === 1 ) {
+   $obj = $odbw-fetchObject( $res );
+   if ( $obj-value === serialize( 'time' ) || 
$obj-value === serialize( 'title' ) ) {
+   $odbw-delete(
+   'bs_settings',
+   array(
+   $odbw-addIdentifierQuotes( 
'key' ) = 'MW::SmartList::Order'
+   )
+   );
+   }
}
}
return true;

-- 
To view, visit https://gerrit.wikimedia.org/r/150531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied7c30c53b64819d995ae982bce60147820c8213
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Added extension classes to wgAutoloadClasses - change (mediawiki...BlueSpiceExtensions)

[Robert Vogel (Code Review)]

Robert Vogel has submitted this change and it was merged.

Change subject: Added extension classes to wgAutoloadClasses
..


Added extension classes to wgAutoloadClasses

Change-Id: I4123e384e322bc13b5ffde175bf1626b10272262
---
M ArticleInfo/ArticleInfo.setup.php
M Authors/Authors.setup.php
M Avatars/Avatars.setup.php
M Blog/Blog.setup.php
M BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
M CSyntaxHighlight/CSyntaxHighlight.setup.php
M Checklist/Checklist.setup.php
M CountThings/CountThings.setup.php
M Emoticons/Emoticons.setup.php
M ExtendedEditBar/ExtendedEditBar.setup.php
M ExtensionInfo/ExtensionInfo.setup.php
M Flexiskin/Flexiskin.setup.php
M FormattingHelp/FormattingHelp.setup.php
M GroupManager/GroupManager.setup.php
M HideTitle/HideTitle.setup.php
M InsertCategory/InsertCategory.setup.php
M InsertFile/InsertFile.setup.php
M InsertLink/InsertLink.setup.php
M InsertMagic/InsertMagic.setup.php
M InterWikiLinks/InterWikiLinks.setup.php
M NamespaceCss/NamespaceCss.setup.php
M Notifications/Notifications.setup.php
M PageAccess/PageAccess.setup.php
M PagesVisited/PagesVisited.setup.php
M Preferences/Preferences.setup.php
M RSSFeeder/RSSFeeder.setup.php
M RSSStandards/RSSStandards.setup.php
M SecureFileStore/SecureFileStore.setup.php
M SmartList/SmartList.setup.php
M StateBar/StateBar.setup.php
M Statistics/Statistics.setup.php
M TopMenuBarCustomizer/TopMenuBarCustomizer.setup.php
M UniversalExport/UniversalExport.setup.php
M UserManager/UserManager.setup.php
M UserPreferences/UserPreferences.setup.php
M UserSidebar/UserSidebar.setup.php
M VisualEditor/VisualEditor.setup.php
M WantedArticle/WantedArticle.setup.php
M WatchList/WatchList.setup.php
M WidgetBar/WidgetBar.setup.php
M WikiAdmin/WikiAdmin.setup.php
41 files changed, 81 insertions(+), 42 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/ArticleInfo/ArticleInfo.setup.php 
b/ArticleInfo/ArticleInfo.setup.php
index 7cf4cfa..2bb8860 100644
--- a/ArticleInfo/ArticleInfo.setup.php
+++ b/ArticleInfo/ArticleInfo.setup.php
@@ -2,6 +2,8 @@
 
 BsExtensionManager::registerExtension('ArticleInfo', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
 
+$GLOBALS['wgAutoloadClasses']['ArticleInfo'] = __DIR__ . 
'/ArticleInfo.class.php';
+
 $wgMessagesDirs['ArticleInfo'] = __DIR__ . '/i18n';
 
 $wgExtensionMessagesFiles['ArticleInfo'] = __DIR__ . 
'/languages/ArticleInfo.i18n.php';
diff --git a/Authors/Authors.setup.php b/Authors/Authors.setup.php
index 63528f4..bceef83 100644
--- a/Authors/Authors.setup.php
+++ b/Authors/Authors.setup.php
@@ -14,5 +14,6 @@
'remoteBasePath' = $GLOBALS['wgScriptPath']
 );
 
+$GLOBALS['wgAutoloadClasses']['Authors'] = __DIR__ . '/Authors.class.php';
 $wgAutoloadClasses['ViewAuthors'] = __DIR__ . '/views/view.Authors.php';
 $wgAutoloadClasses['ViewAuthorsUserPageProfileImageSetting'] = __DIR__ . 
'/views/view.AuthorsUserPageProfileImageSetting.php';
\ No newline at end of file
diff --git a/Avatars/Avatars.setup.php b/Avatars/Avatars.setup.php
index 12cfcf9..84cdd44 100644
--- a/Avatars/Avatars.setup.php
+++ b/Avatars/Avatars.setup.php
@@ -6,7 +6,7 @@
 
 $wgExtensionMessagesFiles['Avatars'] = __DIR__ . '/languages/Avatars.i18n.php';
 
-$wgAutoloadClasses['Avatars'] = __DIR__ . '/Avatars.class.php';
+$GLOBALS['wgAutoloadClasses']['Avatars'] = __DIR__ . '/Avatars.class.php';
 
 $wgHooks['BeforePageDisplay'][] = Avatars::onBeforePageDisplay;
 
diff --git a/Blog/Blog.setup.php b/Blog/Blog.setup.php
index 1b196e9..3f7ed4b 100644
--- a/Blog/Blog.setup.php
+++ b/Blog/Blog.setup.php
@@ -14,5 +14,6 @@
'remoteBasePath' = $GLOBALS['wgScriptPath']
 );
 
+$GLOBALS['wgAutoloadClasses']['Blog'] = __DIR__ . '/Blog.class.php';
 $wgAutoloadClasses['ViewBlog'] = __DIR__ . '/views/view.Blog.php';
 $wgAutoloadClasses['ViewBlogItem'] = __DIR__ . '/views/view.BlogItem.php';
\ No newline at end of file
diff --git 
a/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php 
b/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
index 2f1168d..070c980 100644
--- a/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
+++ b/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
@@ -13,4 +13,5 @@
 
 $wgAjaxExportList[] = 'BlueSpiceProjectFeedbackHelper::disableFeedback';
 
+$GLOBALS['wgAutoloadClasses']['BlueSpiceProjectFeedbackHelper'] = __DIR__ . 
'/BlueSpiceProjectFeedbackHelper.class.php';
 $wgAutoloadClasses['ViewBlueSpiceProjectFeedbackHelperPanel'] = __DIR__ . 
'/views/view.BlueSpiceProjectFeedbackHelperPanel.php';
\ No newline at end of file
diff --git a/CSyntaxHighlight/CSyntaxHighlight.setup.php 
b/CSyntaxHighlight/CSyntaxHighlight.setup.php
index d66d1f8..c632dc3 100644
--- a/CSyntaxHighlight/CSyntaxHighlight.setup.php
+++ b/CSyntaxHighlight/CSyntaxHighlight.setup.php
@@ -2,6 +2,8 @@
 
 BsExtensionManager::registerExtension('CSyntaxHighlight', 

[MediaWiki-commits] [Gerrit] Update Wikia's MediaWiki version to 1.19.18 - change (pywikibot/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update Wikia's MediaWiki version to 1.19.18
..


Update Wikia's MediaWiki version to 1.19.18

Change-Id: Iae8f80d88acfd9aa7dd30094d76704b09b443bf3
---
M pywikibot/families/lyricwiki_family.py
M pywikibot/families/wikia_family.py
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  John Vandenberg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/pywikibot/families/lyricwiki_family.py 
b/pywikibot/families/lyricwiki_family.py
index 5b25802..a4ec752 100644
--- a/pywikibot/families/lyricwiki_family.py
+++ b/pywikibot/families/lyricwiki_family.py
@@ -17,7 +17,7 @@
 }
 
 def version(self, code):
-return 1.16.2
+return 1.19.18
 
 def scriptpath(self, code):
 return ''
diff --git a/pywikibot/families/wikia_family.py 
b/pywikibot/families/wikia_family.py
index b91bf45..75a699f 100644
--- a/pywikibot/families/wikia_family.py
+++ b/pywikibot/families/wikia_family.py
@@ -20,7 +20,7 @@
 return u'www.wikia.com'
 
 def version(self, code):
-return 1.19.17
+return 1.19.18
 
 def scriptpath(self, code):
 return ''

-- 
To view, visit https://gerrit.wikimedia.org/r/150793
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae8f80d88acfd9aa7dd30094d76704b09b443bf3
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Grunny mwgru...@gmail.com
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add MathSearchImage - change (mediawiki...MathSearch)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add MathSearchImage
..


Add MathSearchImage

Add the image that is used for the MathSearch
Button to the extension code.

Change-Id: I389582dd49ec6fd641b61332dc30124a4f6ff818
---
M FormulaInfo.php
A images/math_search_logo.png
2 files changed, 5 insertions(+), 3 deletions(-)

Approvals:
  Physikerwelt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/FormulaInfo.php b/FormulaInfo.php
index 5244cb6..6eb8cc7 100644
--- a/FormulaInfo.php
+++ b/FormulaInfo.php
@@ -55,7 +55,7 @@
}
 
public function DisplayInfo( $pid, $eid ) {
-   global $wgMathDebug, $wgOut;
+   global $wgMathDebug, $wgExtensionAssetsPath;
/* $out Output page find out how to get that variable in a 
static context*/
$out = $this-getOutput();
$out-addWikiText( '==General==' );
@@ -81,8 +81,10 @@
// $wgOut-addWikiText('b:'.var_export($res,true).'/b');
$out-addWikiText( 'TeX (as stored in database): 
syntaxhighlight lang=latex' . $mo-getTex() . '/syntaxhighlight' );
$out-addWikiText( 'MathML (' . self::getlengh( 
$mo-getMathml() ) . ') :', false );
-   // TODO: Add logo
-   $out-addHtml( 'a href=/wiki/Special:MathSearch?mathpattern=' 
. urlencode( $mo-getTex() ) . 'searchx=Searchimg 
src=http://wikidemo.formulasearchengine.com/images/FSE-PIC.png; width=15 
height=15/a' );
+
+   $imgUrl = $wgExtensionAssetsPath . 
/MathSearch/images/math_search_logo.png;
+   $mathSearchImg = Html::element( 'img', array( 'src' = $imgUrl, 
'width' = 15, 'height' = 15 ) );
+   $out-addHtml( 'a href=/wiki/Special:MathSearch?mathpattern=' 
. urlencode( $mo-getTex() ) . 'searchx=Search' . $mathSearchImg . '/a' );
$out-addHtml(  $mo-getMathml() );
# $log=htmlspecialchars( $res-math_log );
$out-addHtml( br /\n );
diff --git a/images/math_search_logo.png b/images/math_search_logo.png
new file mode 100644
index 000..68ecf8a
--- /dev/null
+++ b/images/math_search_logo.png
Binary files differ

-- 
To view, visit https://gerrit.wikimedia.org/r/150690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I389582dd49ec6fd641b61332dc30124a4f6ff818
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: Brian Wolff bawolff...@gmail.com
Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update WoWWiki's MediaWiki version to 1.19.18 - change (pywikibot/core)

[Grunny (Code Review)]

Grunny has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150795

Change subject: Update WoWWiki's MediaWiki version to 1.19.18
..

Update WoWWiki's MediaWiki version to 1.19.18

Missed this file in the Wikia update.

Change-Id: I759654e0caa2069415859177c7da0dea709164df
---
M pywikibot/families/wowwiki_family.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/95/150795/1

diff --git a/pywikibot/families/wowwiki_family.py 
b/pywikibot/families/wowwiki_family.py
index 0ff4809..9cf7bad 100644
--- a/pywikibot/families/wowwiki_family.py
+++ b/pywikibot/families/wowwiki_family.py
@@ -58,4 +58,4 @@
 return ''
 
 def version(self, code):
-return '1.16.5'
+return '1.19.18'

-- 
To view, visit https://gerrit.wikimedia.org/r/150795
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I759654e0caa2069415859177c7da0dea709164df
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Grunny mwgru...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix the OutputPageJsConfigHookHandlerTest - change (mediawiki...Wikibase)

[Tobias Gritschacher (Code Review)]

Tobias Gritschacher has submitted this change and it was merged.

Change subject: Fix the OutputPageJsConfigHookHandlerTest
..


Fix the OutputPageJsConfigHookHandlerTest

After Ied57a511c7

Change-Id: I1f9b0486aaa548af9f7f63183b56c57289413991
---
M repo/tests/phpunit/includes/Hook/OutputPageJsConfigHookHandlerTest.php
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  WikidataJenkins: Verified



diff --git 
a/repo/tests/phpunit/includes/Hook/OutputPageJsConfigHookHandlerTest.php 
b/repo/tests/phpunit/includes/Hook/OutputPageJsConfigHookHandlerTest.php
index 546facb..a42659f 100644
--- a/repo/tests/phpunit/includes/Hook/OutputPageJsConfigHookHandlerTest.php
+++ b/repo/tests/phpunit/includes/Hook/OutputPageJsConfigHookHandlerTest.php
@@ -50,6 +50,7 @@
'wbUserIsBlocked',
'wbUserCanEdit',
'wbCopyright',
+   'wbBadgeItems',
'wbExperimentalFeatures'
);
 

-- 
To view, visit https://gerrit.wikimedia.org/r/150788
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f9b0486aaa548af9f7f63183b56c57289413991
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] exec_environ.pp: Install libaio1 to enable asynchronous I/O ... - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: exec_environ.pp: Install libaio1 to enable asynchronous I/O 
system calls
..


exec_environ.pp: Install libaio1 to enable asynchronous I/O system calls

Install Linux kernel AIO access library libaio1 to enable userspace to use 
asynchronous I/O system calls.
This can improve performance for applications like databases or webservers

Bug: 68615
Change-Id: I482c530ef8b47e21f3f4a9107fd41f3b4416fd0e
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  coren: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 844b929..38dcaad 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -291,6 +291,7 @@
 'jq',  # Bug #65049.
 'ksh',
 'iotop',   # useful for labs admins to monitor 
tools
+'libaio1', # Bug 68615
 'libav-tools', # Bug #53870.
 'libdmtx0a',   # Bug #53867.
 'libfcgi0ldbl',# Bug 56995

-- 
To view, visit https://gerrit.wikimedia.org/r/150787
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I482c530ef8b47e21f3f4a9107fd41f3b4416fd0e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hedonil hedo...@action.ms
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Cleanup whitespace - change (mediawiki...ContentTranslation)

[Amire80 (Code Review)]

Amire80 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150796

Change subject: Cleanup whitespace
..

Cleanup whitespace

Change-Id: Iea3d46de2e5c814821bc71656eccf0ac6343b913
---
M modules/tools/ext.cx.progressbar.js
M modules/tools/ext.cx.tools.js
M modules/tools/ext.cx.tools.mtabuse.js
M modules/translation/ext.cx.translation.progress.js
4 files changed, 75 insertions(+), 36 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/96/150796/1

diff --git a/modules/tools/ext.cx.progressbar.js 
b/modules/tools/ext.cx.progressbar.js
index 7875fff..aa71847 100644
--- a/modules/tools/ext.cx.progressbar.js
+++ b/modules/tools/ext.cx.progressbar.js
@@ -29,20 +29,22 @@
};
 
ProgressBar.prototype.render = function () {
-   this.$container.append(
-   $( 'div' )
+   this.$container.append( $( 'div' )
.addClass( 'cx-progressbar' )
.append(
$( 'span' ).addClass( 'cx-progressbar__bar' ),
$( 'span' ).addClass( 
'cx-progressbar__bar--mt' )
)
);
+
this.$info = $( 'div' )
.addClass( 'cx-progressbar__info' )
-   .append( $( 'div' )
-   .addClass( 'cx-progressbar__info--total' ),
+   .append(
$( 'div' )
-   .addClass( 'cx-progressbar__info--mt' ) );
+   .addClass( 
'cx-progressbar__info--total' ),
+   $( 'div' )
+   .addClass( 'cx-progressbar__info--mt' )
+   );
 
this.$container.append( this.$info.hide() );
this.$bar = this.$container.find( '.cx-progressbar__bar' );
@@ -52,10 +54,13 @@
 
ProgressBar.prototype.listen = function () {
var progressBar = this;
+
mw.hook( 'mw.cx.progress' ).add( $.proxy( this.update, this ) );
+
this.$container.on( 'mouseenter', '.cx-progressbar', function 
() {
progressBar.$info.show();
} );
+
this.$container.on( 'mouseleave', '.cx-progressbar', function 
() {
progressBar.$info.hide();
} );
@@ -67,12 +72,18 @@
mtPercentage = parseInt( mtPercentage, 10 );
this.$bar.css( 'width', this.status + '%' );
this.$mtbar.css( 'width', mtPercentage + '%' );
+
this.$info.find( '.cx-progressbar__info--total' )
-   .text( mw.msg( 'cx-header-progressbar-text',
-   mw.language.convertNumber( percentage ) ) );
+   .text( mw.msg(
+   'cx-header-progressbar-text',
+   mw.language.convertNumber( percentage )
+   ) );
+
this.$info.find( '.cx-progressbar__info--mt' )
-   .text( mw.msg( 'cx-header-progressbar-text-mt',
-   mw.language.convertNumber( mtPercentage ) ) );
+   .text( mw.msg(
+   'cx-header-progressbar-text-mt',
+   mw.language.convertNumber( mtPercentage )
+   ) );
};
 
$.fn.cxProgressBar = function ( options ) {
diff --git a/modules/tools/ext.cx.tools.js b/modules/tools/ext.cx.tools.js
index b8b65c2..b84da80 100644
--- a/modules/tools/ext.cx.tools.js
+++ b/modules/tools/ext.cx.tools.js
@@ -25,6 +25,7 @@
ContentTranslationTools.prototype.init = function () {
this.render();
this.$toolsContainer.cxtoolmanager();
+
// Handle enter key press in the search field.
this.$searchBox.find( 'input' ).keypress( function ( event ) {
if ( event.which === 13 ) {
@@ -33,27 +34,34 @@
mw.hook( 'mw.cx.search.link' ).fire( text );
}
} );
+
mw.hook( 'mw.cx.tools.ready' ).fire();
};
 
ContentTranslationTools.prototype.render = function () {
-   var $progressBar, $loadingIndicator, $search;
+   var $progressBar, $search, $loadingIndicator;
 
this.$searchBox = $( 'div' )
.addClass( 'card search cx-tools--container' );
+
this.$toolsContainer = $( 'div' )
.addClass( 'cx-tools--container' );
+
$progressBar = $( 'div' )
.addClass( 'cx-header__progressbar' )
.cxProgressBar();

[MediaWiki-commits] [Gerrit] Role + Module for Quarry Labs tool - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: Role + Module for Quarry Labs tool
..


Role + Module for Quarry Labs tool

- Implements
https://meta.wikimedia.org/wiki/Research:Ideas/Public_query_interface_for_Labs
- Deployed via fabric file kept in the source
  repository at analytics/quarry/web
- NAT rules and /etc/hosts for access to labsdb handled
  manually for now
- Uses /srv for everything
- Uses labsdebrepo for python packages

Change-Id: I6042041ffe853095970296c103d3d2e7e19b79e2
---
A manifests/role/labsquarry.pp
A modules/quarry/files/celeryd
A modules/quarry/manifests/celeryrunner.pp
A modules/quarry/manifests/init.pp
A modules/quarry/manifests/web.pp
A modules/quarry/templates/celeryd.conf.erb
A modules/quarry/templates/quarry-web.nginx.erb
7 files changed, 580 insertions(+), 0 deletions(-)

Approvals:
  coren: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/labsquarry.pp b/manifests/role/labsquarry.pp
new file mode 100644
index 000..dfa0384
--- /dev/null
+++ b/manifests/role/labsquarry.pp
@@ -0,0 +1,33 @@
+class role::labs::quarry::web {
+include role::labs::lvm::srv
+include misc::labsdebrepo
+
+class { '::quarry::web':
+require = [Mount['/srv'], Class['misc::labsdebrepo']],
+}
+}
+
+class role::labs::quarry::celeryrunner {
+include role::labs::lvm::srv
+include misc::labsdebrepo
+
+class { '::quarry::celeryrunner':
+require = [Mount['/srv'], Class['misc::labsdebrepo']],
+}
+}
+
+class role::labs::quarry::database {
+include role::labs::lvm::srv
+
+class { '::quarry::database':
+require = Mount['/srv']
+}
+}
+
+class role::labs::quarry::redis {
+include role::labs::lvm::srv
+
+class { '::quarry::redis':
+require = Mount['/srv']
+}
+}
diff --git a/modules/quarry/files/celeryd b/modules/quarry/files/celeryd
new file mode 100644
index 000..0fe704f
--- /dev/null
+++ b/modules/quarry/files/celeryd
@@ -0,0 +1,387 @@
+#!/bin/sh -e
+# 
+#  celeryd - Starts the Celery worker daemon.
+# 
+#
+# :Usage: /etc/init.d/celeryd 
{start|stop|force-reload|restart|try-restart|status}
+# :Configuration file: /etc/default/celeryd
+#
+# See 
http://docs.celeryproject.org/en/latest/tutorials/daemonizing.html#generic-init-scripts
+
+
+### BEGIN INIT INFO
+# Provides:  celeryd
+# Required-Start:$network $local_fs $remote_fs
+# Required-Stop: $network $local_fs $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop:  0 1 6
+# Short-Description: celery task worker daemon
+### END INIT INFO
+#
+#
+# To implement separate init scripts, copy this script and give it a different
+# name:
+# I.e., if my new application, little-worker needs an init, I
+# should just use:
+#
+#   cp /etc/init.d/celeryd /etc/init.d/little-worker
+#
+# You can then configure this by manipulating /etc/default/little-worker.
+#
+VERSION=10.0
+echo celery init v${VERSION}.
+if [ $(id -u) -ne 0 ]; then
+echo Error: This program can only be used by the root user.
+echoUnprivileged users must use the 'celery multi' utility, 
+echoor 'celery worker --detach'.
+exit 1
+fi
+
+
+# Can be a runlevel symlink (e.g. S02celeryd)
+if [ -L $0 ]; then
+SCRIPT_FILE=$(readlink $0)
+else
+SCRIPT_FILE=$0
+fi
+SCRIPT_NAME=$(basename $SCRIPT_FILE)
+
+DEFAULT_USER=celery
+DEFAULT_PID_FILE=/var/run/celery/%n.pid
+DEFAULT_LOG_FILE=/var/log/celery/%n.log
+DEFAULT_LOG_LEVEL=INFO
+DEFAULT_NODES=celery
+DEFAULT_CELERYD=-m celery worker --detach
+
+CELERY_DEFAULTS=${CELERY_DEFAULTS:-/etc/default/${SCRIPT_NAME}}
+
+# Make sure executable configuration script is owned by root
+_config_sanity() {
+local path=$1
+local owner=$(ls -ld $path | awk '{print $3}')
+local iwgrp=$(ls -ld $path | cut -b 6)
+local iwoth=$(ls -ld $path | cut -b 9)
+
+if [ $(id -u $owner) != 0 ]; then
+echo Error: Config script '$path' must be owned by root!
+echo
+echo Resolution:
+echo Review the file carefully and make sure it has not been 
+echo modified with mailicious intent.  When sure the 
+echo script is safe to execute with superuser privileges 
+echo you can change ownership of the script:
+echo $ sudo chown root '$path'
+exit 1
+fi
+
+if [ $iwoth != - ]; then  # S_IWOTH
+echo Error: Config script '$path' cannot be writable by others!
+echo
+echo Resolution:
+echo Review the file carefully and make sure it has not been 
+echo modified with malicious intent.  When sure the 
+echo script is safe to execute with superuser privileges 
+echo you can change the scripts permissions:
+echo $ sudo chmod 640 '$path'
+exit 1
+fi
+if [ $iwgrp != - ]; then  # 

[MediaWiki-commits] [Gerrit] Update WoWWiki's MediaWiki version to 1.19.18 - change (pywikibot/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update WoWWiki's MediaWiki version to 1.19.18
..


Update WoWWiki's MediaWiki version to 1.19.18

Missed this file in the Wikia update.

Change-Id: I759654e0caa2069415859177c7da0dea709164df
---
M pywikibot/families/wowwiki_family.py
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Xqt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/pywikibot/families/wowwiki_family.py 
b/pywikibot/families/wowwiki_family.py
index 0ff4809..9cf7bad 100644
--- a/pywikibot/families/wowwiki_family.py
+++ b/pywikibot/families/wowwiki_family.py
@@ -58,4 +58,4 @@
 return ''
 
 def version(self, code):
-return '1.16.5'
+return '1.19.18'

-- 
To view, visit https://gerrit.wikimedia.org/r/150795
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I759654e0caa2069415859177c7da0dea709164df
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Grunny mwgru...@gmail.com
Gerrit-Reviewer: Xqt i...@gno.de
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] [DNM] Silver and golden badge icons - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150797

Change subject: [DNM] Silver and golden badge icons
..

[DNM] Silver and golden badge icons

Change-Id: Ie72b62bcd325821ce6a4fdd0ce8cf5f0cc5285d4
---
A lib/resources/images/wb-badges-gold.png
A lib/resources/images/wb-badges-gold.svg
A lib/resources/images/wb-badges-silver.png
A lib/resources/images/wb-badges-silver.svg
4 files changed, 30 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/97/150797/1

diff --git a/lib/resources/images/wb-badges-gold.png 
b/lib/resources/images/wb-badges-gold.png
new file mode 100644
index 000..9944abd
--- /dev/null
+++ b/lib/resources/images/wb-badges-gold.png
Binary files differ
diff --git a/lib/resources/images/wb-badges-gold.svg 
b/lib/resources/images/wb-badges-gold.svg
new file mode 100644
index 000..3b50569
--- /dev/null
+++ b/lib/resources/images/wb-badges-gold.svg
@@ -0,0 +1,15 @@
+?xml version=1.0 encoding=utf-8?
+svg xmlns=http://www.w3.org/2000/svg;
+width=12 height=19 viewBox=0 0 57.6 91.2
+g fill=#FFD700 
transform=matrix(1.0741053,0,0,1.0741053,-20.22352,-6.387075)
+path 
d=M45.7,61.6c-2.6,0-8.6,6.1-8.6,6.1v21.9c0,0.5,0.6,0.7,0.9,0.4l7.7-7.6l7.8,7.7c0.3,0.3,0.9,0.1,0.9-0.4
+v-22C54.3,67.7,48.3,61.6,45.7,61.6z/
+path fill=#FFC100 
d=M71.9,35.1c0-2.5-6.4-3.9-7.2-6.2c-0.8-2.3,3.6-7.3,2.2-9.2c-1.4-2-7.5,0.6-9.5-0.8c-1.9-1.4-1.3-8-3.7-8.8
+c-2.3-0.7-5.6,4.9-8.1,4.9c-2.5,0-5.9-5.7-8.1-4.9c-2.3,0.8-1.7,7.3-3.7,8.8c-2,1.4-8-1.2-9.5,0.8c-1.4,1.9,2.9,6.9,2.2,9.2
+c-0.7,2.3-7.2,3.7-7.2,6.2c0,2.5,6.4,3.9,7.2,6.2c0.8,2.3-3.6,7.3-2.2,9.2c1.4,2,7.5-0.6,9.5,0.8c1.9,1.4,1.3,8,3.7,8.8
+c2.3,0.7,5.6-4.9,8.1-4.9c2.5,0,5.9,5.7,8.1,4.9c2.3-0.8,1.7-7.3,3.7-8.8c2-1.4,8,1.2,9.5-0.8c1.4-1.9-2.9-6.9-2.2-9.2
+C65.5,39.1,71.9,37.6,71.9,35.1z 
M45.7,49.2c-7.8,0-14.1-6.3-14.1-14.1s6.3-14.1,14.1-14.1s14.1,6.3,14.1,14.1S53.5,49.2,45.7,49.2
+z/
+circle cx=45.7 cy=35.1 r=9.4/
+/g
+/svg
\ No newline at end of file
diff --git a/lib/resources/images/wb-badges-silver.png 
b/lib/resources/images/wb-badges-silver.png
new file mode 100644
index 000..11995e8
--- /dev/null
+++ b/lib/resources/images/wb-badges-silver.png
Binary files differ
diff --git a/lib/resources/images/wb-badges-silver.svg 
b/lib/resources/images/wb-badges-silver.svg
new file mode 100644
index 000..1e8123e
--- /dev/null
+++ b/lib/resources/images/wb-badges-silver.svg
@@ -0,0 +1,15 @@
+?xml version=1.0 encoding=utf-8?
+svg xmlns=http://www.w3.org/2000/svg;
+width=12 height=19 viewBox=0 0 57.6 91.2
+g fill=#CCC transform=matrix(1.0741053,0,0,1.0741053,-20.22352,-6.387075)
+path 
d=M45.7,61.6c-2.6,0-8.6,6.1-8.6,6.1v21.9c0,0.5,0.6,0.7,0.9,0.4l7.7-7.6l7.8,7.7c0.3,0.3,0.9,0.1,0.9-0.4
+v-22C54.3,67.7,48.3,61.6,45.7,61.6z/
+path fill=#BBB 
d=M71.9,35.1c0-2.5-6.4-3.9-7.2-6.2c-0.8-2.3,3.6-7.3,2.2-9.2c-1.4-2-7.5,0.6-9.5-0.8c-1.9-1.4-1.3-8-3.7-8.8
+c-2.3-0.7-5.6,4.9-8.1,4.9c-2.5,0-5.9-5.7-8.1-4.9c-2.3,0.8-1.7,7.3-3.7,8.8c-2,1.4-8-1.2-9.5,0.8c-1.4,1.9,2.9,6.9,2.2,9.2
+c-0.7,2.3-7.2,3.7-7.2,6.2c0,2.5,6.4,3.9,7.2,6.2c0.8,2.3-3.6,7.3-2.2,9.2c1.4,2,7.5-0.6,9.5,0.8c1.9,1.4,1.3,8,3.7,8.8
+c2.3,0.7,5.6-4.9,8.1-4.9c2.5,0,5.9,5.7,8.1,4.9c2.3-0.8,1.7-7.3,3.7-8.8c2-1.4,8,1.2,9.5-0.8c1.4-1.9-2.9-6.9-2.2-9.2
+C65.5,39.1,71.9,37.6,71.9,35.1z 
M45.7,49.2c-7.8,0-14.1-6.3-14.1-14.1s6.3-14.1,14.1-14.1s14.1,6.3,14.1,14.1S53.5,49.2,45.7,49.2
+z/
+circle cx=45.7 cy=35.1 r=9.4/
+/g
+/svg
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/150797
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie72b62bcd325821ce6a4fdd0ce8cf5f0cc5285d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Reduce the number of cases in GetEntitiesTest - change (mediawiki...Wikibase)

[Daniel Kinzler (Code Review)]

Daniel Kinzler has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150798

Change subject: Reduce the number of cases in GetEntitiesTest
..

Reduce the number of cases in GetEntitiesTest

Bug: 68919
Change-Id: I2ca21d0632d42c88bec88e299be6b958a2faf71d
---
M repo/tests/phpunit/includes/api/GetEntitiesTest.php
1 file changed, 28 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/98/150798/1

diff --git a/repo/tests/phpunit/includes/api/GetEntitiesTest.php 
b/repo/tests/phpunit/includes/api/GetEntitiesTest.php
index 24880fe..4821dde 100644
--- a/repo/tests/phpunit/includes/api/GetEntitiesTest.php
+++ b/repo/tests/phpunit/includes/api/GetEntitiesTest.php
@@ -9,8 +9,7 @@
 /**
  * @covers Wikibase\Api\GetEntities
  *
- * Test cases are generated using the data provided in the various static 
arrays below
- * Adding one extra element to any of the arrays (except format) will generate 
4 new tests
+ * Test cases are generated using the data provided in the various static 
arrays below.
  *
  * @licence GNU GPL v2+
  * @author Adam Shorland
@@ -148,29 +147,38 @@
public static function provideData() {
$testCases = array();
 
-   // Generate test cases based on the static information provided 
in arrays above
-   foreach ( self::$goodItems as $itemData ) {
-   foreach ( self::$goodProps  as $propData ) {
-   foreach ( self::$goodLangs as $langData ) {
-   foreach ( self::$goodSorts as $sortData 
) {
-   $testCase['p'] = $itemData['p'];
-   $testCase['e'] = $itemData['e'];
-   $testCase['p']['props'] = 
$propData;
-   $testCase['p']['languages'] = 
$langData;
-   $testCase['p'] = array_merge( 
$testCase['p'], $sortData );
-   $testCases[] = $testCase;
-   if( in_array( 'claims', 
explode( '|', $propData ) ) ){
-   
$testCase['p']['ungroupedlist'] = true;
-   $testCases[] = 
$testCase;
-   }
-   }
+   // Test cases for props filter
+   foreach ( self::$goodProps  as $propData ) {
+   foreach ( self::$goodItems as $testCase ) {
+   $testCase['p']['props'] = $propData;
+   $testCases[] = $testCase;
+
+   if( in_array( 'claims', explode( '|', $propData 
) ) ){
+   $testCase['p']['ungroupedlist'] = true;
+   $testCases[] = $testCase;
}
}
}
 
-   // We only want to test each format once so don't include this 
in the main generation loop
+   // Test cases for languages
+   foreach ( self::$goodLangs as $langData ) {
+   foreach ( self::$goodItems as $testCase ) {
+   $testCase['p']['languages'] = $langData;
+   $testCases[] = $testCase;
+   }
+   }
+
+   // Test cases for sort order
+   foreach ( self::$goodSorts as $sortData ) {
+   foreach ( self::$goodItems as $testCase ) {
+   $testCase['p'] = array_merge( $testCase['p'], 
$sortData );
+   $testCases[] = $testCase;
+   }
+   }
+
+   // Test cases for different formats (for one item)
foreach ( self::$goodFormats as $formatData ) {
-   $testCase = $testCases[0];
+   $testCase = reset( self::$goodItems );
$testCase['p']['format'] = $formatData;
$testCases[] = $testCase;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/150798
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ca21d0632d42c88bec88e299be6b958a2faf71d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add log entry - change (mediawiki...mathoid)

[Physikerwelt (Code Review)]

Hello GWicke,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/150799

to review the following change.

Change subject: Add log entry
..

Add log entry

If $wgMathDebug is set the math extension, expects
a debug value to be set.
---
M mathoid-worker.js
1 file changed, 31 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid 
refs/changes/99/150799/1

diff --git a/mathoid-worker.js b/mathoid-worker.js
index 9a0a0e3..5e832c9 100644
--- a/mathoid-worker.js
+++ b/mathoid-worker.js
@@ -82,38 +82,39 @@
 });
 
 
-
 function handleRequest(req, res, q, type) {
-   var mml =true;
-   //Keep format variables constant
-   if(type == tex){
-   type = TeX
-   }
-   if(type == mml || type == MathML){
-   type = MathML
-   mml = false;
-   }
-   if(type == ascii || type == asciimath ){
-   type = AsciiMath
-   }   
-   mjAPI.typeset({math:q, format:type, svg:true, img:true, mml:mml}, 
function (data) {
-   if(data.errors){
-   data.success = false;
-   } else {
-   data.success = true;
-   }   
-   var jsonData = JSON.stringify(data);
-   errBuf = new Buffer(jsonData);
-   res.writeHead(200,
-   {
-   'Content-Type': 'application/json',
-   'Content-length': errBuf.length
-   });
-   res.end(errBuf);
+var mml = true;
+//Keep format variables constant
+if (type == tex) {
+type = TeX
+}
+if (type == mml || type == MathML) {
+type = MathML
+mml = false;
+}
+if (type == ascii || type == asciimath) {
+type = AsciiMath
+}
+mjAPI.typeset({math: q, format: type, svg: true, img: true, mml: mml}, 
function (data) {
+if (data.errors) {
+data.success = false;
+data.log = Error: + JSON.stringify(data.errors);
+} else {
+data.success = true;
+data.log = success;
+}
+var jsonData = JSON.stringify(data);
+errBuf = new Buffer(jsonData);
+res.writeHead(200,
+{
+'Content-Type': 'application/json',
+'Content-length': errBuf.length
+});
+res.end(errBuf);
 
-   requestQueue.shift();
-   handleRequests();//*/
-});
+requestQueue.shift();
+handleRequests();
+});
 }
 
 handleRequests = function() {

-- 
To view, visit https://gerrit.wikimedia.org/r/150799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I975f53f99979f1ea8b7aa4d2d5ba501635009de5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: GWicke gwi...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add log entry - change (mediawiki...mathoid)

[Physikerwelt (Code Review)]

Hello GWicke,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/150800

to review the following change.

Change subject: Add log entry
..

Add log entry

If $wgMathDebug is set the math extension, expects
a debug value to be set.
---
M mathoid-worker.js
1 file changed, 12 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid 
refs/changes/00/150800/1

diff --git a/mathoid-worker.js b/mathoid-worker.js
index 9a0a0e3..601e187 100644
--- a/mathoid-worker.js
+++ b/mathoid-worker.js
@@ -82,26 +82,27 @@
 });
 
 
-
 function handleRequest(req, res, q, type) {
-   var mml =true;
+   var mml = true;
//Keep format variables constant
-   if(type == tex){
+   if (type == tex) {
type = TeX
}
-   if(type == mml || type == MathML){
+   if (type == mml || type == MathML) {
type = MathML
mml = false;
}
-   if(type == ascii || type == asciimath ){
+   if (type == ascii || type == asciimath) {
type = AsciiMath
-   }   
-   mjAPI.typeset({math:q, format:type, svg:true, img:true, mml:mml}, 
function (data) {
-   if(data.errors){
+   }
+   mjAPI.typeset({math: q, format: type, svg: true, img: true, mml: mml}, 
function (data) {
+   if (data.errors) {
data.success = false;
+   data.log = Error: + JSON.stringify(data.errors);
} else {
data.success = true;
-   }   
+   data.log = success;
+   }
var jsonData = JSON.stringify(data);
errBuf = new Buffer(jsonData);
res.writeHead(200,
@@ -112,8 +113,8 @@
res.end(errBuf);
 
requestQueue.shift();
-   handleRequests();//*/
-});
+   handleRequests();
+   });
 }
 
 handleRequests = function() {

-- 
To view, visit https://gerrit.wikimedia.org/r/150800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice1e6dbf786ed9af53a05dc740c93738f6b30bfa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: GWicke gwi...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Drop sort and dir options from GetEntities. - change (mediawiki...Wikibase)

[Daniel Kinzler (Code Review)]

Daniel Kinzler has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150801

Change subject: Drop sort and dir options from GetEntities.
..

Drop sort and dir options from GetEntities.

These options did no longer do anything.

Change-Id: I1e25ab0be40d66af5cbf3f2ee210b4c5e66345df
---
M repo/includes/api/GetEntities.php
M repo/tests/phpunit/includes/api/GetEntitiesTest.php
2 files changed, 3 insertions(+), 43 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/01/150801/1

diff --git a/repo/includes/api/GetEntities.php 
b/repo/includes/api/GetEntities.php
index 6dfb4d3..0d2086c 100644
--- a/repo/includes/api/GetEntities.php
+++ b/repo/includes/api/GetEntities.php
@@ -249,7 +249,7 @@
);
}
$options-setLanguages( $languages );
-   $options-setOption( EntitySerializer::OPT_SORT_ORDER, 
$params['dir'] );
+   $options-setOption( EntitySerializer::OPT_SORT_ORDER, 
EntitySerializer::SORT_ASC );
$options-setOption( EntitySerializer::OPT_PARTS, $props );
$options-setIndexTags( $this-getResult()-getIsRawMode() );
return $options;
@@ -280,22 +280,6 @@
'descriptions', 'claims', 'datatype' ),
ApiBase::PARAM_DFLT = 
'info|sitelinks|aliases|labels|descriptions|claims|datatype',
ApiBase::PARAM_ISMULTI = true,
-   ),
-   'sort' = array(
-   // This could be done like the urls, where 
sitelinks/title sort on the title field
-   // and sitelinks/site sort on the site code.
-   ApiBase::PARAM_TYPE = array( 'sitelinks' ),
-   ApiBase::PARAM_DFLT = '',
-   ApiBase::PARAM_ISMULTI = true,
-   ),
-   'dir' = array(
-   ApiBase::PARAM_TYPE = array(
-   EntitySerializer::SORT_ASC,
-   EntitySerializer::SORT_DESC,
-   EntitySerializer::SORT_NONE
-   ),
-   ApiBase::PARAM_DFLT = 
EntitySerializer::SORT_ASC,
-   ApiBase::PARAM_ISMULTI = false,
),
'languages' = array(
ApiBase::PARAM_TYPE = 
Utils::getLanguageCodes(),
@@ -335,14 +319,6 @@
),
'props' = array( 'The names of the properties to get 
back from each entity.',
Will be further filtered by any languages 
given.
-   ),
-   'sort' = array( 'The names of the properties to sort.',
-   Use together with 'dir' to give the sort 
order.,
-   Note that this will change due to name clash 
(ie. sort should work on all entities).
-   ),
-   'dir' = array( 'The sort order for the given 
properties.',
-   Use together with 'sort' to give the 
properties to sort.,
-   Note that this will change due to name clash 
(ie. dir should work on all entities).
),
'languages' = array( 'By default the internationalized 
values are returned in all available languages.',
'This parameter allows filtering these down to 
one or more languages by providing one or more language codes.'
@@ -408,8 +384,8 @@
= 'Get the item for page Berlin on the site 
enwiki, with language attributes in English language',

'api.php?action=wbgetentitiessites=enwikititles=berlinnormalize='
= 'Get the item for page Berlin on the site enwiki 
after normalizing the title from berlin',
-   
'api.php?action=wbgetentitiesids=Q42props=sitelinkssortdir=descending'
-   = 'Get the sitelinks for item Q42 sorted in a 
descending order',
+   'api.php?action=wbgetentitiesids=Q42props=sitelinks'
+   = 'Get the sitelinks for item Q42',
'api.php?action=wbgetentitiesids=Q42sitefilter=enwiki'
= 'Get entities with ID Q42 showing only sitelinks 
from enwiki'
);
diff --git a/repo/tests/phpunit/includes/api/GetEntitiesTest.php 
b/repo/tests/phpunit/includes/api/GetEntitiesTest.php
index 4821dde..d7a894b 100644
--- a/repo/tests/phpunit/includes/api/GetEntitiesTest.php
+++ 

[MediaWiki-commits] [Gerrit] Get tokens for testing API modules from User obj - change (mediawiki...Wikibase)

[Daniel Kinzler (Code Review)]

Daniel Kinzler has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150802

Change subject: Get tokens for testing API modules from User obj
..

Get tokens for testing API modules from User obj

We used to make an extra API call to get the token.

Change-Id: I2382917e66a996cdd50132c2371826ed99ab6055
---
M repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/02/150802/1

diff --git a/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php 
b/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
index 326b139..de74ae8 100644
--- a/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
+++ b/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
@@ -74,7 +74,14 @@
 *  Appends an edit token to a request
 */
protected function doApiRequestWithToken( array $params, array $session 
= null, User $user = null ) {
-   $params['token'] = $this-getToken();
+   if ( !$user ) {
+   $user = $GLOBALS['wgUser'];
+   }
+
+   if ( !array_key_exists( 'token', $params ) ) {
+   $params['token'] = $user-getEditToken();
+   }
+
return $this-doApiRequest( $params, $session, false, $user );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/150802
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2382917e66a996cdd50132c2371826ed99ab6055
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Language screenshot job should run on test2.wikipedia.org - change (integration/jenkins-job-builder-config)

[Vikassy (Code Review)]

Vikassy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150803

Change subject: Language screenshot job should run on test2.wikipedia.org
..

Language screenshot job should run on test2.wikipedia.org

Change-Id: Id386fb32305a5e3f0d805e4351b613395e72684d
---
M jobs.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/03/150803/1

diff --git a/jobs.yaml b/jobs.yaml
index 0ed171b..8582c14 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -300,6 +300,7 @@
 browser: firefox
 mediawiki_password_variable: 
MEDIAWIKI_PASSWORD_LANGUAGESCREENSHOTBOT_WMFLABS_ORG
 mediawiki_user: LanguageScreenshotBot
+mediawiki_url: test2.wikipedia.org
 
 # WikiLove
 - project:

-- 
To view, visit https://gerrit.wikimedia.org/r/150803
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id386fb32305a5e3f0d805e4351b613395e72684d
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] spamassassin: qualify vars - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: spamassassin: qualify vars
..


spamassassin: qualify vars

Change-Id: I6809ed620cbd5d95b4341507f62f6014701822fa
---
M modules/spamassassin/templates/spamassassin.default.erb
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Alexandros Kosiaris: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/spamassassin/templates/spamassassin.default.erb 
b/modules/spamassassin/templates/spamassassin.default.erb
index a46c300..84213de 100644
--- a/modules/spamassassin/templates/spamassassin.default.erb
+++ b/modules/spamassassin/templates/spamassassin.default.erb
@@ -14,7 +14,7 @@
 # make sure --max-children is not set to anything higher than 5,
 # unless you know what you're doing.
 
-OPTIONS=--max-children %= max_children % %= debug_logging % 
--nouser-config --listen-ip=127.0.0.1 -u %= spamd_user % -g %= spamd_group 
%
+OPTIONS=--max-children %= @max_children % %= @debug_logging % 
--nouser-config --listen-ip=127.0.0.1 -u %= @spamd_user % -g %= @spamd_group 
%
 
 # Pid file
 # Where should spamd write its PID to file? If you use the -u or
@@ -23,7 +23,7 @@
 PIDFILE=/var/run/spamd.pid
 
 # Set nice level of spamd
-NICE=--nicelevel %= nicelevel %
+NICE=--nicelevel %= @nicelevel %
 
 # Cronjob
 # Set to anything but 0 to enable the cron job to automatically update

-- 
To view, visit https://gerrit.wikimedia.org/r/149993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6809ed620cbd5d95b4341507f62f6014701822fa
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] swift:lint - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: swift:lint
..


swift:lint

Change-Id: Iada37354e732f3ba58f79e61a1869771b4b4405d
---
M manifests/role/swift.pp
1 file changed, 126 insertions(+), 96 deletions(-)

Approvals:
  Filippo Giunchedi: Looks good to me, but someone else must approve
  Alexandros Kosiaris: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 4566424..96560f9 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -1,5 +1,6 @@
-# vim: noet
-@monitor_group { swift: description = swift servers }
+@monitor_group { 'swift':
+description = 'swift servers',
+}
 
 class role::swift {
 class base {
@@ -7,87 +8,100 @@
 }
 
 class eqiad-prod inherits role::swift::base {
-system::role { role::swift::eqiad-prod: description = Swift eqiad 
production cluster }
+system::role { 'role::swift::eqiad-prod':
+description = 'Swift eqiad production cluster',
+}
 include passwords::swift::eqiad_prod
-class { ::swift::base: hash_path_suffix = 4f93c548a5903a13, 
cluster_name = eqiad-prod }
+class { '::swift::base':
+hash_path_suffix = '4f93c548a5903a13',
+cluster_name = 'eqiad-prod',
+}
 class ganglia_reporter inherits role::swift::eqiad-prod {
 # one host per cluster should report global stats
-file { /usr/local/bin/swift-ganglia-report-global-stats:
+file { '/usr/local/bin/swift-ganglia-report-global-stats':
 ensure = present,
 owner  = 'root',
 group  = 'root',
 mode   = '0555',
-source = 
puppet:///files/swift/swift-ganglia-report-global-stats,
+source = 
'puppet:///files/swift/swift-ganglia-report-global-stats',
 }
 # config file to hold the  password
 $password = $passwords::swift::eqiad_prod::rewrite_password
-file { /etc/swift-ganglia-report-global-stats.conf:
+file { '/etc/swift-ganglia-report-global-stats.conf':
 owner   = 'root',
 group   = 'root',
 mode= '0440',
-content = 
template(swift/swift-ganglia-report-global-stats.conf.erb),
+content = 
template('swift/swift-ganglia-report-global-stats.conf.erb'),
 }
-cron { swift-ganglia-report-global-stats:
+cron { 'swift-ganglia-report-global-stats':
 ensure  = present,
 command = /usr/local/bin/swift-ganglia-report-global-stats 
-C /etc/swift-ganglia-report-global-stats.conf -u 'mw:media' -c eqiad-prod,
-user= root,
+user= 'root',
 }
 # report global stats to graphite
-file { /usr/local/bin/swift-account-stats:
+file { '/usr/local/bin/swift-account-stats':
 ensure  = present,
 owner   = 'root',
 group   = 'root',
 mode= '0555',
-source  = puppet:///files/swift/swift-account-stats,
-require = [ Package['python-swiftclient'], 
Package['python-statsd'] ],
+source  = 'puppet:///files/swift/swift-account-stats',
+require = [Package['python-swiftclient'],
+Package['python-statsd']
+],
 }
-file { /etc/swift/account_mw_media.env:
+file { '/etc/swift/account_mw_media.env':
 owner   = 'root',
 group   = 'root',
 mode= '0440',
 content = export 
ST_AUTH=http://ms-fe.eqiad.wmnet/auth/v1.0\nexport ST_USER=mw:media\nexport 
ST_KEY=${password}\n
 }
-cron { swift-account-stats_mw_media:
+cron { 'swift-account-stats_mw_media':
 ensure  = present,
 command = . /etc/swift/account_mw_media.env  
/usr/local/bin/swift-account-stats --prefix swift.eqiad-prod.stats 
--statsd-host statsd.eqiad.wmnet 1/dev/null,
-user= root,
-hour= *,
-minute  = *,
+user= 'root',
+hour= '*',
+minute  = '*',
 }
 # swift-dispersion reporting
-file { /usr/local/bin/swift-dispersion-stats:
+file { '/usr/local/bin/swift-dispersion-stats':
 ensure  = present,
 owner   = 'root',
 group   = 'root',
 mode= '0555',
-source  = puppet:///files/swift/swift-dispersion-stats,
-require = [ Package['swift'], Package['python-statsd'] ],
+source  = 

[MediaWiki-commits] [Gerrit] Allow localisation of site link text - change (mediawiki...RelatedSites)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Allow localisation of site link text
..


Allow localisation of site link text

This uses the same system message infrastructure as is used for the
$wgExtraInterlanguageLinkPrefixes feature in core. It is fully backward
compatible.

Also adds a title attribute to each link, again using the same logic as
is used in core for interlanguage links.

Bug: 68359
Change-Id: Id6b1aac8e824859bfd6de3b4a8c7f020ce59579e
---
M RelatedSites.class.php
1 file changed, 29 insertions(+), 1 deletion(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/RelatedSites.class.php b/RelatedSites.class.php
index 60a2653..b16f3b8 100644
--- a/RelatedSites.class.php
+++ b/RelatedSites.class.php
@@ -78,9 +78,34 @@
 
$title = Title::newFromText( $site );
if ( $title ) {
+   // Use the same system message keys as the core 
$wgExtraInterlanguageLinkPrefixes feature
+   $linkTextMsg = wfMessage( 'interlanguage-link-' 
. $title-getInterwiki() );
+   $linkText = $linkTextMsg-isDisabled() ?
+   ( Language::fetchLanguageName( 
$title-getInterwiki() ) ?: $site ) :
+   $linkTextMsg-text();
+
+   // This logic is essentially copied from core 
SkinTemplate#getLanguages
+   $linkTitle = null;
+   $linkTitleMsg = wfMessage( 
'interlanguage-link-sitename-' . $title-getInterwiki() );
+   if ( !$linkTitleMsg-isDisabled() ) {
+   if ( $title-getText() === '' ) {
+   $linkTitle = wfMessage(
+   
'interlanguage-link-title-nonlangonly',
+   $linkTitleMsg-text()
+   )-text();
+   } else {
+   $linkTitle = wfMessage(
+   
'interlanguage-link-title-nonlang',
+   $title-getText(),
+   $linkTitleMsg-text()
+   )-text();
+   }
+   }
+
$relatedSitesUrls[] = array(
'href' = $title-getFullURL(),
-   'text' = Language::fetchLanguageName( 
$title-getInterwiki() ) ?: $site,
+   'text' = $linkText,
+   'title' = $linkTitle,
'class' = 'interwiki-' . $tmp[0]
);
}
@@ -148,6 +173,9 @@
foreach ( (array) $relatedSitesUrls as $url ) {
$attributes = array();
$attributes['href'] = htmlspecialchars( $url['href'] );
+   if ( !empty( $url['title'] ) ) {
+   $attributes['title'] = htmlspecialchars( 
$url['title'] );
+   }
 
if ( $url['text'] == $wgSitename ) {
$attributes['rel'] = 'nofollow';

-- 
To view, visit https://gerrit.wikimedia.org/r/148312
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6b1aac8e824859bfd6de3b4a8c7f020ce59579e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/RelatedSites
Gerrit-Branch: master
Gerrit-Owner: TTO at.li...@live.com.au
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: TTO at.li...@live.com.au
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tie all jobs to UbuntuPrecise - change (integration/jenkins-job-builder-config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150804

Change subject: Tie all jobs to UbuntuPrecise
..

Tie all jobs to UbuntuPrecise

Make sure jobs never run on the new UbuntuTrusty labeled instances.
Will migrate as time allow.

Bug: 68340
Change-Id: Ia2369c3a966bb18b1b065db5746ce773fd4976c0
---
M job_template.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/04/150804/1

diff --git a/job_template.yaml b/job_template.yaml
index e6b99f5..a0159a6 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -36,7 +36,7 @@
 
 - defaults:
 name: browsertests
-node: contintLabsSlave
+node: contintLabsSlave  UbuntuPrecise
 
 scm:
   - git:

-- 
To view, visit https://gerrit.wikimedia.org/r/150804
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2369c3a966bb18b1b065db5746ce773fd4976c0
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Hashar has...@free.fr

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Allow localisation of site link text - change (mediawiki...RelatedSites)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150805

Change subject: Allow localisation of site link text
..

Allow localisation of site link text

This uses the same system message infrastructure as is used for the
$wgExtraInterlanguageLinkPrefixes feature in core. It is fully backward
compatible.

Also adds a title attribute to each link, again using the same logic as
is used in core for interlanguage links.

Bug: 68359
Change-Id: Id6b1aac8e824859bfd6de3b4a8c7f020ce59579e
---
M RelatedSites.class.php
1 file changed, 29 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedSites 
refs/changes/05/150805/1

diff --git a/RelatedSites.class.php b/RelatedSites.class.php
index 60a2653..b16f3b8 100644
--- a/RelatedSites.class.php
+++ b/RelatedSites.class.php
@@ -78,9 +78,34 @@
 
$title = Title::newFromText( $site );
if ( $title ) {
+   // Use the same system message keys as the core 
$wgExtraInterlanguageLinkPrefixes feature
+   $linkTextMsg = wfMessage( 'interlanguage-link-' 
. $title-getInterwiki() );
+   $linkText = $linkTextMsg-isDisabled() ?
+   ( Language::fetchLanguageName( 
$title-getInterwiki() ) ?: $site ) :
+   $linkTextMsg-text();
+
+   // This logic is essentially copied from core 
SkinTemplate#getLanguages
+   $linkTitle = null;
+   $linkTitleMsg = wfMessage( 
'interlanguage-link-sitename-' . $title-getInterwiki() );
+   if ( !$linkTitleMsg-isDisabled() ) {
+   if ( $title-getText() === '' ) {
+   $linkTitle = wfMessage(
+   
'interlanguage-link-title-nonlangonly',
+   $linkTitleMsg-text()
+   )-text();
+   } else {
+   $linkTitle = wfMessage(
+   
'interlanguage-link-title-nonlang',
+   $title-getText(),
+   $linkTitleMsg-text()
+   )-text();
+   }
+   }
+
$relatedSitesUrls[] = array(
'href' = $title-getFullURL(),
-   'text' = Language::fetchLanguageName( 
$title-getInterwiki() ) ?: $site,
+   'text' = $linkText,
+   'title' = $linkTitle,
'class' = 'interwiki-' . $tmp[0]
);
}
@@ -148,6 +173,9 @@
foreach ( (array) $relatedSitesUrls as $url ) {
$attributes = array();
$attributes['href'] = htmlspecialchars( $url['href'] );
+   if ( !empty( $url['title'] ) ) {
+   $attributes['title'] = htmlspecialchars( 
$url['title'] );
+   }
 
if ( $url['text'] == $wgSitename ) {
$attributes['rel'] = 'nofollow';

-- 
To view, visit https://gerrit.wikimedia.org/r/150805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6b1aac8e824859bfd6de3b4a8c7f020ce59579e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedSites
Gerrit-Branch: wmf/1.24wmf15
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: TTO at.li...@live.com.au
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 relative urls in html output. - change (mediawiki...parsoid)

[Subramanya Sastry (Code Review)]

Subramanya Sastry has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150806

Change subject: Use relative urls in html output.
..

Use relative urls in html output.

Change-Id: I403a58a43a40013a9456955d1dce9694e58bc899
---
M tests/server/server.js
1 file changed, 14 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/06/150806/1

diff --git a/tests/server/server.js b/tests/server/server.js
index ae76289..b083718 100755
--- a/tests/server/server.js
+++ b/tests/server/server.js
@@ -720,11 +720,11 @@
 });
 
 var pageListData = [
-   { url: '/topfails', title: 'Results by title' },
-   { url: '/failedFetches', title: 'Non-existing test pages' },
-   { url: '/failsDistr', title: 'Histogram of failures' },
-   { url: '/skipsDistr', title: 'Histogram of skips' },
-   { url: '/commits', title: 'List of all tested commits' }
+   { url: 'topfails', title: 'Results by title' },
+   { url: 'failedFetches', title: 'Non-existing test pages' },
+   { url: 'failsDistr', title: 'Histogram of failures' },
+   { url: 'skipsDistr', title: 'Histogram of skips' },
+   { url: 'commits', title: 'List of all tested commits' }
 ];
 
 if (perfConfig) {
@@ -805,11 +805,11 @@
{ description: 'Git SHA1', value: 
row[0].maxhash },
{ description: 'Test Results', value: 
row[0].maxresults },
{ description: 'Crashers', value: 
row[0].crashers,
-   url: '/crashers' },
+   url: 'crashers' },
{ description: 'Fixes', value: numFixes,
-   url: '/topfixes/between/' + 
row[0].secondhash + '/' + row[0].maxhash },
+   url: 'topfixes/between/' + 
row[0].secondhash + '/' + row[0].maxhash },
{ description: 'Regressions', value: 
numRegressions,
-   url: '/regressions/between/' + 
row[0].secondhash + '/' + row[0].maxhash },
+   url: 'regressions/between/' + 
row[0].secondhash + '/' + row[0].maxhash },
],
averages: [
{ description: 'Errors', value: 
row[0].avgerrors },
@@ -857,7 +857,7 @@
 
var data = {
page: page,
-   urlPrefix: '/topfails',
+   urlPrefix: 'topfails',
urlSuffix: '',
heading: 'Results by title',
header: ['Title', 'Commit', 'Syntactic diffs', 'Semantic 
diffs', 'Errors']
@@ -1046,11 +1046,11 @@
} else {
var data = {
page: page,
-   urlPrefix: '/regressions/between/' + r1 + '/' + 
r2,
+   urlPrefix: 'regressions/between/' + r1 + '/' + 
r2,
urlSuffix: '',
heading: Total regressions between selected 
revisions:  +
row[0].numRegressions,
-   headingLink: [{url: '/topfixes/between/' + r1 + 
'/' + r2, name: 'topfixes'}],
+   headingLink: [{url: 'topfixes/between/' + r1 + 
'/' + r2, name: 'topfixes'}],
header: RH.regressionsHeaderData
};
db.query( dbRegressionsBetweenRevs, [ r2, r1, offset ],
@@ -1070,7 +1070,7 @@
} else {
var data = {
page: page,
-   urlPrefix: '/topfixes/between/' + r1 + '/' + r2,
+   urlPrefix: 'topfixes/between/' + r1 + '/' + r2,
urlSuffix: '',
heading: 'Total fixes between selected 
revisions: ' + row[0].numFixes,
headingLink: [{url: /regressions/between/ + 
r1 + / + r2, name: 'regressions'}],
@@ -1095,8 +1095,8 @@
var row = rows[i];
var tableRow = {hash: row.hash, timestamp: 
row.timestamp, numtests: row.numtests};
if ( i + 1  n ) {
-   tableRow.regUrl = 
'/regressions/between/' + rows[i+1].hash + '/' + row.hash;
-   tableRow.fixUrl = '/topfixes/between/' 
+ rows[i+1].hash + '/' + row.hash;
+   tableRow.regUrl = 
'regressions/between/' + rows[i+1].hash + '/' + row.hash;
+   tableRow.fixUrl = 'topfixes/between/' + 
rows[i+1].hash + '/' + row.hash;

[MediaWiki-commits] [Gerrit] Tie all jobs to UbuntuPrecise - change (integration/jenkins-job-builder-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Tie all jobs to UbuntuPrecise
..


Tie all jobs to UbuntuPrecise

Make sure jobs never run on the new UbuntuTrusty labeled instances.
Will migrate as time allow.

Bug: 68340
Change-Id: Ia2369c3a966bb18b1b065db5746ce773fd4976c0
---
M job_template.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/job_template.yaml b/job_template.yaml
index e6b99f5..a0159a6 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -36,7 +36,7 @@
 
 - defaults:
 name: browsertests
-node: contintLabsSlave
+node: contintLabsSlave  UbuntuPrecise
 
 scm:
   - git:

-- 
To view, visit https://gerrit.wikimedia.org/r/150804
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2369c3a966bb18b1b065db5746ce773fd4976c0
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tie language screenshot to UbuntuPrecise - change (integration/jenkins-job-builder-config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150807

Change subject: Tie language screenshot to UbuntuPrecise
..

Tie language screenshot to UbuntuPrecise

I am not sure it works fine for matrix jobs though :-(

Updates:
browsertests-VisualEditor-language-screenshot-linux-firefox-sauce

Bug: 68340
Change-Id: Ic4224e6c6bc75f8aa7f9dddce7debe062006c5e9
---
M job_template.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/07/150807/1

diff --git a/job_template.yaml b/job_template.yaml
index a0159a6..97fad83 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -25,7 +25,7 @@
 type: label-expression
 name: label
 values:
- - contintLabsSlave
+ - contintLabsSlave  UbuntuPrecise
  - axis:
 type: user-defined
 name: LANGUAGE_SCREENSHOT_CODE

-- 
To view, visit https://gerrit.wikimedia.org/r/150807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4224e6c6bc75f8aa7f9dddce7debe062006c5e9
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Hashar has...@free.fr

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add strings for localisation of Wikivoyage RelatedSites links - change (mediawiki...WikimediaMessages)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add strings for localisation of Wikivoyage RelatedSites links
..


Add strings for localisation of Wikivoyage RelatedSites links

These strings are currently hard-coded in English in
InitialiseSettings.php, with no way to localise other than by Bugzilla
request.

This will have no effect until a change to the RelatedSites extension is
merged (Id6b1aac8e82) and also to InitialiseSettings (I4f353cfb2cc).
However, it is harmless if this change is merged before the other changes.

Bug: 68359
Change-Id: Icd91c80a2f3eace388074a6ad0117a5ecea00c6b
---
M i18n/wikimedia/en.json
M i18n/wikimedia/qqq.json
2 files changed, 22 insertions(+), 2 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/i18n/wikimedia/en.json b/i18n/wikimedia/en.json
index 575f650..5bcc34f 100644
--- a/i18n/wikimedia/en.json
+++ b/i18n/wikimedia/en.json
@@ -198,5 +198,15 @@
 wikimedia-flow-terms-of-use-reopen-topic: By clicking 
\{{int:flow-reopen-topic-submit}}\, you agree to our 
[//wikimediafoundation.org/wiki/Terms_of_Use Terms of Use] and agree to 
irrevocably release your text under the 
[//creativecommons.org/licenses/by-sa/3.0 CC BY-SA 3.0 License] and 
[//en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License 
GFDL],
 wikimedia-upload-nolicenses: Uploading files to this wiki is not 
enabled. Please [[commons:Special:UploadWizard|upload to Wikimedia 
Commons]].\n\nTo be able to use this special page to upload to this wiki, an 
administrator needs to add one or more license options to the page 
[[MediaWiki:Licenses]].\n\nUse the following format: code* Template 
name|Label/code. Use any text to enable uploading without license options.,
 wikimediashoplink-linktext: Wikimedia Shop,
-wikimediashoplink-link-tooltip: Visit the Wikimedia Shop
+wikimediashoplink-link-tooltip: Visit the Wikimedia Shop,
+interlanguage-link-mul: More languages,
+interlanguage-link-sitename-mul: Multilingual {{SITENAME}},
+interlanguage-link-wikipedia: Wikipedia,
+interlanguage-link-sitename-wikipedia: Wikipedia, the free 
encyclopedia,
+interlanguage-link-commons: Wikimedia Commons,
+interlanguage-link-sitename-commons: Wikimedia Commons media 
repository,
+interlanguage-link-dmoz: DMOZ,
+interlanguage-link-sitename-dmoz: DMOZ web directory,
+interlanguage-link-citizendium: Citizendium,
+interlanguage-link-sitename-citizendium: Citizendium
 }
diff --git a/i18n/wikimedia/qqq.json b/i18n/wikimedia/qqq.json
index 1096bf4..945ea85 100644
--- a/i18n/wikimedia/qqq.json
+++ b/i18n/wikimedia/qqq.json
@@ -219,5 +219,15 @@
wikimedia-flow-terms-of-use-reopen-topic: Terms of use and copyright 
warning shown when reopening a Flow topic. Replace Terms_of_Use in the URL with 
Special:MyLanguage/Terms_of_Use/your_language, for example, 
Special:MyLanguage/Terms_of_Use/fr for French.\n\nRefers to 
{{msg-mw|flow-reopen-topic-submit}}.,
wikimedia-upload-nolicenses: This error is shown on 
[[Special:Upload]] on Wikimedia wikis when no license options are configured on 
[[MediaWiki:Licenses]].\n\nSee also [[mw:Manual:Image administration]].,
wikimediashoplink-linktext: Text for the link in the sidebar to the 
Wikimedia Shop,
-   wikimediashoplink-link-tooltip: Tooltip for the link in the sidebar 
to the Wikimedia Shop
+   wikimediashoplink-link-tooltip: Tooltip for the link in the sidebar 
to the Wikimedia Shop,
+   interlanguage-link-mul: Display text used for a language link (in 
the sidebar) to a multilingual version of the site, such as 
[[wikisource:|Multilingual Wikisource]].\n\nThis message '''should not''' use 
the same wording as the {{msg-mw|otherlanguages}} message, in order to avoid 
repetitiveness. For example, in English, the word \more\ is used in this 
message, as opposed to \other\ in {{msg-mw|otherlanguages}}.,
+   interlanguage-link-sitename-mul: Part of the title (tooltip) text 
used for a language link (in the sidebar) to a multilingual version of the 
site, such as [[wikisource:|Multilingual Wikisource]].,
+   interlanguage-link-wikipedia: Display text used for a sidebar link 
to a relevant page on Wikipedia.\n\nUsed on Wikivoyage sites for the \Related 
sites\ feature.,
+   interlanguage-link-sitename-wikipedia: Part of the title (tooltip) 
text used for a sidebar link to a relevant page on Wikipedia. The text \the 
free encyclopedia\ is the motto of Wikipedia, and should be translated 
according to what is used on your language's edition of Wikipedia.,
+   interlanguage-link-commons: Display text used for a sidebar link to 
a relevant page on Wikimedia Commons.\n\nUsed on Wikivoyage sites for the 
\Related sites\ feature.,
+   interlanguage-link-sitename-commons: Part of the title (tooltip) 
text used for a sidebar link to a relevant page 

[MediaWiki-commits] [Gerrit] Use relative urls in html output. - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Use relative urls in html output.
..


Use relative urls in html output.

Change-Id: I403a58a43a40013a9456955d1dce9694e58bc899
---
M tests/server/server.js
1 file changed, 14 insertions(+), 14 deletions(-)

Approvals:
  Subramanya Sastry: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/server/server.js b/tests/server/server.js
index ae76289..b083718 100755
--- a/tests/server/server.js
+++ b/tests/server/server.js
@@ -720,11 +720,11 @@
 });
 
 var pageListData = [
-   { url: '/topfails', title: 'Results by title' },
-   { url: '/failedFetches', title: 'Non-existing test pages' },
-   { url: '/failsDistr', title: 'Histogram of failures' },
-   { url: '/skipsDistr', title: 'Histogram of skips' },
-   { url: '/commits', title: 'List of all tested commits' }
+   { url: 'topfails', title: 'Results by title' },
+   { url: 'failedFetches', title: 'Non-existing test pages' },
+   { url: 'failsDistr', title: 'Histogram of failures' },
+   { url: 'skipsDistr', title: 'Histogram of skips' },
+   { url: 'commits', title: 'List of all tested commits' }
 ];
 
 if (perfConfig) {
@@ -805,11 +805,11 @@
{ description: 'Git SHA1', value: 
row[0].maxhash },
{ description: 'Test Results', value: 
row[0].maxresults },
{ description: 'Crashers', value: 
row[0].crashers,
-   url: '/crashers' },
+   url: 'crashers' },
{ description: 'Fixes', value: numFixes,
-   url: '/topfixes/between/' + 
row[0].secondhash + '/' + row[0].maxhash },
+   url: 'topfixes/between/' + 
row[0].secondhash + '/' + row[0].maxhash },
{ description: 'Regressions', value: 
numRegressions,
-   url: '/regressions/between/' + 
row[0].secondhash + '/' + row[0].maxhash },
+   url: 'regressions/between/' + 
row[0].secondhash + '/' + row[0].maxhash },
],
averages: [
{ description: 'Errors', value: 
row[0].avgerrors },
@@ -857,7 +857,7 @@
 
var data = {
page: page,
-   urlPrefix: '/topfails',
+   urlPrefix: 'topfails',
urlSuffix: '',
heading: 'Results by title',
header: ['Title', 'Commit', 'Syntactic diffs', 'Semantic 
diffs', 'Errors']
@@ -1046,11 +1046,11 @@
} else {
var data = {
page: page,
-   urlPrefix: '/regressions/between/' + r1 + '/' + 
r2,
+   urlPrefix: 'regressions/between/' + r1 + '/' + 
r2,
urlSuffix: '',
heading: Total regressions between selected 
revisions:  +
row[0].numRegressions,
-   headingLink: [{url: '/topfixes/between/' + r1 + 
'/' + r2, name: 'topfixes'}],
+   headingLink: [{url: 'topfixes/between/' + r1 + 
'/' + r2, name: 'topfixes'}],
header: RH.regressionsHeaderData
};
db.query( dbRegressionsBetweenRevs, [ r2, r1, offset ],
@@ -1070,7 +1070,7 @@
} else {
var data = {
page: page,
-   urlPrefix: '/topfixes/between/' + r1 + '/' + r2,
+   urlPrefix: 'topfixes/between/' + r1 + '/' + r2,
urlSuffix: '',
heading: 'Total fixes between selected 
revisions: ' + row[0].numFixes,
headingLink: [{url: /regressions/between/ + 
r1 + / + r2, name: 'regressions'}],
@@ -1095,8 +1095,8 @@
var row = rows[i];
var tableRow = {hash: row.hash, timestamp: 
row.timestamp, numtests: row.numtests};
if ( i + 1  n ) {
-   tableRow.regUrl = 
'/regressions/between/' + rows[i+1].hash + '/' + row.hash;
-   tableRow.fixUrl = '/topfixes/between/' 
+ rows[i+1].hash + '/' + row.hash;
+   tableRow.regUrl = 
'regressions/between/' + rows[i+1].hash + '/' + row.hash;
+   tableRow.fixUrl = 'topfixes/between/' + 
rows[i+1].hash + '/' + row.hash;
}

[MediaWiki-commits] [Gerrit] Tie language screenshot to UbuntuPrecise - change (integration/jenkins-job-builder-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Tie language screenshot to UbuntuPrecise
..


Tie language screenshot to UbuntuPrecise

I am not sure it works fine for matrix jobs though :-(

Updates:
browsertests-VisualEditor-language-screenshot-linux-firefox-sauce

Bug: 68340
Change-Id: Ic4224e6c6bc75f8aa7f9dddce7debe062006c5e9
---
M job_template.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/job_template.yaml b/job_template.yaml
index a0159a6..97fad83 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -25,7 +25,7 @@
 type: label-expression
 name: label
 values:
- - contintLabsSlave
+ - contintLabsSlave  UbuntuPrecise
  - axis:
 type: user-defined
 name: LANGUAGE_SCREENSHOT_CODE

-- 
To view, visit https://gerrit.wikimedia.org/r/150807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4224e6c6bc75f8aa7f9dddce7debe062006c5e9
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
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 strings for localisation of Wikivoyage RelatedSites links - change (mediawiki...WikimediaMessages)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150808

Change subject: Add strings for localisation of Wikivoyage RelatedSites links
..

Add strings for localisation of Wikivoyage RelatedSites links

These strings are currently hard-coded in English in
InitialiseSettings.php, with no way to localise other than by Bugzilla
request.
This will have no effect until a change to the RelatedSites extension is
merged (Id6b1aac8e82) and also to InitialiseSettings (I4f353cfb2cc).
However, it is harmless if this change is merged before the other changes.
Bug: 68359
Change-Id: Icd91c80a2f3eace388074a6ad0117a5ecea00c6b
---
M i18n/wikimedia/en.json
M i18n/wikimedia/qqq.json
2 files changed, 22 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages 
refs/changes/08/150808/1

diff --git a/i18n/wikimedia/en.json b/i18n/wikimedia/en.json
index a8bdc37..9ccc8fb 100644
--- a/i18n/wikimedia/en.json
+++ b/i18n/wikimedia/en.json
@@ -196,5 +196,15 @@
 wikimedia-flow-terms-of-use-summarize: By clicking 
\{{int:flow-summarize-topic-submit}}\, you agree to our 
[//wikimediafoundation.org/wiki/Terms_of_Use Terms of Use] and agree to 
irrevocably release your text under the 
[//creativecommons.org/licenses/by-sa/3.0 CC BY-SA 3.0 License] and 
[//en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License 
GFDL],
 wikimedia-flow-terms-of-use-close-topic: By clicking 
\{{int:flow-close-topic-submit}}\, you agree to our 
[//wikimediafoundation.org/wiki/Terms_of_Use Terms of Use] and agree to 
irrevocably release your text under the 
[//creativecommons.org/licenses/by-sa/3.0 CC BY-SA 3.0 License] and 
[//en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License 
GFDL],
 wikimedia-flow-terms-of-use-reopen-topic: By clicking 
\{{int:flow-reopen-topic-submit}}\, you agree to our 
[//wikimediafoundation.org/wiki/Terms_of_Use Terms of Use] and agree to 
irrevocably release your text under the 
[//creativecommons.org/licenses/by-sa/3.0 CC BY-SA 3.0 License] and 
[//en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License 
GFDL],
-wikimedia-upload-nolicenses: Uploading files to this wiki is not 
enabled. Please [[commons:Special:UploadWizard|upload to Wikimedia 
Commons]].\n\nTo be able to use this special page to upload to this wiki, an 
administrator needs to add one or more license options to the page 
[[MediaWiki:Licenses]].\n\nUse the following format: code* Template 
name|Label/code. Use any text to enable uploading without license options.
+wikimedia-upload-nolicenses: Uploading files to this wiki is not 
enabled. Please [[commons:Special:UploadWizard|upload to Wikimedia 
Commons]].\n\nTo be able to use this special page to upload to this wiki, an 
administrator needs to add one or more license options to the page 
[[MediaWiki:Licenses]].\n\nUse the following format: code* Template 
name|Label/code. Use any text to enable uploading without license options.,
+interlanguage-link-mul: More languages,
+interlanguage-link-sitename-mul: Multilingual {{SITENAME}},
+interlanguage-link-wikipedia: Wikipedia,
+interlanguage-link-sitename-wikipedia: Wikipedia, the free 
encyclopedia,
+interlanguage-link-commons: Wikimedia Commons,
+interlanguage-link-sitename-commons: Wikimedia Commons media 
repository,
+interlanguage-link-dmoz: DMOZ,
+interlanguage-link-sitename-dmoz: DMOZ web directory,
+interlanguage-link-citizendium: Citizendium,
+interlanguage-link-sitename-citizendium: Citizendium
 }
diff --git a/i18n/wikimedia/qqq.json b/i18n/wikimedia/qqq.json
index 0ae0815..a10d848 100644
--- a/i18n/wikimedia/qqq.json
+++ b/i18n/wikimedia/qqq.json
@@ -217,5 +217,15 @@
wikimedia-flow-terms-of-use-summarize: Terms of use and copyright 
warning shown when summarizing a Flow topic\n\nRefers to 
{{msg-mw|flow-summarize-topic-submit}}.,
wikimedia-flow-terms-of-use-close-topic: Terms of use and copyright 
warning shown when closing a Flow topic\n\nRefers to 
{{msg-mw|flow-close-topic-submit}}.,
wikimedia-flow-terms-of-use-reopen-topic: Terms of use and copyright 
warning shown when reopening a Flow topic\n\nRefers to 
{{msg-mw|flow-reopen-topic-submit}}.,
-   wikimedia-upload-nolicenses: This error is shown on 
[[Special:Upload]] on Wikimedia wikis when no license options are configured on 
[[MediaWiki:Licenses]].\n\nSee also [[mw:Manual:Image administration]].
+   wikimedia-upload-nolicenses: This error is shown on 
[[Special:Upload]] on Wikimedia wikis when no license options are configured on 
[[MediaWiki:Licenses]].\n\nSee also [[mw:Manual:Image administration]].,
+   interlanguage-link-mul: Display text used for a language link (in 
the sidebar) to a multilingual version of the site, such as 
[[wikisource:|Multilingual Wikisource]].\n\nThis message '''should 

[MediaWiki-commits] [Gerrit] Add strings for localisation of Wikivoyage RelatedSites links - change (mediawiki...WikimediaMessages)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add strings for localisation of Wikivoyage RelatedSites links
..


Add strings for localisation of Wikivoyage RelatedSites links

These strings are currently hard-coded in English in
InitialiseSettings.php, with no way to localise other than by Bugzilla
request.
This will have no effect until a change to the RelatedSites extension is
merged (Id6b1aac8e82) and also to InitialiseSettings (I4f353cfb2cc).
However, it is harmless if this change is merged before the other changes.
Bug: 68359
Change-Id: Icd91c80a2f3eace388074a6ad0117a5ecea00c6b
---
M i18n/wikimedia/en.json
M i18n/wikimedia/qqq.json
2 files changed, 22 insertions(+), 2 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/i18n/wikimedia/en.json b/i18n/wikimedia/en.json
index a8bdc37..9ccc8fb 100644
--- a/i18n/wikimedia/en.json
+++ b/i18n/wikimedia/en.json
@@ -196,5 +196,15 @@
 wikimedia-flow-terms-of-use-summarize: By clicking 
\{{int:flow-summarize-topic-submit}}\, you agree to our 
[//wikimediafoundation.org/wiki/Terms_of_Use Terms of Use] and agree to 
irrevocably release your text under the 
[//creativecommons.org/licenses/by-sa/3.0 CC BY-SA 3.0 License] and 
[//en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License 
GFDL],
 wikimedia-flow-terms-of-use-close-topic: By clicking 
\{{int:flow-close-topic-submit}}\, you agree to our 
[//wikimediafoundation.org/wiki/Terms_of_Use Terms of Use] and agree to 
irrevocably release your text under the 
[//creativecommons.org/licenses/by-sa/3.0 CC BY-SA 3.0 License] and 
[//en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License 
GFDL],
 wikimedia-flow-terms-of-use-reopen-topic: By clicking 
\{{int:flow-reopen-topic-submit}}\, you agree to our 
[//wikimediafoundation.org/wiki/Terms_of_Use Terms of Use] and agree to 
irrevocably release your text under the 
[//creativecommons.org/licenses/by-sa/3.0 CC BY-SA 3.0 License] and 
[//en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License 
GFDL],
-wikimedia-upload-nolicenses: Uploading files to this wiki is not 
enabled. Please [[commons:Special:UploadWizard|upload to Wikimedia 
Commons]].\n\nTo be able to use this special page to upload to this wiki, an 
administrator needs to add one or more license options to the page 
[[MediaWiki:Licenses]].\n\nUse the following format: code* Template 
name|Label/code. Use any text to enable uploading without license options.
+wikimedia-upload-nolicenses: Uploading files to this wiki is not 
enabled. Please [[commons:Special:UploadWizard|upload to Wikimedia 
Commons]].\n\nTo be able to use this special page to upload to this wiki, an 
administrator needs to add one or more license options to the page 
[[MediaWiki:Licenses]].\n\nUse the following format: code* Template 
name|Label/code. Use any text to enable uploading without license options.,
+interlanguage-link-mul: More languages,
+interlanguage-link-sitename-mul: Multilingual {{SITENAME}},
+interlanguage-link-wikipedia: Wikipedia,
+interlanguage-link-sitename-wikipedia: Wikipedia, the free 
encyclopedia,
+interlanguage-link-commons: Wikimedia Commons,
+interlanguage-link-sitename-commons: Wikimedia Commons media 
repository,
+interlanguage-link-dmoz: DMOZ,
+interlanguage-link-sitename-dmoz: DMOZ web directory,
+interlanguage-link-citizendium: Citizendium,
+interlanguage-link-sitename-citizendium: Citizendium
 }
diff --git a/i18n/wikimedia/qqq.json b/i18n/wikimedia/qqq.json
index 0ae0815..a10d848 100644
--- a/i18n/wikimedia/qqq.json
+++ b/i18n/wikimedia/qqq.json
@@ -217,5 +217,15 @@
wikimedia-flow-terms-of-use-summarize: Terms of use and copyright 
warning shown when summarizing a Flow topic\n\nRefers to 
{{msg-mw|flow-summarize-topic-submit}}.,
wikimedia-flow-terms-of-use-close-topic: Terms of use and copyright 
warning shown when closing a Flow topic\n\nRefers to 
{{msg-mw|flow-close-topic-submit}}.,
wikimedia-flow-terms-of-use-reopen-topic: Terms of use and copyright 
warning shown when reopening a Flow topic\n\nRefers to 
{{msg-mw|flow-reopen-topic-submit}}.,
-   wikimedia-upload-nolicenses: This error is shown on 
[[Special:Upload]] on Wikimedia wikis when no license options are configured on 
[[MediaWiki:Licenses]].\n\nSee also [[mw:Manual:Image administration]].
+   wikimedia-upload-nolicenses: This error is shown on 
[[Special:Upload]] on Wikimedia wikis when no license options are configured on 
[[MediaWiki:Licenses]].\n\nSee also [[mw:Manual:Image administration]].,
+   interlanguage-link-mul: Display text used for a language link (in 
the sidebar) to a multilingual version of the site, such as 
[[wikisource:|Multilingual Wikisource]].\n\nThis message '''should not''' use 
the same wording as the {{msg-mw|otherlanguages}} 

[MediaWiki-commits] [Gerrit] [WIP] More readable diff - change (mediawiki...MassMessage)

[Wctaiwan (Code Review)]

Wctaiwan has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150809

Change subject: [WIP] More readable diff
..

[WIP] More readable diff

Subclass DifferenceEngine. Move parsing of target array into target
strings from SpecialEditMassMessageList into MassMessageListContent and
use target strings for diff.

This approach has the advantage of being simple and consistent with
wikitext, but maybe we should instead show two lists of wikilinked
targets, one for added pages and one for removed pages.

TODO: Headings for description diff and target diff in the UI

Bug: 68600
Change-Id: Ic74008270e5f0b61c458eaae0b48d3af559baa80
---
M MassMessage.php
M includes/SpecialEditMassMessageList.php
M includes/content/MassMessageListContent.php
M includes/content/MassMessageListContentHandler.php
A includes/content/MassMessageListDiffEngine.php
5 files changed, 77 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage 
refs/changes/09/150809/1

diff --git a/MassMessage.php b/MassMessage.php
index 2f074bc..8660fde 100644
--- a/MassMessage.php
+++ b/MassMessage.php
@@ -82,6 +82,7 @@
 $wgAutoloadClasses['MassMessageSkipLogFormatter'] = 
$dir/includes/logging/MassMessageSkipLogFormatter.php;
 $wgAutoloadClasses['MassMessageListContent'] = 
$dir/includes/content/MassMessageListContent.php;
 $wgAutoloadClasses['MassMessageListContentHandler'] = 
$dir/includes/content/MassMessageListContentHandler.php;
+$wgAutoloadClasses['MassMessageListDiffEngine'] = 
$dir/includes/content/MassMessageListDiffEngine.php;
 $wgAutoloadClasses['MassMessageTestCase'] = 
$dir/tests/MassMessageTestCase.php;
 
 // ContentHandler
diff --git a/includes/SpecialEditMassMessageList.php 
b/includes/SpecialEditMassMessageList.php
index 87434fe..bd3d855 100644
--- a/includes/SpecialEditMassMessageList.php
+++ b/includes/SpecialEditMassMessageList.php
@@ -73,7 +73,7 @@
 
$content = $this-rev-getContent( Revision::FOR_THIS_USER, 
$this-getUser() );
$description = $content-getDescription();
-   $targets = $content-getTargets();
+   $targets = $content-getTargetStrings();
 
return array(
'title' = array(
@@ -90,7 +90,7 @@
),
'content' = array(
'type' = 'textarea',
-   'default' = ( $targets !== null ) ? 
self::parseTargets( $targets ) : '',
+   'default' = ( $targets !== null ) ? implode( 
\n, $targets ) : '',
'label-message' = 'massmessage-edit-content',
),
);
@@ -159,28 +159,6 @@
 
public function onSuccess() {
// No-op: We have already redirected.
-   }
-
-   /**
-* Parse array of targets for editing.
-* @var array $targets
-* @return string
-*/
-   protected static function parseTargets( $targets ) {
-   global $wgCanonicalServer;
-
-   $lines = array();
-   foreach ( $targets as $target ) {
-   if ( array_key_exists( 'site', $target ) ) {
-   $lines[] = $target['title'] . '@' . 
$target['site'];
-   } elseif ( strpos( $target['title'], '@' ) !== false ) {
-   // List the site if it'd otherwise be ambiguous
-   $lines[] = $target['title'] . '@' . 
MassMessage::getBaseUrl( $wgCanonicalServer );
-   } else {
-   $lines[] = $target['title'];
-   }
-   }
-   return implode( \n, $lines );
}
 
/**
diff --git a/includes/content/MassMessageListContent.php 
b/includes/content/MassMessageListContent.php
index e266557..1252e93 100644
--- a/includes/content/MassMessageListContent.php
+++ b/includes/content/MassMessageListContent.php
@@ -90,6 +90,32 @@
}
 
/**
+* Return targets as an array of title or title@site strings.
+* @return array|null
+*/
+   public function getTargetStrings() {
+   global $wgCanonicalServer;
+
+   $targets = $this-getTargets();
+   if ( $targets === null ) {
+   return null;
+   }
+
+   $targetStrings = array();
+   foreach ( $targets as $target ) {
+   if ( array_key_exists( 'site', $target ) ) {
+   $targetStrings[] = $target['title'] . '@' . 
$target['site'];
+   } elseif ( strpos( $target['title'], '@' ) !== false ) {
+   // List the site if it'd otherwise be ambiguous
+   $targetStrings[] = $target['title'] . '@' . 

[MediaWiki-commits] [Gerrit] Allow localisation of site link text - change (mediawiki...RelatedSites)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Allow localisation of site link text
..


Allow localisation of site link text

This uses the same system message infrastructure as is used for the
$wgExtraInterlanguageLinkPrefixes feature in core. It is fully backward
compatible.

Also adds a title attribute to each link, again using the same logic as
is used in core for interlanguage links.

Bug: 68359
Change-Id: Id6b1aac8e824859bfd6de3b4a8c7f020ce59579e
---
M RelatedSites.class.php
1 file changed, 29 insertions(+), 1 deletion(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/RelatedSites.class.php b/RelatedSites.class.php
index 60a2653..b16f3b8 100644
--- a/RelatedSites.class.php
+++ b/RelatedSites.class.php
@@ -78,9 +78,34 @@
 
$title = Title::newFromText( $site );
if ( $title ) {
+   // Use the same system message keys as the core 
$wgExtraInterlanguageLinkPrefixes feature
+   $linkTextMsg = wfMessage( 'interlanguage-link-' 
. $title-getInterwiki() );
+   $linkText = $linkTextMsg-isDisabled() ?
+   ( Language::fetchLanguageName( 
$title-getInterwiki() ) ?: $site ) :
+   $linkTextMsg-text();
+
+   // This logic is essentially copied from core 
SkinTemplate#getLanguages
+   $linkTitle = null;
+   $linkTitleMsg = wfMessage( 
'interlanguage-link-sitename-' . $title-getInterwiki() );
+   if ( !$linkTitleMsg-isDisabled() ) {
+   if ( $title-getText() === '' ) {
+   $linkTitle = wfMessage(
+   
'interlanguage-link-title-nonlangonly',
+   $linkTitleMsg-text()
+   )-text();
+   } else {
+   $linkTitle = wfMessage(
+   
'interlanguage-link-title-nonlang',
+   $title-getText(),
+   $linkTitleMsg-text()
+   )-text();
+   }
+   }
+
$relatedSitesUrls[] = array(
'href' = $title-getFullURL(),
-   'text' = Language::fetchLanguageName( 
$title-getInterwiki() ) ?: $site,
+   'text' = $linkText,
+   'title' = $linkTitle,
'class' = 'interwiki-' . $tmp[0]
);
}
@@ -148,6 +173,9 @@
foreach ( (array) $relatedSitesUrls as $url ) {
$attributes = array();
$attributes['href'] = htmlspecialchars( $url['href'] );
+   if ( !empty( $url['title'] ) ) {
+   $attributes['title'] = htmlspecialchars( 
$url['title'] );
+   }
 
if ( $url['text'] == $wgSitename ) {
$attributes['rel'] = 'nofollow';

-- 
To view, visit https://gerrit.wikimedia.org/r/150805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6b1aac8e824859bfd6de3b4a8c7f020ce59579e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedSites
Gerrit-Branch: wmf/1.24wmf15
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: TTO at.li...@live.com.au
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 WikimediaMessages to 1.24wmf15 HEAD - change (mediawiki/core)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150810

Change subject: Update WikimediaMessages to 1.24wmf15 HEAD
..

Update WikimediaMessages to 1.24wmf15 HEAD

Change-Id: If34dc77c9508ea61b2844399e91a5ca9d42a9c1e
---
M extensions/WikimediaMessages
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/10/150810/1

diff --git a/extensions/WikimediaMessages b/extensions/WikimediaMessages
index 2f9fc5a..f06ab26 16
--- a/extensions/WikimediaMessages
+++ b/extensions/WikimediaMessages
-Subproject commit 2f9fc5a871a7de10874262e854dfb40edede425e
+Subproject commit f06ab26ee3c70a3ea26f98a615e880c2b8212c4b

-- 
To view, visit https://gerrit.wikimedia.org/r/150810
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If34dc77c9508ea61b2844399e91a5ca9d42a9c1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf15
Gerrit-Owner: Reedy re...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update RelatedSites to 1.24wmf15 HEAD - change (mediawiki/core)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150811

Change subject: Update RelatedSites to 1.24wmf15 HEAD
..

Update RelatedSites to 1.24wmf15 HEAD

Change-Id: I5ef48b035db05ec8ff3c638c33eaccbd38a9aaa4
---
M extensions/RelatedSites
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/11/150811/1

diff --git a/extensions/RelatedSites b/extensions/RelatedSites
index e36c925..aa77134 16
--- a/extensions/RelatedSites
+++ b/extensions/RelatedSites
-Subproject commit e36c92577f1d0b094ebd668acf17b65b3d2a95c3
+Subproject commit aa77134c35c639154cd9af9a14ef0830ca6032d1

-- 
To view, visit https://gerrit.wikimedia.org/r/150811
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ef48b035db05ec8ff3c638c33eaccbd38a9aaa4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf15
Gerrit-Owner: Reedy re...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update WikimediaMessages to 1.24wmf15 HEAD - change (mediawiki/core)

[Reedy (Code Review)]

Reedy has submitted this change and it was merged.

Change subject: Update WikimediaMessages to 1.24wmf15 HEAD
..


Update WikimediaMessages to 1.24wmf15 HEAD

Change-Id: If34dc77c9508ea61b2844399e91a5ca9d42a9c1e
---
M extensions/WikimediaMessages
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Reedy: Verified; Looks good to me, approved



diff --git a/extensions/WikimediaMessages b/extensions/WikimediaMessages
index 2f9fc5a..f06ab26 16
--- a/extensions/WikimediaMessages
+++ b/extensions/WikimediaMessages
-Subproject commit 2f9fc5a871a7de10874262e854dfb40edede425e
+Subproject commit f06ab26ee3c70a3ea26f98a615e880c2b8212c4b

-- 
To view, visit https://gerrit.wikimedia.org/r/150810
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If34dc77c9508ea61b2844399e91a5ca9d42a9c1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf15
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update RelatedSites to 1.24wmf15 HEAD - change (mediawiki/core)

[Reedy (Code Review)]

Reedy has submitted this change and it was merged.

Change subject: Update RelatedSites to 1.24wmf15 HEAD
..


Update RelatedSites to 1.24wmf15 HEAD

Change-Id: I5ef48b035db05ec8ff3c638c33eaccbd38a9aaa4
---
M extensions/RelatedSites
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Reedy: Verified; Looks good to me, approved



diff --git a/extensions/RelatedSites b/extensions/RelatedSites
index e36c925..aa77134 16
--- a/extensions/RelatedSites
+++ b/extensions/RelatedSites
-Subproject commit e36c92577f1d0b094ebd668acf17b65b3d2a95c3
+Subproject commit aa77134c35c639154cd9af9a14ef0830ca6032d1

-- 
To view, visit https://gerrit.wikimedia.org/r/150811
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ef48b035db05ec8ff3c638c33eaccbd38a9aaa4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf15
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Use `div` instead of `section` - change (mediawiki/core)

[Prtksxna (Code Review)]

Prtksxna has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150812

Change subject: Use `div` instead of `section`
..

Use `div` instead of `section`

This is so that the sizing of the h1's and
the h2's is correct.

Change-Id: Ied1d03f63c132dc3904d05cd4e55f70aa3f80c3d
---
M docs/kss/styleguide-template/index.html
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/12/150812/1

diff --git a/docs/kss/styleguide-template/index.html 
b/docs/kss/styleguide-template/index.html
index b6036b2..4096239 100644
--- a/docs/kss/styleguide-template/index.html
+++ b/docs/kss/styleguide-template/index.html
@@ -33,7 +33,7 @@
{{html overview}}
{{else}}
{{#eachSection rootNumber}}
-   section
+   div
{{#whenDepth 1}}
h1{{ reference }}.0 {{ header 
}}/h1
{{else}}
@@ -60,7 +60,7 @@
{{html 
description}}
{{/if}}
{{/ifAny}}
-   /section
+   /div
{{/eachSection}}
{{/if}}
/article

-- 
To view, visit https://gerrit.wikimedia.org/r/150812
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied1d03f63c132dc3904d05cd4e55f70aa3f80c3d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix bug 68543 - change (pywikibot/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix bug 68543
..


Fix bug 68543

Doesn't matter the sandbox is redirected or not

Change-Id: Ibfc472411a502f2332ccc2930890066198c28398
---
M scripts/clean_sandbox.py
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  John Vandenberg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/scripts/clean_sandbox.py b/scripts/clean_sandbox.py
index 6fc5398..6939777 100755
--- a/scripts/clean_sandbox.py
+++ b/scripts/clean_sandbox.py
@@ -193,8 +193,12 @@
 sandboxPage = pywikibot.Page(self.site, title)
 pywikibot.output(u'Preparing to process sandbox page %s'
  % sandboxPage.title(asLink=True))
+if sandboxPage.isRedirectPage():
+pywikibot.warning(
+u'%s is a redirect page, cleaning it anyway'
+% sandboxPage.title(asLink=True))
 try:
-text = sandboxPage.get()
+text = sandboxPage.get(get_redirect=True)
 if not self.getOption('text'):
 translatedContent = i18n.translate(self.site, content)
 else:

-- 
To view, visit https://gerrit.wikimedia.org/r/150693
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfc472411a502f2332ccc2930890066198c28398
Gerrit-PatchSet: 4
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Bep bjorn.erik.peder...@gmail.com
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] hhvm: create module + list all dev dependencies - change (operations/puppet)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150813

Change subject: hhvm: create module + list all dev dependencies
..

hhvm: create module + list all dev dependencies

Ori requested Jenkins to build extensions with HHVM. To do so we need a
bunch of packages dependencies he listed up on bug 63120.

This patch introduces a hhvm module and a single class
hhvm::packages::dev which contains all the needed packages as requested
by Ori.

Include in on labs Jenkins slaves running Trusty.

I am using ensure_packages() to tentatively avoid duplicate definitions
in puppet.

Bug: 63120
Change-Id: I7c271d65a0856c0d21057618e6eb59ad1bdf421e
---
M modules/contint/manifests/packages/labs.pp
A modules/hhvm/manifests/packages/dev.pp
2 files changed, 66 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/13/150813/1

diff --git a/modules/contint/manifests/packages/labs.pp 
b/modules/contint/manifests/packages/labs.pp
index 81c49e2..737efba 100644
--- a/modules/contint/manifests/packages/labs.pp
+++ b/modules/contint/manifests/packages/labs.pp
@@ -75,4 +75,8 @@
 require  = Package['python-pip'],
 }
 
+if $::lsbdistcodename == 'trusty' {
+include ::hvvm::packages::dev
+}
+
 }
diff --git a/modules/hhvm/manifests/packages/dev.pp 
b/modules/hhvm/manifests/packages/dev.pp
new file mode 100644
index 000..cb3ac46
--- /dev/null
+++ b/modules/hhvm/manifests/packages/dev.pp
@@ -0,0 +1,62 @@
+# == Class hhvm::packages::dev
+#
+# Packages needed for hhvm development such as compiling extensions
+#
+class hhvm::packages::dev {
+
+$packages = [
+'autoconf',
+'automake',
+'binutils-dev',
+'build-essential',
+'cmake',
+'g++',
+'git',
+'hhvm',
+'hhvm-dev',
+'libboost-dev',
+'libboost-filesystem-dev',
+'libboost-program-options-dev',
+'libboost-regex-dev',
+'libboost-system-dev',
+'libboost-thread-dev',
+'libbz2-dev',
+'libc-client-dev',
+'libc-client2007e-dev',
+'libcap-dev',
+'libcurl4-openssl-dev',
+'libdwarf-dev',
+'libedit-dev',
+'libelf-dev',
+'libevent-dev',
+'libexpat-dev',
+'libgd2-xpm-dev',
+'libgoogle-glog-dev',
+'libgoogle-perftools-dev',
+'libiberty-dev',
+'libiconv-hook-dev',
+'libicu-dev',
+'libinotifytools0-dev',
+'libjemalloc-dev',
+'libldap2-dev',
+'liblua5.1-dev',
+'libmagickwand-dev',
+'libmcrypt-dev',
+'libmemcached-dev',
+'libmysqlclient-dev',
+'libncurses-dev',
+'libonig-dev',
+'libpcre3-dev',
+'libreadline-dev',
+'libtbb-dev',
+'libtool',
+'libxml2-dev',
+'libxslt1-dev',
+'libyaml-dev',
+'ocaml-native-compilers',
+'php5-imagick',
+'zlib1g-dev',
+]
+
+ensure_packages($packages)
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/150813
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c271d65a0856c0d21057618e6eb59ad1bdf421e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Disable 'Show All' link if all bars are visible - change (wikimedia/TransparencyReport)

[Prtksxna (Code Review)]

Prtksxna has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150814

Change subject: Disable 'Show All' link if all bars are visible
..

Disable 'Show All' link if all bars are visible

Change-Id: I325c03d128dd55ededf7bf89bfcb0e56bf83c36c
---
M source/javascripts/privacy.js
M source/privacy.html.erb
M source/stylesheets/graph.css.scss
3 files changed, 20 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport 
refs/changes/14/150814/1

diff --git a/source/javascripts/privacy.js b/source/javascripts/privacy.js
index 8da39c1..b7b5580 100644
--- a/source/javascripts/privacy.js
+++ b/source/javascripts/privacy.js
@@ -585,6 +585,15 @@
dispatch.filter();
} );
 
+   dispatch.on( 'filter.show_all', function () {
+   $( '#by_country_show_all, 
#request_type_show_all' ).addClass( 'disabled' );
+   if ( ds.filters.country ) {
+   $( '#by_country_show_all' 
).removeClass( 'disabled' );
+   }
+   if ( ds.filters.type ) {
+   $( '#request_type_show_all' 
).removeClass( 'disabled' );
+   }
+   } );
} );
} );
 
diff --git a/source/privacy.html.erb b/source/privacy.html.erb
index 50e42de..f444edc 100644
--- a/source/privacy.html.erb
+++ b/source/privacy.html.erb
@@ -134,7 +134,7 @@
div class=graph
div class=row
div class=col-md-4
-   h3Request Typea 
id=request_type_show_all href=javascript: void(0)Show All/a/h3
+   h3Request Typea 
id=request_type_show_all href=javascript: void(0) class=disabledShow 
All/a/h3
div id=bar_graph_by_type 
class=bar_graph_horizontal/div
h3Information Produced?/h3
div
@@ -143,7 +143,7 @@
/div
/div
div class=col-md-7
-   h3By Countrya 
id=by_country_show_all href=javascript: void(0)Show All/a/h3
+   h3By Countrya 
id=by_country_show_all href=javascript: void(0) class=disabledShow 
All/a/h3
div id=bar_graph_by_country 
class=bar_graph_horizontal/div
/div
/div
diff --git a/source/stylesheets/graph.css.scss 
b/source/stylesheets/graph.css.scss
index 65916e7..94f7819 100644
--- a/source/stylesheets/graph.css.scss
+++ b/source/stylesheets/graph.css.scss
@@ -48,6 +48,15 @@
font-size: 15px;
margin-left: 5px;
font-family: sans-serif;
+
+   .disabled {
+   color: #ccc;
+   cursor: text;
+
+   :hover {
+   text-decoration: none;
+   }
+   }
}
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/150814
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I325c03d128dd55ededf7bf89bfcb0e56bf83c36c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Documentation and slight refactoring in translation.progress.js - change (mediawiki...ContentTranslation)

[Amire80 (Code Review)]

Amire80 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/150815

Change subject: Documentation and slight refactoring in translation.progress.js
..

Documentation and slight refactoring in translation.progress.js

Change-Id: Ie05221c82d940ade390f31f2f9ca9e04f04d7d1a
---
M modules/translation/ext.cx.translation.progress.js
1 file changed, 27 insertions(+), 24 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/15/150815/1

diff --git a/modules/translation/ext.cx.translation.progress.js 
b/modules/translation/ext.cx.translation.progress.js
index 35c0061..195e845 100644
--- a/modules/translation/ext.cx.translation.progress.js
+++ b/modules/translation/ext.cx.translation.progress.js
@@ -16,12 +16,13 @@
 
/**
 * Get the total source weight.
+* This is only calculated once per session and cached, because the 
source doesn't change.
 * @return {int} Total source weight
 */
function getTotalSourceWeight() {
-   var $sourceContainer,
-   $sections;
+   var $sourceContainer, $sections;
 
+   // Return the cached value
if ( totalSourceWeight ) {
return totalSourceWeight;
}
@@ -54,22 +55,23 @@
 * @return {float} percentage
 */
function getMachineTranslationPercentage() {
-   var sourceWeight,
-   percentage,
-   completedTranslation = 0;
-
-   $( '.cx-column--translation [data-cx-weight]' ).each( function 
() {
-   var $this = $( this );
-
-   if ( $this.data( 'cx-mt' ) === true ) {
-   completedTranslation += $this.data( 'cx-weight' 
);
-   }
-   } );
+   var sourceWeight, percentage, completedTranslation;
 
sourceWeight = getTotalSourceWeight();
if ( sourceWeight === 0 ) {
return 0;
}
+
+   completedTranslation = 0;
+
+   // Sum the weight of all translated sections that have 
machine-translated text
+   $( '.cx-column--translation [data-cx-weight]' ).each( function 
() {
+   var $section = $( this );
+
+   if ( $section.data( 'cx-mt' ) === true ) {
+   completedTranslation += $section.data( 
'cx-weight' );
+   }
+   } );
 
percentage = ( completedTranslation / sourceWeight ) * 100;
 
@@ -81,23 +83,24 @@
 * @return {float} percentage
 */
function getTranslationProgress() {
-   var sourceWeight,
-   percentage,
-   completedTranslation = 0;
-
-   $( '.cx-column--translation [data-cx-weight]' ).each( function 
() {
-   var $this = $( this );
-
-   if ( $this.data( 'cx-mt' ) === false ) {
-   completedTranslation += $this.data( 'cx-weight' 
);
-   }
-   } );
+   var sourceWeight, percentage, completedTranslation;
 
sourceWeight = getTotalSourceWeight();
if ( sourceWeight === 0 ) {
return 0;
}
 
+   completedTranslation = 0;
+
+   // Sum the weight of all translated sections that have any text
+   $( '.cx-column--translation [data-cx-weight]' ).each( function 
() {
+   var $section = $( this );
+
+   if ( $section.data( 'cx-mt' ) === false ) {
+   completedTranslation += $section.data( 
'cx-weight' );
+   }
+   } );
+
percentage = ( completedTranslation / sourceWeight ) * 100;
 
return percentage;

-- 
To view, visit https://gerrit.wikimedia.org/r/150815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie05221c82d940ade390f31f2f9ca9e04f04d7d1a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add log entry - change (mediawiki...mathoid)

[Physikerwelt (Code Review)]

Physikerwelt has submitted this change and it was merged.

Change subject: Add log entry
..


Add log entry

If $wgMathDebug is set the math extension, expects
a debug value to be set.

Change-Id: I206f30dd33840cbe692e9c33d4127620963de8f7
---
M mathoid-worker.js
1 file changed, 12 insertions(+), 11 deletions(-)

Approvals:
  Physikerwelt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/mathoid-worker.js b/mathoid-worker.js
index 9a0a0e3..601e187 100644
--- a/mathoid-worker.js
+++ b/mathoid-worker.js
@@ -82,26 +82,27 @@
 });
 
 
-
 function handleRequest(req, res, q, type) {
-   var mml =true;
+   var mml = true;
//Keep format variables constant
-   if(type == tex){
+   if (type == tex) {
type = TeX
}
-   if(type == mml || type == MathML){
+   if (type == mml || type == MathML) {
type = MathML
mml = false;
}
-   if(type == ascii || type == asciimath ){
+   if (type == ascii || type == asciimath) {
type = AsciiMath
-   }   
-   mjAPI.typeset({math:q, format:type, svg:true, img:true, mml:mml}, 
function (data) {
-   if(data.errors){
+   }
+   mjAPI.typeset({math: q, format: type, svg: true, img: true, mml: mml}, 
function (data) {
+   if (data.errors) {
data.success = false;
+   data.log = Error: + JSON.stringify(data.errors);
} else {
data.success = true;
-   }   
+   data.log = success;
+   }
var jsonData = JSON.stringify(data);
errBuf = new Buffer(jsonData);
res.writeHead(200,
@@ -112,8 +113,8 @@
res.end(errBuf);
 
requestQueue.shift();
-   handleRequests();//*/
-});
+   handleRequests();
+   });
 }
 
 handleRequests = function() {

-- 
To view, visit https://gerrit.wikimedia.org/r/150800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice1e6dbf786ed9af53a05dc740c93738f6b30bfa
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits