date:20141127

[MediaWiki-commits] [Gerrit] Remove unused use clauses - change (mediawiki...Wikibase)

2014-11-27 Thread Adrian Lang (Code Review)

Adrian Lang has uploaded a new change for review.

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

Change subject: Remove unused use clauses
..

Remove unused use clauses

Change-Id: Id84d1a4085214f8aa1ab2ce5809d6a53bedfc5d6
---
M repo/includes/View/ClaimsView.php
1 file changed, 0 insertions(+), 2 deletions(-)


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

diff --git a/repo/includes/View/ClaimsView.php 
b/repo/includes/View/ClaimsView.php
index b0f7153..5d826bd 100644
--- a/repo/includes/View/ClaimsView.php
+++ b/repo/includes/View/ClaimsView.php
@@ -8,9 +8,7 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Snak\Snak;
-use Wikibase\Lib\Store\EntityInfoBuilderFactory;
 use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\ReferencedEntitiesFinder;
 
 /**
  * Generates HTML to display claims.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id84d1a4085214f8aa1ab2ce5809d6a53bedfc5d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] Move ClaimHtmlGenerator to Wikibase\Repo\View - change (mediawiki...Wikibase)

2014-11-27 Thread Adrian Lang (Code Review)

Adrian Lang has uploaded a new change for review.

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

Change subject: Move ClaimHtmlGenerator to Wikibase\Repo\View
..

Move ClaimHtmlGenerator to Wikibase\Repo\View

Change-Id: Ibc725c5ecebf1e321c934fc548b9ad91138ffd7a
---
R repo/includes/View/ClaimHtmlGenerator.php
M repo/includes/View/ClaimsView.php
M repo/includes/View/EntityViewFactory.php
R repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
M repo/tests/phpunit/includes/View/ClaimsViewTest.php
5 files changed, 4 insertions(+), 7 deletions(-)


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

diff --git a/repo/includes/ClaimHtmlGenerator.php 
b/repo/includes/View/ClaimHtmlGenerator.php
similarity index 98%
rename from repo/includes/ClaimHtmlGenerator.php
rename to repo/includes/View/ClaimHtmlGenerator.php
index c5b127c..141ba3e 100644
--- a/repo/includes/ClaimHtmlGenerator.php
+++ b/repo/includes/View/ClaimHtmlGenerator.php
@@ -1,6 +1,6 @@
 ?php
 
-namespace Wikibase;
+namespace Wikibase\Repo\View;
 
 use Wikibase\DataModel\ByPropertyIdArray;
 use Wikibase\DataModel\Claim\Claim;
@@ -9,7 +9,6 @@
 use Wikibase\DataModel\Statement\Statement;
 use Wikibase\Lib\Serializers\ClaimSerializer;
 use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\Repo\View\SnakHtmlGenerator;
 
 /**
  * Base class for generating the HTML for a Claim in Entity View.
diff --git a/repo/includes/View/ClaimsView.php 
b/repo/includes/View/ClaimsView.php
index b0f7153..ccd3c56 100644
--- a/repo/includes/View/ClaimsView.php
+++ b/repo/includes/View/ClaimsView.php
@@ -3,7 +3,6 @@
 namespace Wikibase\Repo\View;
 
 use Linker;
-use Wikibase\ClaimHtmlGenerator;
 use Wikibase\DataModel\Claim\Claim;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\Property;
diff --git a/repo/includes/View/EntityViewFactory.php 
b/repo/includes/View/EntityViewFactory.php
index 8c2afad..5a047c2 100644
--- a/repo/includes/View/EntityViewFactory.php
+++ b/repo/includes/View/EntityViewFactory.php
@@ -6,7 +6,6 @@
 use Language;
 use ValueFormatters\FormatterOptions;
 use ValueFormatters\ValueFormatter;
-use Wikibase\ClaimHtmlGenerator;
 use Wikibase\EntityView;
 use Wikibase\ItemView;
 use Wikibase\LanguageFallbackChain;
diff --git a/repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php 
b/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
similarity index 98%
rename from repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php
rename to repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
index eddb0ee..37fea2f 100644
--- a/repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php
+++ b/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
@@ -4,7 +4,6 @@
 
 use DataValues\StringValue;
 use Title;
-use Wikibase\ClaimHtmlGenerator;
 use Wikibase\DataModel\Claim\Claim;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Reference;
@@ -16,6 +15,7 @@
 use Wikibase\Lib\DispatchingSnakFormatter;
 use Wikibase\Lib\SnakFormatter;
 use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Repo\View\ClaimHtmlGenerator;
 use Wikibase\Repo\View\SnakHtmlGenerator;
 
 /**
diff --git a/repo/tests/phpunit/includes/View/ClaimsViewTest.php 
b/repo/tests/phpunit/includes/View/ClaimsViewTest.php
index da3ac43..60a3343 100644
--- a/repo/tests/phpunit/includes/View/ClaimsViewTest.php
+++ b/repo/tests/phpunit/includes/View/ClaimsViewTest.php
@@ -5,7 +5,6 @@
 use DataValues\StringValue;
 use TestUser;
 use Title;
-use Wikibase\ClaimHtmlGenerator;
 use Wikibase\DataModel\Claim\Claim;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityIdValue;
@@ -17,6 +16,7 @@
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikibase\DataModel\Snak\Snak;
 use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Repo\View\ClaimHtmlGenerator;
 use Wikibase\Repo\View\ClaimsView;
 use Wikibase\Repo\View\SectionEditLinkGenerator;
 use Wikibase\Repo\WikibaseRepo;
@@ -160,7 +160,7 @@
 * @return ClaimHtmlGenerator
 */
private function getClaimHtmlGeneratorMock() {
-   $claimHtmlGenerator = $this-getMockBuilder( 
'Wikibase\ClaimHtmlGenerator' )
+   $claimHtmlGenerator = $this-getMockBuilder( 
'Wikibase\Repo\View\ClaimHtmlGenerator' )
-disableOriginalConstructor()
-getMock();
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc725c5ecebf1e321c934fc548b9ad91138ffd7a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] Fix broken @see in Number(Un)Localizer doc - change (mediawiki...Wikibase)

2014-11-27 Thread WMDE

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

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

Change subject: Fix broken @see in Number(Un)Localizer doc
..

Fix broken @see in Number(Un)Localizer doc

Also see https://github.com/DataValues/Number/pull/14

Change-Id: Iad716fb67f14980b35ab32e2a333cfb00a8eee81
---
M lib/includes/formatters/MediaWikiNumberLocalizer.php
M lib/includes/parsers/MediaWikiNumberUnlocalizer.php
2 files changed, 11 insertions(+), 13 deletions(-)


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

diff --git a/lib/includes/formatters/MediaWikiNumberLocalizer.php 
b/lib/includes/formatters/MediaWikiNumberLocalizer.php
index c23eeb3..a6c0d70 100644
--- a/lib/includes/formatters/MediaWikiNumberLocalizer.php
+++ b/lib/includes/formatters/MediaWikiNumberLocalizer.php
@@ -19,7 +19,7 @@
/**
 * @var Language
 */
-   protected $language;
+   private $language;
 
/**
 * @param Language $language
@@ -29,17 +29,16 @@
}
 
/**
-* @see Localizer::localize()
+* @see NumberLocalizer::localizeNumber
 *
-* @since 0.5
+* @param string|int|float $number
 *
-* @param string $number a numeric string
-*
-* @return string
 * @throws InvalidArgumentException
+* @return string
 */
public function localizeNumber( $number ) {
-   $localiezdNumber = $this-language-formatNum( $number );
-   return $localiezdNumber;
+   $localizedNumber = $this-language-formatNum( $number );
+   return $localizedNumber;
}
+
 }
diff --git a/lib/includes/parsers/MediaWikiNumberUnlocalizer.php 
b/lib/includes/parsers/MediaWikiNumberUnlocalizer.php
index 25e91e0..691bf2e 100644
--- a/lib/includes/parsers/MediaWikiNumberUnlocalizer.php
+++ b/lib/includes/parsers/MediaWikiNumberUnlocalizer.php
@@ -1,12 +1,11 @@
 ?php
 
 namespace Wikibase\Lib;
+
 use Language;
 use ValueParsers\BasicNumberUnlocalizer;
 
 /**
- * MediaWikiNumberUnlocalizer
- *
  * @since 0.5
  *
  * @license GPL 2+
@@ -33,11 +32,11 @@
}
 
/**
-* @see Unlocalizer::unlocalize()
+* @see NumberUnlocalizer::unlocalizeNumber
 *
 * @param string $number string to process
 *
-* @return string unlocalized string
+* @return string unlocalized number, in a form suitable for floatval 
resp. intval.
 */
public function unlocalizeNumber( $number ) {
$canonicalizedNumber = $this-language-parseFormattedNumber( 
$number );
@@ -52,7 +51,7 @@
}
 
/**
-* @see Unlocalizer::getNumberRegex()
+* @see NumberUnlocalizer::getNumberRegex
 *
 * Constructs a regular expression based on 
Language::digitTransformTable()
 * and Language::separatorTransformTable().

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad716fb67f14980b35ab32e2a333cfb00a8eee81
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] labs: make mwyaml hiera backend first lookup - change (operations/puppet)

2014-11-27 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: labs: make mwyaml hiera backend first lookup
..


labs: make mwyaml hiera backend first lookup

Change the backend order for hiera lookups in labs so that settings
provided by the mwyaml backend will take precedence over settings made
in the on disk yaml files. This was found to be necessary by
experimentation in the beta cluster.

Change-Id: Ib718cc83521d0268d859a955feb3615f277a51d2
---
M modules/puppetmaster/files/labs.hiera.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/puppetmaster/files/labs.hiera.yaml 
b/modules/puppetmaster/files/labs.hiera.yaml
index 93b0360..02b2e07 100644
--- a/modules/puppetmaster/files/labs.hiera.yaml
+++ b/modules/puppetmaster/files/labs.hiera.yaml
@@ -1,6 +1,6 @@
 :backends:
-  - nuyaml
   - mwyaml
+  - nuyaml
 :nuyaml:
   :datadir: /etc/puppet/hieradata
   :expand_path:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib718cc83521d0268d859a955feb3615f277a51d2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@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] Allow browsing all published queries. - change (analytics...web)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Allow browsing all published queries.
..


Allow browsing all published queries.

Bug: T72735
Change-Id: I164d1bd5b64932d113a4d8fe2306c3185c48ca23
---
M quarry/web/app.py
A quarry/web/static/css/query/list.css
M quarry/web/templates/query/list.html
M quarry/web/utils/pagination.py
4 files changed, 56 insertions(+), 9 deletions(-)

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



diff --git a/quarry/web/app.py b/quarry/web/app.py
index da60c9d..862f09c 100644
--- a/quarry/web/app.py
+++ b/quarry/web/app.py
@@ -39,6 +39,14 @@
 
 class QueriesRangeBasedPagination(RangeBasedPagination):
 
+def get_page_link(self, page_key, limit):
+get_params = dict(request.args)
+get_params.update({
+'from': page_key, 'limit': limit})
+return url_for('query_runs_all', **dict(
+[(key, value) for key, value in get_params.items()])
+)
+
 def order_queryset(self):
 if self.direction == 'next':
 self.queryset = self.queryset.order_by(desc(QueryRun.timestamp))
@@ -310,17 +318,23 @@
 
 
 @app.route(/query/runs/all)
-def all_query_runs():
+def query_runs_all():
 queries = g.conn.session.query(Query)\
 .join(Query.latest_rev).join(QueryRevision.latest_run)
+queries_filter = 'all'
+if request.args.get('published') == 'true':
+queries = queries.filter(Query.published)
+queries_filter = 'published'
 limit = int(request.args.get(
 'limit', app.config.get('QUERY_RESULTS_PER_PAGE', 50)))
 queries, prev_link, next_link = QueriesRangeBasedPagination(
 queries, request.args.get('from'), limit,
-'/query/runs/all', request.referrer).paginate()
+request.path,
+request.referrer, dict(request.args)).paginate()
 return render_template(
 query/list.html, user=get_user(), queries=queries,
-prev_link=prev_link, next_link=next_link)
+prev_link=prev_link, next_link=next_link,
+queries_filter=queries_filter)
 
 
 @app.route('/run/int:qrun_id/status')
diff --git a/quarry/web/static/css/query/list.css 
b/quarry/web/static/css/query/list.css
new file mode 100644
index 000..732d1d3
--- /dev/null
+++ b/quarry/web/static/css/query/list.css
@@ -0,0 +1,3 @@
+.query-list-filters {
+margin-bottom: 10px;
+}
diff --git a/quarry/web/templates/query/list.html 
b/quarry/web/templates/query/list.html
index a500564..9f3a34c 100644
--- a/quarry/web/templates/query/list.html
+++ b/quarry/web/templates/query/list.html
@@ -1,10 +1,19 @@
 {% set active_page = query-runs-all %}
 {% extends base.html %}
 {% block head %}
+link rel=stylesheet href=/static/css/query/list.css
 script src=/static/js/query/list.js /script
 {% endblock %}
 {% block content %}
 div id=content class=container
+div class=query-list-filters btn-group btn-group-sm pull-right 
role=group
+  button type=button class=btn btn-default{% if queries_filter == 
'all' %} active{% endif %}
+  a href=/query/runs/allAll queries/a
+  /button
+  button type=button class=btn btn-default{% if queries_filter == 
'published' %} active{% endif %}
+  a href=/query/runs/all?published=truePublished queries/a
+  /button
+/div
 table class=table table-bordered table-hover
 {% if queries %}
 tr
diff --git a/quarry/web/utils/pagination.py b/quarry/web/utils/pagination.py
index 6bcbf06..8342d00 100644
--- a/quarry/web/utils/pagination.py
+++ b/quarry/web/utils/pagination.py
@@ -2,7 +2,8 @@
 
 Generic range based pagination.
 
-def __init__(self, queryset, page_key, limit, base_url, referrer_url=None):
+def __init__(self, queryset, page_key, limit, base_url, referrer_url=None,
+ get_params={}):
 
 Instantiate RangeBasedPagination.
 
@@ -18,13 +19,15 @@
 base_url: A string for the base url of the paginated view.
 referrer_url: A string for url from which the current page
 has been referred.
+get_params: A dictionary for request's GET parameters.
 
 self.queryset = queryset
 self.page_key = page_key
 self.limit = abs(limit)
 self.direction = 'next' if limit = 0 else 'prev'
 self.base_url = base_url
-self.referrer_url = referrer_url
+self.referrer_url = referrer_url or ''
+self.get_params = get_params or {}
 
 def paginate(self):
 
@@ -102,15 +105,14 @@
 if self.page_key and (self.direction == 'next' or (
 self.direction == 'prev' and
 page_items_count == self.limit)):
-prev_link = '{url}?from={page_key}limit={limit}'.format(
-url=self.base_url,
+
+prev_link = self.get_page_link(

[MediaWiki-commits] [Gerrit] codfw-prod: add ms-be2013 - change (operations...swift-ring)

2014-11-27 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: codfw-prod: add ms-be2013
..

codfw-prod: add ms-be2013

Change-Id: I7844775a72b727792979aae3e95bf50df35d1585
---
M codfw-prod/account.builder
M codfw-prod/account.dump
M codfw-prod/account.ring.gz
M codfw-prod/container.builder
M codfw-prod/container.dump
M codfw-prod/container.ring.gz
M codfw-prod/object.builder
M codfw-prod/object.dump
M codfw-prod/object.ring.gz
9 files changed, 230 insertions(+), 214 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-ring 
refs/changes/31/176231/1

diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder
index ec7f7fe..9f7 100644
--- a/codfw-prod/account.builder
+++ b/codfw-prod/account.builder
Binary files differ
diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump
index bd57758..9e9c054 100644
--- a/codfw-prod/account.dump
+++ b/codfw-prod/account.dump
@@ -1,30 +1,32 @@
-codfw-prod/account.builder, build version 29
-65536 partitions, 3.00 replicas, 1 regions, 3 zones, 26 devices, 0.06 
balance
+codfw-prod/account.builder, build version 32
+65536 partitions, 3.00 replicas, 1 regions, 3 zones, 28 devices, 0.02 
balance
 The minimum number of hours before a partition can be reassigned is 3
 Devices:id  region  zone  ip address  port  replication ip  
replication port  name weight partitions balance meta
- 0   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdm3  92.00   77700.00 
- 1   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdn3  92.00   77700.00 
- 2   1 210.192.16.21  600210.192.16.21 
 6002  sdm3  92.00   77700.00 
- 3   1 210.192.16.21  600210.192.16.21 
 6002  sdn3  92.00   77700.00 
- 4   1 310.192.32.14  600210.192.32.14 
 6002  sdm3  92.00   77700.00 
- 5   1 310.192.32.14  600210.192.32.14 
 6002  sdn3  92.00   77700.00 
- 6   1 1 10.192.0.20  6002 10.192.0.20 
 6002  sdm3  92.00   77700.00 
- 7   1 1 10.192.0.20  6002 10.192.0.20 
 6002  sdn3  92.00   77700.00 
- 8   1 1 10.192.0.21  6002 10.192.0.21 
 6002  sdm3  92.00   77700.00 
- 9   1 1 10.192.0.21  6002 10.192.0.21 
 6002  sdn3  92.00   77700.00 
-10   1 1 10.192.0.22  6002 10.192.0.22 
 6002  sdm3  92.00   77700.00 
-11   1 1 10.192.0.22  6002 10.192.0.22 
 6002  sdn3  92.00   77700.00 
-12   1 210.192.16.22  600210.192.16.22 
 6002  sdm3  92.00   77700.00 
-13   1 210.192.16.22  600210.192.16.22 
 6002  sdn3  92.00   77700.00 
-14   1 210.192.16.23  600210.192.16.23 
 6002  sdm3  92.00   77700.00 
-15   1 210.192.16.23  600210.192.16.23 
 6002  sdn3  92.00   77700.00 
-16   1 210.192.16.24  600210.192.16.24 
 6002  sdm3  92.00   77700.00 
-17   1 210.192.16.24  600210.192.16.24 
 6002  sdn3  92.00   77700.00 
-18   1 310.192.32.15  600210.192.32.15 
 6002  sdm3  92.00   77700.00 
-19   1 310.192.32.15  600210.192.32.15 
 6002  sdn3  92.00   77700.00 
-20   1 310.192.32.16  600210.192.32.16 
 6002  sdm3  92.00   77700.00 
-21   1 310.192.32.16  600210.192.32.16 
 6002  sdn3  92.00   77700.00 
-22   1 310.192.32.17  600210.192.32.17 
 6002  sdm3  92.00   77700.00 
-23   1 310.192.32.17  600210.192.32.17 
 6002  sdn3  92.00   77700.00 
-24   1 210.192.16.32  600210.192.16.32 
 6002  sdm3  60.00   5064   -0.06 
-25   1 210.192.16.32  600210.192.16.32 
 6002  sdn3  60.00   5064   -0.06 
+ 0   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdm3  92.00   73890.00 
+ 1   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdn3  92.00   73890.00 
+

[MediaWiki-commits] [Gerrit] codfw-prod: add ms-be2013 - change (operations...swift-ring)

2014-11-27 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: codfw-prod: add ms-be2013
..


codfw-prod: add ms-be2013

Change-Id: I7844775a72b727792979aae3e95bf50df35d1585
---
M codfw-prod/account.builder
M codfw-prod/account.dump
M codfw-prod/account.ring.gz
M codfw-prod/container.builder
M codfw-prod/container.dump
M codfw-prod/container.ring.gz
M codfw-prod/object.builder
M codfw-prod/object.dump
M codfw-prod/object.ring.gz
9 files changed, 230 insertions(+), 214 deletions(-)

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



diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder
index ec7f7fe..9f7 100644
--- a/codfw-prod/account.builder
+++ b/codfw-prod/account.builder
Binary files differ
diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump
index bd57758..9e9c054 100644
--- a/codfw-prod/account.dump
+++ b/codfw-prod/account.dump
@@ -1,30 +1,32 @@
-codfw-prod/account.builder, build version 29
-65536 partitions, 3.00 replicas, 1 regions, 3 zones, 26 devices, 0.06 
balance
+codfw-prod/account.builder, build version 32
+65536 partitions, 3.00 replicas, 1 regions, 3 zones, 28 devices, 0.02 
balance
 The minimum number of hours before a partition can be reassigned is 3
 Devices:id  region  zone  ip address  port  replication ip  
replication port  name weight partitions balance meta
- 0   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdm3  92.00   77700.00 
- 1   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdn3  92.00   77700.00 
- 2   1 210.192.16.21  600210.192.16.21 
 6002  sdm3  92.00   77700.00 
- 3   1 210.192.16.21  600210.192.16.21 
 6002  sdn3  92.00   77700.00 
- 4   1 310.192.32.14  600210.192.32.14 
 6002  sdm3  92.00   77700.00 
- 5   1 310.192.32.14  600210.192.32.14 
 6002  sdn3  92.00   77700.00 
- 6   1 1 10.192.0.20  6002 10.192.0.20 
 6002  sdm3  92.00   77700.00 
- 7   1 1 10.192.0.20  6002 10.192.0.20 
 6002  sdn3  92.00   77700.00 
- 8   1 1 10.192.0.21  6002 10.192.0.21 
 6002  sdm3  92.00   77700.00 
- 9   1 1 10.192.0.21  6002 10.192.0.21 
 6002  sdn3  92.00   77700.00 
-10   1 1 10.192.0.22  6002 10.192.0.22 
 6002  sdm3  92.00   77700.00 
-11   1 1 10.192.0.22  6002 10.192.0.22 
 6002  sdn3  92.00   77700.00 
-12   1 210.192.16.22  600210.192.16.22 
 6002  sdm3  92.00   77700.00 
-13   1 210.192.16.22  600210.192.16.22 
 6002  sdn3  92.00   77700.00 
-14   1 210.192.16.23  600210.192.16.23 
 6002  sdm3  92.00   77700.00 
-15   1 210.192.16.23  600210.192.16.23 
 6002  sdn3  92.00   77700.00 
-16   1 210.192.16.24  600210.192.16.24 
 6002  sdm3  92.00   77700.00 
-17   1 210.192.16.24  600210.192.16.24 
 6002  sdn3  92.00   77700.00 
-18   1 310.192.32.15  600210.192.32.15 
 6002  sdm3  92.00   77700.00 
-19   1 310.192.32.15  600210.192.32.15 
 6002  sdn3  92.00   77700.00 
-20   1 310.192.32.16  600210.192.32.16 
 6002  sdm3  92.00   77700.00 
-21   1 310.192.32.16  600210.192.32.16 
 6002  sdn3  92.00   77700.00 
-22   1 310.192.32.17  600210.192.32.17 
 6002  sdm3  92.00   77700.00 
-23   1 310.192.32.17  600210.192.32.17 
 6002  sdn3  92.00   77700.00 
-24   1 210.192.16.32  600210.192.16.32 
 6002  sdm3  60.00   5064   -0.06 
-25   1 210.192.16.32  600210.192.16.32 
 6002  sdn3  60.00   5064   -0.06 
+ 0   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdm3  92.00   73890.00 
+ 1   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdn3  92.00   73890.00 
+ 2   1 210.192.16.21  600210.192.16.21

[MediaWiki-commits] [Gerrit] Add jobs for WikibaseJavaScriptApi - change (integration/config)

2014-11-27 Thread Adrian Lang (Code Review)

Adrian Lang has uploaded a new change for review.

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

Change subject: Add jobs for WikibaseJavaScriptApi
..

Add jobs for WikibaseJavaScriptApi

Change-Id: Ibbae82c943b44b98202060c631a9309608738c12
---
M zuul/layout.yaml
1 file changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/32/176232/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 57306a0..82d2978 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5767,6 +5767,22 @@
   - mwext-Wikibase-client-tests
   - mwext-Wikibase-qunit
 
+  - name: mediawiki/extensions/WikibaseJavaScriptApi
+check:
+  - mwext-WikibaseJavaScriptApi-jslint
+  - mwext-WikibaseJavaScriptApi-lint
+  - php-composer-validate
+test:
+  - mwext-WikibaseJavaScriptApi-jslint
+  - mwext-WikibaseJavaScriptApi-lint
+  - php-composer-validate
+  - mwext-WikibaseJavaScriptApi-qunit
+gate-and-submit:
+  - mwext-WikibaseJavaScriptApi-jslint
+  - mwext-WikibaseJavaScriptApi-lint
+  - php-composer-validate
+  - mwext-WikibaseJavaScriptApi-qunit
+
   - name: mediawiki/extensions/Wikidata
 template:
   - name: extension-unittests

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbae82c943b44b98202060c631a9309608738c12
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] make deploy safer by default, require DESTHOST - change (operations...swift-ring)

2014-11-27 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: make deploy safer by default, require DESTHOST
..

make deploy safer by default, require DESTHOST

this should avoid accidentally typing make deploy and triggering a deploy,
require DESTHOST instead and update README

Change-Id: I633a1aea460b444efde0cad589ac7d00a2c5daf3
---
M Makefile
M README.md
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-ring 
refs/changes/33/176233/1

diff --git a/Makefile b/Makefile
index c819363..d238ce8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DESTHOST=palladium.eqiad.wmnet
+DESTHOST=
 TARGETS=eqiad-prod esams-prod codfw-prod
 
 BUILDER_FILES=$(foreach dir,$(TARGETS),$(wildcard $(dir)/*.builder))
@@ -17,6 +17,7 @@
 
 # TODO(fgiunchedi): rsync HEAD, not the working tree
 deploy:
+   [ -n $(DESTHOST) ] || { echo 'set DESTHOST to deploy'; exit 1; }
rsync --progress --verbose --archive --compress --relative \
$(RING_FILES) $(BUILDER_FILES) $(DESTHOST):swift-ring
ssh $(DESTHOST) sudo rsync --verbose --backup --recursive \
diff --git a/README.md b/README.md
index fac67d8..29e2e7f 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@
   review
 * Once merged, deploy the rings to the puppet master:
 
-make deploy
+make deploy DESTHOST=puppet.eqiad.wmnet
 
 
 Testing

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I633a1aea460b444efde0cad589ac7d00a2c5daf3
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/swift-ring
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] make deploy safer by default, require DESTHOST - change (operations...swift-ring)

2014-11-27 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: make deploy safer by default, require DESTHOST
..


make deploy safer by default, require DESTHOST

this should avoid accidentally typing make deploy and triggering a deploy,
require DESTHOST instead and update README

Change-Id: I633a1aea460b444efde0cad589ac7d00a2c5daf3
---
M Makefile
M README.md
2 files changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/Makefile b/Makefile
index c819363..d238ce8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DESTHOST=palladium.eqiad.wmnet
+DESTHOST=
 TARGETS=eqiad-prod esams-prod codfw-prod
 
 BUILDER_FILES=$(foreach dir,$(TARGETS),$(wildcard $(dir)/*.builder))
@@ -17,6 +17,7 @@
 
 # TODO(fgiunchedi): rsync HEAD, not the working tree
 deploy:
+   [ -n $(DESTHOST) ] || { echo 'set DESTHOST to deploy'; exit 1; }
rsync --progress --verbose --archive --compress --relative \
$(RING_FILES) $(BUILDER_FILES) $(DESTHOST):swift-ring
ssh $(DESTHOST) sudo rsync --verbose --backup --recursive \
diff --git a/README.md b/README.md
index fac67d8..29e2e7f 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@
   review
 * Once merged, deploy the rings to the puppet master:
 
-make deploy
+make deploy DESTHOST=puppet.eqiad.wmnet
 
 
 Testing

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I633a1aea460b444efde0cad589ac7d00a2c5daf3
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/swift-ring
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Move {Entity, Property, Item}View to Wikibase\Repo\View - change (mediawiki...Wikibase)

2014-11-27 Thread Adrian Lang (Code Review)

Adrian Lang has uploaded a new change for review.

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

Change subject: Move {Entity,Property,Item}View to Wikibase\Repo\View
..

Move {Entity,Property,Item}View to Wikibase\Repo\View

Change-Id: I42cdba5ccd507a530fd9a56cda29739577994da3
---
R repo/includes/View/EntityView.php
M repo/includes/View/EntityViewFactory.php
R repo/includes/View/ItemView.php
R repo/includes/View/PropertyView.php
M repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
M repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
R repo/tests/phpunit/includes/View/EntityViewTest.php
R repo/tests/phpunit/includes/View/ItemViewTest.php
R repo/tests/phpunit/includes/View/PropertyViewTest.php
9 files changed, 15 insertions(+), 20 deletions(-)


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

diff --git a/repo/includes/EntityView.php b/repo/includes/View/EntityView.php
similarity index 97%
rename from repo/includes/EntityView.php
rename to repo/includes/View/EntityView.php
index 137a03c..ee53a3b 100644
--- a/repo/includes/EntityView.php
+++ b/repo/includes/View/EntityView.php
@@ -1,14 +1,12 @@
 ?php
 
-namespace Wikibase;
+namespace Wikibase\Repo\View;
 
 use Html;
 use InvalidArgumentException;
 use Language;
 use Wikibase\DataModel\Entity\Entity;
-use Wikibase\Repo\View\ClaimsView;
-use Wikibase\Repo\View\FingerprintView;
-use Wikibase\Repo\View\TextInjector;
+use Wikibase\EntityRevision;
 
 /**
  * Base class for creating views for all different kinds of Wikibase\Entity.
diff --git a/repo/includes/View/EntityViewFactory.php 
b/repo/includes/View/EntityViewFactory.php
index 5a047c2..95cd0f5 100644
--- a/repo/includes/View/EntityViewFactory.php
+++ b/repo/includes/View/EntityViewFactory.php
@@ -6,15 +6,12 @@
 use Language;
 use ValueFormatters\FormatterOptions;
 use ValueFormatters\ValueFormatter;
-use Wikibase\EntityView;
-use Wikibase\ItemView;
 use Wikibase\LanguageFallbackChain;
 use Wikibase\Lib\OutputFormatSnakFormatterFactory;
 use Wikibase\Lib\SnakFormatter;
 use Wikibase\Lib\Store\EntityLookup;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Store\LabelLookup;
-use Wikibase\PropertyView;
 
 /**
  * @since 0.5
diff --git a/repo/includes/ItemView.php b/repo/includes/View/ItemView.php
similarity index 95%
rename from repo/includes/ItemView.php
rename to repo/includes/View/ItemView.php
index e506d21..a3946ef 100644
--- a/repo/includes/ItemView.php
+++ b/repo/includes/View/ItemView.php
@@ -1,11 +1,10 @@
 ?php
 
-namespace Wikibase;
+namespace Wikibase\Repo\View;
 
 use InvalidArgumentException;
 use Wikibase\DataModel\Entity\Item;
-use Wikibase\Repo\View\SectionEditLinkGenerator;
-use Wikibase\Repo\View\SiteLinksView;
+use Wikibase\EntityRevision;
 use Wikibase\Repo\WikibaseRepo;
 
 /**
diff --git a/repo/includes/PropertyView.php 
b/repo/includes/View/PropertyView.php
similarity index 96%
rename from repo/includes/PropertyView.php
rename to repo/includes/View/PropertyView.php
index 6e8786b..742cfc0 100644
--- a/repo/includes/PropertyView.php
+++ b/repo/includes/View/PropertyView.php
@@ -1,10 +1,11 @@
 ?php
 
-namespace Wikibase;
+namespace Wikibase\Repo\View;
 
 use DataTypes\DataType;
 use InvalidArgumentException;
 use Wikibase\DataModel\Entity\Property;
+use Wikibase\EntityRevision;
 use Wikibase\Repo\WikibaseRepo;
 
 /**
diff --git a/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php 
b/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
index 66210a3..cc43627 100644
--- a/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
+++ b/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
@@ -77,7 +77,7 @@
-disableOriginalConstructor()
-getMock();
 
-   $entityView = $this-getMockBuilder( 'Wikibase\EntityView' )
+   $entityView = $this-getMockBuilder( 
'Wikibase\Repo\View\EntityView' )
-disableOriginalConstructor()
-getMock();
 
diff --git a/repo/tests/phpunit/includes/View/EntityViewFactoryTest.php 
b/repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
index ff72816..979cdb4 100644
--- a/repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
+++ b/repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
@@ -38,8 +38,8 @@
 
public function newEntityViewProvider() {
return array(
-   array( 'Wikibase\ItemView', 'item' ),
-   array( 'Wikibase\PropertyView', 'property' )
+   array( 'Wikibase\Repo\View\ItemView', 'item' ),
+   array( 'Wikibase\Repo\View\PropertyView', 'property' )
);
}
 
diff --git a/repo/tests/phpunit/includes/EntityViewTest.php 
b/repo/tests/phpunit/includes/View/EntityViewTest.php
similarity index 98%
rename from

[MediaWiki-commits] [Gerrit] [BrowserTest] Fixed a couple of page elements - change (mediawiki...VisualEditor)

2014-11-27 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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

Change subject: [BrowserTest] Fixed a couple of page elements
..

[BrowserTest] Fixed a couple of page elements

Change-Id: Ia4652896243705651c86ff5f83dbd03029757705
Paired-With: Amir Aharoni
Bug: T76133
---
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git 
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb 
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index 5470d80..37c01be 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -49,13 +49,13 @@
   a(:edit_wikitext, title: /You can edit this page\./)
   span(:ex, text: 'Return to save form')
   a(:first_reference, text: '[1]', index: 1)
-  div(:formatting_option_menus, class: 'oo-ui-toolGroup-tools 
oo-ui-clippableElement-clippable', index: 1)
+  div(:formatting_option_menus, class: 'oo-ui-toolGroup-tools 
oo-ui-clippableElement-clippable', index: 2)
   img(:formula_image, class: 'mwe-math-fallback-png-inline')
   span(:formula_insert_menu, class: 'oo-ui-tool-name-math')
   a(:formula_link, css: 'span.oo-ui-tool-name-math  a.oo-ui-tool-link')
   a(:heading, text: /Heading/)
   span(:hamburger_menu, css: 'div.oo-ui-listToolGroup:nth-child(2)  
span:nth-child(1)  span:nth-child(3)')
-  div(:heading_dropdown_menus, class: 'oo-ui-toolGroup-tools 
oo-ui-clippableElement-clippable')
+  div(:heading_dropdown_menus, class: 'oo-ui-toolGroup-tools 
oo-ui-clippableElement-clippable', index: 1)
   div(:iframe, css: 'div.oo-ui-window-setup  div.oo-ui-window-frame')
   span(:increase_indentation, class: 'oo-ui-iconElement-icon 
oo-ui-icon-indent-list')
   div(:indentation_pull_down, class: 'oo-ui-toolGroup-tools 
oo-ui-clippableElement-clippable', index: 3)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4652896243705651c86ff5f83dbd03029757705
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
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] Revert ocg: Temp hack to bypass hiera for redis passwords - change (operations/puppet)

2014-11-27 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: Revert ocg: Temp hack to bypass hiera for redis passwords
..

Revert ocg: Temp hack to bypass hiera for redis passwords

This reverts commit cf6ff6f9e3c6aa7586d5b17ca51d8eaf7648b5a4.

Change-Id: I7666c442772eb28eaf696a5d10a54a6bd19e73a7
---
M modules/ocg/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/176236/1

diff --git a/modules/ocg/manifests/init.pp b/modules/ocg/manifests/init.pp
index 871aeef..50bfae6 100644
--- a/modules/ocg/manifests/init.pp
+++ b/modules/ocg/manifests/init.pp
@@ -15,7 +15,7 @@
 $service_port = 8000,
 $redis_host = 'localhost',
 $redis_port = 6379,
-$redis_password = $::passwords::redis::main_password, # HACK: Temp fix for 
https://phabricator.wikimedia.org/T76111
+$redis_password = '',
 $statsd_host = 'localhost',
 $statsd_port = 8125,
 $statsd_is_txstatsd = 0,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7666c442772eb28eaf696a5d10a54a6bd19e73a7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Revert ocg: Temp hack to bypass hiera for redis passwords - change (operations/puppet)

2014-11-27 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Revert ocg: Temp hack to bypass hiera for redis passwords
..


Revert ocg: Temp hack to bypass hiera for redis passwords

This reverts commit cf6ff6f9e3c6aa7586d5b17ca51d8eaf7648b5a4.

Change-Id: I7666c442772eb28eaf696a5d10a54a6bd19e73a7
---
M modules/ocg/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/modules/ocg/manifests/init.pp b/modules/ocg/manifests/init.pp
index 871aeef..50bfae6 100644
--- a/modules/ocg/manifests/init.pp
+++ b/modules/ocg/manifests/init.pp
@@ -15,7 +15,7 @@
 $service_port = 8000,
 $redis_host = 'localhost',
 $redis_port = 6379,
-$redis_password = $::passwords::redis::main_password, # HACK: Temp fix for 
https://phabricator.wikimedia.org/T76111
+$redis_password = '',
 $statsd_host = 'localhost',
 $statsd_port = 8125,
 $statsd_is_txstatsd = 0,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7666c442772eb28eaf696a5d10a54a6bd19e73a7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@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] Inject siteLinkGroups into ItemView - change (mediawiki...Wikibase)

2014-11-27 Thread Adrian Lang (Code Review)

Adrian Lang has uploaded a new change for review.

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

Change subject: Inject siteLinkGroups into ItemView
..

Inject siteLinkGroups into ItemView

Change-Id: Icd9af0daf0353245eeb73c225dd9121a762d5e98
---
M repo/includes/View/EntityView.php
M repo/includes/View/EntityViewFactory.php
M repo/includes/View/ItemView.php
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
5 files changed, 48 insertions(+), 7 deletions(-)


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

diff --git a/repo/includes/View/EntityView.php 
b/repo/includes/View/EntityView.php
index ee53a3b..59731f1 100644
--- a/repo/includes/View/EntityView.php
+++ b/repo/includes/View/EntityView.php
@@ -45,6 +45,11 @@
 */
protected $textInjector;
 
+   /**
+* @param FingerprintView $fingerprintView
+* @param ClaimsView $claimsView
+* @param Language $language
+*/
public function __construct(
FingerprintView $fingerprintView,
ClaimsView $claimsView,
diff --git a/repo/includes/View/EntityViewFactory.php 
b/repo/includes/View/EntityViewFactory.php
index 95cd0f5..de04594 100644
--- a/repo/includes/View/EntityViewFactory.php
+++ b/repo/includes/View/EntityViewFactory.php
@@ -41,15 +41,22 @@
 */
private $sectionEditLinkGenerator;
 
+   /**
+* @var string[]
+*/
+   private $siteLinkGroups;
+
public function __construct(
EntityTitleLookup $entityTitleLookup,
EntityLookup $entityLookup,
-   OutputFormatSnakFormatterFactory $snakFormatterFactory
+   OutputFormatSnakFormatterFactory $snakFormatterFactory,
+   array $siteLinkGroups
) {
$this-entityTitleLookup = $entityTitleLookup;
$this-entityLookup = $entityLookup;
$this-snakFormatterFactory = $snakFormatterFactory;
$this-sectionEditLinkGenerator = new 
SectionEditLinkGenerator();
+   $this-siteLinkGroups = $siteLinkGroups;
}
 
/**
diff --git a/repo/includes/View/ItemView.php b/repo/includes/View/ItemView.php
index a3946ef..8b7087f 100644
--- a/repo/includes/View/ItemView.php
+++ b/repo/includes/View/ItemView.php
@@ -20,6 +20,30 @@
 class ItemView extends EntityView {
 
/**
+* @var string[]
+*/
+   private $siteLinkGroups;
+
+   /**
+* @see EntityView::__construct
+*
+* @param FingerprintView $fingerprintView
+* @param ClaimsView $claimsView
+* @param Language $language
+* @param string[] $siteLinkGroups
+*/
+   public function __construct(
+   FingerprintView $fingerprintView,
+   ClaimsView $claimsView,
+   Language $language,
+   array $siteLinkGroups
+   ) {
+   parent::__construct( $fingerprintView, $claimsView, $language );
+
+   $this-siteLinkGroups = $siteLinkGroups;
+   }
+
+   /**
 * @see EntityView::getMainHtml
 */
protected function getMainHtml( EntityRevision $entityRevision, array 
$entityInfo,
@@ -55,8 +79,7 @@
protected function getTocSections() {
$array = parent::getTocSections();
$array['claims'] = 'wikibase-statements';
-   $groups = 
WikibaseRepo::getDefaultInstance()-getSettings()-getSetting( 'siteLinkGroups' 
);
-   foreach ( $groups as $group ) {
+   foreach ( $this-siteLinkGroups as $group ) {
$id = htmlspecialchars( 'sitelinks-' . $group, 
ENT_QUOTES );
$array[$id] = 'wikibase-sitelinks-' . $group;
}
@@ -75,7 +98,6 @@
 */
protected function getHtmlForSiteLinks( Item $item, $editable = true ) {
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
-   $groups = $wikibaseRepo-getSettings()-getSetting( 
'siteLinkGroups' );
 
// FIXME: Inject this
$siteLinksView = new SiteLinksView(
@@ -87,7 +109,12 @@
 
$itemId = $item-getId();
 
-   return $siteLinksView-getHtml( $item-getSiteLinks(), $itemId, 
$groups, $editable );
+   return $siteLinksView-getHtml(
+   $item-getSiteLinks(),
+   $itemId,
+   $this-siteLinkGroups,
+   $editable
+   );
}
 
 }
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index d4f19b9..2b89aa0 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -972,7 +972,8 @@
$entityViewFactory = new EntityViewFactory(
$entityTitleLookup,

[MediaWiki-commits] [Gerrit] codfw-prod: add ms-be2015 - change (operations...swift-ring)

2014-11-27 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: codfw-prod: add ms-be2015
..

codfw-prod: add ms-be2015

Change-Id: Ib659b7f7e4a90e5d9e7e269793e19020c2eb8956
---
M codfw-prod/account.builder
M codfw-prod/account.dump
M codfw-prod/account.ring.gz
M codfw-prod/container.builder
M codfw-prod/container.dump
M codfw-prod/container.ring.gz
M codfw-prod/object.builder
M codfw-prod/object.dump
M codfw-prod/object.ring.gz
9 files changed, 246 insertions(+), 230 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-ring 
refs/changes/39/176239/1

diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder
index 9f7..7870f63 100644
--- a/codfw-prod/account.builder
+++ b/codfw-prod/account.builder
Binary files differ
diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump
index 9e9c054..74dcc5c 100644
--- a/codfw-prod/account.dump
+++ b/codfw-prod/account.dump
@@ -1,32 +1,34 @@
-codfw-prod/account.builder, build version 32
-65536 partitions, 3.00 replicas, 1 regions, 3 zones, 28 devices, 0.02 
balance
+codfw-prod/account.builder, build version 35
+65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 5.00 
balance
 The minimum number of hours before a partition can be reassigned is 3
 Devices:id  region  zone  ip address  port  replication ip  
replication port  name weight partitions balance meta
- 0   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdm3  92.00   73890.00 
- 1   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdn3  92.00   73890.00 
- 2   1 210.192.16.21  600210.192.16.21 
 6002  sdm3  92.00   73890.00 
- 3   1 210.192.16.21  600210.192.16.21 
 6002  sdn3  92.00   73890.00 
- 4   1 310.192.32.14  600210.192.32.14 
 6002  sdm3  92.00   73890.00 
- 5   1 310.192.32.14  600210.192.32.14 
 6002  sdn3  92.00   73890.00 
- 6   1 1 10.192.0.20  6002 10.192.0.20 
 6002  sdm3  92.00   73890.00 
- 7   1 1 10.192.0.20  6002 10.192.0.20 
 6002  sdn3  92.00   73890.00 
- 8   1 1 10.192.0.21  6002 10.192.0.21 
 6002  sdm3  92.00   73890.00 
- 9   1 1 10.192.0.21  6002 10.192.0.21 
 6002  sdn3  92.00   73890.00 
-10   1 1 10.192.0.22  6002 10.192.0.22 
 6002  sdm3  92.00   73890.00 
-11   1 1 10.192.0.22  6002 10.192.0.22 
 6002  sdn3  92.00   73890.00 
-12   1 210.192.16.22  600210.192.16.22 
 6002  sdm3  92.00   73890.00 
-13   1 210.192.16.22  600210.192.16.22 
 6002  sdn3  92.00   73890.00 
-14   1 210.192.16.23  600210.192.16.23 
 6002  sdm3  92.00   73890.00 
-15   1 210.192.16.23  600210.192.16.23 
 6002  sdn3  92.00   73890.00 
-16   1 210.192.16.24  600210.192.16.24 
 6002  sdm3  92.00   73890.00 
-17   1 210.192.16.24  600210.192.16.24 
 6002  sdn3  92.00   73890.00 
-18   1 310.192.32.15  600210.192.32.15 
 6002  sdm3  92.00   73890.00 
-19   1 310.192.32.15  600210.192.32.15 
 6002  sdn3  92.00   73890.00 
-20   1 310.192.32.16  600210.192.32.16 
 6002  sdm3  92.00   73890.00 
-21   1 310.192.32.16  600210.192.32.16 
 6002  sdn3  92.00   73890.00 
-22   1 310.192.32.17  600210.192.32.17 
 6002  sdm3  92.00   73890.00 
-23   1 310.192.32.17  600210.192.32.17 
 6002  sdn3  92.00   73890.00 
-24   1 210.192.16.32  600210.192.16.32 
 6002  sdm3  60.00   4818   -0.02 
-25   1 210.192.16.32  600210.192.16.32 
 6002  sdn3  60.00   4818   -0.02 
-26   1 1 10.192.0.30  6002 10.192.0.30 
 6002  sdm3  60.00   4818   -0.02 
-27   1 1 10.192.0.30  6002 10.192.0.30 
 6002  sdn3  60.00   4818   -0.02 
+

[MediaWiki-commits] [Gerrit] codfw-prod: add ms-be2015 - change (operations...swift-ring)

2014-11-27 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: codfw-prod: add ms-be2015
..


codfw-prod: add ms-be2015

Change-Id: Ib659b7f7e4a90e5d9e7e269793e19020c2eb8956
---
M codfw-prod/account.builder
M codfw-prod/account.dump
M codfw-prod/account.ring.gz
M codfw-prod/container.builder
M codfw-prod/container.dump
M codfw-prod/container.ring.gz
M codfw-prod/object.builder
M codfw-prod/object.dump
M codfw-prod/object.ring.gz
9 files changed, 246 insertions(+), 230 deletions(-)

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



diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder
index 9f7..7870f63 100644
--- a/codfw-prod/account.builder
+++ b/codfw-prod/account.builder
Binary files differ
diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump
index 9e9c054..74dcc5c 100644
--- a/codfw-prod/account.dump
+++ b/codfw-prod/account.dump
@@ -1,32 +1,34 @@
-codfw-prod/account.builder, build version 32
-65536 partitions, 3.00 replicas, 1 regions, 3 zones, 28 devices, 0.02 
balance
+codfw-prod/account.builder, build version 35
+65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 5.00 
balance
 The minimum number of hours before a partition can be reassigned is 3
 Devices:id  region  zone  ip address  port  replication ip  
replication port  name weight partitions balance meta
- 0   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdm3  92.00   73890.00 
- 1   1 1 10.192.0.19  6002 10.192.0.19 
 6002  sdn3  92.00   73890.00 
- 2   1 210.192.16.21  600210.192.16.21 
 6002  sdm3  92.00   73890.00 
- 3   1 210.192.16.21  600210.192.16.21 
 6002  sdn3  92.00   73890.00 
- 4   1 310.192.32.14  600210.192.32.14 
 6002  sdm3  92.00   73890.00 
- 5   1 310.192.32.14  600210.192.32.14 
 6002  sdn3  92.00   73890.00 
- 6   1 1 10.192.0.20  6002 10.192.0.20 
 6002  sdm3  92.00   73890.00 
- 7   1 1 10.192.0.20  6002 10.192.0.20 
 6002  sdn3  92.00   73890.00 
- 8   1 1 10.192.0.21  6002 10.192.0.21 
 6002  sdm3  92.00   73890.00 
- 9   1 1 10.192.0.21  6002 10.192.0.21 
 6002  sdn3  92.00   73890.00 
-10   1 1 10.192.0.22  6002 10.192.0.22 
 6002  sdm3  92.00   73890.00 
-11   1 1 10.192.0.22  6002 10.192.0.22 
 6002  sdn3  92.00   73890.00 
-12   1 210.192.16.22  600210.192.16.22 
 6002  sdm3  92.00   73890.00 
-13   1 210.192.16.22  600210.192.16.22 
 6002  sdn3  92.00   73890.00 
-14   1 210.192.16.23  600210.192.16.23 
 6002  sdm3  92.00   73890.00 
-15   1 210.192.16.23  600210.192.16.23 
 6002  sdn3  92.00   73890.00 
-16   1 210.192.16.24  600210.192.16.24 
 6002  sdm3  92.00   73890.00 
-17   1 210.192.16.24  600210.192.16.24 
 6002  sdn3  92.00   73890.00 
-18   1 310.192.32.15  600210.192.32.15 
 6002  sdm3  92.00   73890.00 
-19   1 310.192.32.15  600210.192.32.15 
 6002  sdn3  92.00   73890.00 
-20   1 310.192.32.16  600210.192.32.16 
 6002  sdm3  92.00   73890.00 
-21   1 310.192.32.16  600210.192.32.16 
 6002  sdn3  92.00   73890.00 
-22   1 310.192.32.17  600210.192.32.17 
 6002  sdm3  92.00   73890.00 
-23   1 310.192.32.17  600210.192.32.17 
 6002  sdn3  92.00   73890.00 
-24   1 210.192.16.32  600210.192.16.32 
 6002  sdm3  60.00   4818   -0.02 
-25   1 210.192.16.32  600210.192.16.32 
 6002  sdn3  60.00   4818   -0.02 
-26   1 1 10.192.0.30  6002 10.192.0.30 
 6002  sdm3  60.00   4818   -0.02 
-27   1 1 10.192.0.30  6002 10.192.0.30 
 6002  sdn3  60.00   4818   -0.02 
+ 0   1 1 10.192.0.19  6002 10.192.0.19

[MediaWiki-commits] [Gerrit] Hygiene: Dont save phpunit handlebars compilations - change (mediawiki...Flow)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: Dont save phpunit handlebars compilations
..


Hygiene: Dont save phpunit handlebars compilations

The original method used to compile templates in this test
results in leaving behind new compiled files in handlebars/compiled
that were never before created(due to being used as a partial instead
of directly).

This patch adjusts to create and evaluate the template on the spot rather
than writing it out.

Change-Id: I7dadd551a5340c8a9ad615a23d4e7bd8bfe2bf65
---
M tests/phpunit/Handlebars/FlowPostMetaActionsTest.php
1 file changed, 7 insertions(+), 4 deletions(-)

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



diff --git a/tests/phpunit/Handlebars/FlowPostMetaActionsTest.php 
b/tests/phpunit/Handlebars/FlowPostMetaActionsTest.php
index 0af4fef..8e8c778 100644
--- a/tests/phpunit/Handlebars/FlowPostMetaActionsTest.php
+++ b/tests/phpunit/Handlebars/FlowPostMetaActionsTest.php
@@ -4,6 +4,7 @@
 
 use Flow\Container;
 use Flow\TemplateHelper;
+use LightnCandy;
 use Symfony\Component\DomCrawler\Crawler;
 
 /**
@@ -107,11 +108,13 @@
}
 
protected function renderTemplate( $templateName, array $args = array() 
) {
-   $lc = new TemplateHelper(
-   Container::get( 'lightncandy.template_dir' ),
-   true // force recompile
+   $lc = Container::get( 'lightncandy' );
+   $filenames = $lc-getTemplateFilenames( $templateName );
+   $phpCode = $lc::compile(
+   file_get_contents( $filenames['template'] ),
+   Container::get( 'lightncandy.template_dir' )
);
-   $renderer = $lc-getTemplate( $templateName );
+   $renderer = LightnCandy::prepare( $phpCode );
 
return new Crawler( $renderer( $args ) );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7dadd551a5340c8a9ad615a23d4e7bd8bfe2bf65
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Bug: prod db contains rows with both _user_id and _user_ip... - change (mediawiki...Flow)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Bug: prod db contains rows with both *_user_id and *_user_ip set
..


Bug: prod db contains rows with both *_user_id and *_user_ip set

Bug: 71858
Bug: 73153
Change-Id: I3d78cbeb7313769c3c10c67f68fdbd52531d8f8f
---
A maintenance/FlowFixUserIp.php
1 file changed, 154 insertions(+), 0 deletions(-)

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



diff --git a/maintenance/FlowFixUserIp.php b/maintenance/FlowFixUserIp.php
new file mode 100644
index 000..c1a0a1b
--- /dev/null
+++ b/maintenance/FlowFixUserIp.php
@@ -0,0 +1,154 @@
+?php
+
+use Flow\Container;
+use Flow\Data\ManagerGroup;
+use Flow\Model\UUID;
+
+require_once ( getenv( 'MW_INSTALL_PATH' ) !== false
+   ? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
+   : dirname( __FILE__ ) . '/../../../maintenance/Maintenance.php' );
+
+/**
+ * Sets *_user_ip to null when *_user_id is  0
+ *
+ * @ingroup Maintenance
+ */
+class FlowFixUserIp extends LoggedUpdateMaintenance {
+   /**
+* The number of entries completed
+*
+* @var int
+*/
+   private $completeCount = 0;
+
+   /**
+* @var ManagerGroup
+*/
+   protected $storage;
+
+   static private $types = array(
+   'post' = 'Flow\Model\PostRevision',
+   'header' = 'Flow\Model\Header',
+   'post-summary' = 'Flow\Model\PostSummary',
+   );
+
+   protected function doDBUpdates() {
+   $this-storage = $storage = Container::get( 'storage' );
+   $dbf = Container::get( 'db.factory' );
+   $dbw = $dbf-getDB( DB_MASTER );
+   $hasRun = false;
+
+   $runUpdate = function( $callback ) use ( $dbf, $dbw, $storage ) 
{
+   $hasRun = true;
+   $continue = \0;
+   do {
+   $dbw-begin();
+   $continue = call_user_func( $callback, $dbw, 
$continue );
+   $dbw-commit();
+   $dbf-waitForSlaves();
+   $storage-clear();
+   } while ( $continue !== null );
+   };
+
+   $runUpdate( array( $this, 'updateTreeRevision' ) );
+   $self = $this;
+   foreach ( array( 'rev_user', 'rev_mod_user', 'rev_edit_user' ) 
as $prefix ){
+   $runUpdate( function( $dbw, $continue ) use ( $self, 
$prefix ) {
+   return $self-updateRevision( $prefix, $dbw, 
$continue );
+   } );
+   }
+
+   return true;
+   }
+
+   public function updateTreeRevision( DatabaseBase $dbw, $continue = null 
) {
+   $rows = $dbw-select(
+   /* table */'flow_tree_revision',
+   /* select */array( 'tree_rev_id' ),
+   array(
+   'tree_rev_id  ' . $dbw-addQuotes( $continue ),
+   'tree_orig_user_ip IS NOT NULL',
+   'tree_orig_user_id  0',
+   ),
+   __METHOD__,
+   /* options */array( 'LIMIT' = $this-mBatchSize, 
'ORDER BY' = 'tree_rev_id' )
+   );
+
+   $om = Container::get( 'storage' )-getStorage( 'PostRevision' );
+   $objs = $ids = array();
+   foreach ( $rows as $row ) {
+   $ids[] = $row-tree_rev_id;
+   $objs[] = $om-get( UUID::create( $row-tree_rev_id ) );
+   }
+   if ( !$ids ) {
+   return null;
+   }
+   $dbw-update(
+   /* table */'flow_tree_revision',
+   /* update */array( 'tree_orig_user_ip' = null ),
+   /* conditions */array( 'tree_rev_id' = $ids ),
+   __METHOD__
+   );
+   foreach ( $objs as $obj ) {
+   $om-cachePurge( $obj );
+   }
+
+   $this-completeCount += count( $ids );
+
+   return end( $ids );
+   }
+
+   public function updateRevision( $columnPrefix, DatabaseBase $dbw, 
$continue = null ) {
+   $rows = $dbw-select(
+   /* table */'flow_revision',
+   /* select */array( 'rev_id', 'rev_type' ),
+   /* conditions */ array(
+   'rev_id  ' . $dbw-addQuotes( $continue ),
+   {$columnPrefix}_id  0,
+   {$columnPrefix}_ip IS NOT NULL,
+   ),
+   __METHOD__,
+   /* options */array(

[MediaWiki-commits] [Gerrit] Only run showSelection if one of the command successfully ex... - change (VisualEditor/VisualEditor)

2014-11-27 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Only run showSelection if one of the command successfully 
executed
..

Only run showSelection if one of the command successfully executed

Change-Id: I1192fcdca79c202559f99ccebc2f0ccbc8501f5c
---
M src/ce/ve.ce.Surface.js
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/40/176240/1

diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 110fe4c..0ead9ae 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -2331,6 +2331,7 @@
  */
 ve.ce.Surface.prototype.checkSequences = function () {
var i, sequences,
+   executed = false,
surfaceModel = this.surface.getModel(),
selection = surfaceModel.getSelection();
 
@@ -2342,9 +2343,9 @@
 
// sequences.length will likely be 0 or 1 so don't cache
for ( i = 0; i  sequences.length; i++ ) {
-   sequences[i].execute( this.surface );
+   executed = sequences[i].execute( this.surface ) || executed;
}
-   if ( sequences.length  0 ) {
+   if ( executed ) {
this.showSelection( this.surface.getModel().getSelection() );
}
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1192fcdca79c202559f99ccebc2f0ccbc8501f5c
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Match workflow last updated to the created revision - change (mediawiki...Flow)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Match workflow last updated to the created revision
..


Match workflow last updated to the created revision

The ApiFlowViewTopicListTest compares the created revision timestamp
against the workflow last updated timestamp expecting them to match.
This is a completely reasonable assumption, make it happen.

Change-Id: I0f035dca726c1462adc43bc00544bcbddeeebf94
---
M includes/Block/Topic.php
M includes/Model/Workflow.php
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/includes/Block/Topic.php b/includes/Block/Topic.php
index 6f3f4d6..1380cc2 100644
--- a/includes/Block/Topic.php
+++ b/includes/Block/Topic.php
@@ -394,7 +394,7 @@
}
 
public function commit() {
-   $this-workflow-updateLastModified();
+   $this-workflow-updateLastModified( 
$this-newRevision-getRevisionId() );
 
switch( $this-action ) {
case 'reply':
diff --git a/includes/Model/Workflow.php b/includes/Model/Workflow.php
index 9f37603..bb09926 100644
--- a/includes/Model/Workflow.php
+++ b/includes/Model/Workflow.php
@@ -140,7 +140,7 @@
$obj-pageId = $title-getArticleID();
$obj-namespace = $title-getNamespace();
$obj-titleText = $title-getDBkey();
-   $obj-updateLastModified();
+   $obj-updateLastModified( $obj-id );
 
return $obj;
}
@@ -240,8 +240,8 @@
 */
public function getLastModifiedObj() { return new MWTimestamp( 
$this-lastModified ); }
 
-   public function updateLastModified() {
-   $this-lastModified = wfTimestampNow();
+   public function updateLastModified( UUID $latestRevisionId ) {
+   $this-lastModified = $latestRevisionId-getTimestamp();
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f035dca726c1462adc43bc00544bcbddeeebf94
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Always use 'wikibase-statements' as statement section header - change (mediawiki...Wikibase)

2014-11-27 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

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

Change subject: Always use 'wikibase-statements' as statement section header
..

Always use 'wikibase-statements' as statement section header

Change-Id: I1f4093ca07c13b6588461ded5f8998c62514e174
---
M repo/i18n/en.json
M repo/includes/ItemView.php
M repo/includes/PropertyView.php
M repo/includes/View/ClaimsView.php
4 files changed, 4 insertions(+), 13 deletions(-)


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

diff --git a/repo/i18n/en.json b/repo/i18n/en.json
index 5b82521..42b79a6 100644
--- a/repo/i18n/en.json
+++ b/repo/i18n/en.json
@@ -48,9 +48,7 @@
wikibase-description-input-help-message: Enter a short description 
for this entity in $1.,
wikibase-fingerprintgroupview-input-help-message: Enter a label of 
this entity, a short description and aliases per language.,
wikibase-fingerprintview-input-help-message: Enter the label of this 
entity, a short description and aliases in $1.,
-   wikibase-claims: Claims,
wikibase-statements: Statements,
-   wikibase-attributes: Attributes,
wikibase-terms: In other languages,
wikibase-sitelinkgroupview-input-help-message: Add a site link by 
specifying a site and a page of that site, edit or remove existing site links.,
wikibase-sitelinks-empty: No page is linked to this item yet.,
diff --git a/repo/includes/ItemView.php b/repo/includes/ItemView.php
index e506d21..f791ebd 100644
--- a/repo/includes/ItemView.php
+++ b/repo/includes/ItemView.php
@@ -35,8 +35,7 @@
$html = parent::getMainHtml( $entityRevision, $entityInfo, 
$editable );
$html .= $this-claimsView-getHtml(
$item-getStatements()-toArray(),
-   $entityInfo,
-   'wikibase-statements'
+   $entityInfo
);
 
return $html;
diff --git a/repo/includes/PropertyView.php b/repo/includes/PropertyView.php
index 71eb388..40105fa 100644
--- a/repo/includes/PropertyView.php
+++ b/repo/includes/PropertyView.php
@@ -59,8 +59,7 @@
if ( $this-displayStatementsOnProperties ) {
$html .= $this-claimsView-getHtml(
$property-getStatements()-toArray(),
-   $entityInfo,
-   'wikibase-attributes'
+   $entityInfo
);
}
 
diff --git a/repo/includes/View/ClaimsView.php 
b/repo/includes/View/ClaimsView.php
index b0f7153..c4342e0 100644
--- a/repo/includes/View/ClaimsView.php
+++ b/repo/includes/View/ClaimsView.php
@@ -5,12 +5,8 @@
 use Linker;
 use Wikibase\ClaimHtmlGenerator;
 use Wikibase\DataModel\Claim\Claim;
-use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Snak\Snak;
-use Wikibase\Lib\Store\EntityInfoBuilderFactory;
 use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\ReferencedEntitiesFinder;
 
 /**
  * Generates HTML to display claims.
@@ -67,10 +63,9 @@
 *
 * @param Claim[] $claims the claims to render
 * @param array $entityInfo
-* @param string $heading the message key of the heading
 * @return string
 */
-   public function getHtml( array $claims, array $entityInfo, $heading = 
'wikibase-claims' ) {
+   public function getHtml( array $claims, array $entityInfo ) {
// aggregate claims by properties
$claimsByProperty = $this-groupClaimsByProperties( $claims );
 
@@ -82,7 +77,7 @@
$claimgrouplistviewHtml = wfTemplate( 'wb-claimgrouplistview', 
$claimsHtml, '' );
 
// TODO: Add link to SpecialPage that allows adding a new claim.
-   $sectionHeading = $this-getHtmlForSectionHeading( $heading );
+   $sectionHeading = $this-getHtmlForSectionHeading( 
'wikibase-statements' );
// FIXME: claimgrouplistview should be the topmost claims 
related template
$html = wfTemplate( 'wb-claimlistview', 
$claimgrouplistviewHtml, '', '' );
return $sectionHeading . $html;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f4093ca07c13b6588461ded5f8998c62514e174
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] Bug: TopicHistoryStorage::find() doesnt work - change (mediawiki...Flow)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Bug: TopicHistoryStorage::find() doesnt work
..


Bug: TopicHistoryStorage::find() doesnt work

Change-Id: I5e591938da531eae32db53afebebfa979e6540c0
---
M includes/Data/Storage/TopicHistoryStorage.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/Data/Storage/TopicHistoryStorage.php 
b/includes/Data/Storage/TopicHistoryStorage.php
index 3fe5199..0cc3052 100644
--- a/includes/Data/Storage/TopicHistoryStorage.php
+++ b/includes/Data/Storage/TopicHistoryStorage.php
@@ -32,7 +32,7 @@
}
 
public function find( array $attributes, array $options = array() ) {
-   $multi = $this-findMulti( $attributes, $options );
+   $multi = $this-findMulti( array( $attributes ), $options );
if ( $multi ) {
return reset( $multi );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e591938da531eae32db53afebebfa979e6540c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] [BrowserTest] Fixed a couple of page elements - change (mediawiki...VisualEditor)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: [BrowserTest] Fixed a couple of page elements
..


[BrowserTest] Fixed a couple of page elements

Change-Id: Ia4652896243705651c86ff5f83dbd03029757705
Paired-With: Amir Aharoni
Bug: T76133
---
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git 
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb 
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index 5470d80..37c01be 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -49,13 +49,13 @@
   a(:edit_wikitext, title: /You can edit this page\./)
   span(:ex, text: 'Return to save form')
   a(:first_reference, text: '[1]', index: 1)
-  div(:formatting_option_menus, class: 'oo-ui-toolGroup-tools 
oo-ui-clippableElement-clippable', index: 1)
+  div(:formatting_option_menus, class: 'oo-ui-toolGroup-tools 
oo-ui-clippableElement-clippable', index: 2)
   img(:formula_image, class: 'mwe-math-fallback-png-inline')
   span(:formula_insert_menu, class: 'oo-ui-tool-name-math')
   a(:formula_link, css: 'span.oo-ui-tool-name-math  a.oo-ui-tool-link')
   a(:heading, text: /Heading/)
   span(:hamburger_menu, css: 'div.oo-ui-listToolGroup:nth-child(2)  
span:nth-child(1)  span:nth-child(3)')
-  div(:heading_dropdown_menus, class: 'oo-ui-toolGroup-tools 
oo-ui-clippableElement-clippable')
+  div(:heading_dropdown_menus, class: 'oo-ui-toolGroup-tools 
oo-ui-clippableElement-clippable', index: 1)
   div(:iframe, css: 'div.oo-ui-window-setup  div.oo-ui-window-frame')
   span(:increase_indentation, class: 'oo-ui-iconElement-icon 
oo-ui-icon-indent-list')
   div(:indentation_pull_down, class: 'oo-ui-toolGroup-tools 
oo-ui-clippableElement-clippable', index: 3)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4652896243705651c86ff5f83dbd03029757705
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: a2d7d64..15ed437 - change (mediawiki/extensions)

2014-11-27 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: a2d7d64..15ed437
..

Syncronize VisualEditor: a2d7d64..15ed437

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/42/176242/1

diff --git a/VisualEditor b/VisualEditor
index a2d7d64..15ed437 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit a2d7d64fcf939ffb00e513e5b90e743884134dca
+Subproject commit 15ed43733135dd81e3ef63004b39488dfd3374a3

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62513067575dd82a49824d67057c65196ab84758
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] Syncronize VisualEditor: a2d7d64..d20cc32 - change (mediawiki/extensions)

2014-11-27 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: a2d7d64..d20cc32
..


Syncronize VisualEditor: a2d7d64..d20cc32

Change-Id: Iaf73da95d5d5cce1deb77676eb5c07a10aad3cfe
---
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 a2d7d64..d20cc32 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit a2d7d64fcf939ffb00e513e5b90e743884134dca
+Subproject commit d20cc324fb43d88c3e77e25bea197f6242607894

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf73da95d5d5cce1deb77676eb5c07a10aad3cfe
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] pngcrush -brute -reduce - change (mediawiki/core)

2014-11-27 Thread Nemo bis (Code Review)

Nemo bis has uploaded a new change for review.

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

Change subject: pngcrush -brute -reduce
..

pngcrush -brute -reduce

Change-Id: I9e4815a75899a68e30b8c264f3d772c8ceb6301b
---
M resources/src/jquery/images/jquery.arrowSteps.divider-rtl.png
M resources/src/jquery/images/marker.png
M resources/src/jquery/images/mask.png
M resources/src/mediawiki.legacy/images/feed-icon.png
M resources/src/mediawiki.legacy/images/question.png
M resources/src/mediawiki.skinning/images/audio-ltr.png
M resources/src/mediawiki.skinning/images/audio-rtl.png
M resources/src/mediawiki.skinning/images/chat-ltr.png
M resources/src/mediawiki.skinning/images/chat-rtl.png
M resources/src/mediawiki.skinning/images/document-ltr.png
M resources/src/mediawiki.skinning/images/document-rtl.png
M resources/src/mediawiki.skinning/images/external-ltr.png
M resources/src/mediawiki.skinning/images/external-rtl.png
M resources/src/mediawiki.skinning/images/ftp-ltr.png
M resources/src/mediawiki.skinning/images/ftp-rtl.png
M resources/src/mediawiki.skinning/images/magnify-clip-ltr.png
M resources/src/mediawiki.skinning/images/magnify-clip-rtl.png
M resources/src/mediawiki.skinning/images/mail.png
M resources/src/mediawiki.skinning/images/video.png
M resources/src/mediawiki.ui/components/images/checked_disabled.png
M resources/src/mediawiki.ui/components/images/ok.png
M resources/src/mediawiki.ui/components/images/radio_disabled.png
22 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/43/176243/1

diff --git a/resources/src/jquery/images/jquery.arrowSteps.divider-rtl.png 
b/resources/src/jquery/images/jquery.arrowSteps.divider-rtl.png
index 7cfbfeb..c212aeb 100644
--- a/resources/src/jquery/images/jquery.arrowSteps.divider-rtl.png
+++ b/resources/src/jquery/images/jquery.arrowSteps.divider-rtl.png
Binary files differ
diff --git a/resources/src/jquery/images/marker.png 
b/resources/src/jquery/images/marker.png
index 19efb6c..915b347 100644
--- a/resources/src/jquery/images/marker.png
+++ b/resources/src/jquery/images/marker.png
Binary files differ
diff --git a/resources/src/jquery/images/mask.png 
b/resources/src/jquery/images/mask.png
index fe08de0..77b138f 100644
--- a/resources/src/jquery/images/mask.png
+++ b/resources/src/jquery/images/mask.png
Binary files differ
diff --git a/resources/src/mediawiki.legacy/images/feed-icon.png 
b/resources/src/mediawiki.legacy/images/feed-icon.png
index 00f49f6..9babde3 100644
--- a/resources/src/mediawiki.legacy/images/feed-icon.png
+++ b/resources/src/mediawiki.legacy/images/feed-icon.png
Binary files differ
diff --git a/resources/src/mediawiki.legacy/images/question.png 
b/resources/src/mediawiki.legacy/images/question.png
index f7405d2..e1fdc7a 100644
--- a/resources/src/mediawiki.legacy/images/question.png
+++ b/resources/src/mediawiki.legacy/images/question.png
Binary files differ
diff --git a/resources/src/mediawiki.skinning/images/audio-ltr.png 
b/resources/src/mediawiki.skinning/images/audio-ltr.png
index 8efc4f2..39d4084 100644
--- a/resources/src/mediawiki.skinning/images/audio-ltr.png
+++ b/resources/src/mediawiki.skinning/images/audio-ltr.png
Binary files differ
diff --git a/resources/src/mediawiki.skinning/images/audio-rtl.png 
b/resources/src/mediawiki.skinning/images/audio-rtl.png
index 1afdf40..cc09e51 100644
--- a/resources/src/mediawiki.skinning/images/audio-rtl.png
+++ b/resources/src/mediawiki.skinning/images/audio-rtl.png
Binary files differ
diff --git a/resources/src/mediawiki.skinning/images/chat-ltr.png 
b/resources/src/mediawiki.skinning/images/chat-ltr.png
index 624ecec..99e95b5 100644
--- a/resources/src/mediawiki.skinning/images/chat-ltr.png
+++ b/resources/src/mediawiki.skinning/images/chat-ltr.png
Binary files differ
diff --git a/resources/src/mediawiki.skinning/images/chat-rtl.png 
b/resources/src/mediawiki.skinning/images/chat-rtl.png
index f90fa33..c6805cf 100644
--- a/resources/src/mediawiki.skinning/images/chat-rtl.png
+++ b/resources/src/mediawiki.skinning/images/chat-rtl.png
Binary files differ
diff --git a/resources/src/mediawiki.skinning/images/document-ltr.png 
b/resources/src/mediawiki.skinning/images/document-ltr.png
index 4ea9373..5f74a00 100644
--- a/resources/src/mediawiki.skinning/images/document-ltr.png
+++ b/resources/src/mediawiki.skinning/images/document-ltr.png
Binary files differ
diff --git a/resources/src/mediawiki.skinning/images/document-rtl.png 
b/resources/src/mediawiki.skinning/images/document-rtl.png
index c281677..8f276a4 100644
--- a/resources/src/mediawiki.skinning/images/document-rtl.png
+++ b/resources/src/mediawiki.skinning/images/document-rtl.png
Binary files differ
diff --git a/resources/src/mediawiki.skinning/images/external-ltr.png 
b/resources/src/mediawiki.skinning/images/external-ltr.png
index 75750ef..e888c3a 100644
---

[MediaWiki-commits] [Gerrit] Cache invalidation on insertShout - change (mediawiki...BlueSpiceExtensions)

2014-11-27 Thread Mglaser (Code Review)

Mglaser has uploaded a new change for review.

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

Change subject: Cache invalidation on insertShout
..

Cache invalidation on insertShout

Cache key now doesn't include the number of messages. This is a global
setting and does not change per user. And it is not available in all
contexts, e.g. when archiving shouts. So the determining factor for the
cache is now solely the article id. This fixes an issue, where new shouts
would not be displayed for a while.

Change-Id: I1f6e1282c0a6853082c21a42eb6ca8eaca8c6b10
---
M ShoutBox/ShoutBox.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/ShoutBox/ShoutBox.class.php b/ShoutBox/ShoutBox.class.php
index ad53595..c86038f 100644
--- a/ShoutBox/ShoutBox.class.php
+++ b/ShoutBox/ShoutBox.class.php
@@ -267,7 +267,7 @@
if ( $iArticleId = 0 )
return true;
 
-   $sKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'ShoutBox', 
$iArticleId, $iLimit );
+   $sKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'ShoutBox', 
$iArticleId );
$aData = BsCacheHelper::get( $sKey );
 
if ( $aData !== false ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f6e1282c0a6853082c21a42eb6ca8eaca8c6b10
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Mglaser gla...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] Bug: action=purge wasnt purging history lists - change (mediawiki...Flow)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Bug: action=purge wasnt purging history lists
..


Bug: action=purge wasnt purging history lists

Change-Id: I5865ebeacf5a16f09b2dccb9b0dd0432bec27067
---
M includes/Actions/PurgeAction.php
1 file changed, 26 insertions(+), 2 deletions(-)

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



diff --git a/includes/Actions/PurgeAction.php b/includes/Actions/PurgeAction.php
index ac300ef..ac4899d 100644
--- a/includes/Actions/PurgeAction.php
+++ b/includes/Actions/PurgeAction.php
@@ -86,19 +86,43 @@
array( 'pager-limit' = 499 )
);
 
-   $this-fetchTopics( $pager-getPage()-getResults() );
+   $results = array();
+   foreach ( $pager-getPage()-getResults() as $entry ) {
+   $results[] = $entry-getId();
+   }
+   $this-fetchTopics( $results );
+
+   // purge the board history
+   $storage-find(
+   'BoardHistoryEntry',
+   array( 'topic_list_id' = $workflow-getId() ),
+   array( 'sort' = 'rev_id', 'order' = 'DESC', 'limit' 
= 499 )
+   );
}
+
 
/**
 * Load the requested topics.  Does not return anything, the goal
 * here is to populate $this-hashBag.
 *
-* @param UUID[]|TopicListEntry[] $results
+* @param UUID[] $results
 */
protected function fetchTopics( array $results ) {
+   // purge the revisions that make up the topic
/** @var TopicListQuery $query */
$query = Container::get( 'query.topiclist' );
$query-getResults( $results );
+
+   // Purge the history
+   $queries = array();
+   foreach ( $results as $id ) {
+   $queries[] = array( 'topic_root_id' = $id );
+   }
+   Container::get( 'storage' )-findMulti(
+   'TopicHistoryEntry',
+   $queries,
+   array( 'sort' = 'rev_id', 'order' = 'DESC', 'limit' 
= 499 )
+   );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5865ebeacf5a16f09b2dccb9b0dd0432bec27067
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Hygiene: Fix phpdoc errors - change (mediawiki...MobileFrontend)

2014-11-27 Thread Florianschmidtwelzow (Code Review)

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Hygiene: Fix phpdoc errors
..

Hygiene: Fix phpdoc errors

Change-Id: I389ac1c62e1ceabc51ef8517ba73e6da2e215515
---
M includes/MobileFrontend.hooks.php
M includes/api/ApiMobileView.php
M includes/modules/MobileUserModule.php
M includes/skins/SkinMinervaAlpha.php
4 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/45/176245/1

diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 9575f1d..a9aa607 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1,4 +1,7 @@
 ?php
+/**
+ * MobileFrontend.hooks.php
+ */
 
 use Wikibase\Client\WikibaseClient;
 use Wikibase\DataModel\Entity\ItemId;
@@ -965,6 +968,8 @@
 
/**
 * LoginFormValidErrorMessages hook handler to promote MF specific 
error message be valid.
+*
+* @param array $messages Array of already added messages
 */
public static function onLoginFormValidErrorMessages( $messages ) {
$messages[] = 'mobile-frontend-donate-image-anon';
diff --git a/includes/api/ApiMobileView.php b/includes/api/ApiMobileView.php
index e5b121d..6868f3f 100644
--- a/includes/api/ApiMobileView.php
+++ b/includes/api/ApiMobileView.php
@@ -819,6 +819,7 @@
}
 
/**
+* Returns usage examples for this module.
 * @see ApiBase::getExamplesMessages()
 */
protected function getExamplesMessages() {
diff --git a/includes/modules/MobileUserModule.php 
b/includes/modules/MobileUserModule.php
index 0ab9ae3..f3cb158 100644
--- a/includes/modules/MobileUserModule.php
+++ b/includes/modules/MobileUserModule.php
@@ -1,5 +1,9 @@
 ?php
 /**
+ * MobileUserModule.php
+ */
+
+/**
  * Extends ResourceLoaderUserModule (Module for user-specific site 
customizations).
  */
 class MobileUserModule extends ResourceLoaderUserModule {
diff --git a/includes/skins/SkinMinervaAlpha.php 
b/includes/skins/SkinMinervaAlpha.php
index aa3c227..9e79271 100644
--- a/includes/skins/SkinMinervaAlpha.php
+++ b/includes/skins/SkinMinervaAlpha.php
@@ -12,6 +12,10 @@
/** @var stringDescribes 'stability' of the skin - alpha, beta, stable 
*/
protected $mode = 'alpha';
 
+   /**
+* Get the needed styles for this skin
+* @return array
+*/
protected function getSkinStyles() {
$styles = parent::getSkinStyles();
$styles[] = 'mediawiki.ui.icon';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I389ac1c62e1ceabc51ef8517ba73e6da2e215515
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de

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

[MediaWiki-commits] [Gerrit] Bug: action=purge doesnt purge the topic list sorted by last... - change (mediawiki...Flow)

2014-11-27 Thread Matthias Mullie (Code Review)

Matthias Mullie has submitted this change and it was merged.

Change subject: Bug: action=purge doesnt purge the topic list sorted by last 
update
..


Bug: action=purge doesnt purge the topic list sorted by last update

Change-Id: Ib58850b708204ec63ffce484dbb26ecad6d000c1
---
M includes/Actions/PurgeAction.php
1 file changed, 22 insertions(+), 4 deletions(-)

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



diff --git a/includes/Actions/PurgeAction.php b/includes/Actions/PurgeAction.php
index ac4899d..c010595 100644
--- a/includes/Actions/PurgeAction.php
+++ b/includes/Actions/PurgeAction.php
@@ -78,18 +78,36 @@
 * @param Workflow $workflow
 */
protected function fetchDiscussion( Workflow $workflow ) {
+   $results = array();
+   $pagers = array();
/** @var ManagerGroup $storage */
$storage = Container::get( 'storage' );
-   $pager = new Pager(
+
+   // 'newest' sort order
+   $pagers[] = new Pager(
$storage-getStorage( 'TopicListEntry' ),
array( 'topic_list_id' = $workflow-getId() ),
array( 'pager-limit' = 499 )
);
 
-   $results = array();
-   foreach ( $pager-getPage()-getResults() as $entry ) {
-   $results[] = $entry-getId();
+   // 'updated' sort order
+   $pagers[] = new Pager(
+   $storage-getStorage( 'TopicListEntry' ),
+   array( 'topic_list_id' = $workflow-getId() ),
+   array(
+   'pager-limit' = 499,
+   'sort' = 'workflow_last_update_timestamp',
+   'order' = 'desc',
+   )
+   );
+
+   foreach ( $pagers as $pager ) {
+   foreach ( $pager-getPage()-getResults() as $entry ) {
+   // use array key to de-duplicate
+   $results[$entry-getId()-getAlphadecimal()] = 
$entry-getId();
+   }
}
+
$this-fetchTopics( $results );
 
// purge the board history

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib58850b708204ec63ffce484dbb26ecad6d000c1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Move ClaimHtmlGenerator to Wikibase\Repo\View - change (mediawiki...Wikibase)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Move ClaimHtmlGenerator to Wikibase\Repo\View
..


Move ClaimHtmlGenerator to Wikibase\Repo\View

Change-Id: Ibc725c5ecebf1e321c934fc548b9ad91138ffd7a
---
R repo/includes/View/ClaimHtmlGenerator.php
M repo/includes/View/ClaimsView.php
M repo/includes/View/EntityViewFactory.php
R repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
M repo/tests/phpunit/includes/View/ClaimsViewTest.php
5 files changed, 4 insertions(+), 7 deletions(-)

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



diff --git a/repo/includes/ClaimHtmlGenerator.php 
b/repo/includes/View/ClaimHtmlGenerator.php
similarity index 98%
rename from repo/includes/ClaimHtmlGenerator.php
rename to repo/includes/View/ClaimHtmlGenerator.php
index c5b127c..141ba3e 100644
--- a/repo/includes/ClaimHtmlGenerator.php
+++ b/repo/includes/View/ClaimHtmlGenerator.php
@@ -1,6 +1,6 @@
 ?php
 
-namespace Wikibase;
+namespace Wikibase\Repo\View;
 
 use Wikibase\DataModel\ByPropertyIdArray;
 use Wikibase\DataModel\Claim\Claim;
@@ -9,7 +9,6 @@
 use Wikibase\DataModel\Statement\Statement;
 use Wikibase\Lib\Serializers\ClaimSerializer;
 use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\Repo\View\SnakHtmlGenerator;
 
 /**
  * Base class for generating the HTML for a Claim in Entity View.
diff --git a/repo/includes/View/ClaimsView.php 
b/repo/includes/View/ClaimsView.php
index b0f7153..ccd3c56 100644
--- a/repo/includes/View/ClaimsView.php
+++ b/repo/includes/View/ClaimsView.php
@@ -3,7 +3,6 @@
 namespace Wikibase\Repo\View;
 
 use Linker;
-use Wikibase\ClaimHtmlGenerator;
 use Wikibase\DataModel\Claim\Claim;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\Property;
diff --git a/repo/includes/View/EntityViewFactory.php 
b/repo/includes/View/EntityViewFactory.php
index 8c2afad..5a047c2 100644
--- a/repo/includes/View/EntityViewFactory.php
+++ b/repo/includes/View/EntityViewFactory.php
@@ -6,7 +6,6 @@
 use Language;
 use ValueFormatters\FormatterOptions;
 use ValueFormatters\ValueFormatter;
-use Wikibase\ClaimHtmlGenerator;
 use Wikibase\EntityView;
 use Wikibase\ItemView;
 use Wikibase\LanguageFallbackChain;
diff --git a/repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php 
b/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
similarity index 98%
rename from repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php
rename to repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
index eddb0ee..37fea2f 100644
--- a/repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php
+++ b/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
@@ -4,7 +4,6 @@
 
 use DataValues\StringValue;
 use Title;
-use Wikibase\ClaimHtmlGenerator;
 use Wikibase\DataModel\Claim\Claim;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Reference;
@@ -16,6 +15,7 @@
 use Wikibase\Lib\DispatchingSnakFormatter;
 use Wikibase\Lib\SnakFormatter;
 use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Repo\View\ClaimHtmlGenerator;
 use Wikibase\Repo\View\SnakHtmlGenerator;
 
 /**
diff --git a/repo/tests/phpunit/includes/View/ClaimsViewTest.php 
b/repo/tests/phpunit/includes/View/ClaimsViewTest.php
index da3ac43..60a3343 100644
--- a/repo/tests/phpunit/includes/View/ClaimsViewTest.php
+++ b/repo/tests/phpunit/includes/View/ClaimsViewTest.php
@@ -5,7 +5,6 @@
 use DataValues\StringValue;
 use TestUser;
 use Title;
-use Wikibase\ClaimHtmlGenerator;
 use Wikibase\DataModel\Claim\Claim;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityIdValue;
@@ -17,6 +16,7 @@
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikibase\DataModel\Snak\Snak;
 use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Repo\View\ClaimHtmlGenerator;
 use Wikibase\Repo\View\ClaimsView;
 use Wikibase\Repo\View\SectionEditLinkGenerator;
 use Wikibase\Repo\WikibaseRepo;
@@ -160,7 +160,7 @@
 * @return ClaimHtmlGenerator
 */
private function getClaimHtmlGeneratorMock() {
-   $claimHtmlGenerator = $this-getMockBuilder( 
'Wikibase\ClaimHtmlGenerator' )
+   $claimHtmlGenerator = $this-getMockBuilder( 
'Wikibase\Repo\View\ClaimHtmlGenerator' )
-disableOriginalConstructor()
-getMock();
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc725c5ecebf1e321c934fc548b9ad91138ffd7a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] Also show Statements on Properties in non-experimental mode - change (mediawiki...Wikibase)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Also show Statements on Properties in non-experimental mode
..


Also show Statements on Properties in non-experimental mode

Change-Id: I2a1969ff501fe4667fb42f325e9f28bf5aab6e2e
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M repo/includes/PropertyView.php
2 files changed, 6 insertions(+), 12 deletions(-)

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



diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index dbdb1d4..2c462cc 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -103,10 +103,7 @@
 
// TODO: Have an itemview and propertyview instead of ugly hack 
here.
var entityType = this.options.value.getType();
-   if(
-   entityType === 'item'
-   || entityType === 'property'  mw.config.get( 
'wbExperimentalFeatures' )
-   ) {
+   if( entityType === 'item' || entityType === 'property' ) {
this._initClaims();
}
 
diff --git a/repo/includes/PropertyView.php b/repo/includes/PropertyView.php
index 6e8786b..a5b71e6 100644
--- a/repo/includes/PropertyView.php
+++ b/repo/includes/PropertyView.php
@@ -36,14 +36,11 @@
$html = parent::getMainHtml( $entityRevision, $entityInfo, 
$editable );
$html .= $this-getHtmlForDataType( $this-getDataType( 
$property ) );
 
-   if ( defined( 'WB_EXPERIMENTAL_FEATURES' )  
WB_EXPERIMENTAL_FEATURES ) {
-   // @fixme Property::getClaims no longer returns any 
statements for properties!
-   $html .= $this-claimsView-getHtml(
-   $property-getStatements()-toArray(),
-   $entityInfo,
-   'wikibase-attributes'
-   );
-   }
+   $html .= $this-claimsView-getHtml(
+   $property-getStatements()-toArray(),
+   $entityInfo,
+   'wikibase-attributes'
+   );
 
$footer = wfMessage( 'wikibase-property-footer' );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a1969ff501fe4667fb42f325e9f28bf5aab6e2e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@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] Bug: prevent floats from breaking out of topic summary - change (mediawiki...Flow)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Bug: prevent floats from breaking out of topic summary
..


Bug: prevent floats from breaking out of topic summary

Change-Id: I83b5bd2e356454d0aecc041099e79f0360b664f7
---
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/flow_topic_titlebar_summary.handlebars
M modules/styles/common.less
4 files changed, 10 insertions(+), 2 deletions(-)

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



diff --git a/handlebars/compiled/flow_block_topic.handlebars.php 
b/handlebars/compiled/flow_block_topic.handlebars.php
index eba9a67..9c7540d 100644
--- a/handlebars/compiled/flow_block_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic.handlebars.php
@@ -47,6 +47,7 @@
div class=flow-topic-summary
'.LCRun3::ch($cx, 'escapeContent', 
Array(Array(((isset($in['summary']['format'])  is_array($in['summary'])) ? 
$in['summary']['format'] : null),((isset($in['summary']['content'])  
is_array($in['summary'])) ? $in['summary']['content'] : null)),Array()), 
'encq').'
/div
+   br class=flow-ui-clear/
' : '').'
 /div
 ';},'flow_topic_titlebar_content' = function ($cx, $in) {return 'h2 
class=flow-topic-title'.LCRun3::ch($cx, 'escapeContent', 
Array(Array(((isset($in['content']['format'])  is_array($in['content'])) ? 
$in['content']['format'] : null),((isset($in['content']['content'])  
is_array($in['content'])) ? $in['content']['content'] : null)),Array()), 
'encq').'/h2
@@ -303,4 +304,4 @@
 /div
 ';
 }
-?
\ No newline at end of file
+?
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php 
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index a37eb9f..2fc5637 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -151,6 +151,7 @@
div class=flow-topic-summary
'.LCRun3::ch($cx, 'escapeContent', 
Array(Array(((isset($in['summary']['format'])  is_array($in['summary'])) ? 
$in['summary']['format'] : null),((isset($in['summary']['content'])  
is_array($in['summary'])) ? $in['summary']['content'] : null)),Array()), 
'encq').'
/div
+   br class=flow-ui-clear/
' : '').'
 /div
 ';},'flow_topic_titlebar_content' = function ($cx, $in) {return 'h2 
class=flow-topic-title'.LCRun3::ch($cx, 'escapeContent', 
Array(Array(((isset($in['content']['format'])  is_array($in['content'])) ? 
$in['content']['format'] : null),((isset($in['content']['content'])  
is_array($in['content'])) ? $in['content']['content'] : null)),Array()), 
'encq').'/h2
@@ -411,4 +412,4 @@
 /div
 ';
 }
-?
\ No newline at end of file
+?
diff --git a/handlebars/flow_topic_titlebar_summary.handlebars 
b/handlebars/flow_topic_titlebar_summary.handlebars
index 5dcc60d..48df93a 100644
--- a/handlebars/flow_topic_titlebar_summary.handlebars
+++ b/handlebars/flow_topic_titlebar_summary.handlebars
@@ -4,5 +4,6 @@
div class=flow-topic-summary
{{escapeContent summary.format summary.content}}
/div
+   br class=flow-ui-clear/
{{/if}}
 /div
diff --git a/modules/styles/common.less b/modules/styles/common.less
index 3e377d1..9d15db8 100644
--- a/modules/styles/common.less
+++ b/modules/styles/common.less
@@ -71,6 +71,11 @@
}
 }
 
+.flow-ui-clear {
+   clear: both;
+   line-height: 0;
+}
+
 @media all and (min-width: @wgFlowDeviceWidthTablet) {
.flow-topic-meta {
font-size: 1em;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I83b5bd2e356454d0aecc041099e79f0360b664f7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Report malformed URLs - change (pywikibot/compat)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Report malformed URLs
..


Report malformed URLs

Don't throw URL exception in the
checker thread if the URL cannot be
parsed.

Introduce NotAnURLError exception
to allow information about malformed URLs
to be passed to the reporting facility.

Change-Id: I93d45db6dec10210ff760154111853f53a042755
---
M weblinkchecker.py
1 file changed, 11 insertions(+), 0 deletions(-)

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



diff --git a/weblinkchecker.py b/weblinkchecker.py
index e7f2a90..8b54517 100644
--- a/weblinkchecker.py
+++ b/weblinkchecker.py
@@ -218,6 +218,10 @@
 pass
 
 
+class NotAnURLError(BaseException):
+pass
+
+
 class LinkChecker(object):
 
 Given a HTTP URL, tries to load the page from the Internet and checks if it
@@ -259,6 +263,8 @@
 return httplib.HTTPConnection(self.host)
 elif self.scheme == 'https':
 return httplib.HTTPSConnection(self.host)
+else:
+raise NotAnURLError(self.url)
 
 def getEncodingUsedByServer(self):
 if not self.serverEncoding:
@@ -489,6 +495,11 @@
 linkChecker = LinkChecker(self.url, HTTPignore=self.HTTPignore)
 try:
 ok, message = linkChecker.check()
+except NotAnURLError as e:
+ok, message = False, i18n.twtranslate(pywikibot.getSite(),
+  'weblinkchecker-badurl_msg',
+  {'URL': self.url})
+
 except:
 pywikibot.output('Exception while processing URL %s in page %s'
  % (self.url, self.page.title()))

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I93d45db6dec10210ff760154111853f53a042755
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: saper sa...@saper.info
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: jenkins-bot 
Gerrit-Reviewer: saper sa...@saper.info

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

[MediaWiki-commits] [Gerrit] Show license text in EditorOverlay only, if there is a license - change (mediawiki...MobileFrontend)

2014-11-27 Thread Florianschmidtwelzow (Code Review)

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Show license text in EditorOverlay only, if there is a license
..

Show license text in EditorOverlay only, if there is a license

Not all wikis (e.g. thirdparty wikis) have set wgRightsText to license
the texts. Show license message in EditorOverlay only, if there is a license
to avoid confusing text.

Change-Id: I86e6dbfbc3097a086b38b5519f0fbf0c32e9cd41
---
M javascripts/modules/editor/EditorOverlayBase.js
M templates/modules/editor/EditorOverlayBase.hogan
2 files changed, 15 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/48/176248/1

diff --git a/javascripts/modules/editor/EditorOverlayBase.js 
b/javascripts/modules/editor/EditorOverlayBase.js
index 5a0b945..41b191f 100644
--- a/javascripts/modules/editor/EditorOverlayBase.js
+++ b/javascripts/modules/editor/EditorOverlayBase.js
@@ -139,18 +139,20 @@
if ( mw.config.get( 'wgNamespaceNumber' ) !== 0 ) {
options.summaryRequestMsg = mw.msg( 
'mobile-frontend-editor-summary' );
}
-   // If terms of use is enabled, include it in the 
licensing message
-   if ( $( '#footer-places-terms-use' ).length  0 ) {
-   options.licenseMsg = mw.msg(
-   
'mobile-frontend-editor-licensing-with-terms',
-   $( '#footer-places-terms-use' ).html(),
-   mw.config.get( 'wgMFLicenseLink' )
-   );
-   } else {
-   options.licenseMsg = mw.msg(
-   'mobile-frontend-editor-licensing',
-   mw.config.get( 'wgMFLicenseLink' )
-   );
+   if ( mw.config.get( 'wgMFLicenseLink' ) ) {
+   // If terms of use is enabled, include it in 
the licensing message
+   if ( $( '#footer-places-terms-use' ).length  0 
) {
+   options.licenseMsg = mw.msg(
+   
'mobile-frontend-editor-licensing-with-terms',
+   $( '#footer-places-terms-use' 
).html(),
+   mw.config.get( 
'wgMFLicenseLink' )
+   );
+   } else {
+   options.licenseMsg = mw.msg(
+   
'mobile-frontend-editor-licensing',
+   mw.config.get( 
'wgMFLicenseLink' )
+   );
+   }
}
this.editCount = user.getEditCount();
this.isNewPage = options.isNewPage;
diff --git a/templates/modules/editor/EditorOverlayBase.hogan 
b/templates/modules/editor/EditorOverlayBase.hogan
index e7748f7..8e8f30b 100644
--- a/templates/modules/editor/EditorOverlayBase.hogan
+++ b/templates/modules/editor/EditorOverlayBase.hogan
@@ -27,7 +27,7 @@
div class=save-panel panel hideable hidden
p class=summary-request{{{summaryRequestMsg}}}/p
textarea rows=2 class=mw-ui-input summary 
placeholder={{summaryMsg}}/textarea
-   p class=license{{{licenseMsg}}}/p
+   {{#licenseMsg}}p 
class=license{{{licenseMsg}}}/p{{/licenseMsg}}
/div
div class=captcha-panel panel hideable hidden
div class=captcha-box

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I86e6dbfbc3097a086b38b5519f0fbf0c32e9cd41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de

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

[MediaWiki-commits] [Gerrit] Remove unused ClaimsView::getSnaksFromClaims method - change (mediawiki...Wikibase)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Remove unused ClaimsView::getSnaksFromClaims method
..


Remove unused ClaimsView::getSnaksFromClaims method

Change-Id: Iad287f8429dd4e248da5d22dfd2f0e88a839f907
---
M repo/includes/View/ClaimsView.php
1 file changed, 0 insertions(+), 15 deletions(-)

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



diff --git a/repo/includes/View/ClaimsView.php 
b/repo/includes/View/ClaimsView.php
index 6ba6369..6241a29 100644
--- a/repo/includes/View/ClaimsView.php
+++ b/repo/includes/View/ClaimsView.php
@@ -120,21 +120,6 @@
}
 
/**
-* Returns all snaks which are stored in this list of claims.
-*
-* @param Claim[] $claims
-* @return Snak[]
-*/
-   private function getSnaksFromClaims( array $claims ) {
-   $snaks = array();
-   /** @var Claim $claim */
-   foreach ( $claims as $claim ) {
-   $snaks = array_merge( $snaks, $claim-getAllSnaks() );
-   }
-   return $snaks;
-   }
-
-   /**
 * Returns the HTML for a group of claims.
 *
 * @param Claim[] $claims

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad287f8429dd4e248da5d22dfd2f0e88a839f907
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
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] Add a feature flag for showing Statements on Properties - change (mediawiki...Wikibase)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Add a feature flag for showing Statements on Properties
..


Add a feature flag for showing Statements on Properties

Bug: T75998
Change-Id: I61f3fa481d69cc3f1621f91a213cfd5a1bbab2ab
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M repo/config/Wikibase.default.php
M repo/includes/PropertyView.php
M repo/includes/View/EntityViewFactory.php
4 files changed, 38 insertions(+), 7 deletions(-)

Approvals:
  Adrian Lang: Looks good to me, but someone else must approve
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index 2c462cc..2e7eabd 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -103,7 +103,10 @@
 
// TODO: Have an itemview and propertyview instead of ugly hack 
here.
var entityType = this.options.value.getType();
-   if( entityType === 'item' || entityType === 'property' ) {
+   if(
+   entityType === 'item'
+   || entityType === 'property'  this.element.find( 
'.wb-claimlistview' ).length === 1
+   ) {
this._initClaims();
}
 
diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php
index 1eb1e3d..8187aa1 100644
--- a/repo/config/Wikibase.default.php
+++ b/repo/config/Wikibase.default.php
@@ -94,6 +94,8 @@
 
'useRedirectTargetColumn' = true,
 
+   'displayStatementsOnProperties' = true,
+
'conceptBaseUri' = function() {
$uri = $GLOBALS['wgServer'];
$uri = preg_replace( '!^//!', 'http://', $uri );
diff --git a/repo/includes/PropertyView.php b/repo/includes/PropertyView.php
index a5b71e6..71eb388 100644
--- a/repo/includes/PropertyView.php
+++ b/repo/includes/PropertyView.php
@@ -6,6 +6,9 @@
 use InvalidArgumentException;
 use Wikibase\DataModel\Entity\Property;
 use Wikibase\Repo\WikibaseRepo;
+use Wikibase\Repo\View\FingerprintView;
+use Wikibase\Repo\View\ClaimsView;
+use Language;
 
 /**
  * Class for creating views for Property instances.
@@ -18,6 +21,23 @@
  * @author H. Snater  mediaw...@snater.com 
  */
 class PropertyView extends EntityView {
+
+   /**
+* @var bool
+*/
+   private $displayStatementsOnProperties;
+
+   /**
+* @param FingerprintView $fingerprintView
+* @param ClaimsView $claimsView
+* @param Language $language
+* @param bool $displayStatementsOnProperties
+*/
+   public function __construct( FingerprintView $fingerprintView, 
ClaimsView $claimsView, Language $language, $displayStatementsOnProperties ) {
+   parent::__construct($fingerprintView, $claimsView, $language);
+
+   $this-displayStatementsOnProperties = 
$displayStatementsOnProperties;
+   }
 
/**
 * @see EntityView::getMainHtml
@@ -36,11 +56,13 @@
$html = parent::getMainHtml( $entityRevision, $entityInfo, 
$editable );
$html .= $this-getHtmlForDataType( $this-getDataType( 
$property ) );
 
-   $html .= $this-claimsView-getHtml(
-   $property-getStatements()-toArray(),
-   $entityInfo,
-   'wikibase-attributes'
-   );
+   if ( $this-displayStatementsOnProperties ) {
+   $html .= $this-claimsView-getHtml(
+   $property-getStatements()-toArray(),
+   $entityInfo,
+   'wikibase-attributes'
+   );
+   }
 
$footer = wfMessage( 'wikibase-property-footer' );
 
diff --git a/repo/includes/View/EntityViewFactory.php 
b/repo/includes/View/EntityViewFactory.php
index 8c2afad..b853bd5 100644
--- a/repo/includes/View/EntityViewFactory.php
+++ b/repo/includes/View/EntityViewFactory.php
@@ -16,6 +16,7 @@
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Store\LabelLookup;
 use Wikibase\PropertyView;
+use Wikibase\Repo\WikibaseRepo;
 
 /**
  * @since 0.5
@@ -83,7 +84,10 @@
if ( $entityType === 'item' ) {
return new ItemView( $fingerprintView, $claimsView, 
$language );
} elseif ( $entityType === 'property' ) {
-   return new PropertyView( $fingerprintView, $claimsView, 
$language );
+   $displayStatementsOnProperties = 
WikibaseRepo::getDefaultInstance()-getSettings()
+   -getSetting( 
'displayStatementsOnProperties' );
+
+

[MediaWiki-commits] [Gerrit] Always use 'wikibase-statements' as statement section header - change (mediawiki...Wikibase)

2014-11-27 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

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

Change subject: Always use 'wikibase-statements' as statement section header
..

Always use 'wikibase-statements' as statement section header

Change-Id: I1f4093ca07c13b6588461ded5f8998c62514e174
---
M repo/i18n/en.json
M repo/includes/ItemView.php
M repo/includes/PropertyView.php
M repo/includes/View/ClaimsView.php
4 files changed, 4 insertions(+), 13 deletions(-)


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

diff --git a/repo/i18n/en.json b/repo/i18n/en.json
index 5b82521..42b79a6 100644
--- a/repo/i18n/en.json
+++ b/repo/i18n/en.json
@@ -48,9 +48,7 @@
wikibase-description-input-help-message: Enter a short description 
for this entity in $1.,
wikibase-fingerprintgroupview-input-help-message: Enter a label of 
this entity, a short description and aliases per language.,
wikibase-fingerprintview-input-help-message: Enter the label of this 
entity, a short description and aliases in $1.,
-   wikibase-claims: Claims,
wikibase-statements: Statements,
-   wikibase-attributes: Attributes,
wikibase-terms: In other languages,
wikibase-sitelinkgroupview-input-help-message: Add a site link by 
specifying a site and a page of that site, edit or remove existing site links.,
wikibase-sitelinks-empty: No page is linked to this item yet.,
diff --git a/repo/includes/ItemView.php b/repo/includes/ItemView.php
index e506d21..f791ebd 100644
--- a/repo/includes/ItemView.php
+++ b/repo/includes/ItemView.php
@@ -35,8 +35,7 @@
$html = parent::getMainHtml( $entityRevision, $entityInfo, 
$editable );
$html .= $this-claimsView-getHtml(
$item-getStatements()-toArray(),
-   $entityInfo,
-   'wikibase-statements'
+   $entityInfo
);
 
return $html;
diff --git a/repo/includes/PropertyView.php b/repo/includes/PropertyView.php
index 6e8786b..9929e65 100644
--- a/repo/includes/PropertyView.php
+++ b/repo/includes/PropertyView.php
@@ -40,8 +40,7 @@
// @fixme Property::getClaims no longer returns any 
statements for properties!
$html .= $this-claimsView-getHtml(
$property-getStatements()-toArray(),
-   $entityInfo,
-   'wikibase-attributes'
+   $entityInfo
);
}
 
diff --git a/repo/includes/View/ClaimsView.php 
b/repo/includes/View/ClaimsView.php
index 6ba6369..451c9e4 100644
--- a/repo/includes/View/ClaimsView.php
+++ b/repo/includes/View/ClaimsView.php
@@ -5,12 +5,8 @@
 use Linker;
 use Wikibase\ClaimHtmlGenerator;
 use Wikibase\DataModel\Claim\Claim;
-use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Snak\Snak;
-use Wikibase\Lib\Store\EntityInfoBuilderFactory;
 use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\ReferencedEntitiesFinder;
 
 /**
  * Generates HTML to display claims.
@@ -67,10 +63,9 @@
 *
 * @param Claim[] $claims the claims to render
 * @param array $entityInfo
-* @param string $heading the message key of the heading
 * @return string
 */
-   public function getHtml( array $claims, array $entityInfo, $heading = 
'wikibase-claims' ) {
+   public function getHtml( array $claims, array $entityInfo ) {
// aggregate claims by properties
$claimsByProperty = $this-groupClaimsByProperties( $claims );
 
@@ -82,7 +77,7 @@
$claimgrouplistviewHtml = wfTemplate( 'wb-claimgrouplistview', 
$claimsHtml, '' );
 
// TODO: Add link to SpecialPage that allows adding a new claim.
-   $sectionHeading = $this-getHtmlForSectionHeading( $heading );
+   $sectionHeading = $this-getHtmlForSectionHeading( 
'wikibase-statements' );
// FIXME: claimgrouplistview should be the topmost claims 
related template
$html = wfTemplate( 'wb-claimlistview', 
$claimgrouplistviewHtml, '', '' );
return $sectionHeading . $html;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f4093ca07c13b6588461ded5f8998c62514e174
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf10
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] Also show Statements on Properties in non-experimental mode - change (mediawiki...Wikibase)

2014-11-27 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

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

Change subject: Also show Statements on Properties in non-experimental mode
..

Also show Statements on Properties in non-experimental mode

Change-Id: I2a1969ff501fe4667fb42f325e9f28bf5aab6e2e
(cherry picked from commit e92535ce71e5391ee8bf3d0717f384babe351716)
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M repo/includes/PropertyView.php
2 files changed, 6 insertions(+), 12 deletions(-)


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

diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index dbdb1d4..2c462cc 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -103,10 +103,7 @@
 
// TODO: Have an itemview and propertyview instead of ugly hack 
here.
var entityType = this.options.value.getType();
-   if(
-   entityType === 'item'
-   || entityType === 'property'  mw.config.get( 
'wbExperimentalFeatures' )
-   ) {
+   if( entityType === 'item' || entityType === 'property' ) {
this._initClaims();
}
 
diff --git a/repo/includes/PropertyView.php b/repo/includes/PropertyView.php
index 6e8786b..a5b71e6 100644
--- a/repo/includes/PropertyView.php
+++ b/repo/includes/PropertyView.php
@@ -36,14 +36,11 @@
$html = parent::getMainHtml( $entityRevision, $entityInfo, 
$editable );
$html .= $this-getHtmlForDataType( $this-getDataType( 
$property ) );
 
-   if ( defined( 'WB_EXPERIMENTAL_FEATURES' )  
WB_EXPERIMENTAL_FEATURES ) {
-   // @fixme Property::getClaims no longer returns any 
statements for properties!
-   $html .= $this-claimsView-getHtml(
-   $property-getStatements()-toArray(),
-   $entityInfo,
-   'wikibase-attributes'
-   );
-   }
+   $html .= $this-claimsView-getHtml(
+   $property-getStatements()-toArray(),
+   $entityInfo,
+   'wikibase-attributes'
+   );
 
$footer = wfMessage( 'wikibase-property-footer' );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a1969ff501fe4667fb42f325e9f28bf5aab6e2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf10
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 TODO - change (mediawiki...Wikibase)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Add TODO
..


Add TODO

Change-Id: I5a625295ce92e598d5e0abf8c32892fe49fe8d49
---
M lib/includes/store/EntityRevision.php
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/includes/store/EntityRevision.php 
b/lib/includes/store/EntityRevision.php
index cffb4fa..7b37f92 100644
--- a/lib/includes/store/EntityRevision.php
+++ b/lib/includes/store/EntityRevision.php
@@ -52,6 +52,8 @@
}
 
/**
+* TODO: change return type to EntityDocument
+*
 * @return Entity
 */
public function getEntity() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a625295ce92e598d5e0abf8c32892fe49fe8d49
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@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] K4: add links so new topic notifications are linked from Spe... - change (mediawiki...Flow)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: K4: add links so new topic notifications are linked from 
Special:Notifications
..


K4: add links so new topic notifications are linked from Special:Notifications

Change-Id: I2b7b845c0200356fc4297be2be1be2236b275b1e
---
M i18n/en.json
M i18n/qqq.json
M includes/Notifications/Formatter.php
M includes/Notifications/Notifications.php
4 files changed, 16 insertions(+), 7 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 5902b9b..a297b97 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -241,8 +241,8 @@
flow-notification-reply-bundle: span class=\plainlinks 
mw-echo-title-heading\[$4 $2]/spanbr /$1 and $5 
{{PLURAL:$6|other|others}} {{GENDER:$1|responded}} on '''$3'''.,
flow-notification-edit: $1 {{GENDER:$1|edited}} a span 
class=\plainlinks\[$5 post]/span in \$2\ on [[$3|$4]].,
flow-notification-edit-bundle: $1 and $5 {{PLURAL:$6|other|others}} 
{{GENDER:$1|edited}} a span class=\plainlinks\[$4 post]/span in \$2\ on 
\$3\.,
-   flow-notification-newtopic: span 
class=\mw-echo-title-heading\$4/spanbr /$1 {{GENDER:$1|created}} a new 
topic on '''$3'''.,
-   flow-notification-newtopic-bundle: {{PLURAL:$1|$1|250=250+}} new 
{{PLURAL:$1|topic|topics}} on '''$2''',
+   flow-notification-newtopic: span class=\mw-echo-title-heading 
plainlinks\[$5 $4]/spanbr /$1 {{GENDER:$1|created}} a new topic on 
'''$3'''.,
+   flow-notification-newtopic-bundle: {{PLURAL:$1|$1|250=250+}} new 
{{PLURAL:$1|topic|topics}} on '''span class=\plainlinks\[$3 $2]/span''',
flow-notification-rename: $1 {{GENDER:$1|changed}} the title of 
span class=\plainlinks\[$2 $3]/span to \$4\ on [[$5|$6]].,
flow-notification-mention: $1 {{GENDER:$1|mentioned}} 
{{GENDER:$5|you}} in {{GENDER:$1|his|her|their}} span class=\plainlinks\[$2 
post]/span in \$3\ on \$4\.,
flow-notification-link-text-view-post: View post,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index acf091f..05cf2f2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -245,8 +245,8 @@
flow-notification-reply-bundle: Notification text for when a user 
receives replies from multiple users on the same topic.\n\nParameters:\n* $1 - 
username of the person who replied\n* $2 - title of the topic\n* $3 - title for 
the page that the Flow board is attached to\n* $4 - permantent URL for the 
post\n* $5 - the count of other action performers, could be number or 
{{msg-mw|Echo-notification-count}}. e.g. 7 others or 99+ others\n* $6 - a 
number used for plural support\nSee also:\n* 
{{msg-mw|Flow-notification-reply-email-batch-bundle-body}}\n{{Related|Flow-notification}},
flow-notification-edit: Notification text for when a user's post is 
edited. Parameters:\n* $1 - username of the person who edited the post\n* $2 - 
title of the topic\n* $3 - title for the Flow board\n* $4 - title for the page 
that the Flow board is attached to\n* $5 - permanent URL for the 
post\n{{Related|Flow-notification}},
flow-notification-edit-bundle: Notification text for when a user 
receives post edits from multiple users on the same topic.\n\nParameters:\n* $1 
- username of the person who edited post\n* $2 - title of the topic\n* $3 - 
title for the page that the Flow board is attached to\n* $4 - permantent URL 
for the topic\n* $5 - the count of other action performers, could be number or 
{{msg-mw|Echo-notification-count}}. e.g. 7 others or 99+ others\n* $6 - a 
number used for plural support\nSee also:\n* 
{{msg-mw|Flow-notification-edit-email-batch-bundle-body}}\n{{Related|Flow-notification}},
-   flow-notification-newtopic: Notification text for when a new topic 
is created. Parameters:\n* $1 - username of the person who created the topic\n* 
$2 - (Unused) title for the Flow board\n* $3 - title for the page that the Flow 
board is attached to\n* $4 - title of the topic\n{{Related|Flow-notification}},
-   flow-notification-newtopic-bundle: Notification text for when 
multiple new topics are created on the same page. Parameters:\n* $1 - The 
number of topics that were created. This value is capped to 250. When this 
value is 250 it means 250 or more topics have been created.\n* $2 - The title 
of the page the topics were created on\n{{Related|Flow-notification}},
+   flow-notification-newtopic: Notification text for when a new topic 
is created. Parameters:\n* $1 - username of the person who created the topic\n* 
$2 - (Unused) title for the Flow board\n* $3 - title for the page that the Flow 
board is attached to\n* $4 - title of the topic\n* $5 - Fully qualified url to 
view the created topic.{{Related|Flow-notification}},
+   flow-notification-newtopic-bundle: Notification text for when 
multiple new topics are created on the same page. Parameters:\n* $1 - The 
number of topics that

[MediaWiki-commits] [Gerrit] Always use 'wikibase-statements' as statement section header - change (mediawiki...Wikibase)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Always use 'wikibase-statements' as statement section header
..


Always use 'wikibase-statements' as statement section header

Change-Id: I1f4093ca07c13b6588461ded5f8998c62514e174
---
M repo/i18n/en.json
M repo/includes/ItemView.php
M repo/includes/PropertyView.php
M repo/includes/View/ClaimsView.php
4 files changed, 4 insertions(+), 13 deletions(-)

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



diff --git a/repo/i18n/en.json b/repo/i18n/en.json
index 5b82521..42b79a6 100644
--- a/repo/i18n/en.json
+++ b/repo/i18n/en.json
@@ -48,9 +48,7 @@
wikibase-description-input-help-message: Enter a short description 
for this entity in $1.,
wikibase-fingerprintgroupview-input-help-message: Enter a label of 
this entity, a short description and aliases per language.,
wikibase-fingerprintview-input-help-message: Enter the label of this 
entity, a short description and aliases in $1.,
-   wikibase-claims: Claims,
wikibase-statements: Statements,
-   wikibase-attributes: Attributes,
wikibase-terms: In other languages,
wikibase-sitelinkgroupview-input-help-message: Add a site link by 
specifying a site and a page of that site, edit or remove existing site links.,
wikibase-sitelinks-empty: No page is linked to this item yet.,
diff --git a/repo/includes/ItemView.php b/repo/includes/ItemView.php
index e506d21..f791ebd 100644
--- a/repo/includes/ItemView.php
+++ b/repo/includes/ItemView.php
@@ -35,8 +35,7 @@
$html = parent::getMainHtml( $entityRevision, $entityInfo, 
$editable );
$html .= $this-claimsView-getHtml(
$item-getStatements()-toArray(),
-   $entityInfo,
-   'wikibase-statements'
+   $entityInfo
);
 
return $html;
diff --git a/repo/includes/PropertyView.php b/repo/includes/PropertyView.php
index 71eb388..40105fa 100644
--- a/repo/includes/PropertyView.php
+++ b/repo/includes/PropertyView.php
@@ -59,8 +59,7 @@
if ( $this-displayStatementsOnProperties ) {
$html .= $this-claimsView-getHtml(
$property-getStatements()-toArray(),
-   $entityInfo,
-   'wikibase-attributes'
+   $entityInfo
);
}
 
diff --git a/repo/includes/View/ClaimsView.php 
b/repo/includes/View/ClaimsView.php
index b0f7153..c4342e0 100644
--- a/repo/includes/View/ClaimsView.php
+++ b/repo/includes/View/ClaimsView.php
@@ -5,12 +5,8 @@
 use Linker;
 use Wikibase\ClaimHtmlGenerator;
 use Wikibase\DataModel\Claim\Claim;
-use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Snak\Snak;
-use Wikibase\Lib\Store\EntityInfoBuilderFactory;
 use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\ReferencedEntitiesFinder;
 
 /**
  * Generates HTML to display claims.
@@ -67,10 +63,9 @@
 *
 * @param Claim[] $claims the claims to render
 * @param array $entityInfo
-* @param string $heading the message key of the heading
 * @return string
 */
-   public function getHtml( array $claims, array $entityInfo, $heading = 
'wikibase-claims' ) {
+   public function getHtml( array $claims, array $entityInfo ) {
// aggregate claims by properties
$claimsByProperty = $this-groupClaimsByProperties( $claims );
 
@@ -82,7 +77,7 @@
$claimgrouplistviewHtml = wfTemplate( 'wb-claimgrouplistview', 
$claimsHtml, '' );
 
// TODO: Add link to SpecialPage that allows adding a new claim.
-   $sectionHeading = $this-getHtmlForSectionHeading( $heading );
+   $sectionHeading = $this-getHtmlForSectionHeading( 
'wikibase-statements' );
// FIXME: claimgrouplistview should be the topmost claims 
related template
$html = wfTemplate( 'wb-claimlistview', 
$claimgrouplistviewHtml, '', '' );
return $sectionHeading . $html;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f4093ca07c13b6588461ded5f8998c62514e174
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
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 unused banner variance parameters - change (mediawiki...CentralNotice)

2014-11-27 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: Remove unused banner variance parameters
..

Remove unused banner variance parameters

Once a banner has been chosen, we don't actually change banner content based on
device, country, isAnonymous, or bucket.  Removing these parameters will reduce
cache fragmentation, and reduce average time to load banners.

This patch should have no user-visible effect.

Change-Id: I1a5ba8773cd8bebcc83edfc9a25d934a3a8530e3
---
M includes/BannerRenderer.php
M includes/MixinController.php
M modules/ext.centralNotice.bannerController/bannerController.js
M special/SpecialBannerLoader.php
M special/SpecialCentralNoticeBanners.php
5 files changed, 16 insertions(+), 47 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice 
refs/changes/51/176251/1

diff --git a/includes/BannerRenderer.php b/includes/BannerRenderer.php
index 36fcdca..d2d5125 100644
--- a/includes/BannerRenderer.php
+++ b/includes/BannerRenderer.php
@@ -20,24 +20,13 @@
 
protected $mixinController = null;
 
-   function __construct( IContextSource $context, Banner $banner, 
$campaignName = null, AllocationContext $allocContext = null ) {
+   function __construct( IContextSource $context, Banner $banner, 
$campaignName = null ) {
$this-context = $context;
 
$this-banner = $banner;
$this-campaignName = $campaignName;
 
-   if ( $allocContext === null ) {
-   /**
-* This should only be used when banners are previewed 
in management forms.
-* TODO: set realistic context in the admin ui, drawn 
from the campaign
-* configuration and current translation settings.
-*/
-   $this-allocContext = new AllocationContext( 'XX', 
'en', 'wikipedia', true, 'desktop', 0 );
-   } else {
-   $this-allocContext = $allocContext;
-   }
-
-   $this-mixinController = new MixinController( $this-context, 
$this-banner-getMixins(), $allocContext );
+   $this-mixinController = new MixinController( $this-context, 
$this-banner-getMixins() );
 
//FIXME: it should make sense to do this:
// $this-mixinController-registerMagicWord( 'campaign', 
array( $this, 'getCampaign' ) );
diff --git a/includes/MixinController.php b/includes/MixinController.php
index 34e33ee..8567423 100644
--- a/includes/MixinController.php
+++ b/includes/MixinController.php
@@ -5,11 +5,9 @@
 
protected $magicWords = array();
protected $uiContext;
-   protected $allocContext;
 
-   function __construct( IContextSource $uiContext, $mixins, 
AllocationContext $allocContext = null ) {
+   function __construct( IContextSource $uiContext, $mixins ) {
$this-uiContext = $uiContext;
-   $this-allocContext = $allocContext;
$this-mixins = $mixins;
 
$this-loadPhp();
@@ -17,10 +15,6 @@
 
function getContext() {
return $this-uiContext;
-   }
-
-   function getAllocContext() {
-   return $this-allocContext;
}
 
function getMagicWords() {
diff --git a/modules/ext.centralNotice.bannerController/bannerController.js 
b/modules/ext.centralNotice.bannerController/bannerController.js
index 1ed85af..9c09ee7 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -142,10 +142,6 @@
banner: bannerName,
campaign: campaign,
uselang: mw.config.get( 'wgUserLanguage' ),
-   db: mw.config.get( 'wgDBname' ),
-   project: mw.config.get( 'wgNoticeProject' ),
-   country: mw.centralNotice.data.country,
-   device: mw.centralNotice.data.device,
debug: mw.centralNotice.data.getVars.debug
};
 
@@ -196,11 +192,15 @@
 
// Only fetch a banner if we need to :)
if ( mw.centralNotice.data.banner ) {
-   fetchBannerQueryParams.banner = 
mw.centralNotice.data.banner;
-   fetchBannerQueryParams.campaign = 
mw.centralNotice.data.campaign;
+   var loadBannerQueryParams = {
+   banner: 
mw.centralNotice.data.banner,
+   campaign: 
mw.centralNotice.data.campaign,
+

[MediaWiki-commits] [Gerrit] fix rubocop string literal offenses - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: fix rubocop string literal offenses
..

fix rubocop string literal offenses

Bug: T75898
Change-Id: Ib5d5018e6ad915232be8048ca160e0241e5b7252
---
M .rubocop_todo.yml
M Gemfile
M lib/mediawiki_selenium.rb
M lib/mediawiki_selenium/step_definitions/login_steps.rb
M lib/mediawiki_selenium/step_definitions/resource_loader_steps.rb
M lib/mediawiki_selenium/step_definitions/upload_file_steps.rb
M lib/mediawiki_selenium/support/env.rb
M lib/mediawiki_selenium/support/hooks.rb
M lib/mediawiki_selenium/support/modules/api_helper.rb
M lib/mediawiki_selenium/support/modules/url_module.rb
M lib/mediawiki_selenium/support/pages/api_page.rb
M lib/mediawiki_selenium/support/pages/login_page.rb
M lib/mediawiki_selenium/support/pages/random_page.rb
M lib/mediawiki_selenium/support/pages/reset_preferences_page.rb
M lib/mediawiki_selenium/support/sauce.rb
M lib/mediawiki_selenium/version.rb
M lib/mediawiki_selenium/warnings_formatter.rb
M mediawiki_selenium.gemspec
18 files changed, 131 insertions(+), 137 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/52/176252/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d610c19..cf0f0d9 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -148,12 +148,6 @@
 Style/SpecialGlobalVars:
   Enabled: false
 
-# Offense count: 192
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiterals:
-  Enabled: false
-
 # Offense count: 3
 # Cop supports --auto-correct.
 Style/UnneededPercentQ:
diff --git a/Gemfile b/Gemfile
index 6fa2b49..136a71d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 #ruby=ruby-2.1.1
 #ruby-gemset=mediawiki_selenium
 
-source https://rubygems.org;
+source 'https://rubygems.org'
 
 gemspec
diff --git a/lib/mediawiki_selenium.rb b/lib/mediawiki_selenium.rb
index 612105f..1779e5f 100644
--- a/lib/mediawiki_selenium.rb
+++ b/lib/mediawiki_selenium.rb
@@ -9,22 +9,22 @@
 https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
 =end
 
-require mediawiki_selenium/version
+require 'mediawiki_selenium/version'
 
-require mediawiki_selenium/support/env
-require mediawiki_selenium/support/hooks
-require mediawiki_selenium/support/sauce
+require 'mediawiki_selenium/support/env'
+require 'mediawiki_selenium/support/hooks'
+require 'mediawiki_selenium/support/sauce'
 
-require mediawiki_selenium/step_definitions/login_steps
-require mediawiki_selenium/step_definitions/navigation_steps
-require mediawiki_selenium/step_definitions/preferences_steps
-require mediawiki_selenium/step_definitions/resource_loader_steps
-require mediawiki_selenium/step_definitions/upload_file_steps
+require 'mediawiki_selenium/step_definitions/login_steps'
+require 'mediawiki_selenium/step_definitions/navigation_steps'
+require 'mediawiki_selenium/step_definitions/preferences_steps'
+require 'mediawiki_selenium/step_definitions/resource_loader_steps'
+require 'mediawiki_selenium/step_definitions/upload_file_steps'
 
-require mediawiki_selenium/support/modules/api_helper
-require mediawiki_selenium/support/modules/url_module
+require 'mediawiki_selenium/support/modules/api_helper'
+require 'mediawiki_selenium/support/modules/url_module'
 
-require mediawiki_selenium/support/pages/api_page
-require mediawiki_selenium/support/pages/login_page
-require mediawiki_selenium/support/pages/random_page
-require mediawiki_selenium/support/pages/reset_preferences_page
+require 'mediawiki_selenium/support/pages/api_page'
+require 'mediawiki_selenium/support/pages/login_page'
+require 'mediawiki_selenium/support/pages/random_page'
+require 'mediawiki_selenium/support/pages/reset_preferences_page'
diff --git a/lib/mediawiki_selenium/step_definitions/login_steps.rb 
b/lib/mediawiki_selenium/step_definitions/login_steps.rb
index 2224358..1f8e9e5 100644
--- a/lib/mediawiki_selenium/step_definitions/login_steps.rb
+++ b/lib/mediawiki_selenium/step_definitions/login_steps.rb
@@ -10,5 +10,5 @@
 =end
 
 Given(/^I am logged in$/) do
-  visit(LoginPage).login_with(ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD])
+  visit(LoginPage).login_with(ENV['MEDIAWIKI_USER'], ENV['MEDIAWIKI_PASSWORD'])
 end
diff --git a/lib/mediawiki_selenium/step_definitions/resource_loader_steps.rb 
b/lib/mediawiki_selenium/step_definitions/resource_loader_steps.rb
index 00a4208..83a000f 100644
--- a/lib/mediawiki_selenium/step_definitions/resource_loader_steps.rb
+++ b/lib/mediawiki_selenium/step_definitions/resource_loader_steps.rb
@@ -41,5 +41,5 @@
 }
 return ret;
 }) ();
-).should == 
+).should == ''
 end
diff --git a/lib/mediawiki_selenium/step_definitions/upload_file_steps.rb 
b/lib/mediawiki_selenium/step_definitions/upload_file_steps.rb
index 9d79dc6..17c4cbb 100644
--- a/lib/mediawiki_selenium/step_definitions/upload_file_steps.rb
+++

[MediaWiki-commits] [Gerrit] mark unused argument (rubocop fix) - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: mark unused argument (rubocop fix)
..

mark unused argument (rubocop fix)

Bug: T75898
Change-Id: Id3ea69d0e2ef6639f4b9a219b4afd9b067f08832
---
M .rubocop_todo.yml
M lib/mediawiki_selenium/support/env.rb
M lib/mediawiki_selenium/support/hooks.rb
M lib/mediawiki_selenium/warnings_formatter.rb
4 files changed, 4 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/53/176253/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index cf0f0d9..05e78fc 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -6,16 +6,6 @@
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-# Cop supports --auto-correct.
-Lint/UnusedBlockArgument:
-  Enabled: false
-
-# Offense count: 4
-# Cop supports --auto-correct.
-Lint/UnusedMethodArgument:
-  Enabled: false
-
-# Offense count: 1
 Lint/UselessAccessModifier:
   Enabled: false
 
diff --git a/lib/mediawiki_selenium/support/env.rb 
b/lib/mediawiki_selenium/support/env.rb
index da741ea..429331a 100644
--- a/lib/mediawiki_selenium/support/env.rb
+++ b/lib/mediawiki_selenium/support/env.rb
@@ -136,7 +136,7 @@
 
   browser
 end
-def set_cookie(browser)
+def set_cookie(_browser)
   # implement this method in env.rb of the repository where it is needed
 end
 def test_name(scenario)
diff --git a/lib/mediawiki_selenium/support/hooks.rb 
b/lib/mediawiki_selenium/support/hooks.rb
index a1181e4..9b6b9c2 100644
--- a/lib/mediawiki_selenium/support/hooks.rb
+++ b/lib/mediawiki_selenium/support/hooks.rb
@@ -21,7 +21,7 @@
 
 AfterConfiguration do |config|
   # Install a formatter that can be used to show feature-related warnings
-  pretty_format, io = config.formats.find { |(format, io)| format == 'pretty' }
+  pretty_format, io = config.formats.find { |(format, _io)| format == 'pretty' 
}
   config.formats  ['MediawikiSelenium::WarningsFormatter', io] if 
pretty_format
 
   # Initiate headless mode
diff --git a/lib/mediawiki_selenium/warnings_formatter.rb 
b/lib/mediawiki_selenium/warnings_formatter.rb
index ee35a67..53b730e 100644
--- a/lib/mediawiki_selenium/warnings_formatter.rb
+++ b/lib/mediawiki_selenium/warnings_formatter.rb
@@ -4,7 +4,7 @@
   class WarningsFormatter
 include Cucumber::Formatter::Console
 
-def initialize(runtime, io, options)
+def initialize(_runtime, io, _options)
   @io = io
   @warning_counts = Hash.new(0)
 end
@@ -20,7 +20,7 @@
   end
 end
 
-def after_features(features)
+def after_features(_features)
   if @warning_counts.any?
 @warning_counts.each do |type, count|
   message = #{count} warning#{count  1 ? 's' : ''}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3ea69d0e2ef6639f4b9a219b4afd9b067f08832
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Stan tris...@saticed.me.uk

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

[MediaWiki-commits] [Gerrit] rubocop line length fixes - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: rubocop line length fixes
..

rubocop line length fixes

Bug: T75898
Change-Id: I1735802960570636aecee9e0c89cb8487990f528
---
M .rubocop.yml
M .rubocop_todo.yml
M lib/mediawiki_selenium/support/env.rb
M lib/mediawiki_selenium/support/hooks.rb
M lib/mediawiki_selenium/support/sauce.rb
M mediawiki_selenium.gemspec
6 files changed, 38 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/55/176255/1

diff --git a/.rubocop.yml b/.rubocop.yml
index cc32da4..345b03d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1 +1,5 @@
 inherit_from: .rubocop_todo.yml
+
+Metrics/LineLength:
+  Max: 100
+
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ee3ef98..e2a84f3 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -9,11 +9,6 @@
 Metrics/CyclomaticComplexity:
   Max: 16
 
-# Offense count: 36
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
-  Max: 187
-
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
diff --git a/lib/mediawiki_selenium/support/env.rb 
b/lib/mediawiki_selenium/support/env.rb
index 429331a..9f8baa4 100644
--- a/lib/mediawiki_selenium/support/env.rb
+++ b/lib/mediawiki_selenium/support/env.rb
@@ -40,7 +40,8 @@
   end
 end
 def environment
-  if ENV['SAUCE_ONDEMAND_USERNAME'] and ENV['SAUCE_ONDEMAND_ACCESS_KEY'] and 
ENV['BROWSER'] != 'phantomjs' and ENV['HEADLESS'] != 'true'
+  if ENV['SAUCE_ONDEMAND_USERNAME'] and ENV['SAUCE_ONDEMAND_ACCESS_KEY'] and
+  ENV['BROWSER'] != 'phantomjs' and ENV['HEADLESS'] != 'true'
 :saucelabs
   else
 :local
@@ -90,8 +91,11 @@
   :payload = json
 )
 end
+WebDriver_Capabilties = Selenium::WebDriver::Remote::Capabilities
 def sauce_browser(test_name, configuration)
-  abort 'Environment variables BROWSER, PLATFORM and VERSION have to be set' 
if (ENV['BROWSER'] == nil) or (ENV['PLATFORM'] == nil) or (ENV['VERSION'] == 
nil)
+  if (ENV['BROWSER'] == nil) or (ENV['PLATFORM'] == nil) or (ENV['VERSION'] == 
nil)
+abort 'Environment variables BROWSER, PLATFORM and VERSION have to be set'
+  end
 
   client = Selenium::WebDriver::Remote::Http::Default.new
 
@@ -102,21 +106,21 @@
 profile = Selenium::WebDriver::Firefox::Profile.new
 profile['dom.max_script_run_time'] = timeout
 profile['dom.max_chrome_script_run_time'] = timeout
-caps = Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_profile 
= profile)
+caps = WebDriver_Capabilities.firefox(:firefox_profile = profile)
   elsif configuration  configuration[:language]  ENV['BROWSER'] == 
'firefox'
 profile = Selenium::WebDriver::Firefox::Profile.new
 profile['intl.accept_languages'] = configuration[:language]
-caps = Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_profile 
= profile)
+caps = WebDriver_Capabilities.firefox(:firefox_profile = profile)
   elsif configuration  configuration[:language]  ENV['BROWSER'] == 'chrome'
 profile = Selenium::WebDriver::Chrome::Profile.new
 profile['intl.accept_languages'] = configuration[:language]
-caps = Selenium::WebDriver::Remote::Capabilities.chrome('chrome.profile' 
= profile.as_json['zip'])
+caps = WebDriver_Capabilities.chrome('chrome.profile' = 
profile.as_json['zip'])
   elsif configuration  configuration[:user_agent]  ENV['BROWSER'] == 
'firefox'
 profile = Selenium::WebDriver::Firefox::Profile.new
 profile['general.useragent.override'] = configuration[:user_agent]
-caps = Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_profile 
= profile)
+caps = WebDriver_Capabilities.firefox(:firefox_profile = profile)
   else
-caps = Selenium::WebDriver::Remote::Capabilities.send(ENV['BROWSER'])
+caps = WebDriver_Capabilities.send(ENV['BROWSER'])
   end
 
   caps.platform = ENV['PLATFORM']
@@ -126,7 +130,8 @@
   browser = Watir::Browser.new(
 :remote,
 http_client: client,
-url: 
http://#{ENV['SAUCE_ONDEMAND_USERNAME']}:#{ENV['SAUCE_ONDEMAND_ACCESS_KEY']}@ondemand.saucelabs.com:80/wd/hub,
+url: 
http://#{ENV['SAUCE_ONDEMAND_USERNAME']}:#{ENV['SAUCE_ONDEMAND_ACCESS_KEY']}@ 
\
+  'ondemand.saucelabs.com:80/wd/hub',
 desired_capabilities: caps)
   browser.wd.file_detector = lambda do |args|
 # args = [/path/to/file]
@@ -143,6 +148,7 @@
   if scenario.respond_to? :feature
 #{scenario.feature.title}: #{scenario.title}
   elsif scenario.respond_to? :scenario_outline
-#{scenario.scenario_outline.feature.title}: 
#{scenario.scenario_outline.title}: #{scenario.name}
+#{scenario.scenario_outline.feature.title}: 
#{scenario.scenario_outline.title}:  \
+  #{scenario.name}
   end
 end
diff --git a/lib/mediawiki_selenium/support/hooks.rb 
b/lib/mediawiki_selenium/support/hooks.rb
index 9b6b9c2..3e63a15 100644
---

[MediaWiki-commits] [Gerrit] add MediaWiki standard rubocop config - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: add MediaWiki standard rubocop config
..

add MediaWiki standard rubocop config

Bug: T75898
Change-Id: Ie5735fca41fbb6fb5216144ccd6c471d88bde578
---
M .rubocop.yml
M .rubocop_todo.yml
2 files changed, 21 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/56/176256/1

diff --git a/.rubocop.yml b/.rubocop.yml
index 345b03d..44f44f7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,26 @@
 inherit_from: .rubocop_todo.yml
 
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
 Metrics/LineLength:
   Max: 100
 
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Style/Alias:
+  Enabled: false
+
+Style/SignalException:
+  Enabled: false
+
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index e2a84f3..6208958 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -5,19 +5,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-Metrics/CyclomaticComplexity:
-  Max: 16
-
-# Offense count: 2
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 37
-
-# Offense count: 2
-Metrics/PerceivedComplexity:
-  Max: 17
-
 # Offense count: 1
 Style/AccessorMethodName:
   Enabled: false
@@ -110,12 +97,6 @@
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/RedundantSelf:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/SignalException:
   Enabled: false
 
 # Offense count: 6

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5735fca41fbb6fb5216144ccd6c471d88bde578
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Stan tris...@saticed.me.uk

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

[MediaWiki-commits] [Gerrit] rubocop and/or style fixes - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: rubocop and/or style fixes
..

rubocop and/or style fixes

Bug: T75898
Change-Id: I22048e027c3ceef4b227acb9fa1d9ad2345c7e82
---
M .rubocop_todo.yml
M lib/mediawiki_selenium/support/env.rb
2 files changed, 3 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/58/176258/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6f12914..425b1a8 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -5,12 +5,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/AndOr:
-  Enabled: false
-
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
diff --git a/lib/mediawiki_selenium/support/env.rb 
b/lib/mediawiki_selenium/support/env.rb
index 56f7ddc..d2728ce 100644
--- a/lib/mediawiki_selenium/support/env.rb
+++ b/lib/mediawiki_selenium/support/env.rb
@@ -40,8 +40,8 @@
   end
 end
 def environment
-  if ENV['SAUCE_ONDEMAND_USERNAME'] and ENV['SAUCE_ONDEMAND_ACCESS_KEY'] and
-  ENV['BROWSER'] != 'phantomjs' and ENV['HEADLESS'] != 'true'
+  if ENV['SAUCE_ONDEMAND_USERNAME']  ENV['SAUCE_ONDEMAND_ACCESS_KEY'] 
+  ENV['BROWSER'] != 'phantomjs'  ENV['HEADLESS'] != 'true'
 :saucelabs
   else
 :local
@@ -93,7 +93,7 @@
 end
 WebDriver_Capabilties = Selenium::WebDriver::Remote::Capabilities
 def sauce_browser(test_name, configuration)
-  if (ENV['BROWSER'] == nil) or (ENV['PLATFORM'] == nil) or (ENV['VERSION'] == 
nil)
+  if (ENV['BROWSER'] == nil) || (ENV['PLATFORM'] == nil) || (ENV['VERSION'] == 
nil)
 abort 'Environment variables BROWSER, PLATFORM and VERSION have to be set'
   end
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I22048e027c3ceef4b227acb9fa1d9ad2345c7e82
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Stan tris...@saticed.me.uk

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

[MediaWiki-commits] [Gerrit] use % instead of %Q per rubocop - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: use % instead of %Q per rubocop
..

use % instead of %Q per rubocop

Bug: T75898
Change-Id: I166106d887c2da7b7ab1476ace2eb3e9cf84bdd6
---
M .rubocop_todo.yml
M lib/mediawiki_selenium/support/hooks.rb
2 files changed, 3 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/59/176259/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 425b1a8..d49b255 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -5,12 +5,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/BarePercentLiterals:
-  Enabled: false
-
 # Offense count: 13
 # Cop supports --auto-correct.
 Style/BlockComments:
diff --git a/lib/mediawiki_selenium/support/hooks.rb 
b/lib/mediawiki_selenium/support/hooks.rb
index 3e63a15..cd4150f 100644
--- a/lib/mediawiki_selenium/support/hooks.rb
+++ b/lib/mediawiki_selenium/support/hooks.rb
@@ -100,9 +100,9 @@
 
   if environment == :saucelabs
 sid = $session_id || sauce_session_id
-sauce_api(%Q{{passed: #{scenario.passed?}}}, sid)
-sauce_api(%Q{{public: true}}, sid)
-sauce_api(%Q{{'build': #{ENV['BUILD_NUMBER']}}}, sid) if 
ENV['BUILD_NUMBER']
+sauce_api(%{{passed: #{scenario.passed?}}}, sid)
+sauce_api(%{{public: true}}, sid)
+sauce_api(%{{'build': #{ENV['BUILD_NUMBER']}}}, sid) if ENV['BUILD_NUMBER']
   end
 
   if @browser

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I166106d887c2da7b7ab1476ace2eb3e9cf84bdd6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Stan tris...@saticed.me.uk

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

[MediaWiki-commits] [Gerrit] T75898: change compact style module definition to nested (pe... - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: T75898: change compact style module definition to nested (per 
rubocop)
..

T75898: change compact style module definition to nested (per rubocop)

Change-Id: I7967a4f04f559989afbdae7f913b3681cd6ef980
---
M .rubocop_todo.yml
M lib/mediawiki_selenium/support/sauce.rb
2 files changed, 14 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/61/176261/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f1ffa98..167c1ec 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -5,11 +5,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/ClassAndModuleChildren:
-  Enabled: false
-
 # Offense count: 10
 Style/Documentation:
   Enabled: false
diff --git a/lib/mediawiki_selenium/support/sauce.rb 
b/lib/mediawiki_selenium/support/sauce.rb
index 3d3e4f9..74e5b90 100644
--- a/lib/mediawiki_selenium/support/sauce.rb
+++ b/lib/mediawiki_selenium/support/sauce.rb
@@ -9,21 +9,23 @@
 
 require 'cucumber/formatter/junit'
 
-module Cucumber::Formatter
-  class Sauce  Junit
+module Cucumber
+  module Formatter
+class Sauce  Junit
 
-private
+  private
 
-def format_exception(exception)
-  if ENV['HEADLESS'] == 'true'
-sauce_job_page = ''
-  elsif $session_id
-sauce_job_page = Sauce Labs job URL: 
http://saucelabs.com/jobs/#{$session_id}\n;
-  else
-sauce_job_page = 'Uh-oh. Could not find link to Sauce Labs job URL.'
+  def format_exception(exception)
+if ENV['HEADLESS'] == 'true'
+  sauce_job_page = ''
+elsif $session_id
+  sauce_job_page = Sauce Labs job URL: 
http://saucelabs.com/jobs/#{$session_id}\n;
+else
+  sauce_job_page = 'Uh-oh. Could not find link to Sauce Labs job URL.'
+end
+([sauce_job_page] + [#{exception.message} (#{exception.class})] +
+ exception.backtrace).join(\n)
   end
-  ([sauce_job_page] + [#{exception.message} (#{exception.class})] +
-exception.backtrace).join(\n)
 end
   end
 end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7967a4f04f559989afbdae7f913b3681cd6ef980
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Stan tris...@saticed.me.uk

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

[MediaWiki-commits] [Gerrit] remove non applicable private (per rubocop) - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: remove non applicable private (per rubocop)
..

remove non applicable private (per rubocop)

Bug: T75898
Change-Id: I2ac4926bfd4e9bd99cb4c7394709847a46c0460d
---
M .rubocop_todo.yml
M lib/mediawiki_selenium/warnings_formatter.rb
2 files changed, 0 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/54/176254/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 05e78fc..ee3ef98 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -5,10 +5,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-Lint/UselessAccessModifier:
-  Enabled: false
-
 # Offense count: 2
 Metrics/CyclomaticComplexity:
   Max: 16
diff --git a/lib/mediawiki_selenium/warnings_formatter.rb 
b/lib/mediawiki_selenium/warnings_formatter.rb
index 53b730e..ab51b0f 100644
--- a/lib/mediawiki_selenium/warnings_formatter.rb
+++ b/lib/mediawiki_selenium/warnings_formatter.rb
@@ -34,8 +34,6 @@
   feature.extend(FeatureWarnings)
 end
 
-private
-
 module FeatureWarnings
   def mw_warn(message, type = :default)
 mw_warnings[type] ||= []

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ac4926bfd4e9bd99cb4c7394709847a46c0460d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Stan tris...@saticed.me.uk

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

[MediaWiki-commits] [Gerrit] change block comments to # comments (per rubocop) - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: change block comments to # comments (per rubocop)
..

change block comments to # comments (per rubocop)

Bug: T75898
Change-Id: Ib397106eea41dfe2d3503d27b07656157cd0fe70
---
M .rubocop_todo.yml
M lib/mediawiki_selenium.rb
M lib/mediawiki_selenium/step_definitions/login_steps.rb
M lib/mediawiki_selenium/step_definitions/navigation_steps.rb
M lib/mediawiki_selenium/step_definitions/preferences_steps.rb
M lib/mediawiki_selenium/step_definitions/resource_loader_steps.rb
M lib/mediawiki_selenium/support/env.rb
M lib/mediawiki_selenium/support/hooks.rb
M lib/mediawiki_selenium/support/modules/url_module.rb
M lib/mediawiki_selenium/support/pages/login_page.rb
M lib/mediawiki_selenium/support/pages/random_page.rb
M lib/mediawiki_selenium/support/pages/reset_preferences_page.rb
M lib/mediawiki_selenium/support/sauce.rb
M lib/mediawiki_selenium/version.rb
14 files changed, 104 insertions(+), 135 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/60/176260/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d49b255..f1ffa98 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -5,11 +5,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 13
-# Cop supports --auto-correct.
-Style/BlockComments:
-  Enabled: false
-
 # Offense count: 1
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/ClassAndModuleChildren:
diff --git a/lib/mediawiki_selenium.rb b/lib/mediawiki_selenium.rb
index 1779e5f..cc436b5 100644
--- a/lib/mediawiki_selenium.rb
+++ b/lib/mediawiki_selenium.rb
@@ -1,13 +1,11 @@
-=begin
-This file is subject to the license terms in the LICENSE file found in the
-mediawiki_selenium top-level directory and at
-https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/LICENSE. No part of
-mediawiki_selenium, including this file, may be copied, modified, propagated, 
or
-distributed except according to the terms contained in the LICENSE file.
-Copyright 2013 by the Mediawiki developers. See the CREDITS file in the
-mediawiki_selenium top-level directory and at
-https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
-=end
+# This file is subject to the license terms in the LICENSE file found in the
+# mediawiki_selenium top-level directory and at
+# https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/LICENSE. No part of
+# mediawiki_selenium, including this file, may be copied, modified, 
propagated, or
+# distributed except according to the terms contained in the LICENSE file.
+# Copyright 2013 by the Mediawiki developers. See the CREDITS file in the
+# mediawiki_selenium top-level directory and at
+# https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
 
 require 'mediawiki_selenium/version'
 
diff --git a/lib/mediawiki_selenium/step_definitions/login_steps.rb 
b/lib/mediawiki_selenium/step_definitions/login_steps.rb
index 1f8e9e5..4ff7978 100644
--- a/lib/mediawiki_selenium/step_definitions/login_steps.rb
+++ b/lib/mediawiki_selenium/step_definitions/login_steps.rb
@@ -1,13 +1,11 @@
-=begin
-This file is subject to the license terms in the LICENSE file found in the
-mediawiki_selenium top-level directory and at
-https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/LICENSE. No part of
-mediawiki_selenium, including this file, may be copied, modified, propagated, 
or
-distributed except according to the terms contained in the LICENSE file.
-Copyright 2013 by the Mediawiki developers. See the CREDITS file in the
-mediawiki_selenium top-level directory and at
-https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
-=end
+# This file is subject to the license terms in the LICENSE file found in the
+# mediawiki_selenium top-level directory and at
+# https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/LICENSE. No part of
+# mediawiki_selenium, including this file, may be copied, modified, 
propagated, or
+# distributed except according to the terms contained in the LICENSE file.
+# Copyright 2013 by the Mediawiki developers. See the CREDITS file in the
+# mediawiki_selenium top-level directory and at
+# https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
 
 Given(/^I am logged in$/) do
   visit(LoginPage).login_with(ENV['MEDIAWIKI_USER'], ENV['MEDIAWIKI_PASSWORD'])
diff --git a/lib/mediawiki_selenium/step_definitions/navigation_steps.rb 
b/lib/mediawiki_selenium/step_definitions/navigation_steps.rb
index 1b66f24..db9f652 100644
--- a/lib/mediawiki_selenium/step_definitions/navigation_steps.rb
+++ b/lib/mediawiki_selenium/step_definitions/navigation_steps.rb
@@ -1,13 +1,11 @@
-=begin
-This file is subject to the license terms in the LICENSE file found in the
-mediawiki_selenium top-level directory and at

[MediaWiki-commits] [Gerrit] ignore cop because is part of module api - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: ignore cop because is part of module api
..

ignore cop because is part of module api

Bug: T75898
Change-Id: I34edaca3a9a673b76190dbad09b43b9d53d33bf0
---
M .rubocop_todo.yml
M lib/mediawiki_selenium/support/env.rb
2 files changed, 1 insertion(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/57/176257/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6208958..6f12914 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -5,10 +5,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-Style/AccessorMethodName:
-  Enabled: false
-
 # Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
diff --git a/lib/mediawiki_selenium/support/env.rb 
b/lib/mediawiki_selenium/support/env.rb
index 9f8baa4..56f7ddc 100644
--- a/lib/mediawiki_selenium/support/env.rb
+++ b/lib/mediawiki_selenium/support/env.rb
@@ -141,7 +141,7 @@
 
   browser
 end
-def set_cookie(_browser)
+def set_cookie(_browser) # rubocop:disable Style/AccessorMethodName
   # implement this method in env.rb of the repository where it is needed
 end
 def test_name(scenario)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34edaca3a9a673b76190dbad09b43b9d53d33bf0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Stan tris...@saticed.me.uk

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

[MediaWiki-commits] [Gerrit] Also show Statements on Properties in non-experimental mode - change (mediawiki...Wikibase)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Also show Statements on Properties in non-experimental mode
..


Also show Statements on Properties in non-experimental mode

Change-Id: I2a1969ff501fe4667fb42f325e9f28bf5aab6e2e
(cherry picked from commit e92535ce71e5391ee8bf3d0717f384babe351716)
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M repo/includes/PropertyView.php
2 files changed, 6 insertions(+), 12 deletions(-)

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



diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index dbdb1d4..2c462cc 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -103,10 +103,7 @@
 
// TODO: Have an itemview and propertyview instead of ugly hack 
here.
var entityType = this.options.value.getType();
-   if(
-   entityType === 'item'
-   || entityType === 'property'  mw.config.get( 
'wbExperimentalFeatures' )
-   ) {
+   if( entityType === 'item' || entityType === 'property' ) {
this._initClaims();
}
 
diff --git a/repo/includes/PropertyView.php b/repo/includes/PropertyView.php
index 6e8786b..a5b71e6 100644
--- a/repo/includes/PropertyView.php
+++ b/repo/includes/PropertyView.php
@@ -36,14 +36,11 @@
$html = parent::getMainHtml( $entityRevision, $entityInfo, 
$editable );
$html .= $this-getHtmlForDataType( $this-getDataType( 
$property ) );
 
-   if ( defined( 'WB_EXPERIMENTAL_FEATURES' )  
WB_EXPERIMENTAL_FEATURES ) {
-   // @fixme Property::getClaims no longer returns any 
statements for properties!
-   $html .= $this-claimsView-getHtml(
-   $property-getStatements()-toArray(),
-   $entityInfo,
-   'wikibase-attributes'
-   );
-   }
+   $html .= $this-claimsView-getHtml(
+   $property-getStatements()-toArray(),
+   $entityInfo,
+   'wikibase-attributes'
+   );
 
$footer = wfMessage( 'wikibase-property-footer' );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a1969ff501fe4667fb42f325e9f28bf5aab6e2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf10
Gerrit-Owner: Hoo man h...@online.de
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] Add a feature flag for showing Statements on Properties - change (mediawiki...Wikibase)

2014-11-27 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

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

Change subject: Add a feature flag for showing Statements on Properties
..

Add a feature flag for showing Statements on Properties

Bug: T75998
Change-Id: I61f3fa481d69cc3f1621f91a213cfd5a1bbab2ab
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M repo/config/Wikibase.default.php
M repo/includes/PropertyView.php
M repo/includes/View/EntityViewFactory.php
4 files changed, 38 insertions(+), 7 deletions(-)


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

diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index 2c462cc..2e7eabd 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -103,7 +103,10 @@
 
// TODO: Have an itemview and propertyview instead of ugly hack 
here.
var entityType = this.options.value.getType();
-   if( entityType === 'item' || entityType === 'property' ) {
+   if(
+   entityType === 'item'
+   || entityType === 'property'  this.element.find( 
'.wb-claimlistview' ).length === 1
+   ) {
this._initClaims();
}
 
diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php
index 1eb1e3d..8187aa1 100644
--- a/repo/config/Wikibase.default.php
+++ b/repo/config/Wikibase.default.php
@@ -94,6 +94,8 @@
 
'useRedirectTargetColumn' = true,
 
+   'displayStatementsOnProperties' = true,
+
'conceptBaseUri' = function() {
$uri = $GLOBALS['wgServer'];
$uri = preg_replace( '!^//!', 'http://', $uri );
diff --git a/repo/includes/PropertyView.php b/repo/includes/PropertyView.php
index a5b71e6..71eb388 100644
--- a/repo/includes/PropertyView.php
+++ b/repo/includes/PropertyView.php
@@ -6,6 +6,9 @@
 use InvalidArgumentException;
 use Wikibase\DataModel\Entity\Property;
 use Wikibase\Repo\WikibaseRepo;
+use Wikibase\Repo\View\FingerprintView;
+use Wikibase\Repo\View\ClaimsView;
+use Language;
 
 /**
  * Class for creating views for Property instances.
@@ -18,6 +21,23 @@
  * @author H. Snater  mediaw...@snater.com 
  */
 class PropertyView extends EntityView {
+
+   /**
+* @var bool
+*/
+   private $displayStatementsOnProperties;
+
+   /**
+* @param FingerprintView $fingerprintView
+* @param ClaimsView $claimsView
+* @param Language $language
+* @param bool $displayStatementsOnProperties
+*/
+   public function __construct( FingerprintView $fingerprintView, 
ClaimsView $claimsView, Language $language, $displayStatementsOnProperties ) {
+   parent::__construct($fingerprintView, $claimsView, $language);
+
+   $this-displayStatementsOnProperties = 
$displayStatementsOnProperties;
+   }
 
/**
 * @see EntityView::getMainHtml
@@ -36,11 +56,13 @@
$html = parent::getMainHtml( $entityRevision, $entityInfo, 
$editable );
$html .= $this-getHtmlForDataType( $this-getDataType( 
$property ) );
 
-   $html .= $this-claimsView-getHtml(
-   $property-getStatements()-toArray(),
-   $entityInfo,
-   'wikibase-attributes'
-   );
+   if ( $this-displayStatementsOnProperties ) {
+   $html .= $this-claimsView-getHtml(
+   $property-getStatements()-toArray(),
+   $entityInfo,
+   'wikibase-attributes'
+   );
+   }
 
$footer = wfMessage( 'wikibase-property-footer' );
 
diff --git a/repo/includes/View/EntityViewFactory.php 
b/repo/includes/View/EntityViewFactory.php
index 89e3759..92056c0 100644
--- a/repo/includes/View/EntityViewFactory.php
+++ b/repo/includes/View/EntityViewFactory.php
@@ -21,6 +21,7 @@
 use Wikibase\Repo\View\FingerprintView;
 use Wikibase\Repo\View\SectionEditLinkGenerator;
 use Wikibase\Repo\View\SnakHtmlGenerator;
+use Wikibase\Repo\WikibaseRepo;
 
 /**
  * @since 0.5
@@ -85,7 +86,10 @@
if ( $entityType === 'item' ) {
return new ItemView( $fingerprintView, $claimsView, 
$language );
} elseif ( $entityType === 'property' ) {
-   return new PropertyView( $fingerprintView, $claimsView, 
$language );
+   $displayStatementsOnProperties = 
WikibaseRepo::getDefaultInstance()-getSettings()
+   -getSetting( 
'displayStatementsOnProperties' );
+
+

[MediaWiki-commits] [Gerrit] Use older version of elastica - change (translatewiki)

2014-11-27 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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

Change subject: Use older version of elastica
..

Use older version of elastica

1.3.4.0 spews deprecation notices which are not trivial to work around
while keeping compatibility with 1.3.0.0 used at WMF.

Change-Id: If45f12c6521a82d586329e8e647c5d4b8cbde266
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/63/176263/1

diff --git a/composer.json b/composer.json
index 647b3bc..a80a906 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
cssjanus/cssjanus: ~1.1,
leafo/lessphp: ~0.5,
psr/log: 1.0.0,
-   ruflin/elastica: ~1.3,
+   ruflin/elastica: 1.3.0.0,
mediawiki/semantic-media-wiki: @dev,
mediawiki/semantic-maps: @dev
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If45f12c6521a82d586329e8e647c5d4b8cbde266
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] Use older version of elastica - change (translatewiki)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Use older version of elastica
..


Use older version of elastica

1.3.4.0 spews deprecation notices which are not trivial to work around
while keeping compatibility with 1.3.0.0 used at WMF.

Change-Id: If45f12c6521a82d586329e8e647c5d4b8cbde266
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/composer.json b/composer.json
index 647b3bc..a80a906 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
cssjanus/cssjanus: ~1.1,
leafo/lessphp: ~0.5,
psr/log: 1.0.0,
-   ruflin/elastica: ~1.3,
+   ruflin/elastica: 1.3.0.0,
mediawiki/semantic-media-wiki: @dev,
mediawiki/semantic-maps: @dev
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If45f12c6521a82d586329e8e647c5d4b8cbde266
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@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 a feature flag for showing Statements on Properties - change (mediawiki...Wikibase)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Add a feature flag for showing Statements on Properties
..


Add a feature flag for showing Statements on Properties

Bug: T75998
Change-Id: I61f3fa481d69cc3f1621f91a213cfd5a1bbab2ab
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M repo/config/Wikibase.default.php
M repo/includes/PropertyView.php
M repo/includes/View/EntityViewFactory.php
4 files changed, 38 insertions(+), 7 deletions(-)

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



diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index 2c462cc..2e7eabd 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -103,7 +103,10 @@
 
// TODO: Have an itemview and propertyview instead of ugly hack 
here.
var entityType = this.options.value.getType();
-   if( entityType === 'item' || entityType === 'property' ) {
+   if(
+   entityType === 'item'
+   || entityType === 'property'  this.element.find( 
'.wb-claimlistview' ).length === 1
+   ) {
this._initClaims();
}
 
diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php
index 1eb1e3d..8187aa1 100644
--- a/repo/config/Wikibase.default.php
+++ b/repo/config/Wikibase.default.php
@@ -94,6 +94,8 @@
 
'useRedirectTargetColumn' = true,
 
+   'displayStatementsOnProperties' = true,
+
'conceptBaseUri' = function() {
$uri = $GLOBALS['wgServer'];
$uri = preg_replace( '!^//!', 'http://', $uri );
diff --git a/repo/includes/PropertyView.php b/repo/includes/PropertyView.php
index a5b71e6..71eb388 100644
--- a/repo/includes/PropertyView.php
+++ b/repo/includes/PropertyView.php
@@ -6,6 +6,9 @@
 use InvalidArgumentException;
 use Wikibase\DataModel\Entity\Property;
 use Wikibase\Repo\WikibaseRepo;
+use Wikibase\Repo\View\FingerprintView;
+use Wikibase\Repo\View\ClaimsView;
+use Language;
 
 /**
  * Class for creating views for Property instances.
@@ -18,6 +21,23 @@
  * @author H. Snater  mediaw...@snater.com 
  */
 class PropertyView extends EntityView {
+
+   /**
+* @var bool
+*/
+   private $displayStatementsOnProperties;
+
+   /**
+* @param FingerprintView $fingerprintView
+* @param ClaimsView $claimsView
+* @param Language $language
+* @param bool $displayStatementsOnProperties
+*/
+   public function __construct( FingerprintView $fingerprintView, 
ClaimsView $claimsView, Language $language, $displayStatementsOnProperties ) {
+   parent::__construct($fingerprintView, $claimsView, $language);
+
+   $this-displayStatementsOnProperties = 
$displayStatementsOnProperties;
+   }
 
/**
 * @see EntityView::getMainHtml
@@ -36,11 +56,13 @@
$html = parent::getMainHtml( $entityRevision, $entityInfo, 
$editable );
$html .= $this-getHtmlForDataType( $this-getDataType( 
$property ) );
 
-   $html .= $this-claimsView-getHtml(
-   $property-getStatements()-toArray(),
-   $entityInfo,
-   'wikibase-attributes'
-   );
+   if ( $this-displayStatementsOnProperties ) {
+   $html .= $this-claimsView-getHtml(
+   $property-getStatements()-toArray(),
+   $entityInfo,
+   'wikibase-attributes'
+   );
+   }
 
$footer = wfMessage( 'wikibase-property-footer' );
 
diff --git a/repo/includes/View/EntityViewFactory.php 
b/repo/includes/View/EntityViewFactory.php
index 89e3759..92056c0 100644
--- a/repo/includes/View/EntityViewFactory.php
+++ b/repo/includes/View/EntityViewFactory.php
@@ -21,6 +21,7 @@
 use Wikibase\Repo\View\FingerprintView;
 use Wikibase\Repo\View\SectionEditLinkGenerator;
 use Wikibase\Repo\View\SnakHtmlGenerator;
+use Wikibase\Repo\WikibaseRepo;
 
 /**
  * @since 0.5
@@ -85,7 +86,10 @@
if ( $entityType === 'item' ) {
return new ItemView( $fingerprintView, $claimsView, 
$language );
} elseif ( $entityType === 'property' ) {
-   return new PropertyView( $fingerprintView, $claimsView, 
$language );
+   $displayStatementsOnProperties = 
WikibaseRepo::getDefaultInstance()-getSettings()
+   -getSetting( 
'displayStatementsOnProperties' );
+
+   return new PropertyView( $fingerprintView,

[MediaWiki-commits] [Gerrit] Move gerrit's remaining ITS templates into gerrit module - change (operations/puppet)

2014-11-27 Thread QChris (Code Review)

Hello Chad,

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

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

to review the following change.

Change subject: Move gerrit's remaining ITS templates into gerrit module
..

Move gerrit's remaining ITS templates into gerrit module

Change-Id: Iad1a12acd159f8c39448fd6be416a0923817e282
---
R modules/gerrit/files/its/templates/DraftPublishedPhabricator.vm
R modules/gerrit/files/its/templates/PatchSetCreatedPhabricator.vm
M modules/gerrit/manifests/jetty.pp
3 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/176264/1

diff --git a/files/gerrit/its/templates/DraftPublishedPhabricator.vm 
b/modules/gerrit/files/its/templates/DraftPublishedPhabricator.vm
similarity index 100%
rename from files/gerrit/its/templates/DraftPublishedPhabricator.vm
rename to modules/gerrit/files/its/templates/DraftPublishedPhabricator.vm
diff --git a/files/gerrit/its/templates/PatchSetCreatedPhabricator.vm 
b/modules/gerrit/files/its/templates/PatchSetCreatedPhabricator.vm
similarity index 100%
rename from files/gerrit/its/templates/PatchSetCreatedPhabricator.vm
rename to modules/gerrit/files/its/templates/PatchSetCreatedPhabricator.vm
diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index a8121bc..d5f2c64 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -161,7 +161,7 @@
 }
 
 file { 
'/var/lib/gerrit2/review_site/etc/its/templates/DraftPublishedPhabricator.vm':
-source  = 
'puppet:///files/gerrit/its/templates/DraftPublishedPhabricator.vm',
+source  = 
'puppet:///modules/gerrit/its/templates/DraftPublishedPhabricator.vm',
 owner   = 'gerrit2',
 group   = 'gerrit2',
 mode= '0755',
@@ -169,7 +169,7 @@
 }
 
 file { 
'/var/lib/gerrit2/review_site/etc/its/templates/PatchSetCreatedPhabricator.vm':
-source  = 
'puppet:///files/gerrit/its/templates/PatchSetCreatedPhabricator.vm',
+source  = 
'puppet:///modules/gerrit/its/templates/PatchSetCreatedPhabricator.vm',
 owner   = 'gerrit2',
 group   = 'gerrit2',
 mode= '0755',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad1a12acd159f8c39448fd6be416a0923817e282
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Chad ch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Remove hooks-bugzilla configuration - change (operations/puppet)

2014-11-27 Thread QChris (Code Review)

Hello Chad,

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

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

to review the following change.

Change subject: Remove hooks-bugzilla configuration
..

Remove hooks-bugzilla configuration

The hooks-bugzilla plugin is no longer in use.

We only keep the bugzilla commentlink around to linkify bugzilla
references and as its-phabricator-from-bugzilla currently uses this
commentlink to hook into gerrit.

Change-Id: I83457c374ee8499f6b53182430f9a33d6636333c
---
M modules/gerrit/files/its/action.config
D modules/gerrit/files/its/templates/DraftPublished.vm
M modules/gerrit/manifests/jetty.pp
M modules/gerrit/templates/gerrit.config.erb
4 files changed, 1 insertion(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/176265/1

diff --git a/modules/gerrit/files/its/action.config 
b/modules/gerrit/files/its/action.config
index a7031ab..90f6c9f 100644
--- a/modules/gerrit/files/its/action.config
+++ b/modules/gerrit/files/its/action.config
@@ -5,22 +5,6 @@
association = subject,footer-Bug,footer-bug
action = add-standard-comment
 
-[rule patchSetCreated]
-   event-type = patchset-created
-   status = !,DRAFT
-   is-draft = !,true
-   association = added@subject,added@footer-Bug,added@footer-bug
-   its-name = its-bugzilla
-   action = add-standard-comment
-   action = status PATCH_TO_REVIEW
-
-[rule changeDraftPublished]
-   event-type = draft-published
-   association = subject,footer-Bug,footer-bug
-   its-name = its-bugzilla
-   action = add-velocity-comment DraftPublished
-   action = status PATCH_TO_REVIEW
-
 [rule patchSetCreatedPhabricator]
event-type = patchset-created
status = !,DRAFT
diff --git a/modules/gerrit/files/its/templates/DraftPublished.vm 
b/modules/gerrit/files/its/templates/DraftPublished.vm
deleted file mode 100644
index f3821d1..000
--- a/modules/gerrit/files/its/templates/DraftPublished.vm
+++ /dev/null
@@ -1,4 +0,0 @@
-Change $change-number had a related patch set (by $author-name) published:
-$subject
-
-${its.formatLink($change-url)}
diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index d5f2c64..491bca1 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -153,11 +153,7 @@
 }
 
 file { '/var/lib/gerrit2/review_site/etc/its/templates/DraftPublished.vm':
-source  = 'puppet:///modules/gerrit/its/templates/DraftPublished.vm',
-owner   = 'gerrit2',
-group   = 'gerrit2',
-mode= '0755',
-require = File['/var/lib/gerrit2/review_site/etc/its/templates'],
+ensure  = absent,
 }
 
 file { 
'/var/lib/gerrit2/review_site/etc/its/templates/DraftPublishedPhabricator.vm':
diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index d5d27f8..4a8dd2b 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -78,7 +78,6 @@
 [commentlink bugzilla]
 match =  \\b[bB][uU][gG]\\:?\\s+#?(\\d+)\\b
 link = https://bugzilla.wikimedia.org/$1
-association = OPTIONAL
 [commentlink codereview]
 match = \\br(\\d+)\\b
 link = https://www.mediawiki.org/wiki/Special:CodeReview/MediaWiki/$1
@@ -142,16 +141,6 @@
 [changeMerge]
 test = true
 checkFrequency = 0
-[bugzilla]
-url = https://bugzilla.wikimedia.org
-username = gerritad...@wikimedia.org
-commentOnChangeAbandoned = false
-commentOnChangeMerged = false
-commentOnChangeRestored = false
-commentOnChangeCreated = false
-commentOnCommentAdded = false
-commentOnPatchSetCreated = false
-commentOnRefUpdatedGitWeb = false
 [its-phabricator]
 url = https://phabricator.wikimedia.org/
 username = gerritbot

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I83457c374ee8499f6b53182430f9a33d6636333c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Chad ch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Drop 'Phabricator' suffix from gerrit's ITS actions - change (operations/puppet)

2014-11-27 Thread QChris (Code Review)

Hello Chad,

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

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

to review the following change.

Change subject: Drop 'Phabricator' suffix from gerrit's ITS actions
..

Drop 'Phabricator' suffix from gerrit's ITS actions

It's only Phabricator right now. No more bugzilla. So we can now skip
the Phabricator suffix.

Change-Id: I0ace692a6e5d6f469bb8459f6d47439af264f3ce
---
M modules/gerrit/files/its/action.config
R modules/gerrit/files/its/templates/DraftPublished.vm
R modules/gerrit/files/its/templates/PatchSetCreated.vm
M modules/gerrit/manifests/jetty.pp
4 files changed, 19 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/176266/1

diff --git a/modules/gerrit/files/its/action.config 
b/modules/gerrit/files/its/action.config
index 90f6c9f..6f663eb 100644
--- a/modules/gerrit/files/its/action.config
+++ b/modules/gerrit/files/its/action.config
@@ -5,16 +5,16 @@
association = subject,footer-Bug,footer-bug
action = add-standard-comment
 
-[rule patchSetCreatedPhabricator]
+[rule patchSetCreated]
event-type = patchset-created
status = !,DRAFT
is-draft = !,true
association = added@subject,added@footer-Bug,added@footer-bug
its-name = its-phabricator
-   action = add-velocity-comment PatchSetCreatedPhabricator
+   action = add-velocity-comment PatchSetCreated
 
-[rule changeDraftPublishedPhabricator]
+[rule changeDraftPublished]
event-type = draft-published
association = subject,footer-Bug,footer-bug
its-name = its-phabricator
-   action = add-velocity-comment DraftPublishedPhabricator
+   action = add-velocity-comment DraftPublished
diff --git a/modules/gerrit/files/its/templates/DraftPublishedPhabricator.vm 
b/modules/gerrit/files/its/templates/DraftPublished.vm
similarity index 100%
rename from modules/gerrit/files/its/templates/DraftPublishedPhabricator.vm
rename to modules/gerrit/files/its/templates/DraftPublished.vm
diff --git a/modules/gerrit/files/its/templates/PatchSetCreatedPhabricator.vm 
b/modules/gerrit/files/its/templates/PatchSetCreated.vm
similarity index 100%
rename from modules/gerrit/files/its/templates/PatchSetCreatedPhabricator.vm
rename to modules/gerrit/files/its/templates/PatchSetCreated.vm
diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index 491bca1..4254492 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -153,23 +153,27 @@
 }
 
 file { '/var/lib/gerrit2/review_site/etc/its/templates/DraftPublished.vm':
-ensure  = absent,
+source  = 'puppet:///modules/gerrit/its/templates/DraftPublished.vm',
+owner   = 'gerrit2',
+group   = 'gerrit2',
+mode= '0755',
+require = File['/var/lib/gerrit2/review_site/etc/its/templates'],
+}
+
+file { '/var/lib/gerrit2/review_site/etc/its/templates/PatchSetCreated.vm':
+source  = 'puppet:///modules/gerrit/its/templates/PatchSetCreated.vm',
+owner   = 'gerrit2',
+group   = 'gerrit2',
+mode= '0755',
+require = File['/var/lib/gerrit2/review_site/etc/its/templates'],
 }
 
 file { 
'/var/lib/gerrit2/review_site/etc/its/templates/DraftPublishedPhabricator.vm':
-source  = 
'puppet:///modules/gerrit/its/templates/DraftPublishedPhabricator.vm',
-owner   = 'gerrit2',
-group   = 'gerrit2',
-mode= '0755',
-require = File['/var/lib/gerrit2/review_site/etc/its/templates'],
+ensure  = absent,
 }
 
 file { 
'/var/lib/gerrit2/review_site/etc/its/templates/PatchSetCreatedPhabricator.vm':
-source  = 
'puppet:///modules/gerrit/its/templates/PatchSetCreatedPhabricator.vm',
-owner   = 'gerrit2',
-group   = 'gerrit2',
-mode= '0755',
-require = File['/var/lib/gerrit2/review_site/etc/its/templates'],
+ensure  = absent,
 }
 
 file { '/var/lib/gerrit2/review_site/static/page-bkg.jpg':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ace692a6e5d6f469bb8459f6d47439af264f3ce
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Chad ch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Switch Gerrit's 'Report Bug' url to Phabricator - change (operations/puppet)

2014-11-27 Thread QChris (Code Review)

Hello Chad,

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

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

to review the following change.

Change subject: Switch Gerrit's 'Report Bug' url to Phabricator
..

Switch Gerrit's 'Report Bug' url to Phabricator

Change-Id: If24e1f5f61b4870a578da658769114929243c08a
---
M modules/gerrit/templates/gerrit.config.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/176267/1

diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index 4a8dd2b..4aa607d 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -1,7 +1,7 @@
 [gerrit]
 basePath = git
 canonicalWebUrl = %= @url %
-reportBugUrl = 
https://bugzilla.wikimedia.org/enter_bug.cgi?product=Wikimediacomponent=Git/Gerrit
+reportBugUrl = 
https://phabricator.wikimedia.org/maniphest/task/create/?projects=PHID-PROJ-lc5rwomzjp6fmcdpbw43
 [core]
 packedGitOpenFiles = 4096
 packedGitLimit = 500m

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If24e1f5f61b4870a578da658769114929243c08a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Chad ch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Always use 'wikibase-statements' as statement section header - change (mediawiki...Wikibase)

2014-11-27 Thread Hoo man (Code Review)

Hoo man has submitted this change and it was merged.

Change subject: Always use 'wikibase-statements' as statement section header
..


Always use 'wikibase-statements' as statement section header

Change-Id: I1f4093ca07c13b6588461ded5f8998c62514e174
---
M repo/i18n/en.json
M repo/includes/ItemView.php
M repo/includes/PropertyView.php
M repo/includes/View/ClaimsView.php
4 files changed, 4 insertions(+), 13 deletions(-)

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



diff --git a/repo/i18n/en.json b/repo/i18n/en.json
index 5b82521..42b79a6 100644
--- a/repo/i18n/en.json
+++ b/repo/i18n/en.json
@@ -48,9 +48,7 @@
wikibase-description-input-help-message: Enter a short description 
for this entity in $1.,
wikibase-fingerprintgroupview-input-help-message: Enter a label of 
this entity, a short description and aliases per language.,
wikibase-fingerprintview-input-help-message: Enter the label of this 
entity, a short description and aliases in $1.,
-   wikibase-claims: Claims,
wikibase-statements: Statements,
-   wikibase-attributes: Attributes,
wikibase-terms: In other languages,
wikibase-sitelinkgroupview-input-help-message: Add a site link by 
specifying a site and a page of that site, edit or remove existing site links.,
wikibase-sitelinks-empty: No page is linked to this item yet.,
diff --git a/repo/includes/ItemView.php b/repo/includes/ItemView.php
index e506d21..f791ebd 100644
--- a/repo/includes/ItemView.php
+++ b/repo/includes/ItemView.php
@@ -35,8 +35,7 @@
$html = parent::getMainHtml( $entityRevision, $entityInfo, 
$editable );
$html .= $this-claimsView-getHtml(
$item-getStatements()-toArray(),
-   $entityInfo,
-   'wikibase-statements'
+   $entityInfo
);
 
return $html;
diff --git a/repo/includes/PropertyView.php b/repo/includes/PropertyView.php
index 71eb388..40105fa 100644
--- a/repo/includes/PropertyView.php
+++ b/repo/includes/PropertyView.php
@@ -59,8 +59,7 @@
if ( $this-displayStatementsOnProperties ) {
$html .= $this-claimsView-getHtml(
$property-getStatements()-toArray(),
-   $entityInfo,
-   'wikibase-attributes'
+   $entityInfo
);
}
 
diff --git a/repo/includes/View/ClaimsView.php 
b/repo/includes/View/ClaimsView.php
index 6ba6369..451c9e4 100644
--- a/repo/includes/View/ClaimsView.php
+++ b/repo/includes/View/ClaimsView.php
@@ -5,12 +5,8 @@
 use Linker;
 use Wikibase\ClaimHtmlGenerator;
 use Wikibase\DataModel\Claim\Claim;
-use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Snak\Snak;
-use Wikibase\Lib\Store\EntityInfoBuilderFactory;
 use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\ReferencedEntitiesFinder;
 
 /**
  * Generates HTML to display claims.
@@ -67,10 +63,9 @@
 *
 * @param Claim[] $claims the claims to render
 * @param array $entityInfo
-* @param string $heading the message key of the heading
 * @return string
 */
-   public function getHtml( array $claims, array $entityInfo, $heading = 
'wikibase-claims' ) {
+   public function getHtml( array $claims, array $entityInfo ) {
// aggregate claims by properties
$claimsByProperty = $this-groupClaimsByProperties( $claims );
 
@@ -82,7 +77,7 @@
$claimgrouplistviewHtml = wfTemplate( 'wb-claimgrouplistview', 
$claimsHtml, '' );
 
// TODO: Add link to SpecialPage that allows adding a new claim.
-   $sectionHeading = $this-getHtmlForSectionHeading( $heading );
+   $sectionHeading = $this-getHtmlForSectionHeading( 
'wikibase-statements' );
// FIXME: claimgrouplistview should be the topmost claims 
related template
$html = wfTemplate( 'wb-claimlistview', 
$claimgrouplistviewHtml, '', '' );
return $sectionHeading . $html;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f4093ca07c13b6588461ded5f8998c62514e174
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf10
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Rewrite completely broken EntityView tests - change (mediawiki...Wikibase)

2014-11-27 Thread Adrian Lang (Code Review)

Adrian Lang has uploaded a new change for review.

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

Change subject: Rewrite completely broken EntityView tests
..

Rewrite completely broken EntityView tests

Change-Id: Ibc373a9017c25cc2bdacbabeea2b97d283e31b00
---
M repo/tests/phpunit/includes/View/EntityViewTest.php
M repo/tests/phpunit/includes/View/ItemViewTest.php
M repo/tests/phpunit/includes/View/PropertyViewTest.php
3 files changed, 88 insertions(+), 268 deletions(-)


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

diff --git a/repo/tests/phpunit/includes/View/EntityViewTest.php 
b/repo/tests/phpunit/includes/View/EntityViewTest.php
index 1199d45..c689b99 100644
--- a/repo/tests/phpunit/includes/View/EntityViewTest.php
+++ b/repo/tests/phpunit/includes/View/EntityViewTest.php
@@ -2,35 +2,11 @@
 
 namespace Wikibase\Test;
 
-use IContextSource;
-use InvalidArgumentException;
-use Language;
-use RequestContext;
-use Title;
-use ValueFormatters\FormatterOptions;
-use Wikibase\DataModel\Claim\Claim;
-use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\DataModel\Entity\Entity;
 use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\EntityIdValue;
-use Wikibase\DataModel\Entity\Item;
-use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\Entity\Property;
-use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\DataModel\Snak\Snak;
 use Wikibase\DataModel\Statement\Statement;
 use Wikibase\EntityRevision;
-use Wikibase\LanguageFallbackChain;
-use Wikibase\Lib\Serializers\SerializationOptions;
-use Wikibase\Lib\SnakFormatter;
-use Wikibase\Lib\Store\EntityInfoBuilderFactory;
-use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\ParserOutputJsConfigBuilder;
-use Wikibase\ReferencedEntitiesFinder;
 use Wikibase\Repo\View\EntityView;
-use Wikibase\Repo\WikibaseRepo;
-use Wikibase\Utils;
 
 /**
  * @covers Wikibase\Repo\View\EntityView
@@ -47,166 +23,6 @@
  * @author Daniel Kinzler
  */
 abstract class EntityViewTest extends \MediaWikiLangTestCase {
-
-   /**
-* @var MockRepository
-*/
-   private $mockRepository;
-
-   protected function newEntityIdParser() {
-   // The data provides use P123 and Q123 IDs, so the parser needs 
to understand these.
-   return new BasicEntityIdParser();
-   }
-
-   public function getTitleForId( EntityId $id ) {
-   $name = $id-getEntityType() . ':' . $id-getSerialization();
-   return Title::makeTitle( NS_MAIN, $name );
-   }
-
-   /**
-* @return EntityTitleLookup
-*/
-   protected function getEntityTitleLookupMock() {
-   $lookup = $this-getMock( 
'Wikibase\Lib\Store\EntityTitleLookup' );
-   $lookup-expects( $this-any() )
-   -method( 'getTitleForId' )
-   -will( $this-returnCallback( array( $this, 
'getTitleForId' ) ) );
-
-   return $lookup;
-   }
-
-   /**
-* @return SnakFormatter
-*/
-   protected function newSnakFormatterMock() {
-   $snakFormatter = $this-getMock( 'Wikibase\Lib\SnakFormatter' );
-
-   $snakFormatter-expects( $this-any() )-method( 'formatSnak' )
-   -will( $this-returnValue( '(value)' ) );
-
-   $snakFormatter-expects( $this-any() )-method( 'getFormat' )
-   -will( $this-returnValue( 
SnakFormatter::FORMAT_HTML_WIDGET ) );
-
-   $snakFormatter-expects( $this-any() )-method( 
'canFormatSnak' )
-   -will( $this-returnValue( true ) );
-
-   return $snakFormatter;
-   }
-
-   /**
-* @param string $entityType
-* @param EntityInfoBuilderFactory $entityInfoBuilderFactory
-* @param EntityTitleLookup $entityTitleLookup
-* @param IContextSource $context
-* @param LanguageFallbackChain $languageFallbackChain
-*
-* @throws InvalidArgumentException
-* @return EntityView
-*/
-   protected function newEntityView(
-   $entityType,
-   EntityInfoBuilderFactory $entityInfoBuilderFactory = null,
-   EntityTitleLookup $entityTitleLookup = null,
-   IContextSource $context = null,
-   LanguageFallbackChain $languageFallbackChain = null
-   ) {
-   if ( !is_string( $entityType ) ) {
-   throw new InvalidArgumentException( '$entityType must 
be a string!' );
-   }
-
-   $langCode = 'en';
-
-   if ( $context === null ) {
-   $context = new RequestContext();
-   $context-setLanguage( $langCode );
-   }
-
-   if ( $languageFallbackChain === null ) {
-

[MediaWiki-commits] [Gerrit] Update Wikibase and WikibaseDataModel - change (mediawiki...Wikidata)

2014-11-27 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

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

Change subject: Update Wikibase and WikibaseDataModel
..

Update Wikibase and WikibaseDataModel

Change-Id: Ic3d71792cf9980f6557ca8ff17ee327397dff56b
---
M composer.lock
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M extensions/Wikibase/repo/config/Wikibase.default.php
M extensions/Wikibase/repo/i18n/en.json
M extensions/Wikibase/repo/includes/ItemView.php
M extensions/Wikibase/repo/includes/PropertyView.php
M extensions/Wikibase/repo/includes/View/ClaimsView.php
M extensions/Wikibase/repo/includes/View/EntityViewFactory.php
M vendor/composer/autoload_files.php
M vendor/composer/autoload_psr4.php
M vendor/composer/installed.json
M vendor/wikibase/data-model/RELEASE-NOTES.md
M vendor/wikibase/data-model/WikibaseDataModel.php
M vendor/wikibase/data-model/src/Claim/Claim.php
M vendor/wikibase/data-model/src/Entity/Property.php
M vendor/wikibase/data-model/src/Statement/Statement.php
M vendor/wikibase/data-model/src/Statement/StatementList.php
M vendor/wikibase/data-model/tests/unit/Statement/StatementListTest.php
18 files changed, 242 insertions(+), 222 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index 950e593..e3fe9fa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -897,16 +897,16 @@
 },
 {
 name: wikibase/data-model,
-version: 2.4.0,
+version: 2.4.1,
 source: {
 type: git,
 url: https://github.com/wmde/WikibaseDataModel.git;,
-reference: 66de8e091eeb93bd201d9fdf52ebda958fae5b2a
+reference: 6223a24ac1df8688c0d429995ebe71ba37e26cd5
 },
 dist: {
 type: zip,
-url: 
https://api.github.com/repos/wmde/WikibaseDataModel/zipball/66de8e091eeb93bd201d9fdf52ebda958fae5b2a;,
-reference: 66de8e091eeb93bd201d9fdf52ebda958fae5b2a,
+url: 
https://api.github.com/repos/wmde/WikibaseDataModel/zipball/6223a24ac1df8688c0d429995ebe71ba37e26cd5;,
+reference: 6223a24ac1df8688c0d429995ebe71ba37e26cd5,
 shasum: 
 },
 require: {
@@ -947,7 +947,7 @@
 wikibase,
 wikidata
 ],
-time: 2014-11-23 00:54:35
+time: 2014-11-26 21:29:26
 },
 {
 name: wikibase/data-model-javascript,
@@ -1188,12 +1188,12 @@
 source: {
 type: git,
 url: 
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: e8d02191319edc1f8c1821fb8c7adfa68cb20e2d
+reference: 9a20e61a5c862a31bb7da1de661691f73e740124
 },
 dist: {
 type: zip,
-url: 
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/e8d02191319edc1f8c1821fb8c7adfa68cb20e2d;,
-reference: e8d02191319edc1f8c1821fb8c7adfa68cb20e2d,
+url: 
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/9a20e61a5c862a31bb7da1de661691f73e740124;,
+reference: 9a20e61a5c862a31bb7da1de661691f73e740124,
 shasum: 
 },
 require: {
@@ -1259,7 +1259,7 @@
 wikibaserepo,
 wikidata
 ],
-time: 2014-11-25 19:41:13
+time: 2014-11-27 14:51:02
 },
 {
 name: wikibase/wikimedia-badges,
diff --git 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index dbdb1d4..2e7eabd 100644
--- 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -105,7 +105,7 @@
var entityType = this.options.value.getType();
if(
entityType === 'item'
-   || entityType === 'property'  mw.config.get( 
'wbExperimentalFeatures' )
+   || entityType === 'property'  this.element.find( 
'.wb-claimlistview' ).length === 1
) {
this._initClaims();
}
diff --git a/extensions/Wikibase/repo/config/Wikibase.default.php 
b/extensions/Wikibase/repo/config/Wikibase.default.php
index 1eb1e3d..8187aa1 100644
--- a/extensions/Wikibase/repo/config/Wikibase.default.php
+++ b/extensions/Wikibase/repo/config/Wikibase.default.php
@@ -94,6 +94,8 @@
 
'useRedirectTargetColumn' = true,
 
+   'displayStatementsOnProperties' = true,
+

[MediaWiki-commits] [Gerrit] Move wikidata jobs to regular labs slaves. - change (integration/config)

2014-11-27 Thread JanZerebecki (Code Review)

JanZerebecki has uploaded a new change for review.

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

Change subject: Move wikidata jobs to regular labs slaves.
..

Move wikidata jobs to regular labs slaves.

After this the special wikidata jenkins slaves can be removed.

T73419
Change-Id: I2590254ef5499572d94f1302e54052f02b2151a8
---
M jjb/wikidata.yaml
1 file changed, 7 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/70/176270/1

diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index 6b6b0f5..4e990e9 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -1,8 +1,9 @@
 - builder:
 name: wd-mw-composer-install-ext
 builders:
-- shell: 'cd $WORKSPACE/extensions/{extension} 
-timeout 300 /usr/local/bin/composer install --prefer-source -vvv'
+- shell: |
+composer=/srv/deployment/integration/composer/vendor/bin/composer
+cd $WORKSPACE/extensions/{extension}  timeout 300 $composer 
install --prefer-source -vvv
 
 - builder:
 name: wd-wikibase-apply-settings
@@ -26,7 +27,7 @@
 
 - job-template:
 name: 'mwext-Wikibase-{kind}-tests'
-node: Wikidata
+node: contintLabsSlave  UbuntuPrecise
 concurrent: true
 defaults: use-zuul-for-mw-ext
 triggers:
@@ -51,7 +52,7 @@
 
 - job-template:
 name: 'mwext-Wikibase-qunit'
-node: Wikidata
+node: contintLabsSlave  UbuntuPrecise
 concurrent: true
 defaults: use-zuul-for-mw-ext
 triggers:
@@ -74,7 +75,7 @@
 
 - job-template:
 name: 'mwext-Wikidata-{kind}-tests'
-node: Wikidata # As this does not use composer there is no reason it can 
not also use regular slaves
+node: contintLabsSlave  UbuntuPrecise
 defaults: use-zuul-for-mw-ext
 triggers:
  - zuul
@@ -96,7 +97,7 @@
 
 - job-template:
 name: 'mwext-Wikidata-qunit'
-node: Wikidata
+node: contintLabsSlave  UbuntuPrecise
 concurrent: true
 defaults: use-zuul-for-mw-ext
 triggers:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2590254ef5499572d94f1302e54052f02b2151a8
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki jan.wikime...@zerebecki.de

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

[MediaWiki-commits] [Gerrit] Set displayStatementsOnProperties for wikidata/testwikidata - change (operations/mediawiki-config)

2014-11-27 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

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

Change subject: Set displayStatementsOnProperties for wikidata/testwikidata
..

Set displayStatementsOnProperties for wikidata/testwikidata

Change-Id: I89767a37ca5e812fc3708e1bdf9d7aecda93d9af
---
M wmf-config/Wikibase.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/71/176271/1

diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index 707f710..b299305 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -57,8 +57,10 @@
 
if ( $wgDBname === 'testwikidatawiki' ) {
$wgWBRepoSettings['specialSiteLinkGroups'][] = 'testwikidata';
+   $wgWBRepoSettings['displayStatementsOnProperties'] = true;
} else {
$wgWBRepoSettings['specialSiteLinkGroups'][] = 'wikidata';
+   $wgWBRepoSettings['displayStatementsOnProperties'] = false;
}
 
if ( $wgDBname === 'testwikidatawiki' ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89767a37ca5e812fc3708e1bdf9d7aecda93d9af
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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 'move-subpages' right to closer and filemover groups... - change (operations/mediawiki-config)

2014-11-27 Thread Glaisher (Code Review)

Glaisher has uploaded a new change for review.

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

Change subject: Add 'move-subpages' right to closer and filemover groups at 
ruwiki
..

Add 'move-subpages' right to closer and filemover groups at ruwiki

Change-Id: I31b397cefb072cd542389646a33095d729a07901
Task: T76131
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/72/176272/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 40fabab..817ee05 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7579,6 +7579,7 @@
'upload' = true,
'reupload-own' = true,
'reupload' = true,
+   'move-subpages' = true, // T76131
),
'filemover' = array( // bug 30984
'movefile' = true,
@@ -7587,6 +7588,7 @@
'reupload-own' = true,
'reupload' = true,
'move-categorypages' = true, // bug 66871
+   'move-subpages' = true, // T76131
),
'suppressredirect' = array( // bug 38408, 66871
'suppressredirect' = true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I31b397cefb072cd542389646a33095d729a07901
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Glaisher glaisher.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add 'move-subpages' right to closer and filemover user g... - change (operations/mediawiki-config)

2014-11-27 Thread Glaisher (Code Review)

Glaisher has uploaded a new change for review.

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

Change subject: Add 'move-subpages' right to closer and filemover user 
groups at ruwiki
..

Add 'move-subpages' right to closer and filemover
user groups at ruwiki

Change-Id: I0d006a94f20d2c607e774aa7901a02568b2538b3
Task: T76131
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/73/176273/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 40fabab..817ee05 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7579,6 +7579,7 @@
'upload' = true,
'reupload-own' = true,
'reupload' = true,
+   'move-subpages' = true, // T76131
),
'filemover' = array( // bug 30984
'movefile' = true,
@@ -7587,6 +7588,7 @@
'reupload-own' = true,
'reupload' = true,
'move-categorypages' = true, // bug 66871
+   'move-subpages' = true, // T76131
),
'suppressredirect' = array( // bug 38408, 66871
'suppressredirect' = true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d006a94f20d2c607e774aa7901a02568b2538b3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Glaisher glaisher.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] Update Wikibase and WikibaseDataModel - change (mediawiki...Wikidata)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Update Wikibase and WikibaseDataModel
..


Update Wikibase and WikibaseDataModel

Change-Id: Ic3d71792cf9980f6557ca8ff17ee327397dff56b
---
M composer.lock
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M extensions/Wikibase/repo/config/Wikibase.default.php
M extensions/Wikibase/repo/i18n/en.json
M extensions/Wikibase/repo/includes/ItemView.php
M extensions/Wikibase/repo/includes/PropertyView.php
M extensions/Wikibase/repo/includes/View/ClaimsView.php
M extensions/Wikibase/repo/includes/View/EntityViewFactory.php
M vendor/composer/autoload_files.php
M vendor/composer/autoload_psr4.php
M vendor/composer/installed.json
M vendor/wikibase/data-model/RELEASE-NOTES.md
M vendor/wikibase/data-model/WikibaseDataModel.php
M vendor/wikibase/data-model/src/Claim/Claim.php
M vendor/wikibase/data-model/src/Entity/Property.php
M vendor/wikibase/data-model/src/Statement/Statement.php
M vendor/wikibase/data-model/src/Statement/StatementList.php
M vendor/wikibase/data-model/tests/unit/Statement/StatementListTest.php
18 files changed, 242 insertions(+), 222 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 950e593..e3fe9fa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -897,16 +897,16 @@
 },
 {
 name: wikibase/data-model,
-version: 2.4.0,
+version: 2.4.1,
 source: {
 type: git,
 url: https://github.com/wmde/WikibaseDataModel.git;,
-reference: 66de8e091eeb93bd201d9fdf52ebda958fae5b2a
+reference: 6223a24ac1df8688c0d429995ebe71ba37e26cd5
 },
 dist: {
 type: zip,
-url: 
https://api.github.com/repos/wmde/WikibaseDataModel/zipball/66de8e091eeb93bd201d9fdf52ebda958fae5b2a;,
-reference: 66de8e091eeb93bd201d9fdf52ebda958fae5b2a,
+url: 
https://api.github.com/repos/wmde/WikibaseDataModel/zipball/6223a24ac1df8688c0d429995ebe71ba37e26cd5;,
+reference: 6223a24ac1df8688c0d429995ebe71ba37e26cd5,
 shasum: 
 },
 require: {
@@ -947,7 +947,7 @@
 wikibase,
 wikidata
 ],
-time: 2014-11-23 00:54:35
+time: 2014-11-26 21:29:26
 },
 {
 name: wikibase/data-model-javascript,
@@ -1188,12 +1188,12 @@
 source: {
 type: git,
 url: 
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: e8d02191319edc1f8c1821fb8c7adfa68cb20e2d
+reference: 9a20e61a5c862a31bb7da1de661691f73e740124
 },
 dist: {
 type: zip,
-url: 
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/e8d02191319edc1f8c1821fb8c7adfa68cb20e2d;,
-reference: e8d02191319edc1f8c1821fb8c7adfa68cb20e2d,
+url: 
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/9a20e61a5c862a31bb7da1de661691f73e740124;,
+reference: 9a20e61a5c862a31bb7da1de661691f73e740124,
 shasum: 
 },
 require: {
@@ -1259,7 +1259,7 @@
 wikibaserepo,
 wikidata
 ],
-time: 2014-11-25 19:41:13
+time: 2014-11-27 14:51:02
 },
 {
 name: wikibase/wikimedia-badges,
diff --git 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index dbdb1d4..2e7eabd 100644
--- 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -105,7 +105,7 @@
var entityType = this.options.value.getType();
if(
entityType === 'item'
-   || entityType === 'property'  mw.config.get( 
'wbExperimentalFeatures' )
+   || entityType === 'property'  this.element.find( 
'.wb-claimlistview' ).length === 1
) {
this._initClaims();
}
diff --git a/extensions/Wikibase/repo/config/Wikibase.default.php 
b/extensions/Wikibase/repo/config/Wikibase.default.php
index 1eb1e3d..8187aa1 100644
--- a/extensions/Wikibase/repo/config/Wikibase.default.php
+++ b/extensions/Wikibase/repo/config/Wikibase.default.php
@@ -94,6 +94,8 @@
 
'useRedirectTargetColumn' = true,
 
+   'displayStatementsOnProperties' = true,
+
'conceptBaseUri' = function() {
$uri =

[MediaWiki-commits] [Gerrit] Update Wikidata - change (mediawiki/core)

2014-11-27 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

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

Change subject: Update Wikidata
..

Update Wikidata

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/74/176274/1

diff --git a/extensions/Wikidata b/extensions/Wikidata
index c0eea89..33433d6 16
--- a/extensions/Wikidata
+++ b/extensions/Wikidata
-Subproject commit c0eea89e6532aecc46358f48db071bbaadcc81f5
+Subproject commit 33433d6e1ccda7fc5f4296e2c97efce104733c26

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ac829935a34696118d098859c9f592e744a25f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf10
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] Set displayStatementsOnProperties for wikidata/testwikidata - change (operations/mediawiki-config)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Set displayStatementsOnProperties for wikidata/testwikidata
..


Set displayStatementsOnProperties for wikidata/testwikidata

Change-Id: I89767a37ca5e812fc3708e1bdf9d7aecda93d9af
---
M wmf-config/Wikibase.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index 707f710..b299305 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -57,8 +57,10 @@
 
if ( $wgDBname === 'testwikidatawiki' ) {
$wgWBRepoSettings['specialSiteLinkGroups'][] = 'testwikidata';
+   $wgWBRepoSettings['displayStatementsOnProperties'] = true;
} else {
$wgWBRepoSettings['specialSiteLinkGroups'][] = 'wikidata';
+   $wgWBRepoSettings['displayStatementsOnProperties'] = false;
}
 
if ( $wgDBname === 'testwikidatawiki' ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I89767a37ca5e812fc3708e1bdf9d7aecda93d9af
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
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] Update Wikidata - change (mediawiki/core)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Update Wikidata
..


Update Wikidata

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

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



diff --git a/extensions/Wikidata b/extensions/Wikidata
index c0eea89..33433d6 16
--- a/extensions/Wikidata
+++ b/extensions/Wikidata
-Subproject commit c0eea89e6532aecc46358f48db071bbaadcc81f5
+Subproject commit 33433d6e1ccda7fc5f4296e2c97efce104733c26

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ac829935a34696118d098859c9f592e744a25f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf10
Gerrit-Owner: Hoo man h...@online.de
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] disable cop in this instance only - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: disable cop in this instance only
..

disable cop in this instance only

Bug: T75898
Change-Id: Icfcbb9e036994c96b0bf2a0673dbd36a59e6463c
---
M .rubocop_todo.yml
M Gemfile
2 files changed, 3 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/82/176282/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 3587a1b..ddbf57b 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -10,11 +10,6 @@
 Style/GlobalVars:
   Enabled: false
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/LeadingCommentSpace:
-  Enabled: false
-
 # Offense count: 3
 # Cop supports --auto-correct.
 Style/NilComparison:
diff --git a/Gemfile b/Gemfile
index 136a71d..7a99a20 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,8 @@
+# rubocop:disable Style/LeadingCommentSpace
+# rvm seems to require no space so disable specifically here only
 #ruby=ruby-2.1.1
 #ruby-gemset=mediawiki_selenium
+# rubocop:enable Style/LeadingCommentSpace
 
 source 'https://rubygems.org'
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfcbb9e036994c96b0bf2a0673dbd36a59e6463c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Stan tris...@saticed.me.uk

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

[MediaWiki-commits] [Gerrit] add basic documentation comments (per rubocop) - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: add basic documentation comments (per rubocop)
..

add basic documentation comments (per rubocop)

Bug:T75898
Change-Id: Ibd5047e7872f77540e784f2a050f75ce113d9723
---
M .rubocop_todo.yml
M lib/mediawiki_selenium/support/modules/sauce_helper.rb
M lib/mediawiki_selenium/support/modules/url_module.rb
M lib/mediawiki_selenium/support/pages/api_page.rb
M lib/mediawiki_selenium/support/pages/login_page.rb
M lib/mediawiki_selenium/support/pages/random_page.rb
M lib/mediawiki_selenium/support/pages/reset_preferences_page.rb
M lib/mediawiki_selenium/support/sauce.rb
M lib/mediawiki_selenium/version.rb
M lib/mediawiki_selenium/warnings_formatter.rb
10 files changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/75/176275/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 167c1ec..86f936e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -5,10 +5,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 10
-Style/Documentation:
-  Enabled: false
-
 # Offense count: 8
 # Cop supports --auto-correct.
 # Configuration parameters: AllowAdjacentOneLineDefs.
diff --git a/lib/mediawiki_selenium/support/modules/sauce_helper.rb 
b/lib/mediawiki_selenium/support/modules/sauce_helper.rb
index 0cb9902..53916ed 100644
--- a/lib/mediawiki_selenium/support/modules/sauce_helper.rb
+++ b/lib/mediawiki_selenium/support/modules/sauce_helper.rb
@@ -1,4 +1,5 @@
 module MediawikiSelenium
+  # Common Sauce Labs code
   module SauceHelper
 # The current Sauce session ID.
 #
diff --git a/lib/mediawiki_selenium/support/modules/url_module.rb 
b/lib/mediawiki_selenium/support/modules/url_module.rb
index 3a68814..65c5e82 100644
--- a/lib/mediawiki_selenium/support/modules/url_module.rb
+++ b/lib/mediawiki_selenium/support/modules/url_module.rb
@@ -7,6 +7,7 @@
 # mediawiki_selenium top-level directory and at
 # https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
 
+# Common URL definitions
 module URL
   def self.url(name)
 if ENV['MEDIAWIKI_URL']
diff --git a/lib/mediawiki_selenium/support/pages/api_page.rb 
b/lib/mediawiki_selenium/support/pages/api_page.rb
index 943bff8..44fc08f 100644
--- a/lib/mediawiki_selenium/support/pages/api_page.rb
+++ b/lib/mediawiki_selenium/support/pages/api_page.rb
@@ -1,5 +1,6 @@
 require 'mediawiki_api'
 
+# Simplified interface for pages
 class APIPage
   include PageObject
 
diff --git a/lib/mediawiki_selenium/support/pages/login_page.rb 
b/lib/mediawiki_selenium/support/pages/login_page.rb
index e75056a..42d73b9 100644
--- a/lib/mediawiki_selenium/support/pages/login_page.rb
+++ b/lib/mediawiki_selenium/support/pages/login_page.rb
@@ -7,6 +7,7 @@
 # mediawiki_selenium top-level directory and at
 # https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
 
+# login page specific functions
 class LoginPage
   include PageObject
 
diff --git a/lib/mediawiki_selenium/support/pages/random_page.rb 
b/lib/mediawiki_selenium/support/pages/random_page.rb
index 3d78fd1..fa90b5e 100644
--- a/lib/mediawiki_selenium/support/pages/random_page.rb
+++ b/lib/mediawiki_selenium/support/pages/random_page.rb
@@ -7,6 +7,7 @@
 # mediawiki_selenium top-level directory and at
 # https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
 
+# constants for load random page function
 class RandomPage
   include PageObject
 
diff --git a/lib/mediawiki_selenium/support/pages/reset_preferences_page.rb 
b/lib/mediawiki_selenium/support/pages/reset_preferences_page.rb
index 2ddb338..49de79e 100644
--- a/lib/mediawiki_selenium/support/pages/reset_preferences_page.rb
+++ b/lib/mediawiki_selenium/support/pages/reset_preferences_page.rb
@@ -7,6 +7,7 @@
 # mediawiki_selenium top-level directory and at
 # https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
 
+# constants for reset preferences page
 class ResetPreferencesPage
   include PageObject
   include URL
diff --git a/lib/mediawiki_selenium/support/sauce.rb 
b/lib/mediawiki_selenium/support/sauce.rb
index 74e5b90..9384b00 100644
--- a/lib/mediawiki_selenium/support/sauce.rb
+++ b/lib/mediawiki_selenium/support/sauce.rb
@@ -11,6 +11,7 @@
 
 module Cucumber
   module Formatter
+# Sauce Lab specific cucumber formatter
 class Sauce  Junit
 
   private
diff --git a/lib/mediawiki_selenium/version.rb 
b/lib/mediawiki_selenium/version.rb
index 57dc2c5..5330a83 100644
--- a/lib/mediawiki_selenium/version.rb
+++ b/lib/mediawiki_selenium/version.rb
@@ -7,6 +7,7 @@
 # mediawiki_selenium top-level directory and at
 # https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
 
+# Common code for using Selenium with Media Wiki
 module MediawikiSelenium
   VERSION = '0.4.1'
 end

[MediaWiki-commits] [Gerrit] remove nil comparison per rubocop - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: remove nil comparison per rubocop
..

remove nil comparison per rubocop

Bug: T75898
Change-Id: Id239bfc2d7b3eb673e18749c275d850259627d61
---
M .rubocop_todo.yml
M lib/mediawiki_selenium/support/env.rb
2 files changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/83/176283/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ddbf57b..2d01a0a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -10,11 +10,6 @@
 Style/GlobalVars:
   Enabled: false
 
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/NilComparison:
-  Enabled: false
-
 # Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
diff --git a/lib/mediawiki_selenium/support/env.rb 
b/lib/mediawiki_selenium/support/env.rb
index a6fbec7..ea9c8f8 100644
--- a/lib/mediawiki_selenium/support/env.rb
+++ b/lib/mediawiki_selenium/support/env.rb
@@ -97,7 +97,7 @@
 WebDriver_Capabilities = Selenium::WebDriver::Remote::Capabilities
 
 def sauce_browser(test_name, configuration)
-  if (ENV['BROWSER'] == nil) || (ENV['PLATFORM'] == nil) || (ENV['VERSION'] == 
nil)
+  if ENV['BROWSER'].nil? || ENV['PLATFORM'].nil? || ENV['VERSION'].nil?
 abort 'Environment variables BROWSER, PLATFORM and VERSION have to be set'
   end
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id239bfc2d7b3eb673e18749c275d850259627d61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Stan tris...@saticed.me.uk

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

[MediaWiki-commits] [Gerrit] use guard clause per rubocop - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: use guard clause per rubocop
..

use guard clause per rubocop

Bug: T75898
Change-Id: I782716d40d3a484a188f412c978540410b7152fe
---
M .rubocop_todo.yml
M lib/mediawiki_selenium/warnings_formatter.rb
2 files changed, 10 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/79/176279/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 3ae7f98..7465f21 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -10,11 +10,6 @@
 Style/GlobalVars:
   Enabled: false
 
-# Offense count: 2
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Enabled: false
-
 # Offense count: 12
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
diff --git a/lib/mediawiki_selenium/warnings_formatter.rb 
b/lib/mediawiki_selenium/warnings_formatter.rb
index 2b2b19d..c4fc1f2 100644
--- a/lib/mediawiki_selenium/warnings_formatter.rb
+++ b/lib/mediawiki_selenium/warnings_formatter.rb
@@ -11,23 +11,20 @@
 end
 
 def after_feature(feature)
-  if feature.mw_warnings.any?
-feature.mw_warnings.each do |type, messages|
-  messages.each { |msg| @io.puts format_string(msg, :pending) }
-  @warning_counts[type] += messages.length
-end
-
-@io.puts
+  return unless feature.mw_warnings.any?
+  feature.mw_warnings.each do |type, messages|
+messages.each { |msg| @io.puts format_string(msg, :pending) }
+@warning_counts[type] += messages.length
   end
+  @io.puts
 end
 
 def after_features(_features)
-  if @warning_counts.any?
-@warning_counts.each do |type, count|
-  message = #{count} warning#{count  1 ? 's' : ''}
-  message +=  due to #{type} unless type == :default
-  @io.puts format_string(message, :pending)
-end
+  return unless @warning_counts.any?
+  @warning_counts.each do |type, count|
+message = #{count} warning#{count  1 ? 's' : ''}
+message +=  due to #{type} unless type == :default
+@io.puts format_string(message, :pending)
   end
 end
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I782716d40d3a484a188f412c978540410b7152fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Stan tris...@saticed.me.uk

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

[MediaWiki-commits] [Gerrit] indentation fix - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: indentation fix
..

indentation fix

Bug: T75898
Change-Id: I9c39fb71c4db63e32b963efeb18024bdf4e654ef
---
M .rubocop_todo.yml
M lib/mediawiki_selenium/support/env.rb
2 files changed, 8 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/81/176281/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 180695b..3587a1b 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -10,11 +10,6 @@
 Style/GlobalVars:
   Enabled: false
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/IndentationWidth:
-  Enabled: false
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/LeadingCommentSpace:
diff --git a/lib/mediawiki_selenium/support/env.rb 
b/lib/mediawiki_selenium/support/env.rb
index a63aa60..a6fbec7 100644
--- a/lib/mediawiki_selenium/support/env.rb
+++ b/lib/mediawiki_selenium/support/env.rb
@@ -84,14 +84,14 @@
 end
 
 def sauce_api(json, session_id)
-RestClient::Request.execute(
-  method: :put,
-  url: 
https://saucelabs.com/rest/v1/#{ENV['SAUCE_ONDEMAND_USERNAME']}/jobs/#{session_id},
-  user: ENV['SAUCE_ONDEMAND_USERNAME'],
-  password: ENV['SAUCE_ONDEMAND_ACCESS_KEY'],
-  headers: {content_type: 'application/json'},
-  payload: json
-)
+  RestClient::Request.execute(
+method: :put,
+url: 
https://saucelabs.com/rest/v1/#{ENV['SAUCE_ONDEMAND_USERNAME']}/jobs/#{session_id},
+user: ENV['SAUCE_ONDEMAND_USERNAME'],
+password: ENV['SAUCE_ONDEMAND_ACCESS_KEY'],
+headers: {content_type: 'application/json'},
+payload: json
+  )
 end
 
 WebDriver_Capabilities = Selenium::WebDriver::Remote::Capabilities

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c39fb71c4db63e32b963efeb18024bdf4e654ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Stan tris...@saticed.me.uk

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

[MediaWiki-commits] [Gerrit] add empty lines (per rubocop style) - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: add empty lines (per rubocop style)
..

add empty lines (per rubocop style)

Bug: T75898
Change-Id: I92a45c476124f9b76b25bbce87d410137a000f44
---
M .rubocop_todo.yml
M lib/mediawiki_selenium/support/env.rb
M lib/mediawiki_selenium/support/pages/login_page.rb
3 files changed, 9 insertions(+), 6 deletions(-)


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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 86f936e..26ee827 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -5,12 +5,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: AllowAdjacentOneLineDefs.
-Style/EmptyLineBetweenDefs:
-  Enabled: false
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/EmptyLines:
diff --git a/lib/mediawiki_selenium/support/env.rb 
b/lib/mediawiki_selenium/support/env.rb
index 61482ac..98035c4 100644
--- a/lib/mediawiki_selenium/support/env.rb
+++ b/lib/mediawiki_selenium/support/env.rb
@@ -30,6 +30,7 @@
 local_browser(configuration)
   end
 end
+
 def browser_name
   if ENV['BROWSER']
 ENV['BROWSER'].to_sym
@@ -37,6 +38,7 @@
 :firefox
   end
 end
+
 def environment
   if ENV['SAUCE_ONDEMAND_USERNAME']  ENV['SAUCE_ONDEMAND_ACCESS_KEY'] 
   ENV['BROWSER'] != 'phantomjs'  ENV['HEADLESS'] != 'true'
@@ -45,6 +47,7 @@
 :local
   end
 end
+
 def local_browser(configuration)
   if ENV['BROWSER_TIMEOUT']  browser_name == :firefox
 timeout = ENV['BROWSER_TIMEOUT'].to_i
@@ -79,6 +82,7 @@
   set_cookie(browser)
   browser
 end
+
 def sauce_api(json, session_id)
 RestClient::Request.execute(
   :method = :put,
@@ -89,7 +93,9 @@
   :payload = json
 )
 end
+
 WebDriver_Capabilities = Selenium::WebDriver::Remote::Capabilities
+
 def sauce_browser(test_name, configuration)
   if (ENV['BROWSER'] == nil) || (ENV['PLATFORM'] == nil) || (ENV['VERSION'] == 
nil)
 abort 'Environment variables BROWSER, PLATFORM and VERSION have to be set'
@@ -139,9 +145,11 @@
 
   browser
 end
+
 def set_cookie(_browser) # rubocop:disable Style/AccessorMethodName
   # implement this method in env.rb of the repository where it is needed
 end
+
 def test_name(scenario)
   if scenario.respond_to? :feature
 #{scenario.feature.title}: #{scenario.title}
diff --git a/lib/mediawiki_selenium/support/pages/login_page.rb 
b/lib/mediawiki_selenium/support/pages/login_page.rb
index 42d73b9..bc3954b 100644
--- a/lib/mediawiki_selenium/support/pages/login_page.rb
+++ b/lib/mediawiki_selenium/support/pages/login_page.rb
@@ -26,6 +26,7 @@
   def logged_in_as_element
 @browser.div(id: 'mw-content-text').p.b
   end
+
   def login_with(username, password, wait_for_logout_element = true)
 self.username_element.when_present.send_keys(username)
 self.password_element.when_present.send_keys(password)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92a45c476124f9b76b25bbce87d410137a000f44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Stan tris...@saticed.me.uk

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

[MediaWiki-commits] [Gerrit] remove extra blank line - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: remove extra blank line
..

remove extra blank line

Change-Id: I455b7d78f19745da5c5601abb3870b9338487d51
---
M .rubocop_todo.yml
M lib/mediawiki_selenium/step_definitions/upload_file_steps.rb
2 files changed, 0 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/77/176277/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 26ee827..3489b24 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -7,11 +7,6 @@
 
 # Offense count: 1
 # Cop supports --auto-correct.
-Style/EmptyLines:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
 Style/EmptyLinesAroundBody:
   Enabled: false
 
diff --git a/lib/mediawiki_selenium/step_definitions/upload_file_steps.rb 
b/lib/mediawiki_selenium/step_definitions/upload_file_steps.rb
index 17c4cbb..8bf72bb 100644
--- a/lib/mediawiki_selenium/step_definitions/upload_file_steps.rb
+++ b/lib/mediawiki_selenium/step_definitions/upload_file_steps.rb
@@ -12,7 +12,6 @@
   on(UploadPage).select_file = path
 end
 
-
 When(/^upload file (.+)$/) do |file_name|
   require 'tempfile'
   path = #{Dir.tmpdir}/#{file_name}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I455b7d78f19745da5c5601abb3870b9338487d51
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Stan tris...@saticed.me.uk

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

[MediaWiki-commits] [Gerrit] remove extra blank line (per rubocop) - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: remove extra blank line (per rubocop)
..

remove extra blank line (per rubocop)

Change-Id: Ia6f8932396eb0fdded5188f4c463fbbfbe554529
---
M .rubocop_todo.yml
M lib/mediawiki_selenium/support/sauce.rb
2 files changed, 0 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/78/176278/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 3489b24..3ae7f98 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -5,11 +5,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/EmptyLinesAroundBody:
-  Enabled: false
-
 # Offense count: 7
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
diff --git a/lib/mediawiki_selenium/support/sauce.rb 
b/lib/mediawiki_selenium/support/sauce.rb
index 9384b00..5086f43 100644
--- a/lib/mediawiki_selenium/support/sauce.rb
+++ b/lib/mediawiki_selenium/support/sauce.rb
@@ -13,7 +13,6 @@
   module Formatter
 # Sauce Lab specific cucumber formatter
 class Sauce  Junit
-
   private
 
   def format_exception(exception)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6f8932396eb0fdded5188f4c463fbbfbe554529
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Stan tris...@saticed.me.uk

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

[MediaWiki-commits] [Gerrit] update hash syntax per rubocop - change (mediawiki/selenium)

2014-11-27 Thread Stan (Code Review)

Stan has uploaded a new change for review.

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

Change subject: update hash syntax per rubocop
..

update hash syntax per rubocop

Bug: T75898
Change-Id: Ibf78b4c4cda89eba2082e8fd4e42ce39d6a951f8
---
M .rubocop_todo.yml
M lib/mediawiki_selenium/support/env.rb
2 files changed, 10 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/80/176280/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7465f21..180695b 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -10,12 +10,6 @@
 Style/GlobalVars:
   Enabled: false
 
-# Offense count: 12
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/HashSyntax:
-  Enabled: false
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/IndentationWidth:
diff --git a/lib/mediawiki_selenium/support/env.rb 
b/lib/mediawiki_selenium/support/env.rb
index 98035c4..a63aa60 100644
--- a/lib/mediawiki_selenium/support/env.rb
+++ b/lib/mediawiki_selenium/support/env.rb
@@ -58,7 +58,7 @@
 profile = Selenium::WebDriver::Firefox::Profile.new
 profile['dom.max_script_run_time'] = timeout
 profile['dom.max_chrome_script_run_time'] = timeout
-browser = Watir::Browser.new browser_name, :http_client = client, 
:profile = profile
+browser = Watir::Browser.new browser_name, http_client: client, profile: 
profile
   elsif configuration  configuration[:language]  browser_name == :firefox
 profile = Selenium::WebDriver::Firefox::Profile.new
 profile['intl.accept_languages'] = configuration[:language]
@@ -85,12 +85,12 @@
 
 def sauce_api(json, session_id)
 RestClient::Request.execute(
-  :method = :put,
-  :url = 
https://saucelabs.com/rest/v1/#{ENV['SAUCE_ONDEMAND_USERNAME']}/jobs/#{session_id},
-  :user = ENV['SAUCE_ONDEMAND_USERNAME'],
-  :password = ENV['SAUCE_ONDEMAND_ACCESS_KEY'],
-  :headers = {:content_type = 'application/json'},
-  :payload = json
+  method: :put,
+  url: 
https://saucelabs.com/rest/v1/#{ENV['SAUCE_ONDEMAND_USERNAME']}/jobs/#{session_id},
+  user: ENV['SAUCE_ONDEMAND_USERNAME'],
+  password: ENV['SAUCE_ONDEMAND_ACCESS_KEY'],
+  headers: {content_type: 'application/json'},
+  payload: json
 )
 end
 
@@ -110,11 +110,11 @@
 profile = Selenium::WebDriver::Firefox::Profile.new
 profile['dom.max_script_run_time'] = timeout
 profile['dom.max_chrome_script_run_time'] = timeout
-caps = WebDriver_Capabilities.firefox(:firefox_profile = profile)
+caps = WebDriver_Capabilities.firefox(firefox_profile: profile)
   elsif configuration  configuration[:language]  ENV['BROWSER'] == 
'firefox'
 profile = Selenium::WebDriver::Firefox::Profile.new
 profile['intl.accept_languages'] = configuration[:language]
-caps = WebDriver_Capabilities.firefox(:firefox_profile = profile)
+caps = WebDriver_Capabilities.firefox(firefox_profile: profile)
   elsif configuration  configuration[:language]  ENV['BROWSER'] == 'chrome'
 profile = Selenium::WebDriver::Chrome::Profile.new
 profile['intl.accept_languages'] = configuration[:language]
@@ -122,7 +122,7 @@
   elsif configuration  configuration[:user_agent]  ENV['BROWSER'] == 
'firefox'
 profile = Selenium::WebDriver::Firefox::Profile.new
 profile['general.useragent.override'] = configuration[:user_agent]
-caps = WebDriver_Capabilities.firefox(:firefox_profile = profile)
+caps = WebDriver_Capabilities.firefox(firefox_profile: profile)
   else
 caps = WebDriver_Capabilities.send(ENV['BROWSER'])
   end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf78b4c4cda89eba2082e8fd4e42ce39d6a951f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Stan tris...@saticed.me.uk

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

[MediaWiki-commits] [Gerrit] remove outdated README - change (mediawiki...CentralNotice)

2014-11-27 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: remove outdated README
..

remove outdated README

Nothing in here was true any more.  We could use a new README, and
it should link to the full documentation on mediawiki.org.

Change-Id: Ieaadb53d1034481f03997f3dde39b715eaedfabc
---
D README
1 file changed, 0 insertions(+), 55 deletions(-)


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

diff --git a/README b/README
deleted file mode 100644
index aa26ccb..000
--- a/README
+++ /dev/null
@@ -1,55 +0,0 @@
-FIXME: this document is very out-of-date.
-
-Wiki page HTML contains an unchanging bit that just sets JS variables
-about what site this is, then calls an external script to fetch site
-notice text.  It also includes a facility to fetch a geolocation data.
-
-That second level is a stable URL which can be heavily cached within
-squids *and* cleanly purged on sitewide updates. This script is currently
-called Special:BannerController.
-
-BannerController fetches list of notices available by calling out to
-a third script, this time with the site info (project and language)
-and geolocation info in the query string. The third script, called
-Special:BannerListLoader provides list of currently available sitenotices
-for that match the given site and geolocation profile. It is possible
-that a number of notices will be available for the given site and user
-parameters.
-
-The fourth level is the bit that would provide the actual site notice
-text, and could be cached arbitrarily long in both squids and final user
-agents, since changed versions will get a new URL with a version number
-one level up.
-
-The theory here is that it should interact better with big-site caching.
-A user agent's first hit to the wiki will look something like:
-
-* Load wiki page HTML
-* Load Special:BannerController JS
-* Load Special:BannerListLoader JS
-* Load Special:BannerLoader JS
-
-A hit to another page on the same wiki can skip step two and three, but
-may need to load notice in step four (if there is more than one available)
-
-* Load new wiki page HTML
-* skip cached Special:BannerController JS
-* skip cached Special:BannerListLoader JS
-* Load Special:BannerLoader JS
-
-Then if the site notice changes, the system only has to purge that
-constant Special:BannerListLoader URL from squids, and right away at
-the next hit the user agent sees:
-
-* Load new wiki page HTML
-* skip cached Special:BannerController JS
-* Load new Special:BannerListLoader JS
-* Load new Special:BannerLoader JS
-
-Caching Special:BannerListLoader for a while could delay visibility of
-changed site notices until the allowed age runs out, but if we manage
-*scheduled* site notices, we could send cache headers which will run
-out at the expected changeover time.
-
-It might be nice to allow for quick corrections though, so caching for
-weeks at a time might not be wise. ;)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaadb53d1034481f03997f3dde39b715eaedfabc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Move validateMapping code into separate class - change (mediawiki...CirrusSearch)

2014-11-27 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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

Change subject: Move validateMapping code into separate class
..

Move validateMapping code into separate class

Meanwhile removed the now unused checkConfig methods

Change-Id: I0c7192c59198a92d9ba3e22bf1b44db3522b2c24
---
M CirrusSearch.php
A includes/Maintenance/Validators/MappingValidator.php
M maintenance/updateOneSearchIndexConfig.php
3 files changed, 131 insertions(+), 120 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/85/176285/1

diff --git a/CirrusSearch.php b/CirrusSearch.php
index 7f1b6ff..55a81ae 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -583,6 +583,7 @@
 
$wgAutoloadClasses['CirrusSearch\Maintenance\Validators\NumberOfShardsValidator']
 = $maintenanceDir . '/Validators/NumberOfShardsValidator.php';
 
$wgAutoloadClasses['CirrusSearch\Maintenance\Validators\ReplicaRangeValidator'] 
= $maintenanceDir . '/Validators/ReplicaRangeValidator.php';
 $wgAutoloadClasses['CirrusSearch\Maintenance\Validators\AnalyzersValidator'] = 
$maintenanceDir . '/Validators/AnalyzersValidator.php';
+$wgAutoloadClasses['CirrusSearch\Maintenance\Validators\MappingValidator'] = 
$maintenanceDir . '/Validators/MappingValidator.php';
 $wgAutoloadClasses['CirrusSearch\Maintenance\UpdateVersionIndex'] = __DIR__ . 
'/maintenance/updateVersionIndex.php';
 $wgAutoloadClasses['CirrusSearch\NearMatchPicker'] = $includes . 
'NearMatchPicker.php';
 $wgAutoloadClasses['CirrusSearch\OtherIndexes'] = $includes . 
'OtherIndexes.php';
diff --git a/includes/Maintenance/Validators/MappingValidator.php 
b/includes/Maintenance/Validators/MappingValidator.php
new file mode 100644
index 000..32a1fc0
--- /dev/null
+++ b/includes/Maintenance/Validators/MappingValidator.php
@@ -0,0 +1,119 @@
+?php
+
+namespace CirrusSearch\Maintenance\Validators;
+
+use CirrusSearch\ElasticsearchIntermediary;
+use CirrusSearch\Maintenance\Maintenance;
+use Elastica\Exception\ExceptionInterface;
+use Elastica\Index;
+use Elastica\Type;
+use Elastica\Type\Mapping;
+
+class MappingValidator extends Validator {
+   /**
+* @var Index
+*/
+   private $index;
+
+   /**
+* @var bool
+*/
+   private $optimizeIndexForExperimentalHighlighter;
+
+   /**
+* @var array
+*/
+   private $availablePlugins;
+
+   /**
+* @var array
+*/
+   private $mappingConfig;
+
+   /**
+* @var Type
+*/
+   private $pageType;
+
+   /**
+* @var Type
+*/
+   private $namespaceType;
+
+   /**
+* @todo: this constructor takes way too much arguments - refactor
+*
+* @param Index $index
+* @param bool $optimizeIndexForExperimentalHighlighter
+* @param array $availablePlugins
+* @param array $mappingConfig
+* @param Type $pageType
+* @param Type $namespaceType
+* @param Maintenance $out
+*/
+   public function __construct( Index $index, 
$optimizeIndexForExperimentalHighlighter, array $availablePlugins, array 
$mappingConfig, Type $pageType, Type $namespaceType, Maintenance $out = null ) {
+   parent::__construct( $out );
+
+   $this-index = $index;
+   $this-optimizeIndexForExperimentalHighlighter = 
$optimizeIndexForExperimentalHighlighter;
+   $this-availablePlugins = $availablePlugins;
+   $this-mappingConfig = $mappingConfig;
+   $this-pageType = $pageType;
+   $this-namespaceType = $namespaceType;
+   }
+
+   public function validate() {
+   $this-outputIndented( Validating mappings... );
+   if ( $this-optimizeIndexForExperimentalHighlighter 
+   !in_array( 'experimental highlighter', 
$this-availablePlugins ) ) {
+   $this-output( impossible!\n );
+   $this-error( 
wgCirrusSearchOptimizeIndexForExperimentalHighlighter is set to true but the  
.
+   'experimental highlighter' plugin is not 
installed on all hosts., 1 );
+   return false;
+   }
+
+   $requiredMappings = $this-mappingConfig;
+   if ( !$this-checkMapping( $requiredMappings ) ) {
+   // TODO Conflict resolution here might leave old 
portions of mappings
+   $pageAction = new Mapping( $this-pageType );
+   foreach ( $requiredMappings[ 'page' ] as $key = $value 
) {
+   $pageAction-setParam( $key, $value );
+   }
+   $namespaceAction = new Mapping( $this-namespaceType );
+   foreach ( $requiredMappings[ 'namespace' ] as $key = 
$value ) {
+

[MediaWiki-commits] [Gerrit] Make Validator::validate methods return Status object - change (mediawiki...CirrusSearch)

2014-11-27 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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

Change subject: Make Validator::validate methods return Status object
..

Make Validator::validate methods return Status object

This makes it possible to return the exact error message at
that point, so we can remove the error() method in Validator.

Change-Id: I1e77ad5334938e312b2907542dce7046a7009db8
---
M includes/Maintenance/Validators/AnalyzersValidator.php
M includes/Maintenance/Validators/CacheWarmersValidator.php
M includes/Maintenance/Validators/MappingValidator.php
M includes/Maintenance/Validators/MaxShardsPerNodeValidator.php
M includes/Maintenance/Validators/NumberOfShardsValidator.php
M includes/Maintenance/Validators/ReplicaRangeValidator.php
M includes/Maintenance/Validators/ShardAllocationValidator.php
M includes/Maintenance/Validators/Validator.php
M maintenance/updateOneSearchIndexConfig.php
9 files changed, 85 insertions(+), 55 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/86/176286/1

diff --git a/includes/Maintenance/Validators/AnalyzersValidator.php 
b/includes/Maintenance/Validators/AnalyzersValidator.php
index 85cb59f..25f552a 100644
--- a/includes/Maintenance/Validators/AnalyzersValidator.php
+++ b/includes/Maintenance/Validators/AnalyzersValidator.php
@@ -5,6 +5,8 @@
 use CirrusSearch\Maintenance\AnalysisConfigBuilder;
 use CirrusSearch\Maintenance\Maintenance;
 use Elastica\Index;
+use RawMessage;
+use Status;
 
 class AnalyzersValidator extends Validator {
/**
@@ -29,6 +31,9 @@
$this-analysisConfigBuilder = $analysisConfigBuilder;
}
 
+   /**
+* @return Status
+*/
public function validate() {
$this-outputIndented( Validating analyzers... );
$settings = $this-index-getSettings()-get();
@@ -37,9 +42,12 @@
$this-output( ok\n );
} else {
$this-output( cannot correct\n );
-   return false;
+   return Status::newFatal( new RawMessage(
+   This script encountered an index difference 
that requires that the index be\n .
+   copied, indexed to, and then the old index 
removed. Re-run this script with the\n .
+   --reindexAndRemoveOk --indexIdentifier=now 
parameters to do this. ) );
}
 
-   return true;
+   return Status::newGood();
}
 }
diff --git a/includes/Maintenance/Validators/CacheWarmersValidator.php 
b/includes/Maintenance/Validators/CacheWarmersValidator.php
index 5204ab2..5a3e231 100644
--- a/includes/Maintenance/Validators/CacheWarmersValidator.php
+++ b/includes/Maintenance/Validators/CacheWarmersValidator.php
@@ -9,6 +9,8 @@
 use Elastica;
 use Elastica\Exception\ResponseException;
 use Elastica\Type;
+use RawMessage;
+use Status;
 use Title;
 
 class CacheWarmersValidator extends Validator {
@@ -35,7 +37,7 @@
}
 
/**
-* @return bool
+* @return Status
 */
public function validate() {
$this-outputIndented( Validating cache warmers...\n );
@@ -46,8 +48,11 @@
$warmersToUpdate = $this-diff( $expectedWarmers, 
$actualWarmers );
$warmersToDelete = array_diff_key( $actualWarmers, 
$expectedWarmers );
 
-   return $this-updateWarmers( $warmersToUpdate )
-$this-deleteWarmers( $warmersToDelete );
+   $status = $this-updateWarmers( $warmersToUpdate );
+   $status2 = $this-deleteWarmers( $warmersToDelete );
+
+   $status-merge( $status2 );
+   return $status;
}
 
private function buildExpectedWarmers() {
@@ -114,18 +119,18 @@
} catch ( ResponseException $e ) {
if ( preg_match( '/dynamic scripting for 
\\[.*\\] disabled/', $e-getResponse()-getError() ) ) {
$this-output( couldn't create dynamic 
script!\n );
-   $this-error( Couldn't create the 
dynamic script required for Cirrus to work properly.   .
+   return Status::newFatal( new RawMessage(
+   Couldn't create the dynamic 
script required for Cirrus to work properly.   .
For now, Cirrus requires 
dynamic scripting.  It'll switch to sandboxed Groovy when it  .
updates to support 
Elasticsearch 1.3.1 we promise.  For now enable dynamic scripting and  .
keep Elasticsearch safely not 
accessible to people you don't trust.  You should always  .
-

[MediaWiki-commits] [Gerrit] Restore default configuration for ruwikisource bureaucrats - change (operations/mediawiki-config)

2014-11-27 Thread Glaisher (Code Review)

Glaisher has uploaded a new change for review.

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

Change subject: Restore default configuration for ruwikisource bureaucrats
..

Restore default configuration for ruwikisource bureaucrats

Change-Id: Ie4f5b3bb710a5ca542dfbd999484210f43e34117
Task: T44105
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/87/176287/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 40fabab..813f127 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -8976,7 +8976,7 @@
'sysop' = array( 'autoeditor' )
),
'+ruwikisource' = array(
-   'bureaucrat' = array( 'sysop', 'bureaucrat', 'autoeditor', 
'rollbacker' ),
+   'bureaucrat' = array( 'autoeditor', 'rollbacker' ),
'sysop' = array( 'autoeditor', 'rollbacker', 'abusefilter', 
'flood' ),
),
'+ruwikivoyage' = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4f5b3bb710a5ca542dfbd999484210f43e34117
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Glaisher glaisher.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] graphite/txstatsd: re-introduce require_package - change (operations/puppet)

2014-11-27 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: graphite/txstatsd: re-introduce require_package
..

graphite/txstatsd: re-introduce require_package

We need require_package as the two classes have overlapping package
needs; however when using require_package, the resource is not always
declared within the same module, so we just require to have the stub
class require_package creates

Change-Id: I8ce1727d4ebf180d98d507fe0d41147887e3579b
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/graphite/manifests/init.pp
M modules/txstatsd/manifests/init.pp
2 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/176289/1

diff --git a/modules/graphite/manifests/init.pp 
b/modules/graphite/manifests/init.pp
index a27918a..1a88ec1 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -13,8 +13,8 @@
 $storage_schemas,
 $storage_aggregation = {},
 $storage_dir = '/var/lib/carbon',
-) {
-package { ['graphite-carbon', 'python-whisper']: }
+) {
+require_package('graphite-carbon', 'python-whisper')
 
 $carbon_service_defaults = {
 log_updates  = false,
@@ -41,24 +41,24 @@
 group   = '_graphite',
 mode= '0755',
 before  = Service['carbon'],
-require = Package['graphite-carbon'],
+require = Class['package::graphite_carbon'],
 }
 
 file { '/etc/carbon/storage-schemas.conf':
 content = configparser_format($storage_schemas),
-require = Package['graphite-carbon'],
+require = Class['package::graphite_carbon'],
 notify  = Service['carbon'],
 }
 
 file { '/etc/carbon/carbon.conf':
 content = configparser_format($carbon_defaults, $carbon_settings),
-require = Package['graphite-carbon'],
+require = Class['package::graphite_carbon'],
 notify  = Service['carbon'],
 }
 
 file { '/etc/carbon/storage-aggregation.conf':
 content = configparser_format($storage_aggregation),
-require = Package['graphite-carbon'],
+require = Class['package::graphite_carbon'],
 notify  = Service['carbon'],
 }
 
diff --git a/modules/txstatsd/manifests/init.pp 
b/modules/txstatsd/manifests/init.pp
index 1b8923f..699ea7b 100644
--- a/modules/txstatsd/manifests/init.pp
+++ b/modules/txstatsd/manifests/init.pp
@@ -23,7 +23,7 @@
 #  }
 #
 class txstatsd($settings) {
-package { ['python-txstatsd', 'python-twisted-web']: }
+require_package('python-txstatsd', 'python-twisted-web', 'graphite-carbon')
 
 file { '/etc/init/txstatsd.conf':
 source = 'puppet:///modules/txstatsd/txstatsd.conf',
@@ -56,7 +56,7 @@
 subscribe = File['/etc/txstatsd/txstatsd.cfg'],
 require   = [
 File['/etc/init/txstatsd.conf'],
-Package['python-txstatsd', 'python-twisted-web'],
+Class['package::python_txstatsd', 'package::python_twisted_web', 
'package::graphite_carbon'],
 User['txstatsd'],
 ],
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ce1727d4ebf180d98d507fe0d41147887e3579b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix PHP Notice in Special:Version - change (mediawiki...SyntaxHighlight_GeSHi)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: Fix PHP Notice in Special:Version
..


Fix PHP Notice in Special:Version

Follow-up to broken revert Ic724f6fe1b1c

Change-Id: I61d19394997cc3499fa084d1b3dc8a7706a499d1
---
M SyntaxHighlight_GeSHi.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  KartikMistry: Looks good to me, but someone else must approve
  Reedy: Looks good to me, approved
  GOIII: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/SyntaxHighlight_GeSHi.php b/SyntaxHighlight_GeSHi.php
index 7b0ef4b..32e2235 100644
--- a/SyntaxHighlight_GeSHi.php
+++ b/SyntaxHighlight_GeSHi.php
@@ -42,7 +42,7 @@
 
 include_once __DIR__ . '/SyntaxHighlight_GeSHi.langs.php';
 
-$wgExtensionCredits['parserhook'][] = array(
+$wgExtensionCredits['parserhook']['SyntaxHighlight_GeSHi'] = array(
'path'   = __FILE__,
'name'   = 'SyntaxHighlight',
'author' = array( 'Brion Vibber', 'Tim Starling', 'Rob 
Church', 'Niklas Laxström' ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I61d19394997cc3499fa084d1b3dc8a7706a499d1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: GOIII george.orwell@outlook.com
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Also propagate moves/deletions from non-Wikibase enabled nam... - change (mediawiki...Wikibase)

2014-11-27 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

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

Change subject: Also propagate moves/deletions from non-Wikibase enabled 
namespaces
..

Also propagate moves/deletions from non-Wikibase enabled namespaces

Per discussion with Lydia: If we start with invalid data, but end up
with valid data there's no reason not to propagate the move. Same
goes for deletions.

Change-Id: I02ecfffa1c69b230171a89c44a7859ecba9eda3f
---
M client/includes/hooks/UpdateRepoHookHandlers.php
1 file changed, 1 insertion(+), 7 deletions(-)


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

diff --git a/client/includes/hooks/UpdateRepoHookHandlers.php 
b/client/includes/hooks/UpdateRepoHookHandlers.php
index 2ad721e..a1b2180 100644
--- a/client/includes/hooks/UpdateRepoHookHandlers.php
+++ b/client/includes/hooks/UpdateRepoHookHandlers.php
@@ -205,11 +205,6 @@
 * @return bool
 */
private function doArticleDeleteComplete( Title $title, User $user ) {
-   if ( !$this-isWikibaseEnabled( $title-getNamespace() ) ) {
-   // shorten out
-   return true;
-   }
-
if ( $this-propagateChangesToRepo !== true ) {
return true;
}
@@ -249,8 +244,7 @@
 * @return bool
 */
private function doTitleMoveComplete( Title $oldTitle, Title $newTitle, 
User $user ) {
-   if ( !$this-isWikibaseEnabled( $oldTitle-getNamespace() )
-!$this-isWikibaseEnabled( $newTitle-getNamespace() 
) ) {
+   if ( !$this-isWikibaseEnabled( $newTitle-getNamespace() ) ) {
return true;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02ecfffa1c69b230171a89c44a7859ecba9eda3f
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] graphite/txstatsd: re-introduce require_package - change (operations/puppet)

2014-11-27 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: graphite/txstatsd: re-introduce require_package
..


graphite/txstatsd: re-introduce require_package

We need require_package as the two classes have overlapping package
needs; however when using require_package, the resource is not always
declared within the same module, so we just require to have the stub
class require_package creates

Change-Id: I8ce1727d4ebf180d98d507fe0d41147887e3579b
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/graphite/manifests/init.pp
M modules/txstatsd/manifests/init.pp
2 files changed, 12 insertions(+), 8 deletions(-)

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



diff --git a/modules/graphite/manifests/init.pp 
b/modules/graphite/manifests/init.pp
index a27918a..41a27ed 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -13,8 +13,8 @@
 $storage_schemas,
 $storage_aggregation = {},
 $storage_dir = '/var/lib/carbon',
-) {
-package { ['graphite-carbon', 'python-whisper']: }
+) {
+require_package('graphite-carbon', 'python-whisper')
 
 $carbon_service_defaults = {
 log_updates  = false,
@@ -41,24 +41,24 @@
 group   = '_graphite',
 mode= '0755',
 before  = Service['carbon'],
-require = Package['graphite-carbon'],
+require = Class['packages::graphite_carbon'],
 }
 
 file { '/etc/carbon/storage-schemas.conf':
 content = configparser_format($storage_schemas),
-require = Package['graphite-carbon'],
+require = Class['packages::graphite_carbon'],
 notify  = Service['carbon'],
 }
 
 file { '/etc/carbon/carbon.conf':
 content = configparser_format($carbon_defaults, $carbon_settings),
-require = Package['graphite-carbon'],
+require = Class['packages::graphite_carbon'],
 notify  = Service['carbon'],
 }
 
 file { '/etc/carbon/storage-aggregation.conf':
 content = configparser_format($storage_aggregation),
-require = Package['graphite-carbon'],
+require = Class['packages::graphite_carbon'],
 notify  = Service['carbon'],
 }
 
diff --git a/modules/txstatsd/manifests/init.pp 
b/modules/txstatsd/manifests/init.pp
index 1b8923f..e2af1c7 100644
--- a/modules/txstatsd/manifests/init.pp
+++ b/modules/txstatsd/manifests/init.pp
@@ -23,7 +23,7 @@
 #  }
 #
 class txstatsd($settings) {
-package { ['python-txstatsd', 'python-twisted-web']: }
+require_package('python-txstatsd', 'python-twisted-web', 'graphite-carbon')
 
 file { '/etc/init/txstatsd.conf':
 source = 'puppet:///modules/txstatsd/txstatsd.conf',
@@ -56,7 +56,11 @@
 subscribe = File['/etc/txstatsd/txstatsd.cfg'],
 require   = [
 File['/etc/init/txstatsd.conf'],
-Package['python-txstatsd', 'python-twisted-web'],
+Class[
+  'packages::python_txstatsd',
+  'packages::python_twisted_web',
+  'packages::graphite_carbon'
+  ],
 User['txstatsd'],
 ],
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ce1727d4ebf180d98d507fe0d41147887e3579b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@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] PostgreSQL: Port update-keys.sql to PostgreSQL - change (mediawiki/core)

2014-11-27 Thread jenkins-bot (Code Review)

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

Change subject: PostgreSQL: Port update-keys.sql to PostgreSQL
..


PostgreSQL: Port update-keys.sql to PostgreSQL

This fixes the same bug in PostgreSQL that was reported
against Oracle as bug 71040, using the same method of copying
the update-keys.sql script into maintenance/postgres.

Since all three copies of this file do the same thing, perhaps
we should find lowest-common-denominator syntax that works in
all databases to avoid redundant copies that can get out of
sync with each other.  (The Oracle and PostgreSQL versions are
already identical to each other).

The comments in the file are confusing and ungrammatical, but
they are a copy of the same language from the other copies.
Since I don't know what it is trying to say, I can't
fix it.

I have verified that this patch fixes the problem where
mediawiki could not be installed with PostgreSQL using
either the CLI or the web installer, due to SQL syntax errors.

I haven't tested the the update-keys actually accomplishes
whatever it was introduced to accomplish, though.

Bug: 72834
Change-Id: I2a0cfa3dd0751b9fb65450b1537b6e77be60009a
---
A maintenance/postgres/update-keys.sql
1 file changed, 29 insertions(+), 0 deletions(-)

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



diff --git a/maintenance/postgres/update-keys.sql 
b/maintenance/postgres/update-keys.sql
new file mode 100644
index 000..7761d0c
--- /dev/null
+++ b/maintenance/postgres/update-keys.sql
@@ -0,0 +1,29 @@
+-- SQL to insert update keys into the initial tables after a
+-- fresh installation of MediaWiki's database.
+-- This is read and executed by the install script; you should
+-- not have to run it by itself unless doing a manual install.
+-- Insert keys here if either the unnecessary would cause heavy
+-- processing or could potentially cause trouble by lowering field
+-- sizes, adding constraints, etc.
+-- When adjusting field sizes, it is recommended removing old
+-- patches but to play safe, update keys should also inserted here.
+
+-- The /*_*/ comments in this and other files are
+-- replaced with the defined table prefix by the installer
+-- and updater scripts. If you are installing or running
+-- updates manually, you will need to manually insert the
+-- table prefix if any when running these scripts.
+--
+
+INSERT INTO /*_*/updatelog (ul_key, ul_value)
+   VALUES( 'filearchive-fa_major_mime-patch-fa_major_mime-chemical.sql', 
null );
+INSERT INTO /*_*/updatelog (ul_key, ul_value)
+   VALUES( 'image-img_major_mime-patch-img_major_mime-chemical.sql', null 
);
+INSERT INTO /*_*/updatelog (ul_key, ul_value)
+   VALUES( 'oldimage-oi_major_mime-patch-oi_major_mime-chemical.sql', null 
);
+INSERT INTO /*_*/updatelog (ul_key, ul_value)
+   VALUES( 'user_groups-ug_group-patch-ug_group-length-increase-255.sql', 
null );
+INSERT INTO /*_*/updatelog (ul_key, ul_value)
+   VALUES( 
'user_former_groups-ufg_group-patch-ufg_group-length-increase-255.sql', null );
+INSERT INTO /*_*/updatelog (ul_key, ul_value)
+   VALUES( 'user_properties-up_property-patch-up_property.sql', null );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a0cfa3dd0751b9fb65450b1537b6e77be60009a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jjanes jeff.ja...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: MarkAHershberger m...@nichework.com
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: Tim Landscheidt t...@tim-landscheidt.de
Gerrit-Reviewer: jenkins-bot 
Gerrit-Reviewer: saper sa...@saper.info

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

[MediaWiki-commits] [Gerrit] PostgreSQL: Port update-keys.sql to PostgreSQL - change (mediawiki/core)

2014-11-27 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: PostgreSQL: Port update-keys.sql to PostgreSQL
..

PostgreSQL: Port update-keys.sql to PostgreSQL

This fixes the same bug in PostgreSQL that was reported
against Oracle as bug 71040, using the same method of copying
the update-keys.sql script into maintenance/postgres.

Since all three copies of this file do the same thing, perhaps
we should find lowest-common-denominator syntax that works in
all databases to avoid redundant copies that can get out of
sync with each other.  (The Oracle and PostgreSQL versions are
already identical to each other).

The comments in the file are confusing and ungrammatical, but
they are a copy of the same language from the other copies.
Since I don't know what it is trying to say, I can't
fix it.

I have verified that this patch fixes the problem where
mediawiki could not be installed with PostgreSQL using
either the CLI or the web installer, due to SQL syntax errors.

I haven't tested the the update-keys actually accomplishes
whatever it was introduced to accomplish, though.

Bug: 72834
Change-Id: I2a0cfa3dd0751b9fb65450b1537b6e77be60009a
(cherry picked from commit 44b4b45bfa49f88f5ec92c4a445cdfe405841969)
---
A maintenance/postgres/update-keys.sql
1 file changed, 29 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/91/176291/1

diff --git a/maintenance/postgres/update-keys.sql 
b/maintenance/postgres/update-keys.sql
new file mode 100644
index 000..7761d0c
--- /dev/null
+++ b/maintenance/postgres/update-keys.sql
@@ -0,0 +1,29 @@
+-- SQL to insert update keys into the initial tables after a
+-- fresh installation of MediaWiki's database.
+-- This is read and executed by the install script; you should
+-- not have to run it by itself unless doing a manual install.
+-- Insert keys here if either the unnecessary would cause heavy
+-- processing or could potentially cause trouble by lowering field
+-- sizes, adding constraints, etc.
+-- When adjusting field sizes, it is recommended removing old
+-- patches but to play safe, update keys should also inserted here.
+
+-- The /*_*/ comments in this and other files are
+-- replaced with the defined table prefix by the installer
+-- and updater scripts. If you are installing or running
+-- updates manually, you will need to manually insert the
+-- table prefix if any when running these scripts.
+--
+
+INSERT INTO /*_*/updatelog (ul_key, ul_value)
+   VALUES( 'filearchive-fa_major_mime-patch-fa_major_mime-chemical.sql', 
null );
+INSERT INTO /*_*/updatelog (ul_key, ul_value)
+   VALUES( 'image-img_major_mime-patch-img_major_mime-chemical.sql', null 
);
+INSERT INTO /*_*/updatelog (ul_key, ul_value)
+   VALUES( 'oldimage-oi_major_mime-patch-oi_major_mime-chemical.sql', null 
);
+INSERT INTO /*_*/updatelog (ul_key, ul_value)
+   VALUES( 'user_groups-ug_group-patch-ug_group-length-increase-255.sql', 
null );
+INSERT INTO /*_*/updatelog (ul_key, ul_value)
+   VALUES( 
'user_former_groups-ufg_group-patch-ufg_group-length-increase-255.sql', null );
+INSERT INTO /*_*/updatelog (ul_key, ul_value)
+   VALUES( 'user_properties-up_property-patch-up_property.sql', null );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a0cfa3dd0751b9fb65450b1537b6e77be60009a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_24
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Jjanes jeff.ja...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fixed spacing - change (mediawiki/core)

2014-11-27 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

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

Change subject: Fixed spacing
..

Fixed spacing

- Added/removed spaces around parenthesis
- Added newline in empty blocks
- Added space after switch/foreach/function
- Use tabs at begin of line
- Add newline at end of file

Change-Id: I244cdb2c333489e1020931bf4ac5266a87439f0d
---
M includes/CdbCompat.php
M includes/Status.php
M includes/api/ApiOpenSearch.php
M includes/cache/LocalisationCache.php
M includes/db/Database.php
M includes/filebackend/FSFileBackend.php
M includes/media/Bitmap.php
M includes/parser/Parser.php
M includes/profiler/ProfilerStandard.php
M includes/profiler/ProfilerXhprof.php
M includes/profiler/SectionProfiler.php
M includes/profiler/output/ProfilerOutputText.php
M includes/utils/AutoloadGenerator.php
M maintenance/backupTextPass.inc
M tests/phpunit/includes/media/FormatMetadataTest.php
M tests/phpunit/maintenance/backupTextPassTest.php
16 files changed, 36 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/92/176292/1

diff --git a/includes/CdbCompat.php b/includes/CdbCompat.php
index 0c00b39..0074cc9 100644
--- a/includes/CdbCompat.php
+++ b/includes/CdbCompat.php
@@ -29,14 +29,17 @@
 /**
  * @deprecated since 1.25
  */
-abstract class CdbReader extends \Cdb\Reader {}
+abstract class CdbReader extends \Cdb\Reader {
+}
 
 /**
  * @deprecated since 1.25
  */
-abstract class CdbWriter extends \Cdb\Writer {}
+abstract class CdbWriter extends \Cdb\Writer {
+}
 
 /**
  * @deprecated since 1.25
  */
-class CdbException extends \Cdb\Exception {}
+class CdbException extends \Cdb\Exception {
+}
diff --git a/includes/Status.php b/includes/Status.php
index 265eae1..fb267bd 100644
--- a/includes/Status.php
+++ b/includes/Status.php
@@ -469,7 +469,7 @@
public function __toString() {
$status = $this-isOK() ? OK : Error;
if ( count( $this-errors ) ) {
-   $errorcount = collected  . ( count($this-errors) ) . 
 error(s) on the way;
+   $errorcount = collected  . ( count( $this-errors ) ) 
.  error(s) on the way;
} else {
$errorcount = no errors detected;
}
@@ -486,16 +486,16 @@
$errorcount,
$valstr
);
-   if ( count ($this-errors )  0 ) {
+   if ( count( $this-errors )  0 ) {
$hdr = sprintf( +-%'-4s-+-%'-25s-+-%'-40s-+\n, , 
,  );
$i = 1;
$out .= \n;
$out .= $hdr;
-   foreach( $this-getStatusArray() as $stat ) {
+   foreach ( $this-getStatusArray() as $stat ) {
$out .= sprintf( | %4d | %-25.25s | %-40.40s 
|\n,
$i,
$stat[0],
-   implode( , array_slice( $stat, 1 ) )
+   implode(  , array_slice( $stat, 1 ) )
);
$i += 1;
}
diff --git a/includes/api/ApiOpenSearch.php b/includes/api/ApiOpenSearch.php
index 4a9e216..2235ba9 100644
--- a/includes/api/ApiOpenSearch.php
+++ b/includes/api/ApiOpenSearch.php
@@ -59,7 +59,7 @@
}
 
public function getCustomPrinter() {
-   switch( $this-getFormat() ) {
+   switch ( $this-getFormat() ) {
case 'json':
return $this-getMain()-createPrinterByName( 
'json' . $this-fm );
 
diff --git a/includes/cache/LocalisationCache.php 
b/includes/cache/LocalisationCache.php
index 2a3cd38..4dbe26e 100644
--- a/includes/cache/LocalisationCache.php
+++ b/includes/cache/LocalisationCache.php
@@ -23,6 +23,7 @@
 use Cdb\Exception as CdbException;
 use Cdb\Reader as CdbReader;
 use Cdb\Writer as CdbWriter;
+
 /**
  * Class for caching the contents of localisation files, Messages*.php
  * and *.i18n.php.
diff --git a/includes/db/Database.php b/includes/db/Database.php
index fc13eeb..cbfad07 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1003,7 +1003,7 @@
if ( $queryProf != '' ) {
$queryStartTime = microtime( true );
$queryProfile = new ScopedCallback(
-   function() use ( $queryStartTime, $queryProf, 
$isMaster ) {
+   function () use ( $queryStartTime, $queryProf, 
$isMaster ) {
$trxProfiler = 
Profiler::instance()-getTransactionProfiler();
$trxProfiler-recordQueryCompletion( 
$queryProf, $queryStartTime, $isMaster );

[MediaWiki-commits] [Gerrit] Replace webservice bash script with python script - change (labs/toollabs)

2014-11-27 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: Replace webservice bash script with python script
..

Replace webservice bash script with python script

Too big to bash

Change-Id: I8eb49476544900629837768f4539215f0dc897f8
---
M misctools/webservice
1 file changed, 149 insertions(+), 101 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/93/176293/1

diff --git a/misctools/webservice b/misctools/webservice
index e5ef365..e5f6e10 100755
--- a/misctools/webservice
+++ b/misctools/webservice
@@ -1,114 +1,162 @@
-#! /bin/bash
+#!/usr/bin/python
+import os
+import pwd
+import re
+import subprocess
+import argparse
+import xml.etree.ElementTree as ET
 
-prefix=$(/bin/cat /etc/wmflabs-project)
-tool=$(/usr/bin/id -nu|sed -e s/^$prefix.//)
-user=$prefix.$tool
-server=lighttpd
-public=public_html
 
-memlimit=4g
-if [ -r /data/project/.system/config/$tool.web-memlimit ]; then
-  memlimit=$(cat /data/project/.system/config/$tool.web-memlimit)
-fi
+def read_file(path, default=None):
+
+Helper function to return contents of file if it exists, or a default 
value.
 
-case $1 in
-  -tomcat)
-server=tomcat
-public=public_tomcat
-shift
-;;
-  -lighttpd)
-shift
-;;
-  -*)
-echo Unknown webservice type $1 2
-exit 1
-;;
-esac
+:param path: Path to file to read from
+:param default: Value to return if the file does not exist
+:return: String containing either contents of the file, or default value
+
+if os.path.exists(path):
+with open(path) as f:
+return f.read()
+return default
 
-home=$(getent passwd $user | cut -d : -f 6 | sed -e 's/\/$//')
-if [ $(getent group $user | cut -d : -f 1) != $user ]; then
-echo $0: $tool does not appear to be a tool 2
-exit 1
-fi
 
-if [ $home =  -o ! -d $home/$public ]; then
-echo $tool does not have a $public 2
-exit 1
-fi
+def start_web_job(server):
+
+Submits a job to the grid, running a particular server, for current user
 
-job=$(qstat -q webgrid-$server -j $server-$tool 21 | grep job_number: | 
sed -e 's/^.*  *\(.*\)$/\1/')
-if [ $job !=  ]; then
-si=$(qstat -j $job 21 | grep 'scheduling info': | sed -e 's/^.*: 
*\(.*\)$/\1/')
-fi
+:param server: Server type to start job as. Current options are lighttpd 
and tomcat
+
+command = ['qsub',
+   '-e', '%s/error.log' % HOME,
+   '-o', '%s/error.log' % HOME,
+   '-i', '/dev/null',
+   '-q', 'webgrid-%s' % server,
+   '-l', 'h_vmem=%s' % MEMLIMIT,
+   '-b', 'y',
+   '-N', '%s-%s' % (server, TOOL),
+   '/usr/local/bin/tool-%s' % server]
+subprocess.check_call(command)
 
-waitdown() {
-wj=$1
-while [ $wj = $1 ]; do
-wj=$(qstat -j $1 21 | grep job_number: | sed -e 's/^.*  
*\(.*\)$/\1/')
-echo -n .
-sleep 1
-done
-}
+def stop_job(job_id):
+
+Deletes a job with given job id from the grid
 
-case $1 in
-start)
+:param job_id: Job id to delete
+
+command = ['qdel', job_id]
+subprocess.check_call(command)
 
-echo -n Starting webservice...
-if [ $job !=  ]; then
-echo Webservice already running.
-else
-if qsub -e $home/error.log -o $home/error.log -i /dev/null -q 
webgrid-$server -l h_vmem=$memlimit -b y -N $server-$tool 
/usr/local/bin/tool-$server /dev/null 21 ; then
-echo  started.
-else
-echo  failed.
-fi
-fi
-;;
 
-restart)
-echo -n Restarting webservice..
-if [ $job !=  ]; then
-qdel -j $job /dev/null 21
-waitdown $job
-else
-echo -n .
-fi
-if qsub -e $home/error.log -o /dev/null -i /dev/null -q 
webgrid-$server -l h_vmem=$memlimit -b y -N $server-$tool 
/usr/local/bin/tool-$server /dev/null 21; then
-echo  restarted.
-else
-echo  failed.
-fi
-;;
 
-status)
-if [ $job !=  ]; then
-if [ $si !=  ]; then
-echo Your webservice is scheduled:
-echo   $si
-else
-echo Your webservice is running (job $job).
-fi
-exit 0
-else
-echo Your webservice is not running.
-exit 1
-fi
-;;
+def qstat_xml(*args):
+
+Executes a qstat call and returns the output in XML format
 
-stop)
-if [ $job !=  ]; then
-echo -n Stopping webservice..
-qdel -j $job /dev/null 21
-waitdown $job
-echo  stopped.
-else
-echo Webservice not running.
-fi
-;;
+:param args: Arguments to the qstat call
+:return: String response in XML form of

[MediaWiki-commits] [Gerrit] extdist: clone composer into /srv/composer - change (operations/puppet)

2014-11-27 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: extdist: clone composer into /srv/composer
..

extdist: clone composer into /srv/composer

Bug: T70940
Change-Id: I9c4c655eec649019bd40bcd397e9e8a435e448d2
---
M modules/extdist/manifests/init.pp
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/94/176294/1

diff --git a/modules/extdist/manifests/init.pp 
b/modules/extdist/manifests/init.pp
index b7e2692..176dbb6 100644
--- a/modules/extdist/manifests/init.pp
+++ b/modules/extdist/manifests/init.pp
@@ -64,6 +64,16 @@
 group = 'extdist',
 }
 
+git::clone { 'integration/composer':
+ensure = 'latest',
+directory  = '/srv/composer',
+branch = 'master',
+require= User['extdist'],
+recurse_submodules = true,
+owner  = 'extdist',
+group  = 'extdist',
+}
+
 file { '/etc/extdist.conf':
 ensure  = present,
 content = ordered_json($ext_settings),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c4c655eec649019bd40bcd397e9e8a435e448d2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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] extdist: clone composer into /srv/composer - change (operations/puppet)

2014-11-27 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: extdist: clone composer into /srv/composer
..


extdist: clone composer into /srv/composer

Bug: T70940
Change-Id: I9c4c655eec649019bd40bcd397e9e8a435e448d2
---
M modules/extdist/manifests/init.pp
1 file changed, 12 insertions(+), 1 deletion(-)

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



diff --git a/modules/extdist/manifests/init.pp 
b/modules/extdist/manifests/init.pp
index b7e2692..05b5f9a 100644
--- a/modules/extdist/manifests/init.pp
+++ b/modules/extdist/manifests/init.pp
@@ -10,6 +10,7 @@
 $dist_dir = ${base_dir}/dist
 $clone_dir = ${base_dir}/extdist
 $src_path = ${base_dir}/src
+$composer_dir = ${base_dir}/composer
 $pid_folder = '/run/extdist'
 
 $ext_settings = {
@@ -48,7 +49,7 @@
 require = User['extdist']
 }
 
-file { [$dist_dir, $clone_dir, $src_path, $pid_folder]:
+file { [$dist_dir, $clone_dir, $src_path, $pid_folder, $composer_dir]:
 ensure = directory,
 owner  = 'extdist',
 group  = 'www-data',
@@ -64,6 +65,16 @@
 group = 'extdist',
 }
 
+git::clone { 'integration/composer':
+ensure = 'latest',
+directory  = $composer_dir,
+branch = 'master',
+require= [File[$composer_dir], User['extdist']],
+recurse_submodules = true,
+owner  = 'extdist',
+group  = 'extdist',
+}
+
 file { '/etc/extdist.conf':
 ensure  = present,
 content = ordered_json($ext_settings),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c4c655eec649019bd40bcd397e9e8a435e448d2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@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] extdist: composer depends on php5-cli - change (operations/puppet)

2014-11-27 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: extdist: composer depends on php5-cli
..

extdist: composer depends on php5-cli

Change-Id: Ibe421ff94355fb7e1f18207d59086779f7fb6d89
---
M modules/extdist/manifests/init.pp
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/176295/1

diff --git a/modules/extdist/manifests/init.pp 
b/modules/extdist/manifests/init.pp
index 05b5f9a..1f50e29 100644
--- a/modules/extdist/manifests/init.pp
+++ b/modules/extdist/manifests/init.pp
@@ -65,11 +65,15 @@
 group = 'extdist',
 }
 
+package { 'php5-cli':
+ensure = 'present',
+}
+
 git::clone { 'integration/composer':
 ensure = 'latest',
 directory  = $composer_dir,
 branch = 'master',
-require= [File[$composer_dir], User['extdist']],
+require= [File[$composer_dir], User['extdist'], 
Package['php5-cli']],
 recurse_submodules = true,
 owner  = 'extdist',
 group  = 'extdist',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe421ff94355fb7e1f18207d59086779f7fb6d89
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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] extdist: composer depends on php5-cli - change (operations/puppet)

2014-11-27 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: extdist: composer depends on php5-cli
..


extdist: composer depends on php5-cli

Change-Id: Ibe421ff94355fb7e1f18207d59086779f7fb6d89
---
M modules/extdist/manifests/init.pp
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/modules/extdist/manifests/init.pp 
b/modules/extdist/manifests/init.pp
index 05b5f9a..1f50e29 100644
--- a/modules/extdist/manifests/init.pp
+++ b/modules/extdist/manifests/init.pp
@@ -65,11 +65,15 @@
 group = 'extdist',
 }
 
+package { 'php5-cli':
+ensure = 'present',
+}
+
 git::clone { 'integration/composer':
 ensure = 'latest',
 directory  = $composer_dir,
 branch = 'master',
-require= [File[$composer_dir], User['extdist']],
+require= [File[$composer_dir], User['extdist'], 
Package['php5-cli']],
 recurse_submodules = true,
 owner  = 'extdist',
 group  = 'extdist',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe421ff94355fb7e1f18207d59086779f7fb6d89
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@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] Expand error message when parser tests found no hook - change (mediawiki/core)

2014-11-27 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

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

Change subject: Expand error message when parser tests found no hook
..

Expand error message when parser tests found no hook

The existing message is hard to understand and does not mention, that
this is a problem in the parser test itself and not with phpunit.

Before:
1) Warning
The data provider specified for ParserTest_file::testParserTest is
invalid.
Problem running hook

After:
1) Warning
The data provider specified for ParserTest_file::testParser
Problem running requested parser hook from the test file

Change-Id: I0b4225cc9ab95e8dd048515315c789113dacf39e
---
M tests/testHelpers.inc
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/96/176296/1

diff --git a/tests/testHelpers.inc b/tests/testHelpers.inc
index b5fc800..f1e8c44 100644
--- a/tests/testHelpers.inc
+++ b/tests/testHelpers.inc
@@ -471,7 +471,7 @@
$hooksResult = $this-delayedParserTest-unleash( 
$this-parserTest );
if ( !$hooksResult ) {
# Some hook reported an issue. Abort.
-   throw new MWException( Problem running hook );
+   throw new MWException( Problem running requested 
parser hook from the test file );
}
 
$this-test = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b4225cc9ab95e8dd048515315c789113dacf39e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de

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

1 2 >

1 - 100 of 146 matches

Mail list logo