[MediaWiki-commits] [Gerrit] fix - spacing. - change (sartoris)
Rfaulk has submitted this change and it was merged. Change subject: fix - spacing. .. fix - spacing. Change-Id: Ia09d0b4a60cade4cc21ad621cb433bd081d1c505 --- M README.rst 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Rfaulk: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/README.rst b/README.rst index 80e2e55..778f311 100644 --- a/README.rst +++ b/README.rst @@ -112,25 +112,41 @@ On *client.realm.org* clone git deploy, local install, configure settings and initialize: $ git clone g...@github.com:Git-Tools/git-deploy.git + ... + $ cd git-deploy + $ sudo pip install -e . + ... Next configure the client instance with git config by assigning the following settings in *scripts/sartoris.ini*: [deploy] + target=target.realm.org + path=/home/me/project/ + user=me + hook-dir=.git/deploy/hooks/ + tag-prefix=sample.com + remote=origin + branch=master + client-path=/home/me/project/ + key-path=/home/me/.ssh/id_rsa + test-repo-path=/tmp/test_repo/ + [system] + run_root=/usr/bin/ Once you have defined settings in *sartoris.ini* call *init.py* to set the got config -- To view, visit https://gerrit.wikimedia.org/r/91820 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia09d0b4a60cade4cc21ad621cb433bd081d1c505 Gerrit-PatchSet: 1 Gerrit-Project: sartoris Gerrit-Branch: master Gerrit-Owner: Rfaulk rfaulk...@wikimedia.org Gerrit-Reviewer: Rfaulk rfaulk...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix - spacing. - change (sartoris)
Rfaulk has uploaded a new change for review. https://gerrit.wikimedia.org/r/91820 Change subject: fix - spacing. .. fix - spacing. Change-Id: Ia09d0b4a60cade4cc21ad621cb433bd081d1c505 --- M README.rst 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/sartoris refs/changes/20/91820/1 diff --git a/README.rst b/README.rst index 80e2e55..778f311 100644 --- a/README.rst +++ b/README.rst @@ -112,25 +112,41 @@ On *client.realm.org* clone git deploy, local install, configure settings and initialize: $ git clone g...@github.com:Git-Tools/git-deploy.git + ... + $ cd git-deploy + $ sudo pip install -e . + ... Next configure the client instance with git config by assigning the following settings in *scripts/sartoris.ini*: [deploy] + target=target.realm.org + path=/home/me/project/ + user=me + hook-dir=.git/deploy/hooks/ + tag-prefix=sample.com + remote=origin + branch=master + client-path=/home/me/project/ + key-path=/home/me/.ssh/id_rsa + test-repo-path=/tmp/test_repo/ + [system] + run_root=/usr/bin/ Once you have defined settings in *sartoris.ini* call *init.py* to set the got config -- To view, visit https://gerrit.wikimedia.org/r/91820 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia09d0b4a60cade4cc21ad621cb433bd081d1c505 Gerrit-PatchSet: 1 Gerrit-Project: sartoris Gerrit-Branch: master Gerrit-Owner: Rfaulk rfaulk...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 54464) Fix URL appearing on Special:Version - change (mediawiki...UserDailyContribs)
Odder has uploaded a new change for review. https://gerrit.wikimedia.org/r/91821 Change subject: (bug 54464) Fix URL appearing on Special:Version .. (bug 54464) Fix URL appearing on Special:Version Annoyin' little bug. Bug: 54464 Change-Id: Ie76a65ea75c1777bcf88a0b8b9e3f4bb021457e9 --- M UserDailyContribs.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserDailyContribs refs/changes/21/91821/1 diff --git a/UserDailyContribs.php b/UserDailyContribs.php index 696bd12..ebb79af 100644 --- a/UserDailyContribs.php +++ b/UserDailyContribs.php @@ -20,7 +20,7 @@ 'name' = 'User Daily Contributions', 'author' = array( 'Nimish Gautam', 'Trevor Parscal' ), 'version' = '0.2.0', - 'url' = 'https://www.mediawiki.org/wiki/Extension:UsabilityInitiative', + 'url' = 'https://www.mediawiki.org/wiki/Extension:UserDailyContribs', 'descriptionmsg' = 'userdailycontribs-desc', ); $wgAutoloadClasses['UserDailyContribsHooks'] = dirname( __FILE__ ) . '/UserDailyContribs.hooks.php'; -- To view, visit https://gerrit.wikimedia.org/r/91821 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie76a65ea75c1777bcf88a0b8b9e3f4bb021457e9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UserDailyContribs Gerrit-Branch: master Gerrit-Owner: Odder tom...@twkozlowski.net Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hide remove button when adding a new statement - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91822
Change subject: Hide remove button when adding a new statement
..
Hide remove button when adding a new statement
(bug 56096)
Remove button is not initialized anymore when adding a new statement.
Change-Id: If020dd22930f4dd308417ce2eb741cad77351948
---
M lib/resources/jquery.wikibase/toolbar/toolbarcontroller.js
1 file changed, 2 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/22/91822/1
diff --git a/lib/resources/jquery.wikibase/toolbar/toolbarcontroller.js
b/lib/resources/jquery.wikibase/toolbar/toolbarcontroller.js
index 30d6416..b62f5ed 100644
--- a/lib/resources/jquery.wikibase/toolbar/toolbarcontroller.js
+++ b/lib/resources/jquery.wikibase/toolbar/toolbarcontroller.js
@@ -155,11 +155,8 @@
// corresponding to the widget just
instantiated.
self.element.on( eventPrefix +
'create.' + self.widgetName, function( event ) {
var $target = $( event.target ),
- isPending = baseClass
-(
-
$target.hasClass( baseClass + '-new' )
- ||
$target.find( baseClass + '-new' ).length 0
- );
+ isWidget = !!def.widget,
+ isPending = isWidget
!$target.data( def.widget.name ).value();
if ( type === 'addtoolbar' ) {
// Initialize toolbars
that are not initialized already:
--
To view, visit https://gerrit.wikimedia.org/r/91822
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If020dd22930f4dd308417ce2eb741cad77351948
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Refactoring of ULS font selection tests - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged. Change subject: Refactoring of ULS font selection tests .. Refactoring of ULS font selection tests Change-Id: Ie4d5843f76bff277750a2d61a13b3297650e52f7 --- M tests/browser/features/font_selection.feature A tests/browser/features/step_definitions/font_selection_steps.rb 2 files changed, 16 insertions(+), 6 deletions(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/font_selection.feature b/tests/browser/features/font_selection.feature index a735b72..c70b2ed 100644 --- a/tests/browser/features/font_selection.feature +++ b/tests/browser/features/font_selection.feature @@ -1,4 +1,4 @@ -@login @reset-preferences-after @commons.wikimedia.beta.wmflabs.org +@commons.wikimedia.beta.wmflabs.org @login @reset-preferences-after Feature: Font selection In order to have better using experience, @@ -12,14 +12,15 @@ Background: Given I am logged in And I set German as the interface language + And I open ULS + And I open display settings +When I open fonts panel of language settings Scenario: Font selector appears -When I open Fonts panel of language settings Then a font selector for interface language appears -Then a font selector for content language appears + And a font selector for content language appears Scenario: Discarding live preview of content font -When I open Fonts panel of language settings And I select OpenDyslexic font for the content language for the live preview And I close the panel to discard the changes Then the active content font must be the same as font prior to the preview @@ -27,7 +28,6 @@ And the selected content font must be system Scenario: Discarding live preview of interface font -When I open Fonts panel of language settings And I select OpenDyslexic font for the interface language for the live preview And I close the panel to discard the changes Then the active interface font must be the same as font prior to the preview @@ -35,7 +35,6 @@ And the selected interface font must be system Scenario: Applying the live preview of interface font -When I open Fonts panel of language settings And I select OpenDyslexic font for the interface language for the live preview And I apply the changes Then the interface font must be changed to the OpenDyslexic font diff --git a/tests/browser/features/step_definitions/font_selection_steps.rb b/tests/browser/features/step_definitions/font_selection_steps.rb new file mode 100644 index 000..125dbc7 --- /dev/null +++ b/tests/browser/features/step_definitions/font_selection_steps.rb @@ -0,0 +1,11 @@ +Given(/^I open ULS$/) do + on(PanelPage).trigger_personal_element.when_visible.click +end + +Given(/^I open display settings$/) do + on(PanelPage).panel_display_element.when_visible.click +end + +When(/^I open fonts panel of language settings$/) do + on(PanelPage).panel_fonts_element.click +end -- To view, visit https://gerrit.wikimedia.org/r/91359 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie4d5843f76bff277750a2d61a13b3297650e52f7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] improve historical campaign lookup - change (mediawiki...CentralNotice)
Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91823
Change subject: improve historical campaign lookup
..
improve historical campaign lookup
Move the enabled check to the db query
Change-Id: I9e3d38fcad39ee02eb4f264068328e16989471ae
---
M includes/Campaign.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/23/91823/1
diff --git a/includes/Campaign.php b/includes/Campaign.php
index e7cc85e..ea585f2 100644
--- a/includes/Campaign.php
+++ b/includes/Campaign.php
@@ -483,12 +483,13 @@
notlog_id = {$row-log_id},
notlog_end_start = $ts,
notlog_end_end = $ts,
+ notlog_end_enabled = 1,
),
__METHOD__
);
$campaign = $singleRes-fetchRow();
- if ( !$campaign or $campaign['enabled'] !== 1 ) {
+ if ( !$campaign ) {
continue;
}
$campaign['projects'] = explode( , ,
$campaign['projects'] );
--
To view, visit https://gerrit.wikimedia.org/r/91823
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e3d38fcad39ee02eb4f264068328e16989471ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Adamw awi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Save a ton of memory in GlobalAllocation - change (mediawiki...CentralNotice)
Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91824
Change subject: Save a ton of memory in GlobalAllocation
..
Save a ton of memory in GlobalAllocation
Untold savings. Render Messages to text and discard along with parameters.
Change-Id: I75bc647a966e5f36a34e84402f629f0ff3d2d776
---
M special/SpecialGlobalAllocation.php
1 file changed, 22 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/24/91824/1
diff --git a/special/SpecialGlobalAllocation.php
b/special/SpecialGlobalAllocation.php
index 693e4db..71f0585 100644
--- a/special/SpecialGlobalAllocation.php
+++ b/special/SpecialGlobalAllocation.php
@@ -294,15 +294,15 @@
$htmlOut .= Html::openElement( 'tr', array(
'class'='mw-sp-centralnotice-allocationrow' ) );
$htmlOut .= Html::openElement( 'td' );
- $htmlOut .= $this-listProjects(
$row['projects'] );
+ $htmlOut .= $row['projects_label'];
$htmlOut .= Html::closeElement( 'td' );
$htmlOut .= Html::openElement( 'td' );
- $htmlOut .= $this-listLanguages(
$row['languages'] );
+ $htmlOut .= $row['languages_label'];
$htmlOut .= Html::closeElement( 'td' );
$htmlOut .= Html::openElement( 'td' );
- $htmlOut .= $this-listCountries(
$row['countries'] );
+ $htmlOut .= $row['countries_label'];
$htmlOut .= Html::closeElement( 'td' );
$htmlOut .= Html::closeElement( 'tr' );
@@ -310,10 +310,10 @@
$htmlOut .= Html::closeElement( 'table' );
$htmlOut .= $this-getBannerAllocationsTable(
- end( $grouping['rows'][0]['projects'] ),
- end( $grouping['rows'][0]['countries'] ),
- end( $grouping['rows'][0]['languages'] ),
- $grouping['rows'][0]['buckets']
+ $grouping['a_project'],
+ $grouping['a_country'],
+ $grouping['a_language'],
+ $grouping['a_num_buckets'] //XXX
);
}
@@ -382,14 +382,27 @@
$label = $this-msg(
'centralnotice-excluding-list',
$this-getLanguage()-commaList( $contributing ),
$this-getLanguage()-listToText( $excluding )
- );
+ )-text();
} else {
$label =
$this-getLanguage()-commaList( $contributing );
}
+ // Optimization: compact by rendering
as text
+ $rows = array();
+ foreach ( $result as $row ) {
+ $rows[] = array(
+ 'countries_label' =
$this-listCountries( $row['countries'] ),
+ 'projects_label' =
$this-listProjects( $row['projects'] ),
+ 'languages_label' =
$this-listLanguages( $row['languages'] ),
+ );
+ }
$groupings[] = array(
'label' = $label,
- 'rows' = $result,
+ 'a_country' = end(
$result[0]['countries'] ),
+ 'a_project' = end(
$result[0]['projects'] ),
+ 'a_language' = end(
$result[0]['languages'] ),
+ 'a_num_buckets' =
$result[0]['buckets'],
+ 'rows' = $rows,
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/91824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I75bc647a966e5f36a34e84402f629f0ff3d2d776
Gerrit-PatchSet: 1
Gerrit-Project:
[MediaWiki-commits] [Gerrit] add - basic start/sync usage. - change (sartoris)
Rfaulk has uploaded a new change for review. https://gerrit.wikimedia.org/r/91825 Change subject: add - basic start/sync usage. .. add - basic start/sync usage. Change-Id: Iecb7201db331809cca8d841625ecb7db18c8e69b --- M README.rst 1 file changed, 50 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/sartoris refs/changes/25/91825/1 diff --git a/README.rst b/README.rst index 778f311..50c432f 100644 --- a/README.rst +++ b/README.rst @@ -164,8 +164,57 @@ **USING GIT DEPLOY** -*start/sync* +First initialize a new repository on *client.realm.org*: + +client.realm.org:~ me$ mkdir me.com + +client.realm.org:~ me$ cd me.com + +client.realm.org:~ me$ git init + +client.realm.org:~ me$ git remote add origin g...@github.com:wikimedia/me.com.git + +client.realm.org:~ me$ git push origin master + +Next initialize the client repo by following the client setup above. Subsequently, initialize the deploy target +on *target.realm.org* as indicated. + +target.realm.org:~ me$ cp ~/default-client-pull.py /var/www/html/sample.com/.git/deploy/hooks/ +target.realm.org:~ me$ chmod +x /var/www/html/sample.com/.git/deploy/hooks/default-client-pull.py + + +*start/sync*: + +Ensure that the client is correctly synced to the remote by issuing a git pull or rebase. Then you can issue a +a start command to write the lock file to the target to begin the deployment. + +client.realm.org:~ me$ cd me.com + +client.realm.org:me.com me$ touch new_file + +client.realm.org:me.com me$ git add new_file + +client.realm.org:me.com me$ git commit -m add - my new file + +client.realm.org:me.com me$ git pull --rebase origin master + +At this point you are ready to enter the deployment process: + +client.realm.org:me.com me$ git deploy start + +perform any testing or add any other commits as necessary + +client.realm.org:me.com me$ git deploy sync + +Once you sync a the specified hooks will be invoked from the client and the target and a tag is written to the +repository on the latest commit of the deploy. If the default push and pull hooks are used the client will simply +push its changes to the remote and the target will pull in the new changes. Deployment tags have the form +*repo-sync-20130918-231126*. + + *start/abort* + + *start/rollback* -- To view, visit https://gerrit.wikimedia.org/r/91825 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iecb7201db331809cca8d841625ecb7db18c8e69b Gerrit-PatchSet: 1 Gerrit-Project: sartoris Gerrit-Branch: master Gerrit-Owner: Rfaulk rfaulk...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add - basic start/sync usage. - change (sartoris)
Rfaulk has submitted this change and it was merged. Change subject: add - basic start/sync usage. .. add - basic start/sync usage. Change-Id: Iecb7201db331809cca8d841625ecb7db18c8e69b --- M README.rst 1 file changed, 50 insertions(+), 1 deletion(-) Approvals: Rfaulk: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/README.rst b/README.rst index 778f311..50c432f 100644 --- a/README.rst +++ b/README.rst @@ -164,8 +164,57 @@ **USING GIT DEPLOY** -*start/sync* +First initialize a new repository on *client.realm.org*: + +client.realm.org:~ me$ mkdir me.com + +client.realm.org:~ me$ cd me.com + +client.realm.org:~ me$ git init + +client.realm.org:~ me$ git remote add origin g...@github.com:wikimedia/me.com.git + +client.realm.org:~ me$ git push origin master + +Next initialize the client repo by following the client setup above. Subsequently, initialize the deploy target +on *target.realm.org* as indicated. + +target.realm.org:~ me$ cp ~/default-client-pull.py /var/www/html/sample.com/.git/deploy/hooks/ +target.realm.org:~ me$ chmod +x /var/www/html/sample.com/.git/deploy/hooks/default-client-pull.py + + +*start/sync*: + +Ensure that the client is correctly synced to the remote by issuing a git pull or rebase. Then you can issue a +a start command to write the lock file to the target to begin the deployment. + +client.realm.org:~ me$ cd me.com + +client.realm.org:me.com me$ touch new_file + +client.realm.org:me.com me$ git add new_file + +client.realm.org:me.com me$ git commit -m add - my new file + +client.realm.org:me.com me$ git pull --rebase origin master + +At this point you are ready to enter the deployment process: + +client.realm.org:me.com me$ git deploy start + +perform any testing or add any other commits as necessary + +client.realm.org:me.com me$ git deploy sync + +Once you sync a the specified hooks will be invoked from the client and the target and a tag is written to the +repository on the latest commit of the deploy. If the default push and pull hooks are used the client will simply +push its changes to the remote and the target will pull in the new changes. Deployment tags have the form +*repo-sync-20130918-231126*. + + *start/abort* + + *start/rollback* -- To view, visit https://gerrit.wikimedia.org/r/91825 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iecb7201db331809cca8d841625ecb7db18c8e69b Gerrit-PatchSet: 1 Gerrit-Project: sartoris Gerrit-Branch: master Gerrit-Owner: Rfaulk rfaulk...@wikimedia.org Gerrit-Reviewer: Rfaulk rfaulk...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] put the glusterfs mount back (dumps rsyncs) - change (operations/puppet)
ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91826
Change subject: put the glusterfs mount back (dumps rsyncs)
..
put the glusterfs mount back (dumps rsyncs)
Change-Id: I6a87acad36213c4a3917d945676d3c062b9c6340
---
M manifests/misc/download.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/26/91826/1
diff --git a/manifests/misc/download.pp b/manifests/misc/download.pp
index ae4d2e1..7ddfd26 100644
--- a/manifests/misc/download.pp
+++ b/manifests/misc/download.pp
@@ -158,7 +158,7 @@
mount {
'/mnt/glusterpublicdata':
- ensure = absent,
+ ensure = present,
device = 'labstore1.pmtpa.wmnet:/publicdata-project',
fstype = 'glusterfs',
options =
'defaults,_netdev=bond0,log-level=WARNING,log-file=/var/log/gluster.log',
--
To view, visit https://gerrit.wikimedia.org/r/91826
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a87acad36213c4a3917d945676d3c062b9c6340
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] put the glusterfs mount back (dumps rsyncs) - change (operations/puppet)
ArielGlenn has submitted this change and it was merged.
Change subject: put the glusterfs mount back (dumps rsyncs)
..
put the glusterfs mount back (dumps rsyncs)
Change-Id: I6a87acad36213c4a3917d945676d3c062b9c6340
---
M manifests/misc/download.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/download.pp b/manifests/misc/download.pp
index ae4d2e1..7ddfd26 100644
--- a/manifests/misc/download.pp
+++ b/manifests/misc/download.pp
@@ -158,7 +158,7 @@
mount {
'/mnt/glusterpublicdata':
- ensure = absent,
+ ensure = present,
device = 'labstore1.pmtpa.wmnet:/publicdata-project',
fstype = 'glusterfs',
options =
'defaults,_netdev=bond0,log-level=WARNING,log-file=/var/log/gluster.log',
--
To view, visit https://gerrit.wikimedia.org/r/91826
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a87acad36213c4a3917d945676d3c062b9c6340
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix regression in main page user stats widget for logged in ... - change (mediawiki...TwnMainPage)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91827
Change subject: Fix regression in main page user stats widget for logged in
users
..
Fix regression in main page user stats widget for logged in users
Gravatar could be missing or subtitle be wrong. Caught by browser tests.
Likely caused by incorrect rebasing of an old patch. Some refactoring to
simplify the html as well.
Change-Id: I1f9f02cab331f984d46ddd0cc995bb042f34ad77
---
M resources/css/ext.translate.mainpage.css
M specials/SpecialTwnMainPage.php
M tests/browser/features/support/pages/main_page.rb
3 files changed, 31 insertions(+), 51 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwnMainPage
refs/changes/27/91827/1
diff --git a/resources/css/ext.translate.mainpage.css
b/resources/css/ext.translate.mainpage.css
index 39dca69..e5d0aba 100644
--- a/resources/css/ext.translate.mainpage.css
+++ b/resources/css/ext.translate.mainpage.css
@@ -232,7 +232,7 @@
min-height: 75px;
}
-.twn-mainpage-alllang-stats {
+.subtitle {
padding: 0 10px;
}
diff --git a/specials/SpecialTwnMainPage.php b/specials/SpecialTwnMainPage.php
index ace9605..6201846 100644
--- a/specials/SpecialTwnMainPage.php
+++ b/specials/SpecialTwnMainPage.php
@@ -596,27 +596,42 @@
$languageCode = $this-getLanguage()-getCode();
$languageName = TranslateUtils::getLanguageName( $languageCode,
$languageCode );
- $subtitle = '';
+ $groupsSourceLanguage = MessageGroups::haveSingleSourceLanguage(
+ MessageGroups::getAllGroups()
+ );
$link = Html::element( 'a', array(
'href' = SpecialPage::getTitleFor( 'LanguageStats'
)-getLocalUrl(),
), $this-msg( 'twnmp-your-view-language-stats' )-text() );
if ( TranslateSandbox::isSandboxed( $this-getUser() ) ) {
+ $subtitleClass = 'for-sandbox';
+ $subtitle = '';
$rows = $this-getSandboxRows();
+ } elseif ( $groupsSourceLanguage === $languageCode ) {
+ $subtitleClass = 'for-all-languages';
+ $subtitle = $this-msg(
'twnmp-your-translations-stats-all-languages' )-escaped();
+ $rows = $this-getTranslationStatsRows( '' );
} else {
+ $subtitleClass = Sanitizer::escapeClass(
for-language-$languageCode );
$subtitle = htmlspecialchars( $languageName );
- $rows = $this-getTranslationStatsRows();
+ $rows = $this-getTranslationStatsRows( $languageCode );
}
+
+ $email = $this-getUser()-getEmail();
+ $avatar = 'https://secure.gravatar.com/avatar/' . md5(
strtolower( $email ) );
+ $background = background-image: url('$avatar?d=mm');;
+ $background = htmlspecialchars( $background );
+ $background = style=\$background\;
return HTML
div class=five columns main-widget stats-widget
- div class=row user-stats-title
+ div class=row user-stats-title $background
h2
{$this-msg( 'twnmp-your-translations-stats'
)-escaped()}
/h2
- div class=subtitle$subtitle/div
+ div class=subtitle $subtitleClass$subtitle/div
/div
$rows
div class=row langstats-link$link/div
@@ -625,20 +640,13 @@
HTML;
}
- public function getTranslationStatsRows() {
- $groupsSourceLanguage = MessageGroups::haveSingleSourceLanguage(
- MessageGroups::getAllGroups()
- );
-
- $languageCode = $this-getLanguage()-getCode();
-
- if ( $groupsSourceLanguage === $languageCode ) {
- # Do stats for all languages, denoted by empty string
- $languageForStats = '';
- } else {
- $languageForStats = $languageCode;
- }
-
+ /**
+* Gets data and formats language stats row. Use empty string to
+* get stats for all languages.
+* @param string $languageForStats Language code or empty string.
+* @return string HTML
+*/
+ public function getTranslationStatsRows( $languageForStats ) {
$stale = 60 * 5;
$expired = 60 * 60 * 12;
$cacher = new CachedStat( userstats-$languageForStats,
$stale, $expired,
@@ -657,41 +665,13 @@
);
}
- $out = Html::openElement(
- 'div',
- array( 'class' = 'five columns main-widget
stats-widget' )
- );
-
-
[MediaWiki-commits] [Gerrit] Preventing joining cursive script character across HTML elem... - change (mediawiki...LiquidThreads)
Ebrahim has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91828
Change subject: Preventing joining cursive script character across HTML elements
..
Preventing joining cursive script character across HTML elements
Change-Id: Iedb86273f7a83515bad87698ea6699622ed4dd8a
---
M lqt.js
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LiquidThreads
refs/changes/28/91828/1
diff --git a/lqt.js b/lqt.js
index 0f460fe..add73dd 100644
--- a/lqt.js
+++ b/lqt.js
@@ -386,7 +386,8 @@
editSubjectField.addClass( 'lqt-command-edit-subject' );
- menu.append( editSubjectField );
+ // appending a space first to prevent cursive script character
joining across elements
+ menu.append( ' ', editSubjectField );
},
'handleChangeSubject' : function ( e ) {
--
To view, visit https://gerrit.wikimedia.org/r/91828
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedb86273f7a83515bad87698ea6699622ed4dd8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Ebrahim ebra...@byagowi.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use i18n instead of hardcoded brackets and spaces - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Use i18n instead of hardcoded brackets and spaces
..
Use i18n instead of hardcoded brackets and spaces
Change-Id: If914e26f2af23f04c46f011ad8a276a9d3190583
---
M includes/Linker.php
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Linker.php b/includes/Linker.php
index 5bb9230..3e2d91f 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -2100,9 +2100,10 @@
$accesskey = self::accesskey( $name );
if ( $accesskey !== false ) {
if ( $tooltip === false || $tooltip === '' ) {
- $tooltip = [$accesskey];
+ $tooltip = wfMessage( 'brackets',
$accesskey )-escaped();
} else {
- $tooltip .= [$accesskey];
+ $tooltip .= wfMessage( 'word-separator'
)-escaped();
+ $tooltip .= wfMessage( 'brackets',
$accesskey )-escaped();
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/90892
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If914e26f2af23f04c46f011ad8a276a9d3190583
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Bene benestar.wikime...@googlemail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QuantityType UI implementation - change (mediawiki...DataValues)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91829
Change subject: QuantityType UI implementation
..
QuantityType UI implementation
First iteration of the JavaScript user interface for the Quantity data type.
Change-Id: Ic89b54e39b3fd759bad568fc412e192b237da320
---
M DataValues/DataValues.resources.php
M DataValues/DataValues.tests.qunit.php
A DataValues/resources/values/DecimalValue.js
M DataValues/resources/values/QuantityValue.js
A DataValues/tests/qunit/values/DecimalValue.tests.js
A DataValues/tests/qunit/values/QuantityValue.tests.js
M DataValuesCommon/DataValuesCommon.classes.php
M DataValuesCommon/DataValuesCommon.mw.php
M DataValuesCommon/js/src/ValueParsers/parsers/QuantityParser.js
M DataValuesCommon/js/tests/ValueParsers/parsers/QuantityParser.tests.js
A DataValuesCommon/src/ValueParsers/QuantityParser.php
M ValueView/ValueView.resources.mw.php
M ValueView/ValueView.resources.php
M ValueView/ValueView.tests.qunit.php
M ValueView/resources/jquery.valueview/valueview.experts/experts.QuantityType.js
M ValueView/resources/mw.ext.valueView.js
A
ValueView/tests/qunit/jquery.valueview/valueview.experts/experts.QuantityType.tests.js
17 files changed, 476 insertions(+), 109 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues
refs/changes/29/91829/2
diff --git a/DataValues/DataValues.resources.php
b/DataValues/DataValues.resources.php
index e67ee6a..366fb20 100644
--- a/DataValues/DataValues.resources.php
+++ b/DataValues/DataValues.resources.php
@@ -47,6 +47,7 @@
// Note: The order here is relevant, scripts
should be places after the ones they
// depend on.
'values/BoolValue.js',
+ 'values/DecimalValue.js',
'values/GlobeCoordinateValue.js',
'values/MonolingualTextValue.js',
'values/MultilingualTextValue.js',
diff --git a/DataValues/DataValues.tests.qunit.php
b/DataValues/DataValues.tests.qunit.php
index d1e0a48..e082bf8 100644
--- a/DataValues/DataValues.tests.qunit.php
+++ b/DataValues/DataValues.tests.qunit.php
@@ -41,6 +41,7 @@
'dataValues.values.tests' = array(
'scripts' = array(
$bp/values/BoolValue.tests.js,
+ $bp/values/DecimalValue.tests.js,
$bp/values/GlobeCoordinateValue.tests.js,
$bp/values/MonolingualTextValue.tests.js,
$bp/values/MultilingualTextValue.tests.js,
diff --git a/DataValues/resources/values/DecimalValue.js
b/DataValues/resources/values/DecimalValue.js
new file mode 100644
index 000..6add979
--- /dev/null
+++ b/DataValues/resources/values/DecimalValue.js
@@ -0,0 +1,179 @@
+/**
+ * @licence GNU GPL v2+
+ * @author H. Snater mediaw...@snater.com
+ */
+dataValues.DecimalValue = ( function( inherit, dv, $ ) {
+ 'use strict';
+
+ var PARENT = dv.DataValue;
+
+ /**
+* Regular expression for matching decimal strings that conform to the
format
+* defined for DecimalValue.
+*/
+ var DECIMAL_VALUE_PATTERN = /^[+-]?(?:[1-9]\d*|\d)(?:\.\d+)?$/;
+
+ /**
+* Constructor for a data value representing a decimal value.
+*
+* @since 0.1
+*
+* @param {string|number} value
+*/
+ var constructor = function( value ) {
+ if( typeof value === 'number' ) {
+ value = convertToDecimalString( value );
+ }
+
+ assertDecimalString( value );
+
+ this._value = value;
+ };
+
+ /**
+* Converts a number to a string confirming to the DecimalValue
definition.
+*
+* @param {number} number
+* @return {string}
+*
+* @throws {Error} if number is invalid
+*/
+ function convertToDecimalString( number ) {
+ if( typeof number !== 'number' || !isFinite( number ) ) {
+ throw new Error( 'Number is invalid (NaN or not
finite)' );
+ }
+
+ var decimal = convertNumberToString( Math.abs( number ) );
+ decimal = ( ( number 0 ) ? '-' : '+' ) + decimal;
+
+ assertDecimalString( decimal );
+
+ return decimal;
+ }
+
+ /**
+* Checks whether a string conforms to the DecimalValue definition.
+*
+* @param {string} decimalString
+*
+* @throws {Error} if string does not conform to the DecimalValue
definition.
+*/
+ function assertDecimalString( decimalString ) {
+ if( typeof decimalString !== 'string' ) {
+
[MediaWiki-commits] [Gerrit] Fix regression in main page user stats widget for logged in ... - change (mediawiki...TwnMainPage)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix regression in main page user stats widget for logged in
users
..
Fix regression in main page user stats widget for logged in users
Gravatar could be missing or subtitle be wrong. Caught by browser tests.
Likely caused by incorrect rebasing of an old patch. Some refactoring to
simplify the html as well.
Change-Id: I1f9f02cab331f984d46ddd0cc995bb042f34ad77
---
M resources/css/ext.translate.mainpage.css
M specials/SpecialTwnMainPage.php
M tests/browser/features/support/pages/main_page.rb
3 files changed, 31 insertions(+), 51 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/css/ext.translate.mainpage.css
b/resources/css/ext.translate.mainpage.css
index 39dca69..e5d0aba 100644
--- a/resources/css/ext.translate.mainpage.css
+++ b/resources/css/ext.translate.mainpage.css
@@ -232,7 +232,7 @@
min-height: 75px;
}
-.twn-mainpage-alllang-stats {
+.subtitle {
padding: 0 10px;
}
diff --git a/specials/SpecialTwnMainPage.php b/specials/SpecialTwnMainPage.php
index ace9605..6201846 100644
--- a/specials/SpecialTwnMainPage.php
+++ b/specials/SpecialTwnMainPage.php
@@ -596,27 +596,42 @@
$languageCode = $this-getLanguage()-getCode();
$languageName = TranslateUtils::getLanguageName( $languageCode,
$languageCode );
- $subtitle = '';
+ $groupsSourceLanguage = MessageGroups::haveSingleSourceLanguage(
+ MessageGroups::getAllGroups()
+ );
$link = Html::element( 'a', array(
'href' = SpecialPage::getTitleFor( 'LanguageStats'
)-getLocalUrl(),
), $this-msg( 'twnmp-your-view-language-stats' )-text() );
if ( TranslateSandbox::isSandboxed( $this-getUser() ) ) {
+ $subtitleClass = 'for-sandbox';
+ $subtitle = '';
$rows = $this-getSandboxRows();
+ } elseif ( $groupsSourceLanguage === $languageCode ) {
+ $subtitleClass = 'for-all-languages';
+ $subtitle = $this-msg(
'twnmp-your-translations-stats-all-languages' )-escaped();
+ $rows = $this-getTranslationStatsRows( '' );
} else {
+ $subtitleClass = Sanitizer::escapeClass(
for-language-$languageCode );
$subtitle = htmlspecialchars( $languageName );
- $rows = $this-getTranslationStatsRows();
+ $rows = $this-getTranslationStatsRows( $languageCode );
}
+
+ $email = $this-getUser()-getEmail();
+ $avatar = 'https://secure.gravatar.com/avatar/' . md5(
strtolower( $email ) );
+ $background = background-image: url('$avatar?d=mm');;
+ $background = htmlspecialchars( $background );
+ $background = style=\$background\;
return HTML
div class=five columns main-widget stats-widget
- div class=row user-stats-title
+ div class=row user-stats-title $background
h2
{$this-msg( 'twnmp-your-translations-stats'
)-escaped()}
/h2
- div class=subtitle$subtitle/div
+ div class=subtitle $subtitleClass$subtitle/div
/div
$rows
div class=row langstats-link$link/div
@@ -625,20 +640,13 @@
HTML;
}
- public function getTranslationStatsRows() {
- $groupsSourceLanguage = MessageGroups::haveSingleSourceLanguage(
- MessageGroups::getAllGroups()
- );
-
- $languageCode = $this-getLanguage()-getCode();
-
- if ( $groupsSourceLanguage === $languageCode ) {
- # Do stats for all languages, denoted by empty string
- $languageForStats = '';
- } else {
- $languageForStats = $languageCode;
- }
-
+ /**
+* Gets data and formats language stats row. Use empty string to
+* get stats for all languages.
+* @param string $languageForStats Language code or empty string.
+* @return string HTML
+*/
+ public function getTranslationStatsRows( $languageForStats ) {
$stale = 60 * 5;
$expired = 60 * 60 * 12;
$cacher = new CachedStat( userstats-$languageForStats,
$stale, $expired,
@@ -657,41 +665,13 @@
);
}
- $out = Html::openElement(
- 'div',
- array( 'class' = 'five columns main-widget
stats-widget' )
- );
-
- $email = $this-getUser()-getEmail();
-
[MediaWiki-commits] [Gerrit] Set up Code Climate for all repositories that have Ruby code - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged. Change subject: Set up Code Climate for all repositories that have Ruby code .. Set up Code Climate for all repositories that have Ruby code Bug: 56151 Change-Id: If284c9dbd0a8fa35594e307fc2e68dcd42862fb8 --- M README.md 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/README.md b/README.md index 8b3ff21..2e0ef6d 100644 --- a/README.md +++ b/README.md @@ -33,15 +33,15 @@ Repositories that use the gem: -- CirrusSearch: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/CirrusSearch), [GitHub](https://github.com/wikimedia/mediawiki-extensions-CirrusSearch), `/tests/browser` folder -- Flow: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Flow), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Flow), `/tests/browser` folder -- MobileFrontend: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/MobileFrontend), [GitHub](https://github.com/wikimedia/mediawiki-extensions-MobileFrontend), `/tests/acceptance` folder -- Translate: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Translate), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Translate), `/tests/browser` folder -- TwnMainPage: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/TwnMainPage), [GitHub](https://github.com/wikimedia/mediawiki-extensions-TwnMainPage), `/tests/browser` folder -- UniversalLanguageSelector: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/UniversalLanguageSelector), [GitHub](https://github.com/wikimedia/mediawiki-extensions-UniversalLanguageSelector), `/tests/browser` folder -- VisualEditor: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/VisualEditor), [GitHub](https://github.com/wikimedia/mediawiki-extensions-VisualEditor), `/modules/ve-mw/test/browser` folder -- Wikibase: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Wikibase), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Wikibase), `/selenium_cuc` folder -- browsertests: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/qa/browsertests), [GitHub](https://github.com/wikimedia/qa-browsertests), `/` folder +- CirrusSearch: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/CirrusSearch), [GitHub](https://github.com/wikimedia/mediawiki-extensions-CirrusSearch), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-CirrusSearch), `/tests/browser` folder +- Flow: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Flow), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Flow), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Flow), `/tests/browser` folder +- MobileFrontend: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/MobileFrontend), [GitHub](https://github.com/wikimedia/mediawiki-extensions-MobileFrontend), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-MobileFrontend), `/tests/acceptance` folder +- Translate: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Translate), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Translate), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Translate), `/tests/browser` folder +- TwnMainPage: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/TwnMainPage), [GitHub](https://github.com/wikimedia/mediawiki-extensions-TwnMainPage), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-TwnMainPage), `/tests/browser` folder +- UniversalLanguageSelector: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/UniversalLanguageSelector), [GitHub](https://github.com/wikimedia/mediawiki-extensions-UniversalLanguageSelector), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-UniversalLanguageSelector), `/tests/browser` folder +- VisualEditor: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/VisualEditor), [GitHub](https://github.com/wikimedia/mediawiki-extensions-VisualEditor), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-VisualEditor), `/modules/ve-mw/test/browser` folder +- Wikibase: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Wikibase), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Wikibase), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Wikibase), `/selenium_cuc` folder +- browsertests:
[MediaWiki-commits] [Gerrit] Native digits on Minerva skin notification count - change (mediawiki...MobileFrontend)
Ebrahim has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91832
Change subject: Native digits on Minerva skin notification count
..
Native digits on Minerva skin notification count
Change-Id: Ieae8c1c7dea0a6054c2ca74f72909ff6d8091c38
---
M includes/skins/SkinMinerva.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/32/91832/1
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 7471c5b..9bdc69b 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -34,6 +34,8 @@
* @param $tpl BaseTemplate
*/
protected function prepareUserButton( BaseTemplate $tpl ) {
+ global $wgLang;
+
$user = $this-getUser();
if ( class_exists( 'MWEchoNotifUser' ) $user-isLoggedIn() )
{
// FIXME: cap higher counts
@@ -46,7 +48,7 @@
'class' = 'user-button',
'id'= 'secondary-button',
) ) .
- Html::element( 'span', array( 'class' = $count
? '' : 'zero' ), $count ) .
+ Html::element( 'span', array( 'class' = $count
? '' : 'zero' ), $wgLang-formatNum( $count ) ) .
Html::closeElement( 'a' )
);
} else {
--
To view, visit https://gerrit.wikimedia.org/r/91832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieae8c1c7dea0a6054c2ca74f72909ff6d8091c38
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Ebrahim ebra...@byagowi.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Modified codes in Example - change (test...examples)
Jshm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91834
Change subject: Modified codes in Example
..
Modified codes in Example
Change-Id: Ic1db85c6cb80b6ae90654aca5d8f49c7ba55e53f
---
M Example/Example.body.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/test/mediawiki/extensions/examples
refs/changes/34/91834/1
diff --git a/Example/Example.body.php b/Example/Example.body.php
index a4a7826..bb32d9f 100644
--- a/Example/Example.body.php
+++ b/Example/Example.body.php
@@ -19,5 +19,5 @@
function getVersion() {
return '0.043';
- }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/91834
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1db85c6cb80b6ae90654aca5d8f49c7ba55e53f
Gerrit-PatchSet: 1
Gerrit-Project: test/mediawiki/extensions/examples
Gerrit-Branch: master
Gerrit-Owner: Jshm jish...@cn.ibm.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add some comments. - change (test...examples)
Jshm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91835
Change subject: Add some comments.
..
Add some comments.
Change-Id: I4fabae687fdc35be4df07c5d9e5d97c437817c6a
---
M Example/Example.body.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/test/mediawiki/extensions/examples
refs/changes/35/91835/1
diff --git a/Example/Example.body.php b/Example/Example.body.php
index bb32d9f..5d31d53 100644
--- a/Example/Example.body.php
+++ b/Example/Example.body.php
@@ -19,5 +19,5 @@
function getVersion() {
return '0.043';
- }
+ } /*** make some changes*/
}
--
To view, visit https://gerrit.wikimedia.org/r/91835
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4fabae687fdc35be4df07c5d9e5d97c437817c6a
Gerrit-PatchSet: 1
Gerrit-Project: test/mediawiki/extensions/examples
Gerrit-Branch: master
Gerrit-Owner: Jshm jish...@cn.ibm.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove undeed methods in tests - change (mediawiki/core)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91831
Change subject: Remove undeed methods in tests
..
Remove undeed methods in tests
Change-Id: Ia2da4027f2cc4a3aaff02695bab35de32a33ed60
---
M tests/phpunit/includes/content/WikitextContentTest.php
M tests/phpunit/includes/upload/UploadFromUrlTest.php
2 files changed, 0 insertions(+), 57 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/31/91831/1
diff --git a/tests/phpunit/includes/content/WikitextContentTest.php
b/tests/phpunit/includes/content/WikitextContentTest.php
index 9f20073..1d133f3 100644
--- a/tests/phpunit/includes/content/WikitextContentTest.php
+++ b/tests/phpunit/includes/content/WikitextContentTest.php
@@ -245,26 +245,6 @@
);
}
- /**
-* @todo Test needs database! Should be done by a test class in the
Database group.
-*/
- /*
- public function getRedirectChain() {
- $text = $this-getNativeData();
- return Title::newFromRedirectArray( $text );
- }
- */
-
- /**
-* @todo Test needs database! Should be done by a test class in the
Database group.
-*/
- /*
- public function getUltimateRedirectTarget() {
- $text = $this-getNativeData();
- return Title::newFromRedirectRecurse( $text );
- }
- */
-
public static function dataIsCountable() {
return array(
array( '',
diff --git a/tests/phpunit/includes/upload/UploadFromUrlTest.php
b/tests/phpunit/includes/upload/UploadFromUrlTest.php
index e680632..397c100 100644
--- a/tests/phpunit/includes/upload/UploadFromUrlTest.php
+++ b/tests/phpunit/includes/upload/UploadFromUrlTest.php
@@ -48,37 +48,6 @@
}
/**
-* @todo Document why we test login, since the $wgUser hack used doesn't
-* require login
-*
-* @coversNothing
-*/
- public function testLogin() {
- $data = $this-doApiRequest( array(
- 'action' = 'login',
- 'lgname' = $this-user-userName,
- 'lgpassword' = $this-user-passWord ) );
- $this-assertArrayHasKey( login, $data[0] );
- $this-assertArrayHasKey( result, $data[0]['login'] );
- $this-assertEquals( NeedToken, $data[0]['login']['result'] );
- $token = $data[0]['login']['token'];
-
- $data = $this-doApiRequest( array(
- 'action' = 'login',
- lgtoken = $token,
- 'lgname' = $this-user-userName,
- 'lgpassword' = $this-user-passWord ) );
-
- $this-assertArrayHasKey( login, $data[0] );
- $this-assertArrayHasKey( result, $data[0]['login'] );
- $this-assertEquals( Success, $data[0]['login']['result'] );
- $this-assertArrayHasKey( 'lgtoken', $data[0]['login'] );
-
- return $data;
- }
-
- /**
-* @depends testLogin
* @depends testClearQueue
*/
public function testSetupUrlDownload( $data ) {
@@ -152,7 +121,6 @@
}
/**
-* @depends testLogin
* @depends testClearQueue
*/
public function testAsyncUpload( $data ) {
@@ -171,7 +139,6 @@
}
/**
-* @depends testLogin
* @depends testClearQueue
*/
public function testAsyncUploadWarning( $data ) {
@@ -201,7 +168,6 @@
}
/**
-* @depends testLogin
* @depends testClearQueue
*/
public function testSyncDownload( $data ) {
@@ -333,9 +299,6 @@
return $data;
}
- /**
-*
-*/
protected function deleteFile( $name ) {
$t = Title::newFromText( $name, NS_FILE );
$this-assertTrue( $t-exists(), File '$name' exists );
--
To view, visit https://gerrit.wikimedia.org/r/91831
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2da4027f2cc4a3aaff02695bab35de32a33ed60
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@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] ctags configuration - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91836
Change subject: ctags configuration
..
ctags configuration
ctags let you generates a list of class/site/node/define which can then
be used by your texteditor to show up the puppet manifest
representation.
The configuration for ctags is done in /.ctags and ctags execution is
wrapped in a rake task 'tags' as a convenience.
Vim supports tags files and you can display the file structure using the
tagbar plugin. The ctags configuration comes from:
https://github.com/majutsushi/tagbar/wiki#puppet
I have added a `--languages=puppet` to restrict it to puppet manifests,
we might want to generate tags for python/php whatever script we have in
operations/puppet.
Change-Id: Ia164ac48f897c3af092b1c14d80fb505889e
---
A .ctags
M .gitignore
M rakefile
3 files changed, 21 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/36/91836/1
diff --git a/.ctags b/.ctags
new file mode 100644
index 000..9ba81c7
--- /dev/null
+++ b/.ctags
@@ -0,0 +1,8 @@
+-h pp
+--langdef=puppet
+--langmap=puppet:.pp
+--languages=puppet
+--regex-puppet=/^class[ \t]*([:a-zA-Z0-9_\-]+)[ \t]*/\1/c,class/
+--regex-puppet=/^site[ \t]*([a-zA-Z0-9_\-]+)[ \t]*/\1/s,site/
+--regex-puppet=/^node[ \t]*([a-zA-Z0-9_\-]+)[ \t]*/\1/n,node/
+--regex-puppet=/^define[ \t]*([:a-zA-Z0-9_\-]+)[ \t]*/\1/d,definition/
diff --git a/.gitignore b/.gitignore
index d34eff6..beb6cdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,6 @@
# Automatically generated documentation:
/doc/*
!/doc/README
+
+# ctags generated file (see `rake tags`)
+/tags
diff --git a/rakefile b/rakefile
index f0d3277..40b67a3 100644
--- a/rakefile
+++ b/rakefile
@@ -217,6 +217,16 @@
end
end
+desc Generates ctags
+task :tags do
+ puts Generating ctags file..
+ system('ctags -R .')
+ puts Done
+ puts
+ puts See https://github.com/majutsushi/tagbar/wiki#puppet for vim
+ puts integration with the vim tagbar plugin.
+end
+
# Wrapper to run rspec in a module
def run_module_spec(module_name)
--
To view, visit https://gerrit.wikimedia.org/r/91836
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia164ac48f897c3af092b1c14d80fb505889e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Triple default $wgMaxShellMemory (raise to 300 MB) - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Triple default $wgMaxShellMemory (raise to 300 MB) .. Triple default $wgMaxShellMemory (raise to 300 MB) 100 MB is no longer sufficient. That value was chosen back in 2006 (r14795); the world has largely moved on to 64-bit programs since then, and applications such as ImageMagick seem to use 16-bit precision for each image channel. It's not enough to scale regular large-ish images on default system settings anymore. Bug: 34241 Change-Id: I66bbe12925689f9273f3b5fb29adc8c15c828c70 (cherry picked from commit 45d3656a4c8e169cadc5bda339296cf0aa00556f) --- M RELEASE-NOTES-1.22 M includes/DefaultSettings.php 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22 index 091a04a..00026bc 100644 --- a/RELEASE-NOTES-1.22 +++ b/RELEASE-NOTES-1.22 @@ -64,6 +64,7 @@ * (bug 54597) $wgBlockOpenProxies, $wgProxyPorts, $wgProxyScriptPath, and $wgProxyMemcExpiry have been removed, along with the open proxy scanner script they were added for. +* Default value of $wgMaxShellMemory has been tripled (it's now 300 MB). === New features in 1.22 === * (bug 44525) mediawiki.jqueryMsg can now parse (whitelisted) HTML elements and attributes. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 430fcb5..3278a35 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -6629,7 +6629,7 @@ /** * Maximum amount of virtual memory available to shell processes under linux, in KB. */ -$wgMaxShellMemory = 102400; +$wgMaxShellMemory = 307200; /** * Maximum file size created by shell processes under linux, in KB -- To view, visit https://gerrit.wikimedia.org/r/91833 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I66bbe12925689f9273f3b5fb29adc8c15c828c70 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_22 Gerrit-Owner: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Bartosz Dziewoński matma@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] Added Code Climate link for mediawiki-selenium gem - change (mediawiki/selenium)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/91837 Change subject: Added Code Climate link for mediawiki-selenium gem .. Added Code Climate link for mediawiki-selenium gem Change-Id: If5fc4697a7aaa79bb47b540f4cd371fd5f185b01 --- M README.md 1 file changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium refs/changes/37/91837/1 diff --git a/README.md b/README.md index 2e0ef6d..515cb4f 100644 --- a/README.md +++ b/README.md @@ -25,11 +25,7 @@ ## Links -mediawiki-selenium gem at various sites: - -- https://rubygems.org/gems/mediawiki-selenium -- https://github.com/wikimedia/mediawiki-selenium -- https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/selenium +mediawiki-selenium gem: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/selenium), [GitHub](https://github.com/wikimedia/mediawiki-selenium), [RubyGems](https://rubygems.org/gems/mediawiki-selenium), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-selenium) Repositories that use the gem: -- To view, visit https://gerrit.wikimedia.org/r/91837 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If5fc4697a7aaa79bb47b540f4cd371fd5f185b01 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] More refactoring ULS font selection tests - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: More refactoring ULS font selection tests
..
More refactoring ULS font selection tests
Change-Id: I6595e279657948265c45407be2c01a4587fdbc94
---
M tests/browser/features/font_selection.feature
M tests/browser/features/step_definitions/font_selection_steps.rb
M tests/browser/features/step_definitions/panel_steps.rb
M tests/browser/features/support/pages/panel_page.rb
4 files changed, 20 insertions(+), 30 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/font_selection.feature
b/tests/browser/features/font_selection.feature
index c70b2ed..55adf0b 100644
--- a/tests/browser/features/font_selection.feature
+++ b/tests/browser/features/font_selection.feature
@@ -21,7 +21,7 @@
And a font selector for content language appears
Scenario: Discarding live preview of content font
- And I select OpenDyslexic font for the content language for the live
preview
+When I select OpenDyslexic font for the content language for the live
preview
And I close the panel to discard the changes
Then the active content font must be the same as font prior to the preview
# System is the default value for English and German
diff --git a/tests/browser/features/step_definitions/font_selection_steps.rb
b/tests/browser/features/step_definitions/font_selection_steps.rb
index 125dbc7..bf699d8 100644
--- a/tests/browser/features/step_definitions/font_selection_steps.rb
+++ b/tests/browser/features/step_definitions/font_selection_steps.rb
@@ -9,3 +9,13 @@
When(/^I open fonts panel of language settings$/) do
on(PanelPage).panel_fonts_element.click
end
+
+Then(/^the active content font must be the same as font prior to the
preview$/) do
+ on(PanelPage).get_content_font.should == @original_content_font
+end
+
+Then(/^the selected content font must be (.*?)$/) do |font|
+ step 'I open display settings'
+ step 'I open fonts panel of language settings'
+ on(PanelPage).selected_content_font.should == font
+end
diff --git a/tests/browser/features/step_definitions/panel_steps.rb
b/tests/browser/features/step_definitions/panel_steps.rb
index 2fe3d5a..92a061a 100644
--- a/tests/browser/features/step_definitions/panel_steps.rb
+++ b/tests/browser/features/step_definitions/panel_steps.rb
@@ -41,30 +41,15 @@
When(/^I close the panel to discard the changes$/) do
- on(PanelPage) do |page|
- page.panel_button_close_element.click
- # Also close the ULS language selection if open
- if uls_position() == 'personal'
- page.uls_button_close_element.when_visible.click
- end
- end
+ on(PanelPage).panel_button_close_element.click
end
-Then(/^the active (.*?) font must be the same as font prior to the preview$/)
do |type|
- case type
- when content
- on(PanelPage).get_content_font.should === @original_content_font
- when interface
- on(PanelPage).get_interface_font.should ===
@original_interface_font
- else
- pending
- end
+Then(/^the active interface font must be the same as font prior to the
preview$/) do
+ on(PanelPage).get_interface_font.should == @original_interface_font
end
-Then(/^the selected (.*?) font must be (.*?)$/) do |type, font|
- if type == 'interface'
- type = 'ui'
- end
+Then(/^the selected interface font must be (.*?)$/) do |font|
+ type = 'ui'
step 'I open Fonts panel of language settings'
Selenium::WebDriver::Support::Select.new(
@browser.driver.find_element(:id, #{type}-font-selector)
@@ -78,15 +63,8 @@
sleep 4
end
-Then(/^the (.*) font must be changed to the (.*?) font$/) do |type, font|
- case type
- when content
- on(PanelPage).get_content_font.should match(^#{font})
- when interface
- on(PanelPage).get_interface_font.should match(^#{font})
- else
- pending
- end
+Then(/^the interface font must be changed to the (.*?) font$/) do |font|
+ on(PanelPage).get_interface_font.should match(^#{font})
end
Then(/^I can disable input methods$/) do
diff --git a/tests/browser/features/support/pages/panel_page.rb
b/tests/browser/features/support/pages/panel_page.rb
index 786c0b8..87de00f 100644
--- a/tests/browser/features/support/pages/panel_page.rb
+++ b/tests/browser/features/support/pages/panel_page.rb
@@ -31,6 +31,8 @@
span(:trigger_cog, class: 'uls-settings-trigger')
a(:trigger_personal, class: 'uls-trigger')
+ select(:selected_content_font, id: 'content-font-selector')
+
select(:select_font_for_interface, id: 'ui-font-selector')
select(:select_font_for_content, id:
[MediaWiki-commits] [Gerrit] (bug 54464) Fix URL appearing on Special:Version - change (mediawiki...UserDailyContribs)
jenkins-bot has submitted this change and it was merged. Change subject: (bug 54464) Fix URL appearing on Special:Version .. (bug 54464) Fix URL appearing on Special:Version Annoyin' little bug. Bug: 54464 Change-Id: Ie76a65ea75c1777bcf88a0b8b9e3f4bb021457e9 --- M UserDailyContribs.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/UserDailyContribs.php b/UserDailyContribs.php index 696bd12..ebb79af 100644 --- a/UserDailyContribs.php +++ b/UserDailyContribs.php @@ -20,7 +20,7 @@ 'name' = 'User Daily Contributions', 'author' = array( 'Nimish Gautam', 'Trevor Parscal' ), 'version' = '0.2.0', - 'url' = 'https://www.mediawiki.org/wiki/Extension:UsabilityInitiative', + 'url' = 'https://www.mediawiki.org/wiki/Extension:UserDailyContribs', 'descriptionmsg' = 'userdailycontribs-desc', ); $wgAutoloadClasses['UserDailyContribsHooks'] = dirname( __FILE__ ) . '/UserDailyContribs.hooks.php'; -- To view, visit https://gerrit.wikimedia.org/r/91821 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie76a65ea75c1777bcf88a0b8b9e3f4bb021457e9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UserDailyContribs Gerrit-Branch: master Gerrit-Owner: Odder tom...@twkozlowski.net Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Billinghurst billinghu...@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] Added Code Climate link for mediawiki-selenium gem - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged. Change subject: Added Code Climate link for mediawiki-selenium gem .. Added Code Climate link for mediawiki-selenium gem Change-Id: If5fc4697a7aaa79bb47b540f4cd371fd5f185b01 --- M README.md 1 file changed, 1 insertion(+), 5 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/README.md b/README.md index 2e0ef6d..515cb4f 100644 --- a/README.md +++ b/README.md @@ -25,11 +25,7 @@ ## Links -mediawiki-selenium gem at various sites: - -- https://rubygems.org/gems/mediawiki-selenium -- https://github.com/wikimedia/mediawiki-selenium -- https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/selenium +mediawiki-selenium gem: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/selenium), [GitHub](https://github.com/wikimedia/mediawiki-selenium), [RubyGems](https://rubygems.org/gems/mediawiki-selenium), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-selenium) Repositories that use the gem: -- To view, visit https://gerrit.wikimedia.org/r/91837 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If5fc4697a7aaa79bb47b540f4cd371fd5f185b01 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org 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] Deleted Jenkins jobs that are known to fail - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged. Change subject: Deleted Jenkins jobs that are known to fail .. Deleted Jenkins jobs that are known to fail Change-Id: I079a12697818df1284de8a5d150a426081d63df9 --- M docs/jobs.md 1 file changed, 0 insertions(+), 29 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/jobs.md b/docs/jobs.md index 0fb0979..219ac6d 100644 --- a/docs/jobs.md +++ b/docs/jobs.md @@ -30,18 +30,6 @@ ## browsertests-commons.wikimedia.beta.wmflabs.org-linux-firefox - Browser Label: firefox -## browsertests-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_6 -- Browser Label: internet_explorer_6 -- bundle exec: cucumber --verbose --profile ci --tags @commons.wikimedia.beta.wmflabs.org --tags ~@ie6-bug - -## browsertests-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_7 -- Browser Label: internet_explorer_7 -- bundle exec: cucumber --verbose --profile ci --tags @commons.wikimedia.beta.wmflabs.org --tags ~@ie7-bug - -## browsertests-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_8 -- Browser Label: internet_explorer_8 -- bundle exec: cucumber --verbose --profile ci --tags @commons.wikimedia.beta.wmflabs.org --tags ~@ie8-bug - ## browsertests-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_9 - Browser Label: internet_explorer_9 @@ -112,20 +100,6 @@ -# CirrusSearch-en.wikipedia.beta.wmflabs.org - - -## CirrusSearch-en.wikipedia.beta.wmflabs.org-linux-chrome -- Browser Label: chrome -- bundle exec: cucumber --verbose --profile ci -- Recipients: cmcma...@wikimedia.org never...@wikimedia.org zfili...@wikimedia.org -- MediaWiki URL: en.wikipedia.beta.wmflabs.org -- Folder: tests/browser/ -- MediaWiki user: Selenium_user -- Repository URL: CirrusSearch - - - # Flow - bundle exec: cucumber --verbose --profile ci --tags @en.wikipedia.beta.wmflabs.org - Recipients: zfili...@wikimedia.org cmcma...@wikimedia.org @@ -140,9 +114,6 @@ ## Flow-en.wikipedia.beta.wmflabs.org-linux-firefox - Browser Label: firefox - -## Flow-en.wikipedia.beta.wmflabs.org-linux-internet_explorer_10 -- Browser Label: internet_explorer_10 -- To view, visit https://gerrit.wikimedia.org/r/91610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I079a12697818df1284de8a5d150a426081d63df9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Cmcmahon cmcma...@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] ctags configuration - change (operations/puppet)
Akosiaris has submitted this change and it was merged.
Change subject: ctags configuration
..
ctags configuration
ctags let you generates a list of class/site/node/define which can then
be used by your texteditor to show up the puppet manifest
representation.
The configuration for ctags is done in /.ctags and ctags execution is
wrapped in a rake task 'tags' as a convenience.
Vim supports tags files and you can display the file structure using the
tagbar plugin. The ctags configuration comes from:
https://github.com/majutsushi/tagbar/wiki#puppet
I have added a `--languages=puppet` to restrict it to puppet manifests,
we might want to generate tags for python/php whatever script we have in
operations/puppet.
Change-Id: Ia164ac48f897c3af092b1c14d80fb505889e
---
A .ctags
M .gitignore
M rakefile
3 files changed, 21 insertions(+), 0 deletions(-)
Approvals:
Akosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.ctags b/.ctags
new file mode 100644
index 000..9ba81c7
--- /dev/null
+++ b/.ctags
@@ -0,0 +1,8 @@
+-h pp
+--langdef=puppet
+--langmap=puppet:.pp
+--languages=puppet
+--regex-puppet=/^class[ \t]*([:a-zA-Z0-9_\-]+)[ \t]*/\1/c,class/
+--regex-puppet=/^site[ \t]*([a-zA-Z0-9_\-]+)[ \t]*/\1/s,site/
+--regex-puppet=/^node[ \t]*([a-zA-Z0-9_\-]+)[ \t]*/\1/n,node/
+--regex-puppet=/^define[ \t]*([:a-zA-Z0-9_\-]+)[ \t]*/\1/d,definition/
diff --git a/.gitignore b/.gitignore
index d34eff6..beb6cdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,6 @@
# Automatically generated documentation:
/doc/*
!/doc/README
+
+# ctags generated file (see `rake tags`)
+/tags
diff --git a/rakefile b/rakefile
index f0d3277..40b67a3 100644
--- a/rakefile
+++ b/rakefile
@@ -217,6 +217,16 @@
end
end
+desc Generates ctags
+task :tags do
+ puts Generating ctags file..
+ system('ctags -R .')
+ puts Done
+ puts
+ puts See https://github.com/majutsushi/tagbar/wiki#puppet for vim
+ puts integration with the vim tagbar plugin.
+end
+
# Wrapper to run rspec in a module
def run_module_spec(module_name)
--
To view, visit https://gerrit.wikimedia.org/r/91836
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia164ac48f897c3af092b1c14d80fb505889e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Akosiaris akosia...@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] Sandbox: Show language preferences of the user - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Sandbox: Show language preferences of the user
..
Sandbox: Show language preferences of the user
Change-Id: I152dc7a91acdb75789f5b63ea0eda39883715da0
---
M resources/js/ext.translate.special.translatesandbox.js
M specials/SpecialTranslateSandbox.php
2 files changed, 11 insertions(+), 5 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.special.translatesandbox.js
b/resources/js/ext.translate.special.translatesandbox.js
index d75972c..1224c67 100644
--- a/resources/js/ext.translate.special.translatesandbox.js
+++ b/resources/js/ext.translate.special.translatesandbox.js
@@ -128,11 +128,7 @@
.addClass( 'email row' )
.text( request.email ),
$( 'div' )
- .addClass( 'languages row' )
- .append(
- $( 'span' ).text( 'Afrikaans' ),
- $( 'span' ).text( 'español' )
- ),
+ .addClass( 'languages row autonym' ),
$( 'div' )
.addClass( 'actions row' )
.append(
@@ -170,6 +166,15 @@
.addClass( 'translations row' )
);
+ if ( request.languagepreferences
request.languagepreferences.languages ) {
+ $.each( request.languagepreferences.languages, function
( index, language ) {
+ $detailsPane.find( '.languages' ).append(
+ $( 'span' )
+ .text( $.uls.data.getAutonym(
language ) )
+ );
+ } );
+ }
+
// @todo: move higher in the tree
storage = new mw.translate.TranslationStashStorage();
storage.getUserTranslations( request.username ).done( function
( translations ) {
diff --git a/specials/SpecialTranslateSandbox.php
b/specials/SpecialTranslateSandbox.php
index eb4e404..285d2ae 100644
--- a/specials/SpecialTranslateSandbox.php
+++ b/specials/SpecialTranslateSandbox.php
@@ -92,6 +92,7 @@
'email' = $user-getEmail(),
'registrationdate' = $user-getRegistration(),
'translations' = 0,
+ 'languagepreferences' = FormatJson::decode(
$user-getOption( 'translate-sandbox' ) ),
'userid' = $user-getId(),
);
--
To view, visit https://gerrit.wikimedia.org/r/91575
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I152dc7a91acdb75789f5b63ea0eda39883715da0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
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] Mark a step as pending since it fails because of a known bug - change (mediawiki...UniversalLanguageSelector)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91838
Change subject: Mark a step as pending since it fails because of a known bug
..
Mark a step as pending since it fails because of a known bug
Bug: 56081
Change-Id: Idfa0f67c95ab6ed2c6e6a3d8fa99d064a8eb871f
---
M tests/browser/features/step_definitions/font_selection_steps.rb
1 file changed, 3 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/38/91838/1
diff --git a/tests/browser/features/step_definitions/font_selection_steps.rb
b/tests/browser/features/step_definitions/font_selection_steps.rb
index bf699d8..6a8ad24 100644
--- a/tests/browser/features/step_definitions/font_selection_steps.rb
+++ b/tests/browser/features/step_definitions/font_selection_steps.rb
@@ -11,7 +11,9 @@
end
Then(/^the active content font must be the same as font prior to the
preview$/) do
- on(PanelPage).get_content_font.should == @original_content_font
+ pending('bug #56081') do
+ on(PanelPage).get_content_font.should_not ==
@original_content_font
+ end
end
Then(/^the selected content font must be (.*?)$/) do |font|
--
To view, visit https://gerrit.wikimedia.org/r/91838
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfa0f67c95ab6ed2c6e6a3d8fa99d064a8eb871f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
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] Mark a step as pending since it fails because of a known bug - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Mark a step as pending since it fails because of a known bug
..
Mark a step as pending since it fails because of a known bug
Bug: 56081
Change-Id: Idfa0f67c95ab6ed2c6e6a3d8fa99d064a8eb871f
---
M tests/browser/features/step_definitions/font_selection_steps.rb
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/step_definitions/font_selection_steps.rb
b/tests/browser/features/step_definitions/font_selection_steps.rb
index bf699d8..6a8ad24 100644
--- a/tests/browser/features/step_definitions/font_selection_steps.rb
+++ b/tests/browser/features/step_definitions/font_selection_steps.rb
@@ -11,7 +11,9 @@
end
Then(/^the active content font must be the same as font prior to the
preview$/) do
- on(PanelPage).get_content_font.should == @original_content_font
+ pending('bug #56081') do
+ on(PanelPage).get_content_font.should_not ==
@original_content_font
+ end
end
Then(/^the selected content font must be (.*?)$/) do |font|
--
To view, visit https://gerrit.wikimedia.org/r/91838
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idfa0f67c95ab6ed2c6e6a3d8fa99d064a8eb871f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
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] Remove obsolete CSS definitions. - change (wikimedia...modifications)
Aklapper has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91839
Change subject: Remove obsolete CSS definitions.
..
Remove obsolete CSS definitions.
The three attachment related definitions were moved into create_attachment.css
in http://bzr.mozilla.org/bugzilla/4.2/revision/6777 which was then renamed to
attachment.css in http://bzr.mozilla.org/bugzilla/4.2/revision/7049, and
attachment.css *is* loaded anyway as can be seen in the source of
https://bugzilla.wikimedia.org/attachment.cgi?id=1234action=edit.
The two form#Create definitions were an old 1:1 copy from
http://bzr.mozilla.org/bugzilla/4.2/view/6363/skins/standard/global.css and got
removed in http://bzr.mozilla.org/bugzilla/4.2/revision/7219
.image_button got superseded in
http://bzr.mozilla.org/bugzilla/4.2/revision/8073 and is unused.
tr.bz_row_odd on buglist.cgi is read from skins/standard/buglist.css anyway.
Bug: 54823
Change-Id: I43f5a7059d413ff1c7775bb32ef6d75a2f953c21
---
M skins/contrib/Wikimedia/global.css
1 file changed, 2 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bugzilla/modifications
refs/changes/39/91839/1
diff --git a/skins/contrib/Wikimedia/global.css
b/skins/contrib/Wikimedia/global.css
index f370121..e947c8a 100644
--- a/skins/contrib/Wikimedia/global.css
+++ b/skins/contrib/Wikimedia/global.css
@@ -336,22 +336,6 @@
padding-left: 1em;
}
-table.attachment_info th {
-text-align: right;
-vertical-align: top;
-}
-
-table.attachment_info td {
-text-align: left;
-vertical-align: top;
-}
-
-/* Text displayed when the attachment is not viewable by the web browser */
-#noview {
-text-align: left;
-vertical-align: middle;
-}
-
/* For bug fields */
.uneditable_textarea {
width: 30em;
@@ -436,30 +420,11 @@
list-style-type: none;
}
+/* Needed to overwrite vector.css */
ul.bug_urls {
list-style-image: none;
}
-form#Create th {
-text-align: right;
-}
-
-form#Create .comment {
-vertical-align: top;
-overflow: auto;
-color: green;
-margin: 0 0.5em;
-padding: 0.3em;
-height: 8ex;
-}
-
-.image_button {
-background-repeat: no-repeat;
-background-position: center center;
-width: 30px;
-height: 20px;
-}
-
-.bz_emailprefs tr.bz_row_odd {
+.bz_emailprefs {
background-color: #f0f0f0;
}
--
To view, visit https://gerrit.wikimedia.org/r/91839
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I43f5a7059d413ff1c7775bb32ef6d75a2f953c21
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Aklapper aklap...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change the assertion back to original state - change (mediawiki...UniversalLanguageSelector)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91840
Change subject: Change the assertion back to original state
..
Change the assertion back to original state
Bug: 56081
Change-Id: I16a8ee6c4d8aae8778f99f6e0cd0bfc7e0f32b4e
---
M tests/browser/features/step_definitions/font_selection_steps.rb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/40/91840/1
diff --git a/tests/browser/features/step_definitions/font_selection_steps.rb
b/tests/browser/features/step_definitions/font_selection_steps.rb
index 6a8ad24..214ca8e 100644
--- a/tests/browser/features/step_definitions/font_selection_steps.rb
+++ b/tests/browser/features/step_definitions/font_selection_steps.rb
@@ -12,7 +12,7 @@
Then(/^the active content font must be the same as font prior to the
preview$/) do
pending('bug #56081') do
- on(PanelPage).get_content_font.should_not ==
@original_content_font
+ on(PanelPage).get_content_font.should == @original_content_font
end
end
--
To view, visit https://gerrit.wikimedia.org/r/91840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16a8ee6c4d8aae8778f99f6e0cd0bfc7e0f32b4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
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] Change the assertion back to original state - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Change the assertion back to original state
..
Change the assertion back to original state
Bug: 56081
Change-Id: I16a8ee6c4d8aae8778f99f6e0cd0bfc7e0f32b4e
---
M tests/browser/features/step_definitions/font_selection_steps.rb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/step_definitions/font_selection_steps.rb
b/tests/browser/features/step_definitions/font_selection_steps.rb
index 6a8ad24..214ca8e 100644
--- a/tests/browser/features/step_definitions/font_selection_steps.rb
+++ b/tests/browser/features/step_definitions/font_selection_steps.rb
@@ -12,7 +12,7 @@
Then(/^the active content font must be the same as font prior to the
preview$/) do
pending('bug #56081') do
- on(PanelPage).get_content_font.should_not ==
@original_content_font
+ on(PanelPage).get_content_font.should == @original_content_font
end
end
--
To view, visit https://gerrit.wikimedia.org/r/91840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16a8ee6c4d8aae8778f99f6e0cd0bfc7e0f32b4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
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] Signup browser tests for the main page - change (mediawiki...TwnMainPage)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91841
Change subject: Signup browser tests for the main page
..
Signup browser tests for the main page
Change-Id: Id2316eb422dd87c41ffac32e140a69443642485b
---
A tests/browser/features/signup.feature
A tests/browser/features/step_definitions/signup_steps.rb
M tests/browser/features/support/pages/main_page.rb
A tests/browser/features/support/pages/signup_page.rb
D tests/browser/features/user_interested_in_project_only.feature
M tests/browser/features/user_not_signed_in.feature
6 files changed, 82 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwnMainPage
refs/changes/41/91841/1
diff --git a/tests/browser/features/signup.feature
b/tests/browser/features/signup.feature
new file mode 100644
index 000..92319ec
--- /dev/null
+++ b/tests/browser/features/signup.feature
@@ -0,0 +1,22 @@
+@sandbox.translatewiki.net
+Feature: Sign up account for the sandbox
+
+ Background:
+Given I am logged out on the main page
+
+ Scenario: Sign up for translator
+When I choose a language I speak
+ And I input a unique username
+ And I input a password
+ And I input an email address
+ And I press the Create account button
+Then I should be logged in into a new account
+
+ Scenario: Sign up for translator
+When I indicate I am not a developer
+ And I input a unique username
+ And I input a password
+ And I input an email address
+ And I input a reason
+ And I press the Create account button
+Then I should be logged in into a new account
diff --git a/tests/browser/features/step_definitions/signup_steps.rb
b/tests/browser/features/step_definitions/signup_steps.rb
new file mode 100644
index 000..d6881f4
--- /dev/null
+++ b/tests/browser/features/step_definitions/signup_steps.rb
@@ -0,0 +1,36 @@
+Given(/^I am logged out on the main page$/) do
+ # The beta=1 will be removed once this feature is considered stable
+ visit(SignupPage, using_params: {extra: beta=1})
+end
+
+When(/^I choose a language I speak$/) do
+ on(SignupPage).select_signup_language('he')
+end
+
+When(/^I input a unique username$/) do
+ on(SignupPage).username = Translator #{@random_string}
+end
+
+When(/^I input a password$/) do
+ on(SignupPage).password = password #{@random_string}
+end
+
+When(/^I input an email address$/) do
+ on(SignupPage).email = #{@random_string}@example.com
+end
+
+When(/^I press the Create account button$/) do
+ on(SignupPage).submit
+end
+
+When(/^I indicate I am not a developer$/) do
+ on(SignupPage).developer_signup_element.click
+end
+
+When(/^I input a reason$/) do
+ on(SignupPage).reason = I am a wannabe developer ;)
+end
+
+Then(/^I should be logged in into a new account$/) do
+ on(MainPage).username_element.when_visible.text.should == Translator
#{@random_string}
+end
diff --git a/tests/browser/features/support/pages/main_page.rb
b/tests/browser/features/support/pages/main_page.rb
index 88c65f3..90a7d97 100644
--- a/tests/browser/features/support/pages/main_page.rb
+++ b/tests/browser/features/support/pages/main_page.rb
@@ -32,4 +32,6 @@
a(:english, text: 'English')
a(:polish, text: 'polski')
+
+ a(:username, class: 'username')
end
diff --git a/tests/browser/features/support/pages/signup_page.rb
b/tests/browser/features/support/pages/signup_page.rb
new file mode 100644
index 000..ec728bf
--- /dev/null
+++ b/tests/browser/features/support/pages/signup_page.rb
@@ -0,0 +1,22 @@
+class SignupPage
+ include PageObject
+
+ include URL
+ page_url URL.url('Special:MainPage?%=params[:extra]%')
+
+ div(:signup_language_selector, class: 'signup-language-selector' )
+ text_field(:language_filter, id: 'languagefilter')
+ def select_signup_language(language)
+ self.signup_language_selector_element.click
+ self.language_filter = language
+ self.language_filter_element.send_keys :return
+ end
+
+ text_field(:username, name: 'wpName')
+ text_field(:password, name: 'wpPassword')
+ text_field(:email, name: 'wpEmail')
+ text_field(:reason, name: 'reason')
+
+ button(:submit, class: 'green button')
+ a(:developer_signup, css: '.dev-signup a')
+end
diff --git a/tests/browser/features/user_interested_in_project_only.feature
b/tests/browser/features/user_interested_in_project_only.feature
deleted file mode 100644
index a604f93..000
--- a/tests/browser/features/user_interested_in_project_only.feature
+++ /dev/null
@@ -1,15 +0,0 @@
-@sandbox.translatewiki.net
-Feature: Users interested in Project only
-
- This is WIP functionality.
-
- Scenario: Sign up process for non-translator user
-
-Given I am on the Main Page of twn
-When I click on the link you can
[MediaWiki-commits] [Gerrit] Made the reload step pending - change (mediawiki...Translate)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91842
Change subject: Made the reload step pending
..
Made the reload step pending
Change-Id: I9f7b4b47032bdaef2386a3c0266e814937b236b5
---
M tests/browser/features/step_definitions/translation_stash_steps.rb
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/42/91842/1
diff --git a/tests/browser/features/step_definitions/translation_stash_steps.rb
b/tests/browser/features/step_definitions/translation_stash_steps.rb
index c788533..6d696e7 100644
--- a/tests/browser/features/step_definitions/translation_stash_steps.rb
+++ b/tests/browser/features/step_definitions/translation_stash_steps.rb
@@ -34,9 +34,11 @@
end
Then(/^I can open and see my earlier translation$/) do
- on(StashPage) do |page|
- page.edit_element.when_present(10).click
- page.translation_element.when_present.value.should == 'Pupu'
+ pending('Does not work because of random language selection on
reload.') do
+ on(StashPage) do |page|
+ page.edit_element.when_present(10).click
+ page.translation_element.when_present.value.should ==
'Pupu'
+ end
end
end
--
To view, visit https://gerrit.wikimedia.org/r/91842
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f7b4b47032bdaef2386a3c0266e814937b236b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Show the number of translations for each user - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91843
Change subject: Show the number of translations for each user
..
Show the number of translations for each user
Change-Id: Ieb33c98a4f471450499fc50ce61d6a4a0696a0ad
---
M specials/SpecialTranslateSandbox.php
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/43/91843/1
diff --git a/specials/SpecialTranslateSandbox.php
b/specials/SpecialTranslateSandbox.php
index 285d2ae..299333c 100644
--- a/specials/SpecialTranslateSandbox.php
+++ b/specials/SpecialTranslateSandbox.php
@@ -13,6 +13,9 @@
* @ingroup SpecialPage TranslateSpecialPage
*/
class SpecialTranslateSandbox extends SpecialPage {
+ /// @param TranslationStashStorage
+ protected $stash;
+
function __construct() {
global $wgTranslateUseSandbox;
parent::__construct( 'TranslateSandbox',
'translate-sandboxmanage', $wgTranslateUseSandbox );
@@ -23,6 +26,7 @@
$this-checkPermissions();
$out = $this-getOutput();
$out-addModules( 'ext.translate.special.translatesandbox' );
+ $this-stash = new TranslationStashStorage( wfGetDB( DB_MASTER
) );
$this-showPage();
}
@@ -91,7 +95,7 @@
'username' = $user-getName(),
'email' = $user-getEmail(),
'registrationdate' = $user-getRegistration(),
- 'translations' = 0,
+ 'translations' = count( $this-stash-getTranslations(
$user ) ),
'languagepreferences' = FormatJson::decode(
$user-getOption( 'translate-sandbox' ) ),
'userid' = $user-getId(),
);
--
To view, visit https://gerrit.wikimedia.org/r/91843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb33c98a4f471450499fc50ce61d6a4a0696a0ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
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] Made the reload step pending - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Made the reload step pending
..
Made the reload step pending
Change-Id: I9f7b4b47032bdaef2386a3c0266e814937b236b5
---
M tests/browser/features/step_definitions/translation_stash_steps.rb
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/step_definitions/translation_stash_steps.rb
b/tests/browser/features/step_definitions/translation_stash_steps.rb
index c788533..6d696e7 100644
--- a/tests/browser/features/step_definitions/translation_stash_steps.rb
+++ b/tests/browser/features/step_definitions/translation_stash_steps.rb
@@ -34,9 +34,11 @@
end
Then(/^I can open and see my earlier translation$/) do
- on(StashPage) do |page|
- page.edit_element.when_present(10).click
- page.translation_element.when_present.value.should == 'Pupu'
+ pending('Does not work because of random language selection on
reload.') do
+ on(StashPage) do |page|
+ page.edit_element.when_present(10).click
+ page.translation_element.when_present.value.should ==
'Pupu'
+ end
end
end
--
To view, visit https://gerrit.wikimedia.org/r/91842
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f7b4b47032bdaef2386a3c0266e814937b236b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed use of wrong callback array element - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixed use of wrong callback array element
..
Fixed use of wrong callback array element
bug: 56124
Change-Id: Ia9f058f42616f5c7c5936733747d0c3a8d56dc19
---
M includes/db/Database.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 5f175a4..42f8482 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -3906,7 +3906,7 @@
if ( count( $this-mTrxIdleCallbacks ) || count(
$this-mTrxPreCommitCallbacks ) ) {
$callers = array();
foreach ( $this-mTrxIdleCallbacks as $callbackInfo ) {
- $callers[] = $callbackInfo[0];
+ $callers[] = $callbackInfo[1];
}
$callers = implode( ', ', $callers );
--
To view, visit https://gerrit.wikimedia.org/r/91819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9f058f42616f5c7c5936733747d0c3a8d56dc19
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
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] Signup browser tests for the main page - change (mediawiki...TwnMainPage)
jenkins-bot has submitted this change and it was merged.
Change subject: Signup browser tests for the main page
..
Signup browser tests for the main page
Change-Id: Id2316eb422dd87c41ffac32e140a69443642485b
---
A tests/browser/features/signup.feature
A tests/browser/features/step_definitions/signup_steps.rb
M tests/browser/features/support/pages/main_page.rb
A tests/browser/features/support/pages/signup_page.rb
D tests/browser/features/user_interested_in_project_only.feature
M tests/browser/features/user_not_signed_in.feature
6 files changed, 82 insertions(+), 23 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/signup.feature
b/tests/browser/features/signup.feature
new file mode 100644
index 000..92319ec
--- /dev/null
+++ b/tests/browser/features/signup.feature
@@ -0,0 +1,22 @@
+@sandbox.translatewiki.net
+Feature: Sign up account for the sandbox
+
+ Background:
+Given I am logged out on the main page
+
+ Scenario: Sign up for translator
+When I choose a language I speak
+ And I input a unique username
+ And I input a password
+ And I input an email address
+ And I press the Create account button
+Then I should be logged in into a new account
+
+ Scenario: Sign up for translator
+When I indicate I am not a developer
+ And I input a unique username
+ And I input a password
+ And I input an email address
+ And I input a reason
+ And I press the Create account button
+Then I should be logged in into a new account
diff --git a/tests/browser/features/step_definitions/signup_steps.rb
b/tests/browser/features/step_definitions/signup_steps.rb
new file mode 100644
index 000..d6881f4
--- /dev/null
+++ b/tests/browser/features/step_definitions/signup_steps.rb
@@ -0,0 +1,36 @@
+Given(/^I am logged out on the main page$/) do
+ # The beta=1 will be removed once this feature is considered stable
+ visit(SignupPage, using_params: {extra: beta=1})
+end
+
+When(/^I choose a language I speak$/) do
+ on(SignupPage).select_signup_language('he')
+end
+
+When(/^I input a unique username$/) do
+ on(SignupPage).username = Translator #{@random_string}
+end
+
+When(/^I input a password$/) do
+ on(SignupPage).password = password #{@random_string}
+end
+
+When(/^I input an email address$/) do
+ on(SignupPage).email = #{@random_string}@example.com
+end
+
+When(/^I press the Create account button$/) do
+ on(SignupPage).submit
+end
+
+When(/^I indicate I am not a developer$/) do
+ on(SignupPage).developer_signup_element.click
+end
+
+When(/^I input a reason$/) do
+ on(SignupPage).reason = I am a wannabe developer ;)
+end
+
+Then(/^I should be logged in into a new account$/) do
+ on(MainPage).username_element.when_visible.text.should == Translator
#{@random_string}
+end
diff --git a/tests/browser/features/support/pages/main_page.rb
b/tests/browser/features/support/pages/main_page.rb
index 88c65f3..90a7d97 100644
--- a/tests/browser/features/support/pages/main_page.rb
+++ b/tests/browser/features/support/pages/main_page.rb
@@ -32,4 +32,6 @@
a(:english, text: 'English')
a(:polish, text: 'polski')
+
+ a(:username, class: 'username')
end
diff --git a/tests/browser/features/support/pages/signup_page.rb
b/tests/browser/features/support/pages/signup_page.rb
new file mode 100644
index 000..ec728bf
--- /dev/null
+++ b/tests/browser/features/support/pages/signup_page.rb
@@ -0,0 +1,22 @@
+class SignupPage
+ include PageObject
+
+ include URL
+ page_url URL.url('Special:MainPage?%=params[:extra]%')
+
+ div(:signup_language_selector, class: 'signup-language-selector' )
+ text_field(:language_filter, id: 'languagefilter')
+ def select_signup_language(language)
+ self.signup_language_selector_element.click
+ self.language_filter = language
+ self.language_filter_element.send_keys :return
+ end
+
+ text_field(:username, name: 'wpName')
+ text_field(:password, name: 'wpPassword')
+ text_field(:email, name: 'wpEmail')
+ text_field(:reason, name: 'reason')
+
+ button(:submit, class: 'green button')
+ a(:developer_signup, css: '.dev-signup a')
+end
diff --git a/tests/browser/features/user_interested_in_project_only.feature
b/tests/browser/features/user_interested_in_project_only.feature
deleted file mode 100644
index a604f93..000
--- a/tests/browser/features/user_interested_in_project_only.feature
+++ /dev/null
@@ -1,15 +0,0 @@
-@sandbox.translatewiki.net
-Feature: Users interested in Project only
-
- This is WIP functionality.
-
- Scenario: Sign up process for non-translator user
-
-Given I am on the Main Page of twn
-When I click on the link you can still join the community
-Then I should be directed
[MediaWiki-commits] [Gerrit] Add rc.unpatrolled to the recentchanges API - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91844
Change subject: Add rc.unpatrolled to the recentchanges API
..
Add rc.unpatrolled to the recentchanges API
On SpecialRecentChanges, the unpatrolled bang icon is only
rendered when:
- the user has the patrol right.
- the rc type is EDIT and rcpatrol is permitted, or
the tc type is NEW and nppatrol is permitted.
- the rc event is in fact still unpatrolled.
In other words, when an edit is patrollable and unpatrolled.
However, consumers of the API are unable to render this because
the API only has a boolean patrolled attribute. Apps using
the absence of patrolled and presence of patrol right as
meaning unpatrolled get into trouble on wikis with RCpatrol
disabled and NPpatrol enabled. In those cases the app would
render a change as unpatrolled, but when the user clicks it
find out it can't be patrolled.
This adds an unpatrolled flag that does just that.
Change-Id: Ic947c6c75eb7936fcebdccbcd27ff62e07f1feda
---
M includes/api/ApiQueryRecentChanges.php
M includes/changes/ChangesList.php
2 files changed, 30 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/44/91844/1
diff --git a/includes/api/ApiQueryRecentChanges.php
b/includes/api/ApiQueryRecentChanges.php
index 6b10bdc..13100ef 100644
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -456,6 +456,10 @@
$vals['patrolled'] = '';
}
+ if ( $this-fld_patrolled ChangesList::isUnpatrolled( $row,
$this-getUser() ) ) {
+ $vals['unpatrolled'] = '';
+ }
+
if ( $this-fld_loginfo $row-rc_type == RC_LOG ) {
$vals['logid'] = intval( $row-rc_logid );
$vals['logtype'] = $row-rc_log_type;
@@ -655,7 +659,7 @@
' ids- Adds the page ID, recent
changes ID and the new and old revision ID',
' sizes - Adds the new and old page
length in bytes',
' redirect - Tags edit if page is a
redirect',
- ' patrolled - Tags edits that have been
patrolled',
+ ' patrolled - Tags patrollable edits as
being patrolled or unpatrolled',
' loginfo- Adds log information (logid,
logtype, etc) to log entries',
' tags - Lists tags for the entry',
' sha1 - Adds the content checksum
for entries associated with a revision',
diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index bf800c4..1b14b97 100644
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -539,14 +539,32 @@
}
protected function showAsUnpatrolled( RecentChange $rc ) {
- $unpatrolled = false;
- if ( !$rc-mAttribs['rc_patrolled'] ) {
- if ( $this-getUser()-useRCPatrol() ) {
- $unpatrolled = true;
- } elseif ( $this-getUser()-useNPPatrol()
$rc-mAttribs['rc_type'] == RC_NEW ) {
- $unpatrolled = true;
+ return self::isUnpatrolled( $rc, $this-getUser() );
+ }
+
+ /**
+* @param object|RecentChange $rc Database row from recentchanges or a
RecentChange object
+* @param User $user
+* @return bool
+*/
+ public static function isUnpatrolled( $rc, User $user ) {
+ if ( $rc instanceof RecentChange ) {
+ $isPatrolled = $rc-mAttribs['rc_patrolled'];
+ $rcType = $rc-mAttribs['rc_type'];
+ } else {
+ $isPatrolled = $rc-rc_patrolled;
+ $rcType = $rc-rc_type;
+ }
+
+ if ( !$isPatrolled ) {
+ if ( $user-useRCPatrol() ) {
+ return true;
+ }
+ if ( $user-useNPPatrol() $rcType == RC_NEW ) {
+ return true;
}
}
- return $unpatrolled;
+
+ return false;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/91844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic947c6c75eb7936fcebdccbcd27ff62e07f1feda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] Add show=unpatrolled to the recentchanges API - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91845
Change subject: Add show=unpatrolled to the recentchanges API
..
Add show=unpatrolled to the recentchanges API
Adding it only in the API because SpecialRecentChanges only shows
Hide patrolled edits option if rcpatrol is enabled.
show=!patrolled returns results that include changes that can't
be patrolled which technically correct (they aren't correct)
but probably not what you're looking for when looking for
unpatrolled changes.
Change-Id: I356a8625c7126b90aa7e7a23efe3bef7d448b502
---
M includes/api/ApiQueryRecentChanges.php
1 file changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/45/91845/1
diff --git a/includes/api/ApiQueryRecentChanges.php
b/includes/api/ApiQueryRecentChanges.php
index 13100ef..dc47cf3 100644
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -191,6 +191,7 @@
|| ( isset( $show['anon'] ) isset(
$show['!anon'] ) )
|| ( isset( $show['redirect'] )
isset( $show['!redirect'] ) )
|| ( isset( $show['patrolled'] )
isset( $show['!patrolled'] ) )
+ || ( isset( $show['patrolled'] )
isset( $show['unpatrolled'] ) )
) {
$this-dieUsageMsg( 'show' );
}
@@ -212,6 +213,16 @@
$this-addWhereIf( 'rc_patrolled = 0', isset(
$show['!patrolled'] ) );
$this-addWhereIf( 'rc_patrolled != 0', isset(
$show['patrolled'] ) );
$this-addWhereIf( 'page_is_redirect = 1', isset(
$show['redirect'] ) );
+
+ if ( isset( $show['unpatrolled'] ) ) {
+ // See ChangesList:isUnpatrolled
+ if ( $user-useRCPatrol() ) {
+ $this-addWhere('rc_patrolled = 0');
+ } elseif ( $user-useNPPatrol() ) {
+ $this-addWhere('rc_patrolled = 0');
+ $this-addWhereFld('rc_type', RC_NEW);
+ }
+ }
// Don't throw log entries out the window here
$this-addWhereIf( 'page_is_redirect = 0 OR
page_is_redirect IS NULL', isset( $show['!redirect'] ) );
@@ -614,7 +625,8 @@
'redirect',
'!redirect',
'patrolled',
- '!patrolled'
+ '!patrolled',
+ 'unpatrolled'
)
),
'limit' = array(
--
To view, visit https://gerrit.wikimedia.org/r/91845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I356a8625c7126b90aa7e7a23efe3bef7d448b502
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Insertables for translatable pages - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91846
Change subject: Insertables for translatable pages
..
Insertables for translatable pages
Change-Id: I27d51d51ea63f3586ba3e883bfedfca7dc51cdea
---
M _autoload.php
M insertables/MediaWikiInsertablesSuggester.php
A insertables/TranslatablePageInsertablesSuggester.php
M messagegroups/WikiPageMessageGroup.php
A tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php
5 files changed, 68 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/46/91846/1
diff --git a/_autoload.php b/_autoload.php
index 4ea5c67..c9ff31f 100644
--- a/_autoload.php
+++ b/_autoload.php
@@ -315,4 +315,6 @@
$wgAutoloadClasses['InsertablesSuggester'] =
$dir/insertables/InsertablesSuggester.php;
$wgAutoloadClasses['MediaWikiInsertablesSuggester'] =
$dir/insertables/MediaWikiInsertablesSuggester.php;
+$wgAutoloadClasses['TranslatablePageInsertablesSuggester'] =
+ $dir/insertables/TranslatablePageInsertablesSuggester.php;
/**@}*/
diff --git a/insertables/MediaWikiInsertablesSuggester.php
b/insertables/MediaWikiInsertablesSuggester.php
index 7b92897..6abe66f 100644
--- a/insertables/MediaWikiInsertablesSuggester.php
+++ b/insertables/MediaWikiInsertablesSuggester.php
@@ -1,7 +1,5 @@
?php
/**
- * Interface for InsertableSuggesters.
- *
* @file
* @author Niklas Laxström
* @license GPL-2.0+
diff --git a/insertables/TranslatablePageInsertablesSuggester.php
b/insertables/TranslatablePageInsertablesSuggester.php
new file mode 100644
index 000..255c8b7
--- /dev/null
+++ b/insertables/TranslatablePageInsertablesSuggester.php
@@ -0,0 +1,34 @@
+?php
+/**
+ * @file
+ * @author Niklas Laxström
+ * @license GPL-2.0+
+ */
+
+/**
+ * Special insertables for translatable pages.
+ * @since 2013.11
+ */
+class TranslatablePageInsertablesSuggester extends
MediaWikiInsertablesSuggester {
+ public function getInsertables( $text ) {
+ $insertables = parent::getInsertables( $text );
+
+ // Translatable pages allow naming the variables. Basically
anything is
+ // allowed in a variable name, but here we are stricter to
avoid too many
+ // false positives.
+ $matches = array();
+ preg_match_all( '/\$([a-z0-9])+/', $text, $matches,
PREG_SET_ORDER );
+ $new = array_map( function( $match ) {
+ // Numerical ones are already handled by parent
+ if ( ctype_digit( $match[1] ) ) {
+ return null;
+ }
+ return new Insertable( $match[0], $match[0] );
+ }, $matches );
+ $new = array_filter( $new );
+ $insertables = array_merge( $insertables, $new );
+
+
+ return $insertables;
+ }
+}
diff --git a/messagegroups/WikiPageMessageGroup.php
b/messagegroups/WikiPageMessageGroup.php
index c7fe461..8299752 100644
--- a/messagegroups/WikiPageMessageGroup.php
+++ b/messagegroups/WikiPageMessageGroup.php
@@ -134,6 +134,10 @@
return $checker;
}
+ public function getInsertablesSuggester() {
+ return new TranslatablePageInsertablesSuggester();
+ }
+
public function getDescription( IContextSource $context = null ) {
$title = $this-getTitle()-getPrefixedText();
$target = :$title;
diff --git
a/tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php
b/tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php
new file mode 100644
index 000..1a8401e
--- /dev/null
+++ b/tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php
@@ -0,0 +1,28 @@
+?php
+/**
+ * Tests for class TranslatablePageInsertablesSuggester
+ *
+ * @file
+ * @author Niklas Laxström
+ * @license GPL-2.0+
+ */
+
+class TranslatablePageInsertablesSuggesterTest extends
MediaWikiInsertablesSuggesterTest {
+
+ /**
+* @dataProvider getInsertablesProvider
+*/
+ public function testGetInsertables( $input, $expected ) {
+ $suggester = new TranslatablePageInsertablesSuggester();
+ $this-assertEquals( $expected, $suggester-getInsertables(
$input ) );
+ }
+
+ public function getInsertablesProvider() {
+ return array(
+ array( 'Hi $1, I am $myname.', array(
+ new Insertable( '$1', '$1', '' ),
+ new Insertable( '$myname', '$myname', '' ),
+ ) ),
+ );
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/91846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id:
[MediaWiki-commits] [Gerrit] Make 'make test' pass - change (translatewiki)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/91847 Change subject: Make 'make test' pass .. Make 'make test' pass Change-Id: I2f5414d9ea088f2f88cf983855807595e27c767e --- M puppet/modules/sudo/files/local 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/47/91847/1 diff --git a/puppet/modules/sudo/files/local b/puppet/modules/sudo/files/local index abf1a6f..ca84d88 100644 --- a/puppet/modules/sudo/files/local +++ b/puppet/modules/sudo/files/local @@ -1,3 +1,4 @@ +# file managed by puppet nikeALL = NOPASSWD: ALL siebrandALL = NOPASSWD: ALL mah ALL = NOPASSWD: ALL -- To view, visit https://gerrit.wikimedia.org/r/91847 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2f5414d9ea088f2f88cf983855807595e27c767e 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] Making large tests a LOT faster - change (analytics/wikimetrics)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91848
Change subject: Making large tests a LOT faster
..
Making large tests a LOT faster
Change-Id: I85edf4c22b827f5e14087a5287eed553efb11620
---
M tests/fixtures.py
M tests/manual/load_test.py
2 files changed, 68 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/48/91848/1
diff --git a/tests/fixtures.py b/tests/fixtures.py
index 75eef13..68408bb 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -121,43 +121,63 @@
self.mwSession.add(self.page)
self.mwSession.commit()
-for e in range(editor_count):
-editor = MediawikiUser(
-user_name='Editor {0}-{1}'.format(name, e),
-user_registration=user_registrations[e],
-)
-self.mwSession.add(editor)
-self.mwSession.commit()
-self.editors.append(editor)
-
-wiki_editor = WikiUser(
-mediawiki_username=editor.user_name,
-mediawiki_userid=editor.user_id,
-project=self.project,
-)
-self.session.add(wiki_editor)
-self.session.commit()
-
-cohort_wiki_editor = CohortWikiUser(
-cohort_id=self.cohort.id,
-wiki_user_id=wiki_editor.id,
-)
-self.session.add(cohort_wiki_editor)
-self.session.commit()
-
-for r in range(revisions_per_editor):
-revision = Revision(
-rev_page=self.page.page_id,
-rev_user=editor.user_id,
-rev_comment='revision {0}, editor {1}'.format(r, e),
-rev_timestamp=revision_timestamps[e][r],
-rev_len=revision_lengths[e][r],
-# rev_parent_id will be set below, following chronology
-)
-self.revisions.append(revision)
-
-self.mwSession.add_all(self.revisions)
+self.mwSession.bind.engine.execute(
+MediawikiUser.__table__.insert(), [
+{
+'user_name': 'Editor {0}-{1}'.format(name, e),
+'user_registration': user_registrations[e],
+}
+for e in range(editor_count)
+]
+)
self.mwSession.commit()
+self.editors = self.mwSession.query(MediawikiUser)\
+.filter(MediawikiUser.user_name.like('Editor {0}-%'.format(name)))\
+.all()
+self.session.bind.engine.execute(
+WikiUser.__table__.insert(), [
+{
+'mediawiki_username': editor.user_name,
+'mediawiki_userid' : editor.user_id,
+'project' : self.project,
+}
+for editor in self.editors
+]
+)
+self.session.commit()
+wiki_users = self.session.query(WikiUser)\
+.filter(WikiUser.mediawiki_username.like('Editor
{0}-%'.format(name)))\
+.all()
+self.session.bind.engine.execute(
+CohortWikiUser.__table__.insert(), [
+{
+'cohort_id' : self.cohort.id,
+'wiki_user_id' : wiki_user.id,
+}
+for wiki_user in wiki_users
+]
+)
+self.session.commit()
+
+from itertools import product
+self.mwSession.bind.engine.execute(
+Revision.__table__.insert(), [
+{
+'rev_page' : self.page.page_id,
+'rev_user' : self.editors[e].user_id,
+'rev_comment' : 'revision {0}, editor {1}'.format(r, e),
+'rev_timestamp' : revision_timestamps[e][r],
+'rev_len' : revision_lengths[e][r],
+# rev_parent_id will be set below, following chronology
+}
+for e, r in product(range(editor_count),
range(revisions_per_editor))
+]
+)
+self.mwSession.commit()
+self.revisions = self.mwSession.query(Revision)\
+.filter(Revision.rev_page == self.page.page_id)\
+.all()
+
# add rev_parent_id chain in chronological order
real_revisions = filter(lambda r: r.rev_timestamp, self.revisions)
ordered_revisions = sorted(real_revisions, key=lambda r:
r.rev_timestamp)
diff --git a/tests/manual/load_test.py b/tests/manual/load_test.py
index b9268d5..194c2e2 100644
--- a/tests/manual/load_test.py
+++ b/tests/manual/load_test.py
@@ -1,5 +1,5 @@
from datetime import datetime, timedelta
-from nose.tools import assert_true
+from
[MediaWiki-commits] [Gerrit] Adding option of not deleting the old cat, It was partially ... - change (pywikibot/compat)
Ladsgroup has uploaded a new change for review. https://gerrit.wikimedia.org/r/91849 Change subject: Adding option of not deleting the old cat, It was partially implemented already .. Adding option of not deleting the old cat, It was partially implemented already Bug: 55291 Change-Id: I76b512acb692598a6a9528a162085e5ee330ffb8 --- M category.py 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat refs/changes/49/91849/1 diff --git a/category.py b/category.py index e1bb0ad..e58be71 100644 --- a/category.py +++ b/category.py @@ -39,6 +39,7 @@ Options for move action: * -hist- Creates a nice wikitable on the talk page of target category that contains detailed page history of the source category. + * -nodelete- Don't delete the old category after move Options for several actions: * -rebuild - reset the database @@ -885,6 +886,7 @@ sort_by_last_name = False restore = False create_pages = False +deleteEmptySourceCat = True for arg in pywikibot.handleArgs(*args): if arg == 'add': action = 'add' @@ -898,6 +900,8 @@ action = 'tree' elif arg == 'listify': action = 'listify' +elif arg =='-nodelete': +deleteEmptySourceCat = False elif arg == '-person': sort_by_last_name = True elif arg == '-rebuild': @@ -971,7 +975,7 @@ newCatTitle = pywikibot.input( u'Please enter the new name of the category:') bot = CategoryMoveRobot(oldCatTitle, newCatTitle, batchMode, -editSummary, inPlace, titleRegex=titleRegex, +editSummary, inPlace, deleteEmptySourceCat= deleteEmptySourceCat, titleRegex=titleRegex, withHistory=withHistory) bot.run() elif action == 'tidy': -- To view, visit https://gerrit.wikimedia.org/r/91849 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76b512acb692598a6a9528a162085e5ee330ffb8 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Ladsgroup ladsgr...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added a few test modes to test ESI bug on beta - should be r... - change (mediawiki...ZeroRatedMobileAccess)
jenkins-bot has submitted this change and it was merged.
Change subject: Added a few test modes to test ESI bug on beta - should be
reverted
..
Added a few test modes to test ESI bug on beta - should be reverted
Change-Id: I566457fdf9de1abb2df126b21303e2fa6ea747d7
---
M includes/PageRenderingHooks.php
1 file changed, 14 insertions(+), 5 deletions(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index 2f900d0..b11e6e8 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -421,9 +421,8 @@
private function createBanner( $wap = false ) {
global $wgZeroRatedMobileAccessEnableESI;
// fixme: temporary until we stabilize it, then remove
X-FORCE-ESI check
- if ( $wgZeroRatedMobileAccessEnableESI === true ||
- $this-request-getHeader( 'X-FORCE-ESI' ) === '1'
- ) {
+ $esiHeader = $this-request-getHeader( 'X-FORCE-ESI' );
+ if ( $wgZeroRatedMobileAccessEnableESI === true || $esiHeader )
{
# Add an 'Enable-ESI' header for varnish
$this-request-response()-header( 'Enable-ESI: 1' );
@@ -432,9 +431,19 @@
if ( $wap ) {
$query .= 'wap=1';
}
- $url = $special-getLocalURL( $query );
+ if ( $esiHeader === 'TST' || $esiHeader === 'TSTAMP' ) {
+ $url = $special-getFullURL( $query );
+ } else {
+ $url = $special-getLocalURL( $query );
+ }
- return 'esi:include' . Html::expandAttributes( array(
'src' = $url, 'onerror' = 'continue' ) ) . '/';
+ $esi = 'esi:include' . Html::expandAttributes( array(
'src' = $url, 'onerror' = 'continue' ) ) . '/';
+
+ if ( $esiHeader === 'AMP' || $esiHeader === 'TSTAMP' ) {
+ $esi = str_replace( 'amp;', '', $esi );
+ }
+
+ return $esi;
}
$config = $this-getConfig();
if ( $config === null ) {
--
To view, visit https://gerrit.wikimedia.org/r/91850
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I566457fdf9de1abb2df126b21303e2fa6ea747d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org
Gerrit-Reviewer: Yurik yu...@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] Added a few test modes to test ESI bug on beta - should be r... - change (mediawiki...ZeroRatedMobileAccess)
Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91850
Change subject: Added a few test modes to test ESI bug on beta - should be
reverted
..
Added a few test modes to test ESI bug on beta - should be reverted
Change-Id: I566457fdf9de1abb2df126b21303e2fa6ea747d7
---
M includes/PageRenderingHooks.php
1 file changed, 14 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess
refs/changes/50/91850/1
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index 2f900d0..b11e6e8 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -421,9 +421,8 @@
private function createBanner( $wap = false ) {
global $wgZeroRatedMobileAccessEnableESI;
// fixme: temporary until we stabilize it, then remove
X-FORCE-ESI check
- if ( $wgZeroRatedMobileAccessEnableESI === true ||
- $this-request-getHeader( 'X-FORCE-ESI' ) === '1'
- ) {
+ $esiHeader = $this-request-getHeader( 'X-FORCE-ESI' );
+ if ( $wgZeroRatedMobileAccessEnableESI === true || $esiHeader )
{
# Add an 'Enable-ESI' header for varnish
$this-request-response()-header( 'Enable-ESI: 1' );
@@ -432,9 +431,19 @@
if ( $wap ) {
$query .= 'wap=1';
}
- $url = $special-getLocalURL( $query );
+ if ( $esiHeader === 'TST' || $esiHeader === 'TSTAMP' ) {
+ $url = $special-getFullURL( $query );
+ } else {
+ $url = $special-getLocalURL( $query );
+ }
- return 'esi:include' . Html::expandAttributes( array(
'src' = $url, 'onerror' = 'continue' ) ) . '/';
+ $esi = 'esi:include' . Html::expandAttributes( array(
'src' = $url, 'onerror' = 'continue' ) ) . '/';
+
+ if ( $esiHeader === 'AMP' || $esiHeader === 'TSTAMP' ) {
+ $esi = str_replace( 'amp;', '', $esi );
+ }
+
+ return $esi;
}
$config = $this-getConfig();
if ( $config === null ) {
--
To view, visit https://gerrit.wikimedia.org/r/91850
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I566457fdf9de1abb2df126b21303e2fa6ea747d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make test more robust - change (mediawiki...TwnMainPage)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/91851 Change subject: Make test more robust .. Make test more robust The same element is used for percentages. If those get loaded before this check, the test fails. Change-Id: I2530b9aac2a21d020e337a0132e510a6c0c79ea9 --- M tests/browser/features/step_definitions/signed_in_source_language_steps.rb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwnMainPage refs/changes/51/91851/1 diff --git a/tests/browser/features/step_definitions/signed_in_source_language_steps.rb b/tests/browser/features/step_definitions/signed_in_source_language_steps.rb index 3527b72..409ee98 100644 --- a/tests/browser/features/step_definitions/signed_in_source_language_steps.rb +++ b/tests/browser/features/step_definitions/signed_in_source_language_steps.rb @@ -34,7 +34,7 @@ end Then(/^I should not see the number of messages in the project tiles$/) do - on(MainPage).statstext_element.text.should == '' + on(MainPage).statstext_element.text.should_not match(/\d+ messages/) end When(/^I should see statsbars in the project tiles$/) do -- To view, visit https://gerrit.wikimedia.org/r/91851 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2530b9aac2a21d020e337a0132e510a6c0c79ea9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwnMainPage 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] Make test more robust - change (mediawiki...TwnMainPage)
Zfilipin has submitted this change and it was merged. Change subject: Make test more robust .. Make test more robust The same element is used for percentages. If those get loaded before this check, the test fails. Change-Id: I2530b9aac2a21d020e337a0132e510a6c0c79ea9 --- M tests/browser/features/step_definitions/signed_in_source_language_steps.rb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/step_definitions/signed_in_source_language_steps.rb b/tests/browser/features/step_definitions/signed_in_source_language_steps.rb index 3527b72..409ee98 100644 --- a/tests/browser/features/step_definitions/signed_in_source_language_steps.rb +++ b/tests/browser/features/step_definitions/signed_in_source_language_steps.rb @@ -34,7 +34,7 @@ end Then(/^I should not see the number of messages in the project tiles$/) do - on(MainPage).statstext_element.text.should == '' + on(MainPage).statstext_element.text.should_not match(/\d+ messages/) end When(/^I should see statsbars in the project tiles$/) do -- To view, visit https://gerrit.wikimedia.org/r/91851 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2530b9aac2a21d020e337a0132e510a6c0c79ea9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwnMainPage Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Recently been getting more commits from others as well - change (mediawiki...WikibaseDataModel)
Jeroen De Dauw has uploaded a new change for review. https://gerrit.wikimedia.org/r/91852 Change subject: Recently been getting more commits from others as well .. Recently been getting more commits from others as well Change-Id: Idf13bc9ea36f1825aff8fd6c101c265f4c7b32b5 --- M WikibaseDataModel.mw.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseDataModel refs/changes/52/91852/1 diff --git a/WikibaseDataModel.mw.php b/WikibaseDataModel.mw.php index 890672c..d99d9f3 100644 --- a/WikibaseDataModel.mw.php +++ b/WikibaseDataModel.mw.php @@ -23,6 +23,7 @@ 'version' = WIKIBASE_DATAMODEL_VERSION, 'author' = array( '[https://www.mediawiki.org/wiki/User:Jeroen_De_Dauw Jeroen De Dauw]', + 'The Wikidata team', ), 'url' = 'https://www.mediawiki.org/wiki/Extension:Wikibase_DataModel', 'descriptionmsg' = 'wikibasedatamodel-desc' -- To view, visit https://gerrit.wikimedia.org/r/91852 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf13bc9ea36f1825aff8fd6c101c265f4c7b32b5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseDataModel Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ruby lint should run after every patch set submission for al... - change (integration/jenkins-job-builder-config)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91853
Change subject: Ruby lint should run after every patch set submission for all
repositories that contain Ruby code
..
Ruby lint should run after every patch set submission for all repositories that
contain Ruby code
Bug: 56156
Change-Id: I59e2fc1a007ba1585cb4bb2647c6104a474597a2
---
M mediawiki-extensions.yaml
1 file changed, 22 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/53/91853/1
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 6dc6c56..00f5f56 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -521,6 +521,11 @@
- '{name}-phpcs-strict-HEAD'
- project:
+name: 'mwext-CirrusSearch'
+jobs:
+ - '{name}-ruby1.9.3lint'
+
+- project:
name: 'mwext-ConfirmEdit'
jobs:
- python-jobs
@@ -534,6 +539,11 @@
name: 'mwext-EventLogging'
jobs:
- python-jobs
+
+- project:
+name: 'mwext-Flow'
+jobs:
+ - '{name}-ruby1.9.3lint'
- project:
name: 'mwext-Interwiki'
@@ -579,6 +589,7 @@
name: 'mwext-Translate'
jobs:
- '{name}-phpcs-strict-HEAD'
+ - '{name}-ruby1.9.3lint'
- project:
name: 'mwext-TranslationNotifications'
@@ -589,6 +600,7 @@
name: 'mwext-TwnMainPage'
jobs:
- '{name}-phpcs-strict-HEAD'
+ - '{name}-ruby1.9.3lint'
- project:
name: 'mwext-UniversalLanguageSelector'
@@ -597,6 +609,16 @@
- '{name}-phpcs-strict-HEAD'
- project:
+name: 'mwext-VisualEditor'
+jobs:
+ - '{name}-ruby1.9.3lint'
+
+- project:
+name: 'mwext-Wikibase'
+jobs:
+ - '{name}-ruby1.9.3lint'
+
+- project:
name: 'mwext-WikimediaMaintenance'
jobs:
- python-jobs
--
To view, visit https://gerrit.wikimedia.org/r/91853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I59e2fc1a007ba1585cb4bb2647c6104a474597a2
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
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] PEP8: ignore E127 - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: PEP8: ignore E127 .. PEP8: ignore E127 this looks sometimes wrong to me which alerts the following default idle indentation e.g.: x = foo + \ bar Change-Id: Ifed496cd62c97797f918d08c48400ac660d20aed --- M .pep8 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/.pep8 b/.pep8 index 2454dfd..4e25b06 100644 --- a/.pep8 +++ b/.pep8 @@ -1,4 +1,4 @@ [pep8] -ignore = E122,E241,E502 +ignore = E122,E127,E241,E502 exclude = .git,ez_setup.py,externals,user-config.py,./scripts/i18n/*,./pywikibot/date.py max_line_length = 256 -- To view, visit https://gerrit.wikimedia.org/r/91416 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifed496cd62c97797f918d08c48400ac660d20aed Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.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] Replace php_sapi_name() with PHP_SAPI - change (mediawiki/core)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91854
Change subject: Replace php_sapi_name() with PHP_SAPI
..
Replace php_sapi_name() with PHP_SAPI
Change-Id: I222789cacaa2653c4dac62708ce228674c90af4c
---
M includes/filebackend/FileBackend.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/54/91854/1
diff --git a/includes/filebackend/FileBackend.php
b/includes/filebackend/FileBackend.php
index f586578..4bcaa7f 100644
--- a/includes/filebackend/FileBackend.php
+++ b/includes/filebackend/FileBackend.php
@@ -807,7 +807,7 @@
* @return ScopedCallback|null
*/
final protected function getScopedPHPBehaviorForOps() {
- if ( php_sapi_name() != 'cli' ) { //
http://bugs.php.net/bug.php?id=47540
+ if ( PHP_SAPI != 'cli' ) { //
http://bugs.php.net/bug.php?id=47540
$old = ignore_user_abort( true ); // avoid
half-finished operations
return new ScopedCallback( function() use ( $old ) {
ignore_user_abort( $old );
--
To view, visit https://gerrit.wikimedia.org/r/91854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I222789cacaa2653c4dac62708ce228674c90af4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace php_sapi_name() with PHP_SAPI - change (mediawiki...code-utils)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91855
Change subject: Replace php_sapi_name() with PHP_SAPI
..
Replace php_sapi_name() with PHP_SAPI
Change-Id: I6861ca68e195bce5573a756ddcde547d11588645
---
M lint.php
M stylize.php
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/code-utils
refs/changes/55/91855/1
diff --git a/lint.php b/lint.php
index 51444d0..e958e15 100755
--- a/lint.php
+++ b/lint.php
@@ -13,7 +13,7 @@
require_once( __DIR__ . '/includes/MwCodeUtilsArgs.php' );
-if ( php_sapi_name() != 'cli' ) {
+if ( PHP_SAPI != 'cli' ) {
echo This script must be run from the command line\n;
exit( 1 );
}
diff --git a/stylize.php b/stylize.php
index 15786ea..8a1e67b 100755
--- a/stylize.php
+++ b/stylize.php
@@ -12,7 +12,7 @@
require_once( __DIR__ . '/includes/MwCodeUtilsArgs.php' );
-if ( php_sapi_name() != 'cli' ) {
+if ( PHP_SAPI != 'cli' ) {
echo This script must be run from the command line\n;
exit( 1 );
}
--
To view, visit https://gerrit.wikimedia.org/r/91855
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6861ca68e195bce5573a756ddcde547d11588645
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/code-utils
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace php_sapi_name() with PHP_SAPI - change (mediawiki...wikidiff)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91856
Change subject: Replace php_sapi_name() with PHP_SAPI
..
Replace php_sapi_name() with PHP_SAPI
Change-Id: Icc227d0fb317d54b4bb3918b797154988e5d70d7
---
M memleak.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/wikidiff
refs/changes/56/91856/1
diff --git a/memleak.php b/memleak.php
index d0df104..5f5f091 100644
--- a/memleak.php
+++ b/memleak.php
@@ -3,11 +3,11 @@
# Quickie memory leak checker.
# 2004-11-14 -- br...@pobox.com
-if( php_sapi_name() != 'cli' ) {
+if( PHP_SAPI != 'cli' ) {
die( Run me from the command line please.\n );
}
-echo
+echo
Memory leak test!
Watch PHP's memory usage in top; a leak in the extension will not
@@ -34,7 +34,7 @@
for( $i = 0; $i = $maxruns; $i++ ) {
$x = memory_get_usage() - $membase;
printf( %5d: up %d bytes\n, $i, $x );
-
+
$a = randomString( $size );
$b = randomString( $size );
$c = wikidiff_do_diff( $a, $b, 1 );
--
To view, visit https://gerrit.wikimedia.org/r/91856
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc227d0fb317d54b4bb3918b797154988e5d70d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/wikidiff
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace php_sapi_name() with PHP_SAPI - change (mediawiki...luasandbox)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91857
Change subject: Replace php_sapi_name() with PHP_SAPI
..
Replace php_sapi_name() with PHP_SAPI
Change-Id: I61b35e34e8ccfa8e7f679e3792daee66ebc52209
---
M luasandbox.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/luasandbox
refs/changes/57/91857/1
diff --git a/luasandbox.php b/luasandbox.php
index 40034e1..e49852c 100644
--- a/luasandbox.php
+++ b/luasandbox.php
@@ -1,5 +1,5 @@
?php
-$br = (php_sapi_name() == cli)? :br;
+$br = (PHP_SAPI == cli)? :br;
if(!extension_loaded('luasandbox')) {
dl('luasandbox.' . PHP_SHLIB_SUFFIX);
--
To view, visit https://gerrit.wikimedia.org/r/91857
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61b35e34e8ccfa8e7f679e3792daee66ebc52209
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add sleep call to HTMLCacheUpdateJob update loop - change (mediawiki/core)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91858
Change subject: Add sleep call to HTMLCacheUpdateJob update loop
..
Add sleep call to HTMLCacheUpdateJob update loop
Removes a WMF live hack from https://gerrit.wikimedia.org/r/#/c/22466
Change-Id: I9a8e27998e51df05b65f8ad675cd7e840c42685b
---
M includes/job/jobs/HTMLCacheUpdateJob.php
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/58/91858/1
diff --git a/includes/job/jobs/HTMLCacheUpdateJob.php
b/includes/job/jobs/HTMLCacheUpdateJob.php
index 44c240b..732ee76 100644
--- a/includes/job/jobs/HTMLCacheUpdateJob.php
+++ b/includes/job/jobs/HTMLCacheUpdateJob.php
@@ -245,6 +245,9 @@
array( 'page_id' = $batch ) + $touchedCond,
__METHOD__
);
+ if ( PHP_SAPI == 'cli' ) {
+ sleep( 1 );
+ }
}
# Update squid
--
To view, visit https://gerrit.wikimedia.org/r/91858
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a8e27998e51df05b65f8ad675cd7e840c42685b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QuantityFormatter registration - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review. https://gerrit.wikimedia.org/r/91859 Change subject: QuantityFormatter registration .. QuantityFormatter registration requires change Ic89b54e39b3fd759bad568fc412e192b237da320 Change-Id: I4d4252fcb8d14bf9324e7ec9c63d406592c0637a --- M lib/includes/formatters/WikibaseValueFormatterBuilders.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/59/91859/1 diff --git a/lib/includes/formatters/WikibaseValueFormatterBuilders.php b/lib/includes/formatters/WikibaseValueFormatterBuilders.php index a979957..20d2326 100644 --- a/lib/includes/formatters/WikibaseValueFormatterBuilders.php +++ b/lib/includes/formatters/WikibaseValueFormatterBuilders.php @@ -62,6 +62,7 @@ SnakFormatter::FORMAT_PLAIN = array( 'VT:string' = 'ValueFormatters\StringFormatter', 'VT:globecoordinate' = 'ValueFormatters\GlobeCoordinateFormatter', + 'VT:quantity' = 'ValueFormatters\QuantityFormatter', 'VT:time' = 'Wikibase\Lib\MwTimeIsoFormatter', 'VT:wikibase-entityid' = array( 'Wikibase\Lib\WikibaseValueFormatterBuilders', 'newEntityIdFormatter' ), 'VT:bad' = 'Wikibase\Lib\UnDeserializableValueFormatter' -- To view, visit https://gerrit.wikimedia.org/r/91859 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d4252fcb8d14bf9324e7ec9c63d406592c0637a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implement EntityTable::removeEntity - change (mediawiki...WikibaseQueryEngine)
Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91860
Change subject: Implement EntityTable::removeEntity
..
Implement EntityTable::removeEntity
Change-Id: Ib6687ed00c32aa6b18640f5eb7e2163524dd7c4d
---
M src/SQLStore/EntityTable.php
M src/SQLStore/Store.php
M tests/Phpunit/SQLStore/EntityTableTest.php
3 files changed, 32 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQueryEngine
refs/changes/60/91860/1
diff --git a/src/SQLStore/EntityTable.php b/src/SQLStore/EntityTable.php
index 8603434..e5c47be 100644
--- a/src/SQLStore/EntityTable.php
+++ b/src/SQLStore/EntityTable.php
@@ -46,14 +46,18 @@
);
}
-
/**
* @since 0.1
*
* @param Entity $entity
*/
public function removeEntity( Entity $entity ) {
-
+ $this-queryInterface-delete(
+ $this-entityTableName,
+ array(
+ 'id' = $entity-getId()-getSerialization()
+ )
+ );
}
}
diff --git a/src/SQLStore/Store.php b/src/SQLStore/Store.php
index 5c57dab..6bdba8d 100644
--- a/src/SQLStore/Store.php
+++ b/src/SQLStore/Store.php
@@ -165,6 +165,8 @@
return new SnakRemover( $this-getSnakStores() );
}
+ // This table is not yet needed.
+ // Later one it will be a dependency of the
EntityInserter/Remover/Updater
private function newEntityTable() {
return new EntityTable(
$this-queryInterface,
diff --git a/tests/Phpunit/SQLStore/EntityTableTest.php
b/tests/Phpunit/SQLStore/EntityTableTest.php
index 8b50264..86f1da0 100644
--- a/tests/Phpunit/SQLStore/EntityTableTest.php
+++ b/tests/Phpunit/SQLStore/EntityTableTest.php
@@ -42,9 +42,9 @@
)
);
- $inserter = new EntityTable( $queryInterface, 'nyan_entities' );
+ $table = new EntityTable( $queryInterface, 'nyan_entities' );
- $inserter-insertEntity( $entity );
+ $table-insertEntity( $entity );
}
public function entityProvider() {
@@ -86,4 +86,26 @@
return $claim;
}
+ /**
+* @dataProvider entityProvider
+*/
+ public function testRemoveEntity( Entity $entity ) {
+ $queryInterface = $this-getMock(
'Wikibase\Database\QueryInterface\QueryInterface' );
+
+ $queryInterface-expects( $this-once() )
+ -method( 'delete' )
+ -with(
+ $this-equalTo( 'nyan_entities' ),
+ $this-equalTo(
+ array(
+ 'id' =
$entity-getId()-getSerialization()
+ )
+ )
+ );
+
+ $table = new EntityTable( $queryInterface, 'nyan_entities' );
+
+ $table-removeEntity( $entity );
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/91860
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6687ed00c32aa6b18640f5eb7e2163524dd7c4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQueryEngine
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] prevent false failure like https://wmf.ci.cloudbees.com/job/... - change (qa/browsertests)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/91861 Change subject: prevent false failure like https://wmf.ci.cloudbees.com/job/browsertests-en.wikipedia.beta.wmflabs.org-windows-internet_explorer_9/338/testReport/ .. prevent false failure like https://wmf.ci.cloudbees.com/job/browsertests-en.wikipedia.beta.wmflabs.org-windows-internet_explorer_9/338/testReport/ Change-Id: Ic712fa2f1a79e435cef057aab7384a92ad59075e --- M features/file.feature 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests refs/changes/61/91861/1 diff --git a/features/file.feature b/features/file.feature index 1c7e525..281551b 100644 --- a/features/file.feature +++ b/features/file.feature @@ -20,4 +20,4 @@ Scenario: Logged-in user goes to file that does not exist Given I am logged in And I am at file that does not exist - Then page text should contain No file by this name exists, but you can upload it. + Then page text should contain No file by this name exists -- To view, visit https://gerrit.wikimedia.org/r/91861 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic712fa2f1a79e435cef057aab7384a92ad59075e Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace php_sapi_name() with PHP_SAPI - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Replace php_sapi_name() with PHP_SAPI
..
Replace php_sapi_name() with PHP_SAPI
Change-Id: I222789cacaa2653c4dac62708ce228674c90af4c
---
M includes/filebackend/FileBackend.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Parent5446: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filebackend/FileBackend.php
b/includes/filebackend/FileBackend.php
index f586578..4bcaa7f 100644
--- a/includes/filebackend/FileBackend.php
+++ b/includes/filebackend/FileBackend.php
@@ -807,7 +807,7 @@
* @return ScopedCallback|null
*/
final protected function getScopedPHPBehaviorForOps() {
- if ( php_sapi_name() != 'cli' ) { //
http://bugs.php.net/bug.php?id=47540
+ if ( PHP_SAPI != 'cli' ) { //
http://bugs.php.net/bug.php?id=47540
$old = ignore_user_abort( true ); // avoid
half-finished operations
return new ScopedCallback( function() use ( $old ) {
ignore_user_abort( $old );
--
To view, visit https://gerrit.wikimedia.org/r/91854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I222789cacaa2653c4dac62708ce228674c90af4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Parent5446 tylerro...@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] ruby1.9.3 lint jobs for some repositories - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: ruby1.9.3 lint jobs for some repositories
..
ruby1.9.3 lint jobs for some repositories
Ruby lint should run after every patch set submission for all
repositories that contain Ruby code.
Jobs created:
mwext-CirrusSearch-ruby1.9.3lint
mwext-Flow-ruby1.9.3lint
mwext-Translate-ruby1.9.3lint
mwext-TwnMainPage-ruby1.9.3lint
mwext-VisualEditor-ruby1.9.3lint
mwext-Wikibase-ruby1.9.3lint
Bug: 56156
Change-Id: I59e2fc1a007ba1585cb4bb2647c6104a474597a2
---
M mediawiki-extensions.yaml
1 file changed, 22 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 6dc6c56..00f5f56 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -521,6 +521,11 @@
- '{name}-phpcs-strict-HEAD'
- project:
+name: 'mwext-CirrusSearch'
+jobs:
+ - '{name}-ruby1.9.3lint'
+
+- project:
name: 'mwext-ConfirmEdit'
jobs:
- python-jobs
@@ -534,6 +539,11 @@
name: 'mwext-EventLogging'
jobs:
- python-jobs
+
+- project:
+name: 'mwext-Flow'
+jobs:
+ - '{name}-ruby1.9.3lint'
- project:
name: 'mwext-Interwiki'
@@ -579,6 +589,7 @@
name: 'mwext-Translate'
jobs:
- '{name}-phpcs-strict-HEAD'
+ - '{name}-ruby1.9.3lint'
- project:
name: 'mwext-TranslationNotifications'
@@ -589,6 +600,7 @@
name: 'mwext-TwnMainPage'
jobs:
- '{name}-phpcs-strict-HEAD'
+ - '{name}-ruby1.9.3lint'
- project:
name: 'mwext-UniversalLanguageSelector'
@@ -597,6 +609,16 @@
- '{name}-phpcs-strict-HEAD'
- project:
+name: 'mwext-VisualEditor'
+jobs:
+ - '{name}-ruby1.9.3lint'
+
+- project:
+name: 'mwext-Wikibase'
+jobs:
+ - '{name}-ruby1.9.3lint'
+
+- project:
name: 'mwext-WikimediaMaintenance'
jobs:
- python-jobs
--
To view, visit https://gerrit.wikimedia.org/r/91853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I59e2fc1a007ba1585cb4bb2647c6104a474597a2
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ruby1.9.3 lint jobs for some repositories - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/91862 Change subject: ruby1.9.3 lint jobs for some repositories .. ruby1.9.3 lint jobs for some repositories Triggers: mwext-CirrusSearch-ruby1.9.3lint mwext-Flow-ruby1.9.3lint mwext-Translate-ruby1.9.3lint mwext-TwnMainPage-ruby1.9.3lint mwext-VisualEditor-ruby1.9.3lint mwext-Wikibase-ruby1.9.3lint Bug: 56156 Change-Id: I59e2fc1a007ba1585cb4bb2647c6104a474597a2 --- M layout.yaml 1 file changed, 28 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/62/91862/1 diff --git a/layout.yaml b/layout.yaml index e0f2754..64e88cc 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1192,9 +1192,14 @@ extname: CentralNotice - name: mediawiki/extensions/CirrusSearch -template: - - name: extension-checks -extname: CirrusSearch +check-only: + - mwext-CirrusSearch-jslint + - mwext-CirrusSearch-lint + - mwext-CirrusSearch-ruby1.9.3lint +gate-and-submit: + - mwext-CirrusSearch-jslint + - mwext-CirrusSearch-lint + - mwext-CirrusSearch-ruby1.9.3lint - name: mediawiki/extensions/CleanChanges template: @@ -1461,9 +1466,20 @@ extname: FeaturedFeeds - name: mediawiki/extensions/Flow -template: - - name: extension-unittests -extname: Flow +check: + - mwext-Flow-jslint + - mwext-Flow-lint + - mwext-Flow-ruby1.9.3lint +test: + - mwext-Flow-jslint + - mwext-Flow-lint: + - mwext-Flow-testextensions-master + - mwext-Flow-ruby1.9.3lint +gate-and-submit: + - mwext-Flow-jslint + - mwext-Flow-lint: + - mwext-Flow-testextensions-master + - mwext-Flow-ruby1.9.3lint - name: mediawiki/extensions/FormPreloadPostCache template: @@ -2223,16 +2239,19 @@ - mwext-Translate-phpcs-strict-HEAD # Experiment, bug 48420 - mwext-Translate-jslint - mwext-Translate-lint + - mwext-Translate-ruby1.9.3lint test: - mwext-Translate-phpcs-strict-HEAD # Experiment, bug 48420 - mwext-Translate-jslint - mwext-Translate-lint: - mwext-Translate-testextensions-master + - mwext-Translate-ruby1.9.3lint gate-and-submit: - mwext-Translate-phpcs-strict # Experiment for bug 48420 - mwext-Translate-jslint - mwext-Translate-lint: - mwext-Translate-testextensions-master + - mwext-Translate-ruby1.9.3lint - name: mediawiki/extensions/TranslationNotifications check: @@ -2265,16 +2284,19 @@ - mwext-TwnMainPage-jslint - mwext-TwnMainPage-lint - mwext-TwnMainPage-phpcs-strict-HEAD # Experiment, bug 48420 + - mwext-TwnMainPage-ruby1.9.3lint test: - mwext-TwnMainPage-jslint - mwext-TwnMainPage-phpcs-strict-HEAD # Experiment, bug 48420 - mwext-TwnMainPage-lint: - mwext-TwnMainPage-testextensions-master + - mwext-TwnMainPage-ruby1.9.3lint gate-and-submit: - mwext-TwnMainPage-jslint - mwext-TwnMainPage-phpcs-strict-HEAD # Experiment, bug 48420 - mwext-TwnMainPage-lint: - mwext-TwnMainPage-testextensions-master + - mwext-TwnMainPage-ruby1.9.3lint - name: mediawiki/extensions/UnicodeConverter template: -- To view, visit https://gerrit.wikimedia.org/r/91862 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59e2fc1a007ba1585cb4bb2647c6104a474597a2 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ruby1.9.3 lint jobs for some repositories - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: ruby1.9.3 lint jobs for some repositories .. ruby1.9.3 lint jobs for some repositories Triggers: mwext-CirrusSearch-ruby1.9.3lint mwext-Flow-ruby1.9.3lint mwext-Translate-ruby1.9.3lint mwext-TwnMainPage-ruby1.9.3lint mwext-VisualEditor-ruby1.9.3lint mwext-Wikibase-ruby1.9.3lint Bug: 56156 Change-Id: I59e2fc1a007ba1585cb4bb2647c6104a474597a2 --- M layout.yaml 1 file changed, 28 insertions(+), 6 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index e0f2754..64e88cc 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1192,9 +1192,14 @@ extname: CentralNotice - name: mediawiki/extensions/CirrusSearch -template: - - name: extension-checks -extname: CirrusSearch +check-only: + - mwext-CirrusSearch-jslint + - mwext-CirrusSearch-lint + - mwext-CirrusSearch-ruby1.9.3lint +gate-and-submit: + - mwext-CirrusSearch-jslint + - mwext-CirrusSearch-lint + - mwext-CirrusSearch-ruby1.9.3lint - name: mediawiki/extensions/CleanChanges template: @@ -1461,9 +1466,20 @@ extname: FeaturedFeeds - name: mediawiki/extensions/Flow -template: - - name: extension-unittests -extname: Flow +check: + - mwext-Flow-jslint + - mwext-Flow-lint + - mwext-Flow-ruby1.9.3lint +test: + - mwext-Flow-jslint + - mwext-Flow-lint: + - mwext-Flow-testextensions-master + - mwext-Flow-ruby1.9.3lint +gate-and-submit: + - mwext-Flow-jslint + - mwext-Flow-lint: + - mwext-Flow-testextensions-master + - mwext-Flow-ruby1.9.3lint - name: mediawiki/extensions/FormPreloadPostCache template: @@ -2223,16 +2239,19 @@ - mwext-Translate-phpcs-strict-HEAD # Experiment, bug 48420 - mwext-Translate-jslint - mwext-Translate-lint + - mwext-Translate-ruby1.9.3lint test: - mwext-Translate-phpcs-strict-HEAD # Experiment, bug 48420 - mwext-Translate-jslint - mwext-Translate-lint: - mwext-Translate-testextensions-master + - mwext-Translate-ruby1.9.3lint gate-and-submit: - mwext-Translate-phpcs-strict # Experiment for bug 48420 - mwext-Translate-jslint - mwext-Translate-lint: - mwext-Translate-testextensions-master + - mwext-Translate-ruby1.9.3lint - name: mediawiki/extensions/TranslationNotifications check: @@ -2265,16 +2284,19 @@ - mwext-TwnMainPage-jslint - mwext-TwnMainPage-lint - mwext-TwnMainPage-phpcs-strict-HEAD # Experiment, bug 48420 + - mwext-TwnMainPage-ruby1.9.3lint test: - mwext-TwnMainPage-jslint - mwext-TwnMainPage-phpcs-strict-HEAD # Experiment, bug 48420 - mwext-TwnMainPage-lint: - mwext-TwnMainPage-testextensions-master + - mwext-TwnMainPage-ruby1.9.3lint gate-and-submit: - mwext-TwnMainPage-jslint - mwext-TwnMainPage-phpcs-strict-HEAD # Experiment, bug 48420 - mwext-TwnMainPage-lint: - mwext-TwnMainPage-testextensions-master + - mwext-TwnMainPage-ruby1.9.3lint - name: mediawiki/extensions/UnicodeConverter template: -- To view, visit https://gerrit.wikimedia.org/r/91862 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59e2fc1a007ba1585cb4bb2647c6104a474597a2 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use Varnish by default for role::cache::text - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91863
Change subject: Use Varnish by default for role::cache::text
..
Use Varnish by default for role::cache::text
Change-Id: I6682db7f9ec62a89c19148bef899a009e2b609c9
---
M manifests/role/cache.pp
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/63/91863/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 44d8fb9..f29131c 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -839,19 +839,19 @@
}
class text {
-
+ # FIXME: remove this hack
include lvs::configuration
class { 'lvs::realserver':
realserver_ips =
flatten([$lvs::configuration::lvs_service_ips[$::realm]['text'][$::site],
$lvs::configuration::lvs_service_ips[$::realm]['text-varnish'][$::site]])
}
- if ($::hostname in ['cp1037', 'cp1038', 'cp1039', 'cp1040'] or
$::hostname =~ /^cp10(5[2-5]|6[5-8])$/ or $::hostname =~
/^amssq(4[7-9]|[56][0-9])$/) or ($::realm == labs and $::hostname =~
/^deployment-cache-text/) {
- # Varnish
- include role::cache::varnish::text
+ if ($::hostname =~ /^sq[0-9][0-9]$/ or $::hostname =~
/^cp10([01][0-9]|20)$/ or $::hostname =~ /^amssq(3[1-9]|4[0-6])$/) {
+ class { role::cache::squid::common: role = text }
}
else {
- class { role::cache::squid::common: role = text }
+ # Varnish
+ include role::cache::varnish::text
}
}
--
To view, visit https://gerrit.wikimedia.org/r/91863
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6682db7f9ec62a89c19148bef899a009e2b609c9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add ulsfo text caches - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91864
Change subject: Add ulsfo text caches
..
Add ulsfo text caches
Change-Id: I2bc9f308ec67640c74f697244a5db6df4ef98f00
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 19 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/91864/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index f29131c..b44d5a2 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -5,6 +5,7 @@
@monitor_group { cache_text_pmtpa: description = text squids pmtpa }
@monitor_group { cache_text_eqiad: description = text squids eqiad }
@monitor_group { cache_text_esams: description = text squids esams }
+@monitor_group { cache_text_ulsfo: description = ulsfo text Varnish }
@monitor_group { cache_upload_pmtpa: description = upload squids pmtpa }
@monitor_group { cache_upload_eqiad: description = eqiad upload Varnish }
@@ -126,6 +127,14 @@
'amssq60.esams.wikimedia.org',
'amssq61.esams.wikimedia.org',
'amssq62.esams.wikimedia.org',
+ ],
+ 'ulsfo' = [
+ 'cp4008.ulsfo.wmnet',
+ 'cp4009.ulsfo.wmnet',
+ 'cp4010.ulsfo.wmnet',
+ 'cp4016.ulsfo.wmnet',
+ 'cp4017.ulsfo.wmnet',
+ 'cp4018.ulsfo.wmnet',
]
},
api = {
diff --git a/manifests/site.pp b/manifests/site.pp
index 2013414..e5713d2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -468,6 +468,16 @@
include role::cache::upload, role::cache::ssl::unified
}
+node /^cp40(0[89]|1[0678])\.ulsfo\.wmnet$/ {
+if $::hostname =~ /^cp(4008|4016)$/ {
+$ganglia_aggregator = true
+}
+
+interface::add_ip6_mapped { main: }
+
+include role::cache::text, role::cache::ssl::unified
+}
+
node /^cp40(1[129]|20)\.ulsfo\.wmnet$/ {
if $::hostname =~ /^cp401[19]$/ {
$ganglia_aggregator = true
--
To view, visit https://gerrit.wikimedia.org/r/91864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bc9f308ec67640c74f697244a5db6df4ef98f00
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use Varnish by default for role::cache::text - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Use Varnish by default for role::cache::text
..
Use Varnish by default for role::cache::text
Change-Id: I6682db7f9ec62a89c19148bef899a009e2b609c9
---
M manifests/role/cache.pp
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 44d8fb9..f29131c 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -839,19 +839,19 @@
}
class text {
-
+ # FIXME: remove this hack
include lvs::configuration
class { 'lvs::realserver':
realserver_ips =
flatten([$lvs::configuration::lvs_service_ips[$::realm]['text'][$::site],
$lvs::configuration::lvs_service_ips[$::realm]['text-varnish'][$::site]])
}
- if ($::hostname in ['cp1037', 'cp1038', 'cp1039', 'cp1040'] or
$::hostname =~ /^cp10(5[2-5]|6[5-8])$/ or $::hostname =~
/^amssq(4[7-9]|[56][0-9])$/) or ($::realm == labs and $::hostname =~
/^deployment-cache-text/) {
- # Varnish
- include role::cache::varnish::text
+ if ($::hostname =~ /^sq[0-9][0-9]$/ or $::hostname =~
/^cp10([01][0-9]|20)$/ or $::hostname =~ /^amssq(3[1-9]|4[0-6])$/) {
+ class { role::cache::squid::common: role = text }
}
else {
- class { role::cache::squid::common: role = text }
+ # Varnish
+ include role::cache::varnish::text
}
}
--
To view, visit https://gerrit.wikimedia.org/r/91863
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6682db7f9ec62a89c19148bef899a009e2b609c9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] trigger rubylint for VisualEditor and Wikibase - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/91867 Change subject: trigger rubylint for VisualEditor and Wikibase .. trigger rubylint for VisualEditor and Wikibase bug: 56156 Change-Id: I04f2546fb5e2e2ea21775b4afc34177207521fb3 --- M layout.yaml 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/67/91867/1 diff --git a/layout.yaml b/layout.yaml index 64e88cc..664e46b 100644 --- a/layout.yaml +++ b/layout.yaml @@ -2391,18 +2391,21 @@ - mwext-VisualEditor-jslint - mwext-VisualEditor-phpcs-HEAD - mwext-VisualEditor-lint + - mwext-VisualEditor-ruby1.9.3lint test: - mwext-VisualEditor-jslint - mwext-VisualEditor-phpcs-HEAD - mwext-VisualEditor-lint - mwext-VisualEditor-doc-test - mwext-VisualEditor-qunit + - mwext-VisualEditor-ruby1.9.3lint gate-and-submit: - mwext-VisualEditor-jslint - mwext-VisualEditor-phpcs-HEAD - mwext-VisualEditor-lint - mwext-VisualEditor-doc-test - mwext-VisualEditor-qunit + - mwext-VisualEditor-ruby1.9.3lint postmerge: - mwext-VisualEditor-doc-publish @@ -2434,9 +2437,11 @@ - name: mediawiki/extensions/Wikibase check: - mwext-Wikibase-jslint + - mwext-Wikibase-ruby1.9.3lint - mwext-Wikibase-lint test: - mwext-Wikibase-jslint + - mwext-Wikibase-ruby1.9.3lint - mwext-Wikibase-lint: # testextensions is a bit too slow. We want to give feedback in Gerrit as # quick as possible. The test is run on gate-and-submit below anyway. @@ -2447,6 +2452,7 @@ - mwext-Wikibase-qunit gate-and-submit: - mwext-Wikibase-jslint + - mwext-Wikibase-ruby1.9.3lint - mwext-Wikibase-lint: # Same as test but with the slow testextensions job. - mwext-Wikibase-testextensions-master -- To view, visit https://gerrit.wikimedia.org/r/91867 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04f2546fb5e2e2ea21775b4afc34177207521fb3 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] trigger rubylint for VisualEditor and Wikibase - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: trigger rubylint for VisualEditor and Wikibase .. trigger rubylint for VisualEditor and Wikibase bug: 56156 Change-Id: I04f2546fb5e2e2ea21775b4afc34177207521fb3 --- M layout.yaml 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 64e88cc..664e46b 100644 --- a/layout.yaml +++ b/layout.yaml @@ -2391,18 +2391,21 @@ - mwext-VisualEditor-jslint - mwext-VisualEditor-phpcs-HEAD - mwext-VisualEditor-lint + - mwext-VisualEditor-ruby1.9.3lint test: - mwext-VisualEditor-jslint - mwext-VisualEditor-phpcs-HEAD - mwext-VisualEditor-lint - mwext-VisualEditor-doc-test - mwext-VisualEditor-qunit + - mwext-VisualEditor-ruby1.9.3lint gate-and-submit: - mwext-VisualEditor-jslint - mwext-VisualEditor-phpcs-HEAD - mwext-VisualEditor-lint - mwext-VisualEditor-doc-test - mwext-VisualEditor-qunit + - mwext-VisualEditor-ruby1.9.3lint postmerge: - mwext-VisualEditor-doc-publish @@ -2434,9 +2437,11 @@ - name: mediawiki/extensions/Wikibase check: - mwext-Wikibase-jslint + - mwext-Wikibase-ruby1.9.3lint - mwext-Wikibase-lint test: - mwext-Wikibase-jslint + - mwext-Wikibase-ruby1.9.3lint - mwext-Wikibase-lint: # testextensions is a bit too slow. We want to give feedback in Gerrit as # quick as possible. The test is run on gate-and-submit below anyway. @@ -2447,6 +2452,7 @@ - mwext-Wikibase-qunit gate-and-submit: - mwext-Wikibase-jslint + - mwext-Wikibase-ruby1.9.3lint - mwext-Wikibase-lint: # Same as test but with the slow testextensions job. - mwext-Wikibase-testextensions-master -- To view, visit https://gerrit.wikimedia.org/r/91867 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I04f2546fb5e2e2ea21775b4afc34177207521fb3 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gitmodules: Consistently use .git in the urls - change (integration/jenkins)
jenkins-bot has submitted this change and it was merged. Change subject: gitmodules: Consistently use .git in the urls .. gitmodules: Consistently use .git in the urls Some did, some didn't. Change-Id: I62474396ef7333f7630a6b78a4e95e44c8b5cdeb --- M .gitmodules 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitmodules b/.gitmodules index 9118e0b..25b9a87 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,18 +1,18 @@ [submodule tools/testswarm] path = tools/testswarm - url = https://gerrit.wikimedia.org/r/p/integration/testswarm + url = https://gerrit.wikimedia.org/r/p/integration/testswarm.git [submodule tools/gruntjs] path = tools/gruntjs url = https://gerrit.wikimedia.org/r/p/integration/gruntjs.git [submodule tools/mwcodesniffer] path = tools/mwcodesniffer - url = https://gerrit.wikimedia.org/r/p/mediawiki/tools/codesniffer + url = https://gerrit.wikimedia.org/r/p/mediawiki/tools/codesniffer.git [submodule tools/junitdiff] path = tools/junitdiff - url = https://gerrit.wikimedia.org/r/p/integration/junitdiff + url = https://gerrit.wikimedia.org/r/p/integration/junitdiff.git [submodule tools/mwcodeutils] path = tools/mwcodeutils url = https://gerrit.wikimedia.org/r/p/mediawiki/tools/code-utils.git [submodule tools/bundler] path = tools/bundler - url = https://gerrit.wikimedia.org/r/p/integration/bundler + url = https://gerrit.wikimedia.org/r/p/integration/bundler.git -- To view, visit https://gerrit.wikimedia.org/r/91647 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I62474396ef7333f7630a6b78a4e95e44c8b5cdeb Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove obsolete testswarm submodule and ant task - change (integration/jenkins)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove obsolete testswarm submodule and ant task
..
Remove obsolete testswarm submodule and ant task
Change-Id: I725a7bcc9fb29a6dabd3e7f2a9f50127030c3cf5
---
M .gitmodules
M jobs/_shared/build.xml
M jobs/_shared/default.properties
D tools/testswarm
4 files changed, 0 insertions(+), 130 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitmodules b/.gitmodules
index 25b9a87..946bf66 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule tools/testswarm]
- path = tools/testswarm
- url = https://gerrit.wikimedia.org/r/p/integration/testswarm.git
[submodule tools/gruntjs]
path = tools/gruntjs
url = https://gerrit.wikimedia.org/r/p/integration/gruntjs.git
diff --git a/jobs/_shared/build.xml b/jobs/_shared/build.xml
index 7380ad2..33705f6 100644
--- a/jobs/_shared/build.xml
+++ b/jobs/_shared/build.xml
@@ -319,119 +319,6 @@
echoproperties prefix=gerrit. /
/target
- !-- Takes a copy of a MediaWiki install --
- target name=testswarm-snapshot depends=-import-gerrit-env,install
- fail
- condition
- notand
- isset property=gerrit.change.number /
- isset property=gerrit.patchset.number /
- isset property=gerrit.branch /
- /and/not
- /condition
- This ant target requires both GERRIT_CHANGE_NUMBER and
GERRIT_PATCHSET_NUMBER environnement variables to be set or at least their ant
equivalents `gerrit.change.number` and `gerrit.patchset.number`.
- /fail
-
- !-- some testswarm specific properties depending on gerrit
context --
- property
- name=changePath
-
value=${gerrit.change.number}/${gerrit.patchset.number} /
- property
- name=testswarm.publicdir
- value=${testswarm.basedir}/clone/${changePath} /
- property
- name=testswarm.sqlite.dir
- value=${testswarm.basedir}/db/${changePath} /
- property
- name=testswarm.sqlite.file
- value=${testswarm.sqlite.dir}/my_wiki.sqlite /
- !-- Dump properties defined just above: --
- echoproperties prefix=testswarm. /
-
- !-- create various directories --
- mkdir dir=${testswarm.sqlite.dir} /
- mkdir dir=${testswarm.publicdir} /
-!--
- mkdir dir=${testswarm.basedir}/conf /
- mkdir dir=${testswarm.basedir}/log /
---
- !-- apply sane permissions to files in the base directory --
- chmod perm=2775
- dirset dir=${testswarm.basedir}
- include name=* /
- /dirset
- /chmod
- !-- the `db` path need to be in the www-data group. That is
done by puppet --
-
- !-- Snapshot the sqlite database --
- echoCopying sqlite database/echo
- copy
- file=${sqlite.dir.forjob}/my_wiki.sqlite
- tofile=${testswarm.sqlite.file}
- /
- !-- Both sqlite file and directory need to be writable by
apache --
- !-- FIXME!! www-data should be enforced by g+s already :-( --
- chmod perm=go+w dir=${testswarm.sqlite.dir} /
- chmod perm=go+w file=${testswarm.sqlite.file} /
-
- !-- Snapshot MediaWiki files --
- !-- FIXME: this should most probably uses `git clone` --
- echoPublishing MediaWiki files/echo
- copy todir=${testswarm.publicdir}
- fileset dir=${sourcedir}
- exclude name=**/.git/ /
- /fileset
- /copy
-
- echoCopying LocalSettings.php/echo
- copy
- file=${builddir}/LocalSettings.php
- todir=${testswarm.publicdir}
- /
- echoCopying ExtraSettings.php/echo
- copy
- file=${basedir}/ExtraSettings.php
- todir=${testswarm.publicdir}
- /
-
- echoTweaking configuration/echo
- !-- TODO actually copy the ExtraSettings file --
-
- !-- Property containing the URL path --
- property name=testswarm.URL.path
- value=${testswarm.URL.basepath}/${changePath} /
-
- replace
[MediaWiki-commits] [Gerrit] a minor fix for djvutext.py - change (pywikibot/compat)
Ladsgroup has uploaded a new change for review. https://gerrit.wikimedia.org/r/91868 Change subject: a minor fix for djvutext.py .. a minor fix for djvutext.py Bug: 55290 Change-Id: I6cb545c93261a4d678be4f0c9873620808453c6b --- M djvutext.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat refs/changes/68/91868/1 diff --git a/djvutext.py b/djvutext.py index 526518c..938d06f 100644 --- a/djvutext.py +++ b/djvutext.py @@ -105,7 +105,7 @@ def get_page(self, pageno): pywikibot.output(unicode(fetching page %d % (pageno))) -cmd = udjvutxt --page=%d \%s\ \%s.out\ \ +cmd = udjvutxt --page %d \%s\ \%s.out\ \ % (pageno, self.djvu, self.djvu) os.system ( cmd.encode(sys.stdout.encoding) ) f = codecs.open(u%s.out % self.djvu, 'r', -- To view, visit https://gerrit.wikimedia.org/r/91868 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6cb545c93261a4d678be4f0c9873620808453c6b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Ladsgroup ladsgr...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] prevent false failure like https://wmf.ci.cloudbees.com/job/... - change (qa/browsertests)
Zfilipin has submitted this change and it was merged. Change subject: prevent false failure like https://wmf.ci.cloudbees.com/job/browsertests-en.wikipedia.beta.wmflabs.org-windows-internet_explorer_9/338/testReport/ .. prevent false failure like https://wmf.ci.cloudbees.com/job/browsertests-en.wikipedia.beta.wmflabs.org-windows-internet_explorer_9/338/testReport/ Change-Id: Ic712fa2f1a79e435cef057aab7384a92ad59075e --- M features/file.feature 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/features/file.feature b/features/file.feature index 1c7e525..281551b 100644 --- a/features/file.feature +++ b/features/file.feature @@ -20,4 +20,4 @@ Scenario: Logged-in user goes to file that does not exist Given I am logged in And I am at file that does not exist - Then page text should contain No file by this name exists, but you can upload it. + Then page text should contain No file by this name exists -- To view, visit https://gerrit.wikimedia.org/r/91861 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic712fa2f1a79e435cef057aab7384a92ad59075e Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [Multimedia Viewer] Add optional message key - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [Multimedia Viewer] Add optional message key .. [Multimedia Viewer] Add optional message key https://gerrit.wikimedia.org/r/#/c/89128/13/MultimediaViewer.i18n.php,unified Change-Id: I9465d45e2187df10c0846a9457161504aaa13d2f --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 52067c6..4dbf67a 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -872,6 +872,7 @@ Multi Maps Multimedia Viewer +optional = multimediaviewer-credit MwEmbed Support descmsg = mwembed-desc -- To view, visit https://gerrit.wikimedia.org/r/91869 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9465d45e2187df10c0846a9457161504aaa13d2f Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@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] [Multimedia Viewer] Add optional message key - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/91869 Change subject: [Multimedia Viewer] Add optional message key .. [Multimedia Viewer] Add optional message key https://gerrit.wikimedia.org/r/#/c/89128/13/MultimediaViewer.i18n.php,unified Change-Id: I9465d45e2187df10c0846a9457161504aaa13d2f --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/69/91869/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 52067c6..4dbf67a 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -872,6 +872,7 @@ Multi Maps Multimedia Viewer +optional = multimediaviewer-credit MwEmbed Support descmsg = mwembed-desc -- To view, visit https://gerrit.wikimedia.org/r/91869 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9465d45e2187df10c0846a9457161504aaa13d2f Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add ulsfo text caches - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Add ulsfo text caches
..
Add ulsfo text caches
Change-Id: I2bc9f308ec67640c74f697244a5db6df4ef98f00
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 19 insertions(+), 0 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index f29131c..b44d5a2 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -5,6 +5,7 @@
@monitor_group { cache_text_pmtpa: description = text squids pmtpa }
@monitor_group { cache_text_eqiad: description = text squids eqiad }
@monitor_group { cache_text_esams: description = text squids esams }
+@monitor_group { cache_text_ulsfo: description = ulsfo text Varnish }
@monitor_group { cache_upload_pmtpa: description = upload squids pmtpa }
@monitor_group { cache_upload_eqiad: description = eqiad upload Varnish }
@@ -126,6 +127,14 @@
'amssq60.esams.wikimedia.org',
'amssq61.esams.wikimedia.org',
'amssq62.esams.wikimedia.org',
+ ],
+ 'ulsfo' = [
+ 'cp4008.ulsfo.wmnet',
+ 'cp4009.ulsfo.wmnet',
+ 'cp4010.ulsfo.wmnet',
+ 'cp4016.ulsfo.wmnet',
+ 'cp4017.ulsfo.wmnet',
+ 'cp4018.ulsfo.wmnet',
]
},
api = {
diff --git a/manifests/site.pp b/manifests/site.pp
index 2013414..e5713d2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -468,6 +468,16 @@
include role::cache::upload, role::cache::ssl::unified
}
+node /^cp40(0[89]|1[0678])\.ulsfo\.wmnet$/ {
+if $::hostname =~ /^cp(4008|4016)$/ {
+$ganglia_aggregator = true
+}
+
+interface::add_ip6_mapped { main: }
+
+include role::cache::text, role::cache::ssl::unified
+}
+
node /^cp40(1[129]|20)\.ulsfo\.wmnet$/ {
if $::hostname =~ /^cp401[19]$/ {
$ganglia_aggregator = true
--
To view, visit https://gerrit.wikimedia.org/r/91864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2bc9f308ec67640c74f697244a5db6df4ef98f00
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve high level interfaces and intialization of the SQLStore - change (mediawiki...WikibaseQueryEngine)
Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91870
Change subject: Improve high level interfaces and intialization of the SQLStore
..
Improve high level interfaces and intialization of the SQLStore
Change-Id: Ia403b652f350733ff646f94688279de1eb67166a
---
D src/QueryEngineResult.php
D src/QueryResult.php
D src/QueryStore.php
A src/QueryStoreInstaller.php
D src/QueryStoreSetup.php
A src/QueryStoreUninstaller.php
A src/QueryStoreUpdater.php
A src/QueryStoreWithDependencies.php
M src/SQLStore/DVHandler/EntityIdHandler.php
A src/SQLStore/SQLStore.php
A src/SQLStore/SQLStoreWithDependencies.php
M src/SQLStore/Setup/Installer.php
D src/SQLStore/Setup/Setup.php
M src/SQLStore/Setup/Uninstaller.php
M src/SQLStore/Setup/Updater.php
D src/SQLStore/Store.php
M tests/Integration/SQLStore/Engine/DescriptionMatchFinderIntegrationTest.php
M tests/Integration/SQLStore/IntegrationStoreBuilder.php
M tests/Integration/SQLStore/WritingIntegrationTest.php
R tests/Phpunit/SQLStore/SQLStoreTest.php
D tests/Phpunit/SQLStore/Setup/SetupTest.php
21 files changed, 407 insertions(+), 596 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQueryEngine
refs/changes/70/91870/1
diff --git a/src/QueryEngineResult.php b/src/QueryEngineResult.php
deleted file mode 100644
index 1f5a51b..000
--- a/src/QueryEngineResult.php
+++ /dev/null
@@ -1,28 +0,0 @@
-?php
-
-namespace Wikibase\QueryEngine;
-
-/**
- * Result of running a query against the query engine.
- *
- * @since 0.1
- *
- * @file
- * @ingroup WikibaseQueryStore
- *
- * @licence GNU GPL v2+
- * @author Jeroen De Dauw jeroended...@gmail.com
- */
-class QueryEngineResult {
-
- /**
-* @since 0.1
-*
-* @return QueryResult
-*/
- public function getQueryResult() {
- // TODO
- return new QueryResult();
- }
-
-}
\ No newline at end of file
diff --git a/src/QueryResult.php b/src/QueryResult.php
deleted file mode 100644
index 9e57edc..000
--- a/src/QueryResult.php
+++ /dev/null
@@ -1,9 +0,0 @@
-?php
-
-namespace Wikibase\QueryEngine;
-
-class QueryResult {
- // TODO: this is a temporary stub
- // * some preliminary query result code in other git repo
- // * still need to figure out where to put it
-}
\ No newline at end of file
diff --git a/src/QueryStore.php b/src/QueryStore.php
deleted file mode 100644
index f03162f..000
--- a/src/QueryStore.php
+++ /dev/null
@@ -1,67 +0,0 @@
-?php
-
-namespace Wikibase\QueryEngine;
-
-/**
- * Interface for query stores providing access to all needed sub components
- * such as updaters, query engines and setup/teardown operations.
- *
- * This interface somewhat acts as facade to the query component.
- * All access to a specific store should typically happen via this interface.
- *
- * @since 0.1
- *
- * @file
- * @ingroup WikibaseQueryStore
- *
- * @licence GNU GPL v2+
- * @author Jeroen De Dauw jeroended...@gmail.com
- */
-interface QueryStore {
-
- // TODO: create store factory and figure out how to inject dependencies
- // for the typical Wikibase repo use case.
-
- /**
-* Returns the name of the query store. This name can be configuration
dependent
-* and is thus not always the same for a certain store type. For
instance, you can
-* have Wikibase SQL store and Wikibase SQL store for update to new
config.
-*
-* @since 0.1
-*
-* @return string
-*/
- public function getName();
-
- /**
-* Returns the query engine for this store.
-* The query engine allows running queries against the store.
-*
-* @since 0.1
-*
-* @return QueryEngine
-*/
- public function getQueryEngine();
-
- /**
-* Returns the updater for this store.
-* The updater allows for updating the data in the store.
-*
-* @since 0.1
-*
-* @return QueryStoreWriter
-*/
- public function getWriter();
-
- /**
-* Sets up the store.
-* This means creating and initializing the storage structures
-* required for storing data in the store.
-*
-* @since 0.1
-*
-* @return QueryStoreSetup
-*/
- public function newSetup();
-
-}
diff --git a/src/QueryStoreInstaller.php b/src/QueryStoreInstaller.php
new file mode 100644
index 000..93579da
--- /dev/null
+++ b/src/QueryStoreInstaller.php
@@ -0,0 +1,15 @@
+?php
+
+namespace Wikibase\QueryEngine;
+
+/**
+ * @since 0.1
+ *
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw jeroended...@gmail.com
+ */
+interface QueryStoreInstaller {
+
+ public function install();
+
+}
diff --git a/src/QueryStoreSetup.php b/src/QueryStoreSetup.php
deleted file mode 100644
index 8258541..000
---
[MediaWiki-commits] [Gerrit] Moving shared code to mediawiki-selenium Ruby gem - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Moving shared code to mediawiki-selenium Ruby gem
..
Moving shared code to mediawiki-selenium Ruby gem
Bug: 53579
Change-Id: I0dcc7d7c91ceabb30e9161238592ddacd666deaa
---
D tests/browser/.gitignore
M tests/browser/Gemfile
A tests/browser/Gemfile.lock
M tests/browser/config/config.yml
M tests/browser/features/support/env.rb
R tests/browser/features/support/hooks.rb
D tests/browser/features/support/sauce.rb
7 files changed, 64 insertions(+), 155 deletions(-)
Approvals:
Cmcmahon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/.gitignore b/tests/browser/.gitignore
deleted file mode 100644
index f24ff04..000
--- a/tests/browser/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Gemfile.lock
-reports/
-config/secret.yml
diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index c3e155e..f2f3136 100644
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -3,9 +3,4 @@
source 'https://rubygems.org'
-gem 'cucumber'
-gem 'json'
-gem 'net-http-persistent'
-gem 'page-object'
-gem 'rspec-expectations'
-gem 'syntax'
+gem 'mediawiki-selenium'
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
new file mode 100644
index 000..a9a7aaa
--- /dev/null
+++ b/tests/browser/Gemfile.lock
@@ -0,0 +1,62 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+builder (3.2.2)
+childprocess (0.3.9)
+ ffi (~ 1.0, = 1.0.11)
+cucumber (1.3.8)
+ builder (= 2.1.2)
+ diff-lcs (= 1.1.3)
+ gherkin (~ 2.12.1)
+ multi_json (= 1.7.5, 2.0)
+ multi_test (= 0.0.2)
+data_magic (0.16.1)
+ faker (= 1.1.2)
+ yml_reader (= 0.2)
+diff-lcs (1.2.4)
+faker (1.2.0)
+ i18n (~ 0.5)
+ffi (1.9.0)
+gherkin (2.12.2)
+ multi_json (~ 1.3)
+i18n (0.6.5)
+json (1.8.1)
+mediawiki-selenium (0.1.10)
+ cucumber
+ json
+ net-http-persistent
+ page-object
+ rest-client
+ rspec-expectations
+ syntax
+mime-types (1.25)
+multi_json (1.8.2)
+multi_test (0.0.2)
+net-http-persistent (2.9)
+page-object (0.9.3)
+ page_navigation (= 0.8)
+ selenium-webdriver (= 2.37.0)
+ watir-webdriver (= 0.6.4)
+page_navigation (0.9)
+ data_magic (= 0.14)
+rest-client (1.6.7)
+ mime-types (= 1.16)
+rspec-expectations (2.14.3)
+ diff-lcs (= 1.1.3, 2.0)
+rubyzip (1.0.0)
+selenium-webdriver (2.37.0)
+ childprocess (= 0.2.5)
+ multi_json (~ 1.0)
+ rubyzip (~ 1.0.0)
+ websocket (~ 1.0.4)
+syntax (1.0.0)
+watir-webdriver (0.6.4)
+ selenium-webdriver (= 2.18.0)
+websocket (1.0.7)
+yml_reader (0.2)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ mediawiki-selenium
diff --git a/tests/browser/config/config.yml b/tests/browser/config/config.yml
index c84790a..02ed528 100644
--- a/tests/browser/config/config.yml
+++ b/tests/browser/config/config.yml
@@ -1,6 +1,3 @@
-mediawiki_username: Selenium_user
-mediawiki_password: selenium123
-
chrome:
name: chrome
platform: Linux
diff --git a/tests/browser/features/support/env.rb
b/tests/browser/features/support/env.rb
index 4b4feb1..2281d94 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -1,133 +1 @@
-# before all
-require 'bundler/setup'
-require 'page-object'
-require 'page-object/page_factory'
-require 'watir-webdriver'
-require 'yaml'
-
-World(PageObject::PageFactory)
-
-def browser(environment, test_name, saucelabs_username, saucelabs_key,
language)
- if environment == :cloudbees
-sauce_browser(test_name, saucelabs_username, saucelabs_key, language)
- else
-local_browser(language)
- end
-end
-def environment
- if ENV['ENVIRONMENT'] == 'cloudbees'
-:cloudbees
- else
-:local
- end
-end
-def local_browser(language)
- if ENV['BROWSER_LABEL']
-browser_label = ENV['BROWSER_LABEL'].to_sym
- else
-browser_label = :firefox
- end
-
- if language == 'default'
-Watir::Browser.new browser_label
- else
-if browser_label == :firefox
- profile = Selenium::WebDriver::Firefox::Profile.new
-elsif browser_label == :chrome
- profile = Selenium::WebDriver::Chrome::Profile.new
-else
- raise Changing default language is currently supported only for Firefox
and Chrome!
-end
-profile['intl.accept_languages'] = language
-Watir::Browser.new browser_label, :profile = profile
- end
-end
-def sauce_api(json, saucelabs_username, saucelabs_key)
- %x{curl -H 'Content-Type:text/json' -s -X PUT -d '#{json}'
http://#{saucelabs_username}:#{saucelabs_key}@saucelabs.com/rest/v1/#{saucelabs_username}/jobs/#{$session_id}}
-end
-def sauce_browser(test_name, saucelabs_username, saucelabs_key, language)
- config = YAML.load_file('config/config.yml')
- browser_label = config[ENV['BROWSER_LABEL']]
-
- if language == 'default'
-
[MediaWiki-commits] [Gerrit] minor and important fix of webbrowser - change (pywikibot/core)
Ladsgroup has uploaded a new change for review. https://gerrit.wikimedia.org/r/91871 Change subject: minor and important fix of webbrowser .. minor and important fix of webbrowser When system wants a cpatcha, you need to import webbrowser in order to be able to open it! Change-Id: I875217b03d9a9dc47d4a5bdc20ea9f10cc26d223 --- M pywikibot/site.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/71/91871/1 diff --git a/pywikibot/site.py b/pywikibot/site.py index e203f0b..13f0cd5 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2773,6 +2773,7 @@ req['captchaword'] = input(captcha[question]) continue elif url in captcha: +import webbrowser webbrowser.open(captcha[url]) req['captchaword'] = cap_answerwikipedia.input( Please view CAPTCHA in your browser, then type answer here:) -- To view, visit https://gerrit.wikimedia.org/r/91871 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I875217b03d9a9dc47d4a5bdc20ea9f10cc26d223 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup ladsgr...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Distinguish redactions from the string REDACTED in formatR... - change (mediawiki/core)
Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91872
Change subject: Distinguish redactions from the string REDACTED in
formatRedactedTrace
..
Distinguish redactions from the string REDACTED in formatRedactedTrace
In the output of MWExceptionHandler::formatRedactedTrace, it is not
possible to determine (without checking the configuration) whether arg 0
in foo('REDACTED') was redacted or was merely passed the string
REDACTED.
This patch changes redaction to instead output foo(REDACTED) in the
case of redaction. This parallels the situation with arrays and objects,
where for example foo(Array) was passed an array while foo('Array')
was passed the string Array.
Change-Id: Ia2a761687c69b630afa3ccd8668b06b28e3ecdd3
---
M includes/Exception.php
1 file changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/72/91872/1
diff --git a/includes/Exception.php b/includes/Exception.php
index fba857f..756e367 100644
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -686,6 +686,9 @@
global $wgRedactedFunctionArguments;
$finalExceptionText = '';
+ // Unique value to indicate redacted parameters
+ $REDACTED = new stdclass();
+
foreach ( $e-getTrace() as $i = $call ) {
$checkFor = array();
if ( isset( $call['class'] ) ) {
@@ -700,7 +703,7 @@
foreach ( $checkFor as $check ) {
if ( isset(
$wgRedactedFunctionArguments[$check] ) ) {
foreach (
(array)$wgRedactedFunctionArguments[$check] as $argNo ) {
- $call['args'][$argNo] =
'REDACTED';
+ $call['args'][$argNo] =
$REDACTED;
}
}
}
@@ -722,7 +725,9 @@
$args = array();
if ( isset( $call['args'] ) ) {
foreach ( $call['args'] as $arg ) {
- if ( is_object( $arg ) ) {
+ if ( $arg === $REDACTED ) {
+ $args[] = 'REDACTED';
+ } elseif ( is_object( $arg ) ) {
$args[] = 'Object(' .
get_class( $arg ) . ')';
} elseif( is_array( $arg ) ) {
$args[] = 'Array';
--
To view, visit https://gerrit.wikimedia.org/r/91872
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2a761687c69b630afa3ccd8668b06b28e3ecdd3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] minor and important fix of webbrowser - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: minor and important fix of webbrowser .. minor and important fix of webbrowser When system wants a cpatcha, you need to import webbrowser in order to be able to open it! Change-Id: I875217b03d9a9dc47d4a5bdc20ea9f10cc26d223 --- M pywikibot/site.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index e203f0b..13f0cd5 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2773,6 +2773,7 @@ req['captchaword'] = input(captcha[question]) continue elif url in captcha: +import webbrowser webbrowser.open(captcha[url]) req['captchaword'] = cap_answerwikipedia.input( Please view CAPTCHA in your browser, then type answer here:) -- To view, visit https://gerrit.wikimedia.org/r/91871 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I875217b03d9a9dc47d4a5bdc20ea9f10cc26d223 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@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] Preventing joining cursive script character across HTML elem... - change (mediawiki...LiquidThreads)
jenkins-bot has submitted this change and it was merged.
Change subject: Preventing joining cursive script character across HTML elements
..
Preventing joining cursive script character across HTML elements
Change-Id: Iedb86273f7a83515bad87698ea6699622ed4dd8a
---
M lqt.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Amire80: Looks good to me, but someone else must approve
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lqt.js b/lqt.js
index 0f460fe..add73dd 100644
--- a/lqt.js
+++ b/lqt.js
@@ -386,7 +386,8 @@
editSubjectField.addClass( 'lqt-command-edit-subject' );
- menu.append( editSubjectField );
+ // appending a space first to prevent cursive script character
joining across elements
+ menu.append( ' ', editSubjectField );
},
'handleChangeSubject' : function ( e ) {
--
To view, visit https://gerrit.wikimedia.org/r/91828
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iedb86273f7a83515bad87698ea6699622ed4dd8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Ebrahim ebra...@byagowi.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Ebrahim ebra...@byagowi.com
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use the latest version of mediawiki-selenium gem - change (mediawiki...VisualEditor)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/91873 Change subject: Use the latest version of mediawiki-selenium gem .. Use the latest version of mediawiki-selenium gem Change-Id: I14baca7b9cfb6a76a4e026ea5c6673b87ced3c0f --- M modules/ve-mw/test/browser/Gemfile M modules/ve-mw/test/browser/Gemfile.lock 2 files changed, 17 insertions(+), 23 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/73/91873/1 diff --git a/modules/ve-mw/test/browser/Gemfile b/modules/ve-mw/test/browser/Gemfile index 145f4a3..84516e3 100755 --- a/modules/ve-mw/test/browser/Gemfile +++ b/modules/ve-mw/test/browser/Gemfile @@ -3,10 +3,4 @@ source 'https://rubygems.org' -gem 'cucumber' -gem 'json' gem 'mediawiki-selenium' -gem 'net-http-persistent' -gem 'page-object' -gem 'rspec-expectations' -gem 'syntax' diff --git a/modules/ve-mw/test/browser/Gemfile.lock b/modules/ve-mw/test/browser/Gemfile.lock index 1f4f4f8..a9a7aaa 100644 --- a/modules/ve-mw/test/browser/Gemfile.lock +++ b/modules/ve-mw/test/browser/Gemfile.lock @@ -17,30 +17,37 @@ faker (1.2.0) i18n (~ 0.5) ffi (1.9.0) -ffi (1.9.0-x86-mingw32) gherkin (2.12.2) multi_json (~ 1.3) -gherkin (2.12.2-x86-mingw32) - multi_json (~ 1.3) i18n (0.6.5) -json (1.8.0) -mediawiki-selenium (0.1.7) +json (1.8.1) +mediawiki-selenium (0.1.10) + cucumber + json + net-http-persistent + page-object + rest-client + rspec-expectations + syntax +mime-types (1.25) multi_json (1.8.2) multi_test (0.0.2) net-http-persistent (2.9) -page-object (0.9.2) +page-object (0.9.3) page_navigation (= 0.8) - selenium-webdriver (= 2.35.0) + selenium-webdriver (= 2.37.0) watir-webdriver (= 0.6.4) page_navigation (0.9) data_magic (= 0.14) +rest-client (1.6.7) + mime-types (= 1.16) rspec-expectations (2.14.3) diff-lcs (= 1.1.3, 2.0) -rubyzip (0.9.9) -selenium-webdriver (2.35.1) +rubyzip (1.0.0) +selenium-webdriver (2.37.0) childprocess (= 0.2.5) multi_json (~ 1.0) - rubyzip ( 1.0.0) + rubyzip (~ 1.0.0) websocket (~ 1.0.4) syntax (1.0.0) watir-webdriver (0.6.4) @@ -50,13 +57,6 @@ PLATFORMS ruby - x86-mingw32 DEPENDENCIES - cucumber - json mediawiki-selenium - net-http-persistent - page-object - rspec-expectations - syntax -- To view, visit https://gerrit.wikimedia.org/r/91873 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14baca7b9cfb6a76a4e026ea5c6673b87ced3c0f 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] Improve high level interfaces and intialization of the SQLStore - change (mediawiki...WikibaseQueryEngine)
Daniel Werner has submitted this change and it was merged.
Change subject: Improve high level interfaces and intialization of the SQLStore
..
Improve high level interfaces and intialization of the SQLStore
Change-Id: Ia403b652f350733ff646f94688279de1eb67166a
---
D src/QueryEngineResult.php
D src/QueryResult.php
D src/QueryStore.php
A src/QueryStoreInstaller.php
D src/QueryStoreSetup.php
A src/QueryStoreUninstaller.php
A src/QueryStoreUpdater.php
A src/QueryStoreWithDependencies.php
M src/SQLStore/DVHandler/EntityIdHandler.php
A src/SQLStore/SQLStore.php
A src/SQLStore/SQLStoreWithDependencies.php
M src/SQLStore/Setup/Installer.php
D src/SQLStore/Setup/Setup.php
M src/SQLStore/Setup/Uninstaller.php
M src/SQLStore/Setup/Updater.php
D src/SQLStore/Store.php
M tests/Integration/SQLStore/Engine/DescriptionMatchFinderIntegrationTest.php
M tests/Integration/SQLStore/IntegrationStoreBuilder.php
M tests/Integration/SQLStore/WritingIntegrationTest.php
R tests/Phpunit/SQLStore/SQLStoreTest.php
D tests/Phpunit/SQLStore/Setup/SetupTest.php
21 files changed, 407 insertions(+), 596 deletions(-)
Approvals:
Daniel Werner: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/QueryEngineResult.php b/src/QueryEngineResult.php
deleted file mode 100644
index 1f5a51b..000
--- a/src/QueryEngineResult.php
+++ /dev/null
@@ -1,28 +0,0 @@
-?php
-
-namespace Wikibase\QueryEngine;
-
-/**
- * Result of running a query against the query engine.
- *
- * @since 0.1
- *
- * @file
- * @ingroup WikibaseQueryStore
- *
- * @licence GNU GPL v2+
- * @author Jeroen De Dauw jeroended...@gmail.com
- */
-class QueryEngineResult {
-
- /**
-* @since 0.1
-*
-* @return QueryResult
-*/
- public function getQueryResult() {
- // TODO
- return new QueryResult();
- }
-
-}
\ No newline at end of file
diff --git a/src/QueryResult.php b/src/QueryResult.php
deleted file mode 100644
index 9e57edc..000
--- a/src/QueryResult.php
+++ /dev/null
@@ -1,9 +0,0 @@
-?php
-
-namespace Wikibase\QueryEngine;
-
-class QueryResult {
- // TODO: this is a temporary stub
- // * some preliminary query result code in other git repo
- // * still need to figure out where to put it
-}
\ No newline at end of file
diff --git a/src/QueryStore.php b/src/QueryStore.php
deleted file mode 100644
index f03162f..000
--- a/src/QueryStore.php
+++ /dev/null
@@ -1,67 +0,0 @@
-?php
-
-namespace Wikibase\QueryEngine;
-
-/**
- * Interface for query stores providing access to all needed sub components
- * such as updaters, query engines and setup/teardown operations.
- *
- * This interface somewhat acts as facade to the query component.
- * All access to a specific store should typically happen via this interface.
- *
- * @since 0.1
- *
- * @file
- * @ingroup WikibaseQueryStore
- *
- * @licence GNU GPL v2+
- * @author Jeroen De Dauw jeroended...@gmail.com
- */
-interface QueryStore {
-
- // TODO: create store factory and figure out how to inject dependencies
- // for the typical Wikibase repo use case.
-
- /**
-* Returns the name of the query store. This name can be configuration
dependent
-* and is thus not always the same for a certain store type. For
instance, you can
-* have Wikibase SQL store and Wikibase SQL store for update to new
config.
-*
-* @since 0.1
-*
-* @return string
-*/
- public function getName();
-
- /**
-* Returns the query engine for this store.
-* The query engine allows running queries against the store.
-*
-* @since 0.1
-*
-* @return QueryEngine
-*/
- public function getQueryEngine();
-
- /**
-* Returns the updater for this store.
-* The updater allows for updating the data in the store.
-*
-* @since 0.1
-*
-* @return QueryStoreWriter
-*/
- public function getWriter();
-
- /**
-* Sets up the store.
-* This means creating and initializing the storage structures
-* required for storing data in the store.
-*
-* @since 0.1
-*
-* @return QueryStoreSetup
-*/
- public function newSetup();
-
-}
diff --git a/src/QueryStoreInstaller.php b/src/QueryStoreInstaller.php
new file mode 100644
index 000..93579da
--- /dev/null
+++ b/src/QueryStoreInstaller.php
@@ -0,0 +1,15 @@
+?php
+
+namespace Wikibase\QueryEngine;
+
+/**
+ * @since 0.1
+ *
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw jeroended...@gmail.com
+ */
+interface QueryStoreInstaller {
+
+ public function install();
+
+}
diff --git a/src/QueryStoreSetup.php b/src/QueryStoreSetup.php
deleted file mode 100644
index 8258541..000
--- a/src/QueryStoreSetup.php
+++ /dev/null
@@ -1,49 +0,0 @@
-?php
-
-namespace
[MediaWiki-commits] [Gerrit] [browser test] Use the latest version of mediawiki-selenium gem - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: [browser test] Use the latest version of mediawiki-selenium gem .. [browser test] Use the latest version of mediawiki-selenium gem Change-Id: I14baca7b9cfb6a76a4e026ea5c6673b87ced3c0f --- M modules/ve-mw/test/browser/Gemfile M modules/ve-mw/test/browser/Gemfile.lock 2 files changed, 17 insertions(+), 23 deletions(-) Approvals: Cmcmahon: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/test/browser/Gemfile b/modules/ve-mw/test/browser/Gemfile index 145f4a3..84516e3 100755 --- a/modules/ve-mw/test/browser/Gemfile +++ b/modules/ve-mw/test/browser/Gemfile @@ -3,10 +3,4 @@ source 'https://rubygems.org' -gem 'cucumber' -gem 'json' gem 'mediawiki-selenium' -gem 'net-http-persistent' -gem 'page-object' -gem 'rspec-expectations' -gem 'syntax' diff --git a/modules/ve-mw/test/browser/Gemfile.lock b/modules/ve-mw/test/browser/Gemfile.lock index 1f4f4f8..a9a7aaa 100644 --- a/modules/ve-mw/test/browser/Gemfile.lock +++ b/modules/ve-mw/test/browser/Gemfile.lock @@ -17,30 +17,37 @@ faker (1.2.0) i18n (~ 0.5) ffi (1.9.0) -ffi (1.9.0-x86-mingw32) gherkin (2.12.2) multi_json (~ 1.3) -gherkin (2.12.2-x86-mingw32) - multi_json (~ 1.3) i18n (0.6.5) -json (1.8.0) -mediawiki-selenium (0.1.7) +json (1.8.1) +mediawiki-selenium (0.1.10) + cucumber + json + net-http-persistent + page-object + rest-client + rspec-expectations + syntax +mime-types (1.25) multi_json (1.8.2) multi_test (0.0.2) net-http-persistent (2.9) -page-object (0.9.2) +page-object (0.9.3) page_navigation (= 0.8) - selenium-webdriver (= 2.35.0) + selenium-webdriver (= 2.37.0) watir-webdriver (= 0.6.4) page_navigation (0.9) data_magic (= 0.14) +rest-client (1.6.7) + mime-types (= 1.16) rspec-expectations (2.14.3) diff-lcs (= 1.1.3, 2.0) -rubyzip (0.9.9) -selenium-webdriver (2.35.1) +rubyzip (1.0.0) +selenium-webdriver (2.37.0) childprocess (= 0.2.5) multi_json (~ 1.0) - rubyzip ( 1.0.0) + rubyzip (~ 1.0.0) websocket (~ 1.0.4) syntax (1.0.0) watir-webdriver (0.6.4) @@ -50,13 +57,6 @@ PLATFORMS ruby - x86-mingw32 DEPENDENCIES - cucumber - json mediawiki-selenium - net-http-persistent - page-object - rspec-expectations - syntax -- To view, visit https://gerrit.wikimedia.org/r/91873 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I14baca7b9cfb6a76a4e026ea5c6673b87ced3c0f Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@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] Improve date display - change (mediawiki...MultimediaViewer)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91874
Change subject: Improve date display
..
Improve date display
Strip any non-text content from the creation/upload date string,
and, if possible, parse and format (according to browser locale)
the result.
Bug: 56146
Change-Id: I214e53c5219335b7a9fc852dc029b2992ca56435
---
M js/ext.multimediaViewer.js
1 file changed, 7 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/74/91874/1
diff --git a/js/ext.multimediaViewer.js b/js/ext.multimediaViewer.js
old mode 100644
new mode 100755
index 168561b..c1865ff
--- a/js/ext.multimediaViewer.js
+++ b/js/ext.multimediaViewer.js
@@ -227,11 +227,17 @@
datetime =
extmeta.DateTimeOriginal || extmeta.DateTime;
if ( datetime ) {
+// get rid of HTML tags
+datetime = $( $.parseHTML( datetime.value )
).text()
+// try to use built in date formatting
+if ( new Date(datetime) ) {
+datetime = ( new Date(datetime)
).toLocaleDateString();
+}
+
dtmsg = (
'multimediaviewer-datetime-' +
(
extmeta.DateTimeOriginal ? 'created' : 'uploaded' )
);
- datetime =
datetime.value;
ui.$datetime.text(
mw.message(
dtmsg, datetime ).text()
--
To view, visit https://gerrit.wikimedia.org/r/91874
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I214e53c5219335b7a9fc852dc029b2992ca56435
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix one warning and backport upstream hooks in our extremely... - change (wikimedia...modifications)
Aklapper has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91875
Change subject: Fix one warning and backport upstream hooks in our extremely
customized footer.html.tmpl. (Hooks can be used by extensions and I have had
the fun of non-working extensions in Wikimedia Bugzilla already before, due to
missing hooks.)
..
Fix one warning and backport upstream hooks in our extremely
customized footer.html.tmpl. (Hooks can be used by extensions
and I have had the fun of non-working extensions in Wikimedia
Bugzilla already before, due to missing hooks.)
Change-Id: I944e55e5e5fd4449c634b263f9c43d202fb21fd3
---
M template/en/custom/global/footer.html.tmpl
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bugzilla/modifications
refs/changes/75/91875/1
diff --git a/template/en/custom/global/footer.html.tmpl
b/template/en/custom/global/footer.html.tmpl
index 00ac761..bb3e2d0 100644
--- a/template/en/custom/global/footer.html.tmpl
+++ b/template/en/custom/global/footer.html.tmpl
@@ -109,8 +109,9 @@
!-- footer --
div id=footer
+ div class=intro[% Hook.process('intro') %]/div
ul id=footer-info
- liBugzilla version [%+
constants.BUGZILLA_VERSION %]/li
+ liBugzilla version [%+
constants.BUGZILLA_VERSION FILTER html %]/li
/ul
ul id=footer-places
@@ -122,7 +123,9 @@
li id=footer-icon-poweredbya
href=http://www.bugzilla.org/;img
src=skins/contrib/Wikimedia/images/bugzilla-badge.png height=31 width=88
alt=Powered by Bugzilla //a/li
/ul
div style=clear:both/div
+ div class=outro[% Hook.process('outro') %]/div
/div
!-- /footer --
+ [% Hook.process(end) %]
/body
/html
--
To view, visit https://gerrit.wikimedia.org/r/91875
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I944e55e5e5fd4449c634b263f9c43d202fb21fd3
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Aklapper aklap...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 55861) Better error message for invalid params parameter. - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 55861) Better error message for invalid params parameter.
..
(bug 55861) Better error message for invalid params parameter.
Also switch around dieUsage() uses to the correct param order
Change-Id: I6ff1a03af3280451dff773eb61310324b5e80bbc
---
M includes/api/ApiFlow.php
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, but someone else must approve
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiFlow.php b/includes/api/ApiFlow.php
index 68df1e8..a66a6a9 100644
--- a/includes/api/ApiFlow.php
+++ b/includes/api/ApiFlow.php
@@ -9,7 +9,7 @@
$output = array();
if ( ! $params['workflow'] ! $params['page'] ) {
- $this-dieUsage( 'missing-param', 'One of workflow or
page parameters must be provided' );
+ $this-dieUsage( 'One of workflow or page parameters
must be provided', 'badparams' );
return;
}
@@ -24,6 +24,12 @@
-createWorkflowLoader( $page, $id );
$requestParams = json_decode( $params['params'], true );
+
+ if ( ! $requestParams ) {
+ $this-dieUsage( 'The params parameter must be a valid
JSON string', 'badparams' );
+ return;
+ }
+
$request = new DerivativeRequest(
$this-getContext()-getRequest(), $requestParams, true );
$blocks = $this-loader-createBlocks();
--
To view, visit https://gerrit.wikimedia.org/r/91551
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ff1a03af3280451dff773eb61310324b5e80bbc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Werdna agarr...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Post action permissions for reply and edit-title - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Post action permissions for reply and edit-title .. Post action permissions for reply and edit-title Change-Id: I533cb527a52c65740e5d2916ebeb5a4892ddde57 --- M includes/PostActionPermissions.php 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/PostActionPermissions.php b/includes/PostActionPermissions.php index 9a3e727..8eaee9a 100644 --- a/includes/PostActionPermissions.php +++ b/includes/PostActionPermissions.php @@ -58,6 +58,16 @@ PostRevision::MODERATED_DELETED = array( 'flow-delete', 'flow-censor' ), PostRevision::MODERATED_CENSORED = 'flow-censor', ), + + 'reply' = array( + PostRevision::MODERATED_NONE = '', + ), + + 'edit-title' = array( + PostRevision::MODERATED_NONE = '', + ), + + ); } -- To view, visit https://gerrit.wikimedia.org/r/91793 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I533cb527a52c65740e5d2916ebeb5a4892ddde57 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] [browser test] Workaround for the problem when Cucumber hook... - change (mediawiki...VisualEditor)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91876
Change subject: [browser test] Workaround for the problem when Cucumber hook
executes twice
..
[browser test] Workaround for the problem when Cucumber hook executes twice
Bug: 56116
Change-Id: I99bf48b1452647b42edd97dc47e8664b08b7667a
---
M modules/ve-mw/test/browser/features/support/hooks.rb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/76/91876/1
diff --git a/modules/ve-mw/test/browser/features/support/hooks.rb
b/modules/ve-mw/test/browser/features/support/hooks.rb
index 14c7841..b7bf553 100644
--- a/modules/ve-mw/test/browser/features/support/hooks.rb
+++ b/modules/ve-mw/test/browser/features/support/hooks.rb
@@ -4,7 +4,7 @@
#This is for the Headings test
Before('@edit_user_page') do
- if !$edit_user_page or !(ENV['REUSE_BROWSER'] == 'true')
+ if (!$edit_user_page or !(ENV['REUSE_BROWSER'] == 'true')) and @browser
step 'I am logged in'
step 'I am at my user page'
step 'I edit the page with a string'
--
To view, visit https://gerrit.wikimedia.org/r/91876
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I99bf48b1452647b42edd97dc47e8664b08b7667a
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] Add Text caches ulsfo cluster - change (operations/puppet)
Mark Bergsma has uploaded a new change for review. https://gerrit.wikimedia.org/r/91877 Change subject: Add Text caches ulsfo cluster .. Add Text caches ulsfo cluster Change-Id: I28fc2ae41af8942ceec5e80af2b66125c991034d --- M manifests/ganglia.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/77/91877/1 diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp index 4c2e179..fd8abf3 100644 --- a/manifests/ganglia.pp +++ b/manifests/ganglia.pp @@ -345,6 +345,7 @@ Bits caches ulsfo = 'cp4001.ulsfo.wmnet cp4003.ulsfo.wmnet', Upload caches ulsfo= 'cp4005.ulsfo.wmnet cp4013.ulsfo.wmnet', Mobile caches ulsfo= 'cp4011.ulsfo.wmnet cp4019.ulsfo.wmnet', +Text caches ulsfo = 'cp4008.ulsfo.wmnet cp4016.ulsfo.wmnet', } $rra_sizes = 'RRA:AVERAGE:0.5:1:360 RRA:AVERAGE:0.5:24:245 RRA:AVERAGE:0.5:168:241 RRA:AVERAGE:0.5:672:241 RRA:AVERAGE:0.5:5760:371' -- To view, visit https://gerrit.wikimedia.org/r/91877 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I28fc2ae41af8942ceec5e80af2b66125c991034d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mark Bergsma m...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding hostname and protocol to the URL of captcha, It's rea... - change (pywikibot/core)
Ladsgroup has uploaded a new change for review. https://gerrit.wikimedia.org/r/91878 Change subject: Adding hostname and protocol to the URL of captcha, It's really important .. Adding hostname and protocol to the URL of captcha, It's really important Change-Id: Ie4466deb3862876e78e4092c9c378c13c8ff93c6 --- M pywikibot/site.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/78/91878/1 diff --git a/pywikibot/site.py b/pywikibot/site.py index 13f0cd5..8bcb955 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2774,7 +2774,7 @@ continue elif url in captcha: import webbrowser -webbrowser.open(captcha[url]) +webbrowser.open(self.family.protocol() + '://' + self.family.hostname() + captcha[url]) req['captchaword'] = cap_answerwikipedia.input( Please view CAPTCHA in your browser, then type answer here:) continue -- To view, visit https://gerrit.wikimedia.org/r/91878 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4466deb3862876e78e4092c9c378c13c8ff93c6 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup ladsgr...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 40941) Increase font size in Gerrit diff messages - change (operations/puppet)
Odder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91879
Change subject: (bug 40941) Increase font size in Gerrit diff messages
..
(bug 40941) Increase font size in Gerrit diff messages
Raising it by 1pt to 9pt to match the font size in commit
messages set in 07e32eedf and, to quote the submitter,
'to make it easier to the eyes of old people.'
(This is a local change, but might as well be pushed upstream
if it's a good idea.)
Bug: 40941
Change-Id: I771580d2a9252369b7b38e2a005ccf9248c1f814
---
M files/gerrit/skin/GerritSite.css
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/79/91879/1
diff --git a/files/gerrit/skin/GerritSite.css b/files/gerrit/skin/GerritSite.css
index 13bfda8..09295e0 100644
--- a/files/gerrit/skin/GerritSite.css
+++ b/files/gerrit/skin/GerritSite.css
@@ -126,6 +126,14 @@
}
/**
+ * https://bugzilla.wikimedia.org/show_bug.cgi?id=40941
+ * Gerrit diff font isn't big enough, either
+ */
+.patchContentTable td {
+ font-size: 9pt !important;
+}
+
+/**
* LDAP login
*/
#gerrit_body h1 {
--
To view, visit https://gerrit.wikimedia.org/r/91879
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I771580d2a9252369b7b38e2a005ccf9248c1f814
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Odder tom...@twkozlowski.net
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Text caches ulsfo cluster - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged. Change subject: Add Text caches ulsfo cluster .. Add Text caches ulsfo cluster Change-Id: I28fc2ae41af8942ceec5e80af2b66125c991034d --- M manifests/ganglia.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Mark Bergsma: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp index 4c2e179..fd8abf3 100644 --- a/manifests/ganglia.pp +++ b/manifests/ganglia.pp @@ -345,6 +345,7 @@ Bits caches ulsfo = 'cp4001.ulsfo.wmnet cp4003.ulsfo.wmnet', Upload caches ulsfo= 'cp4005.ulsfo.wmnet cp4013.ulsfo.wmnet', Mobile caches ulsfo= 'cp4011.ulsfo.wmnet cp4019.ulsfo.wmnet', +Text caches ulsfo = 'cp4008.ulsfo.wmnet cp4016.ulsfo.wmnet', } $rra_sizes = 'RRA:AVERAGE:0.5:1:360 RRA:AVERAGE:0.5:24:245 RRA:AVERAGE:0.5:168:241 RRA:AVERAGE:0.5:672:241 RRA:AVERAGE:0.5:5760:371' -- To view, visit https://gerrit.wikimedia.org/r/91877 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I28fc2ae41af8942ceec5e80af2b66125c991034d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mark Bergsma m...@wikimedia.org Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] registering namespace with Extension_default_namespaces - change (mediawiki...GWToolset)
jenkins-bot has submitted this change and it was merged.
Change subject: registering namespace with Extension_default_namespaces
..
registering namespace with Extension_default_namespaces
* re: assembla/159 - sort out content namespace
Change-Id: I47e95f194e718b21e13645028c27c0314a958dd4
---
M GWToolset.php
M README
2 files changed, 20 insertions(+), 4 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GWToolset.php b/GWToolset.php
index 78c62f7..9f08fb1 100644
--- a/GWToolset.php
+++ b/GWToolset.php
@@ -35,11 +35,24 @@
/**
* define namespaces
+ * @see http://www.mediawiki.org/wiki/Manual:Using_custom_namespaces
+ * @see https://www.mediawiki.org/wiki/Extension_default_namespaces#GWToolset
*/
if ( !defined( 'NS_GWTOOLSET' ) ) {
- define( 'NS_GWTOOLSET', 332 );
+ define( 'NS_GWTOOLSET', 490 );
define( 'NS_GWTOOLSET_TALK', NS_GWTOOLSET + 1 );
+} else {
+ echo
+ 'Namespace conflict. Either another extension or configuration
has already ' .
+ 'defined the namespace NS_GWTOOLSET.';
+ exit();
}
+
+$wgExtraNamespaces[NS_GWTOOLSET] = 'GWToolset';
+$wgExtraNamespaces[NS_GWTOOLSET_TALK] = 'GWToolset_talk';
+$wgNamespaceProtection[NS_GWTOOLSET] = array( 'gwtoolset' );
+$wgNamespacesWithSubpages[NS_GWTOOLSET] = true;
+$wgNamespacesWithSubpages[NS_GWTOOLSET_TALK] = true;
/**
* registering extension metadata with MediaWiki
@@ -56,7 +69,9 @@
/**
* add user permissions
*/
+$wgGroupPermissions[gwtoolset][gwtoolset] = true;
$wgGroupPermissions[gwtoolset][upload_by_url] = true;
+$wgGroupPermissions['sysop']['gwtoolset'] = true;
$wgGroupPermissions['sysop']['gwtoolset-debug'] = true;
/**
diff --git a/README b/README
index c055fea..bec1006 100644
--- a/README
+++ b/README
@@ -12,12 +12,13 @@
Reviewers
-
-many thanks to those who have reviewed the code and helped us get the
-extension ready for the wikimedia production servers
+many thanks to those who have reviewed the code and helped us get the extension
+ready for the wikimedia production servers ( listed in alphabetical order )
User:Aaron_Schulz
-User:CSteipp
User:Bawolff
+User:BryanDavis
+User:CSteipp
User:MHolmquist
User:Parent5446
User:Peachey88
--
To view, visit https://gerrit.wikimedia.org/r/91818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47e95f194e718b21e13645028c27c0314a958dd4
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/GWToolset
Gerrit-Branch: master
Gerrit-Owner: Dan-nl d_ent...@yahoo.com
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Dan-nl d_ent...@yahoo.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] Backport upstream fix to our custom header.html.tmpl template - change (wikimedia...modifications)
Aklapper has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91880
Change subject: Backport upstream fix to our custom header.html.tmpl template
..
Backport upstream fix to our custom header.html.tmpl template
http://bzr.mozilla.org/bugzilla/4.2/revision/8182
Change-Id: I0b2b3f30d578efadb0e79d2c43330566c8e19b61
---
M template/en/custom/global/header.html.tmpl
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bugzilla/modifications
refs/changes/80/91880/1
diff --git a/template/en/custom/global/header.html.tmpl
b/template/en/custom/global/header.html.tmpl
index 6696bcf..cd2ea8f 100644
--- a/template/en/custom/global/header.html.tmpl
+++ b/template/en/custom/global/header.html.tmpl
@@ -254,7 +254,7 @@
#%]
body onload=[% onload %]
-class=[%
urlbase.replace('^https?://','').replace('/$','').replace('[-~@:/.]+','-') %]
+class=[%
urlbase.replace('^https?://','').replace('/$','').replace('[-~@:/.]+','-')
FILTER css_class_quote %]
[% FOREACH class = bodyclasses %]
[% ' ' %][% class FILTER css_class_quote %]
[% END %] yui-skin-sam
--
To view, visit https://gerrit.wikimedia.org/r/91880
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b2b3f30d578efadb0e79d2c43330566c8e19b61
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Aklapper aklap...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] no need to log in twice - change (qa/browsertests)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/91881 Change subject: no need to log in twice .. no need to log in twice Change-Id: Ie9a47062976eb9d60029475b29099062d06bfea7 --- M features/page.feature 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests refs/changes/81/91881/1 diff --git a/features/page.feature b/features/page.feature index a2f0553..53dc366 100644 --- a/features/page.feature +++ b/features/page.feature @@ -44,8 +44,7 @@ And watch element should not be there Scenario: Move existing page dialog -Given I am logged in - And I am starting a page to be moved +Given I am starting a page to be moved And I create the page to be moved When I click Move Then I should be on a page Move newly created page @@ -56,8 +55,7 @@ @ie6-bug Scenario: Move existing page -Given I am logged in -And I am starting a page to be moved to a new name +Given I am starting a page to be moved to a new name And I have clicked Move on the newly created page When I make a new page name for the moved page And I click Move page -- To view, visit https://gerrit.wikimedia.org/r/91881 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9a47062976eb9d60029475b29099062d06bfea7 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removing site.pp entries for wm126-134 - change (operations/puppet)
Cmjohnson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91882
Change subject: Removing site.pp entries for wm126-134
..
Removing site.pp entries for wm126-134
Change-Id: I1ff125f36863022f19b8e4bbb6bde9c6640d25ec
---
M manifests/site.pp
1 file changed, 0 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/82/91882/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 2013414..3b93f02 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1986,36 +1986,6 @@
include nfs::upload
}
-# mw126-130 are application servers (precise)
-node /^mw1(2[6-9]|30)\.pmtpa\.wmnet$/ {
-include role::applicationserver::appserver
-include nfs::upload
-}
-
-# mw131-134 are pulled for elasticsearch testing
-# approved by site architect afeldman ;)
-node mw131.pmtpa.wmnet {
-include accounts::manybubbles,
-accounts::demon
-
-sudo_user { [ manybubbles ]: privileges = ['ALL = NOPASSWD: ALL'] }
-sudo_user { [ demon ]: privileges = ['ALL = NOPASSWD: ALL'] }
-
-include role::applicationserver::appserver
-include nfs::upload
-}
-node /^mw13[234]\.pmtpa\.wmnet$/ {
-include accounts::manybubbles,
-accounts::demon,
-groups::wikidev
-
-sudo_user { [ manybubbles ]: privileges = ['ALL = NOPASSWD: ALL'] }
-sudo_user { [ demon ]: privileges = ['ALL = NOPASSWD: ALL'] }
-
-include standard
-include role::elasticsearch::production
-}
-
# mw1001-1016 are jobrunners (precise)
node /^mw10(0[1-9]|1[0-6])\.eqiad\.wmnet$/ {
if $::hostname =~ /^mw100[12]$/ {
--
To view, visit https://gerrit.wikimedia.org/r/91882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ff125f36863022f19b8e4bbb6bde9c6640d25ec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
