date:20141118

[MediaWiki-commits] [Gerrit] Add WOFF2 version of all fonts - change (mediawiki...UniversalLanguageSelector)

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

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

Change subject: Add WOFF2 version of all fonts
..


Add WOFF2 version of all fonts

WOFF2 generated using woff2_compress tool of
https://code.google.com/p/font-compression-reference

Change-Id: I796fcb7ce0ad492842cbc2ddbcde77e3e5c5e185
---
A data/fontrepo/fonts/AbyssinicaSIL/AbyssinicaSIL-R.woff2
A data/fontrepo/fonts/Akkadian/Akkadian.woff2
A data/fontrepo/fonts/Alef/Alef-Bold.woff2
A data/fontrepo/fonts/Alef/Alef-Regular.woff2
M data/fontrepo/fonts/Alef/font.ini
A data/fontrepo/fonts/Artaxerxes/Artaxerxes.woff2
A data/fontrepo/fonts/Autonym/Autonym.woff2
A data/fontrepo/fonts/CharisSIL/CharisSIL-R.woff2
A data/fontrepo/fonts/ComicNeue/ComicNeue-Bold.woff2
A data/fontrepo/fonts/ComicNeue/ComicNeue-Regular-Oblique.woff2
A data/fontrepo/fonts/ComicNeue/ComicNeue-Regular.woff2
M data/fontrepo/fonts/ComicNeue/font.ini
A data/fontrepo/fonts/DoulosSIL/DoulosSIL-R.woff2
A data/fontrepo/fonts/EastSyriacAdiabene/SyrCOMAdiabene.woff2
A data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.woff2
A data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana-Bold.woff2
A data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana.woff2
M data/fontrepo/fonts/FreeFontThana/font.ini
A data/fontrepo/fonts/GentiumPlus/GentiumPlus-I.woff2
A data/fontrepo/fonts/GentiumPlus/GentiumPlus-R.woff2
M data/fontrepo/fonts/GentiumPlus/font.ini
A data/fontrepo/fonts/Gubbi/Gubbi.woff2
A data/fontrepo/fonts/Hanuman/Hanuman.woff2
A data/fontrepo/fonts/Hanuman/Hanumanb.woff2
M data/fontrepo/fonts/Hanuman/font.ini
A data/fontrepo/fonts/HussainiNastaleeq/hussaini-nastaleeq.woff2
M data/fontrepo/fonts/IranianSans/font.ini
A data/fontrepo/fonts/IranianSans/irsans.woff2
A data/fontrepo/fonts/IranianSans/irsansb.woff2
M data/fontrepo/fonts/IranianSerif/font.ini
A data/fontrepo/fonts/IranianSerif/irseri.woff2
A data/fontrepo/fonts/Jomolhari/Jomolhari.woff2
A data/fontrepo/fonts/Junicode/Junicode-Bold.woff2
A data/fontrepo/fonts/Junicode/Junicode-BoldItalic.woff2
A data/fontrepo/fonts/Junicode/Junicode-Italic.woff2
A data/fontrepo/fonts/Junicode/Junicode.woff2
M data/fontrepo/fonts/Junicode/font.ini
A data/fontrepo/fonts/KhmerOS/KhmerOS.woff2
A data/fontrepo/fonts/KhmerOSbattambang/KhmerOSbattambang.woff2
A data/fontrepo/fonts/Lateef/LateefRegOT.woff2
M data/fontrepo/fonts/Lateef/font.ini
A data/fontrepo/fonts/LinuxLibertine/LinLibertine_RBIah.woff2
A data/fontrepo/fonts/LinuxLibertine/LinLibertine_RBah.woff2
A data/fontrepo/fonts/LinuxLibertine/LinLibertine_RIah.woff2
A data/fontrepo/fonts/LinuxLibertine/LinLibertine_Rah.woff2
M data/fontrepo/fonts/LinuxLibertine/font.ini
A data/fontrepo/fonts/LohitAssamese/Lohit-Assamese.woff2
A data/fontrepo/fonts/LohitBengali/Lohit-Bengali.woff2
A data/fontrepo/fonts/LohitDevanagari/Lohit-Devanagari.woff2
A data/fontrepo/fonts/LohitGujarati/Lohit-Gujarati.woff2
A data/fontrepo/fonts/LohitKannada/Lohit-Kannada.woff2
A data/fontrepo/fonts/LohitMarathi/Lohit-Marathi.woff2
A data/fontrepo/fonts/LohitNepali/Lohit-Nepali.woff2
A data/fontrepo/fonts/LohitOdia/Lohit-Odia.woff2
A data/fontrepo/fonts/LohitPunjabi/Lohit-Punjabi.woff2
A data/fontrepo/fonts/LohitTamil/Lohit-Tamil.woff2
A data/fontrepo/fonts/LohitTamilClassical/Lohit-Tamil-Classical.woff2
A data/fontrepo/fonts/LohitTelugu/Lohit-Telugu.woff2
A data/fontrepo/fonts/MiriamCLM/MiriamCLM-Book.woff2
A data/fontrepo/fonts/Myanmar3/Myanmar3.woff2
A data/fontrepo/fonts/NafeesWeb/NafeesWeb.woff2
A data/fontrepo/fonts/Nazli/Nazli-bold.woff2
A data/fontrepo/fonts/Nazli/Nazli.woff2
M data/fontrepo/fonts/Nazli/font.ini
A data/fontrepo/fonts/Nokora/Nokora-Bold.woff2
A data/fontrepo/fonts/Nokora/Nokora-Regular.woff2
M data/fontrepo/fonts/Nokora/font.ini
A data/fontrepo/fonts/NuosuSIL/NuosuSIL.woff2
M data/fontrepo/fonts/NuosuSIL/font.ini
A data/fontrepo/fonts/OpenDyslexic/OpenDyslexic-Bold.woff2
A data/fontrepo/fonts/OpenDyslexic/OpenDyslexic-BoldItalic.woff2
A data/fontrepo/fonts/OpenDyslexic/OpenDyslexic-Italic.woff2
A data/fontrepo/fonts/OpenDyslexic/OpenDyslexic-Regular.woff2
M data/fontrepo/fonts/OpenDyslexic/font.ini
M data/fontrepo/fonts/OskiEast/font.ini
A data/fontrepo/fonts/OskiEast/oskie.woff2
A data/fontrepo/fonts/OskiEast/oskiebold.woff2
A data/fontrepo/fonts/OskiEast/oskiebolditalic.woff2
A data/fontrepo/fonts/OskiEast/oskieitalic.woff2
A data/fontrepo/fonts/Padauk/Padauk-Regular.woff2
A data/fontrepo/fonts/Pagul/Pagul.woff2
A data/fontrepo/fonts/Pangururan/Pangururan.woff2
M data/fontrepo/fonts/Pangururan/font.ini
A data/fontrepo/fonts/Phetsarath/Phetsarath-Bold.woff2
A data/fontrepo/fonts/Phetsarath/Phetsarath-Regular.woff2
M data/fontrepo/fonts/Phetsarath/font.ini
A data/fontrepo/fonts/RailwaySans/RailwaySans.woff2
M data/fontrepo/fonts/RailwaySans/font.ini
A data/fontrepo/fonts/Saab/Saab.woff2
A data/fontrepo/fonts/Scheherazade/Scheherazade-R.woff2
M data/fontrepo/fonts/Scheherazade/font.ini
A data/fontrepo/fonts/SertoUrhoy/SyrCOMUrhoy.woff2
A

[MediaWiki-commits] [Gerrit] Fix tracking for version - change (mediawiki...SyntaxHighlight_GeSHi)

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

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

Change subject: Fix tracking for version
..


Fix tracking for version

* wikiapiary does not detect the version so this way fixes the issue.

Note this has been tested.

Change-Id: I2ad43801cc71285cad8576657c5dc5e4668a37b3
---
M SyntaxHighlight_GeSHi.class.php
M SyntaxHighlight_GeSHi.php
2 files changed, 3 insertions(+), 14 deletions(-)

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



diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php
index 7ac0611..2216a4d 100644
--- a/SyntaxHighlight_GeSHi.class.php
+++ b/SyntaxHighlight_GeSHi.class.php
@@ -508,18 +508,6 @@
}
 
/**
-* Get the GeSHI's version information while Special:Version is read.
-* @param $extensionTypes
-* @return bool
-*/
-   public static function extensionTypes( $extensionTypes ) {
-   global $wgExtensionCredits;
-   self::initialise();
-   
$wgExtensionCredits['parserhook']['SyntaxHighlight_GeSHi']['version'] = 
GESHI_VERSION;
-   return true;
-   }
-
-   /**
 * Register a ResourceLoader module providing styles for each supported 
language.
 *
 * @param ResourceLoader $resourceLoader
diff --git a/SyntaxHighlight_GeSHi.php b/SyntaxHighlight_GeSHi.php
index de2c76b..9a3bc97 100644
--- a/SyntaxHighlight_GeSHi.php
+++ b/SyntaxHighlight_GeSHi.php
@@ -40,13 +40,15 @@
die( This version of SyntaxHighlight GeSHi requires MediaWiki 1.24 );
 }
 
+define('GESHI_VERSION', '1.0.8.12');
 
-$wgExtensionCredits['parserhook']['SyntaxHighlight_GeSHi'] = array(
+$wgExtensionCredits['parserhook'][] = array(
'path'   = __FILE__,
'name'   = 'SyntaxHighlight',
'author' = array( 'Brion Vibber', 'Tim Starling', 'Rob 
Church', 'Niklas Laxström' ),
'descriptionmsg' = 'syntaxhighlight-desc',
'url'= 
'https://www.mediawiki.org/wiki/Extension:SyntaxHighlight_GeSHi',
+   'version'= GESHI_VERSION,
 );
 
 // Change these in LocalSettings.php
@@ -61,7 +63,6 @@
 $wgAutoloadClasses['ResourceLoaderGeSHiModule'] = $dir . 
'ResourceLoaderGeSHiModule.php';
 $wgAutoloadClasses['ResourceLoaderGeSHiLocalModule'] = $dir . 
'ResourceLoaderGeSHiLocalModule.php';
 
-$wgHooks['ExtensionTypes'][] = 'SyntaxHighlight_GeSHi::extensionTypes';
 $wgHooks['ResourceLoaderRegisterModules'][] = 
'SyntaxHighlight_GeSHi::resourceLoaderRegisterModules';
 $wgHooks['ContentGetParserOutput'][] = 'SyntaxHighlight_GeSHi::renderHook';
 $wgHooks['ApiFormatHighlight'][] = 'SyntaxHighlight_GeSHi::apiFormatHighlight';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ad43801cc71285cad8576657c5dc5e4668a37b3
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: TheDJ hartman.w...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Updating and debugging the extension - change (mediawiki...MsUpload)

2014-11-18 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Updating and debugging the extension
..

Updating and debugging the extension

* Updates to 9.5.1

Languges added

* French (fr)
* Hebrew (he)
* Lithuanian (lt)
* Added qqq

Source of update is http://www.ratin.de/msupload.html

Change-Id: I9ff37f40237ad4e77323f6ee728e4808d654ed4c
(cherry picked from commit 7d57c5ebd29578562a550f0877506b1d9234d360)
---
M .gitignore
A MsUpload.css
A MsUpload.js
D README.TXT
A README.md
D css/images/ui-bg_flat_0_aa_40x100.png
D css/images/ui-bg_flat_75_ff_40x100.png
D css/images/ui-bg_glass_55_fbf9ee_1x400.png
D css/images/ui-bg_glass_65_ff_1x400.png
D css/images/ui-bg_glass_75_dadada_1x400.png
D css/images/ui-bg_glass_75_e6e6e6_1x400.png
D css/images/ui-bg_glass_95_fef1ec_1x400.png
D css/images/ui-bg_highlight-soft_75_cc_1x100.png
D css/jquery.css
D css/msupload.css
M i18n/de.json
M i18n/en.json
M i18n/es.json
A i18n/fr.json
A i18n/he.json
M i18n/it.json
M i18n/ja.json
A i18n/lt.json
M i18n/pt-br.json
A i18n/qqq.json
M i18n/ru.json
M i18n/zh-hans.json
M i18n/zh-hant.json
M images/msu_close.png
M images/msu_document-film.png
M images/msu_document-globe.png
M images/msu_document-image.png
M images/msu_document-music.png
M images/msu_document-pdf.png
M images/msu_document.png
M images/msu_error-small.png
M images/msu_error.png
M images/msu_loading.png
M images/msu_progress_stripe.png
M images/msu_tick.png
M images/msu_upload_button.png
A images/msu_upload_button_old.gif
M images/msu_upload_icon.png
D js/msupload.insert.js
D js/msupload.js
D js/plupload/plupload.flash.js
D js/plupload/plupload.flash.swf
D js/plupload/plupload.full.js
D js/plupload/plupload.html4.js
D js/plupload/plupload.html5.js
D js/plupload/plupload.js
D js/plupload/plupload.silverlight.js
D js/plupload/plupload.silverlight.xap
M msupload.body.php
M msupload.i18n.php
M msupload.php
A plupload/Moxie.swf
A plupload/Moxie.xap
A plupload/plupload.full.min.js
59 files changed, 1,201 insertions(+), 1,522 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ff37f40237ad4e77323f6ee728e4808d654ed4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsUpload
Gerrit-Branch: REL1_24
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com

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

[MediaWiki-commits] [Gerrit] Reimaging script improvements - change (operations/puppet)

2014-11-18 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Reimaging script improvements
..

Reimaging script improvements

Clean up/sign salt keys as well when FORCE is requested
Use ipmitool to force PXE and reboot the box
Add one more argument (the .mgmt name) for ipmitool to work

Change-Id: Icd1fb181db49d3e73942cb3cbc4a35e807591267
---
M modules/puppetmaster/files/reimage.sh
1 file changed, 33 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/174070/1

diff --git a/modules/puppetmaster/files/reimage.sh 
b/modules/puppetmaster/files/reimage.sh
index 822065a..faec1f2 100755
--- a/modules/puppetmaster/files/reimage.sh
+++ b/modules/puppetmaster/files/reimage.sh
@@ -26,11 +26,16 @@
 
 function clean_salt {
 nodename=${1}
+force_yes=${2}
 log cleaning salt key cache for ${nodename}
 # delete the key only if it has been accepted already, we are going to
 # ask confirmation later about unaccepted keys
 if salt-key --list accepted | fgrep -q ${nodename}; then
-salt-key --delete ${nodename}
+if [ ${force_yes} -eq 1 ]; then
+salt-key -y --delete ${nodename}
+else
+salt-key --delete ${nodename}
+fi
 fi
 # salt-key --delete above exits 0 regardless, double check
 if salt-key --list accepted | fgrep -q ${nodename}; then
@@ -70,6 +75,7 @@
 
 function sign_salt {
 nodename=${1}
+force_yes=${2}
 while true; do
 log Seeking the node key to add
 if ! salt-key --list unaccepted | fgrep -q ${nodename}; then
@@ -77,13 +83,32 @@
 sleep $SLEEPTIME
 continue
 fi;
-salt-key -a ${nodename}
+if [ ${force_yes} -eq 1 ]; then
+salt-key -y -a ${nodename}
+else
+salt-key -a ${nodename}
+fi
 break
 done
 }
 
+function set_pxe_and_reboot {
+mgmtname=${1}
+if [ -z $IPMI_PASSWORD ]; then
+   echo WARNING: IPMI_PASSWORD not found. Assuming bash, do: 
+   echo HISTCONTROL=ignorebothenter
+   echo spaceexport IPMI_PASSWORD='supersecretpass'
+   echo WARNING: Continuing without auto rebooting the box
+   return
+fi
+export IPMI_PASSWORD
+ipmitool -I lanplus -H ${mgmtname} -U root -E chassis bootdev pxe
+ipmitool -I lanplus -H ${mgmtname} -U root -E chassis power cycle
+
+}
+
 function usage {
-echo Usage: $0 [-y][-s SECONDS] nodename; exit 1;
+echo Usage: $0 [-y][-s SECONDS] nodename mgmtname; exit 1;
 }
 
 ## Main script
@@ -103,12 +128,15 @@
 done
 shift $((OPTIND-1))
 nodename=$1
+mgmtname=$2
 test -z ${nodename}  usage
+test -z ${mgmtname}  usage
 log Preparing reimaging of node ${nodename}
 
 clean_puppet $nodename
-clean_salt $nodename
+clean_salt $nodename $FORCE
+set_pxe_and_reboot $mgmtname
 sign_puppet $nodename $FORCE
-sign_salt $nodename
+sign_salt $nodename $FORCE
 
 log Node ${nodename} is now signed and both puppet and salt should work.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd1fb181db49d3e73942cb3cbc4a35e807591267
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org

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

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

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

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

Change subject: Add jobs for cdb
..


Add jobs for cdb

Bug: 73541
Change-Id: Iaf98b66aecd1a859c3bfa37e49fec98db40194a7
---
M jjb/misc.yaml
M zuul/layout.yaml
2 files changed, 20 insertions(+), 0 deletions(-)

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



diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 39a5bcd..8a6c26d 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -101,3 +101,10 @@
 name: 'qrpedia'
 jobs:
  - '{name}-phplint'
+
+- project:
+name: 'cdb'
+jobs:
+ - '{name}-phplint'
+ - '{name}-phpunit'
+ - php-composer-validate
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 061b456..b9bae3b 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5918,6 +5918,19 @@
 gate-and-submit:
   - qrpedia-phplint
 
+  - name: cdb
+check:
+ - cdb-phplint
+ - php-composer-validate
+test:
+ - cdb-phplint
+ - cdb-phpunit
+ - php-composer-validate
+gate-and-submit:
+ - cdb-phplint
+ - cdb-phpunit
+ - php-composer-validate
+
   - name: sartoris
 template:
   - name: 'python'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf98b66aecd1a859c3bfa37e49fec98db40194a7
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Chad ch...@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] Fix path to i18n - change (mediawiki...MsUpload)

2014-11-18 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Fix path to i18n
..

Fix path to i18n

* This fixes the path to i18n the problem was introduced in the latest release.

Change-Id: I751ab3f5e187d55a6c89fc3ff580c0670e0cddf7
---
M .gitignore
A MsUpload.css
A MsUpload.js
D README.TXT
A README.md
D css/images/ui-bg_flat_0_aa_40x100.png
D css/images/ui-bg_flat_75_ff_40x100.png
D css/images/ui-bg_glass_55_fbf9ee_1x400.png
D css/images/ui-bg_glass_65_ff_1x400.png
D css/images/ui-bg_glass_75_dadada_1x400.png
D css/images/ui-bg_glass_75_e6e6e6_1x400.png
D css/images/ui-bg_glass_95_fef1ec_1x400.png
D css/images/ui-bg_highlight-soft_75_cc_1x100.png
D css/jquery.css
D css/msupload.css
M i18n/de.json
M i18n/en.json
M i18n/es.json
A i18n/fr.json
A i18n/he.json
M i18n/it.json
M i18n/ja.json
A i18n/lt.json
M i18n/pt-br.json
A i18n/qqq.json
M i18n/ru.json
M i18n/zh-hans.json
M i18n/zh-hant.json
M images/msu_close.png
M images/msu_document-film.png
M images/msu_document-globe.png
M images/msu_document-image.png
M images/msu_document-music.png
M images/msu_document-pdf.png
M images/msu_document.png
M images/msu_error-small.png
M images/msu_error.png
M images/msu_loading.png
M images/msu_progress_stripe.png
M images/msu_tick.png
M images/msu_upload_button.png
A images/msu_upload_button_old.gif
M images/msu_upload_icon.png
D js/msupload.insert.js
D js/msupload.js
D js/plupload/plupload.flash.js
D js/plupload/plupload.flash.swf
D js/plupload/plupload.full.js
D js/plupload/plupload.html4.js
D js/plupload/plupload.html5.js
D js/plupload/plupload.js
D js/plupload/plupload.silverlight.js
D js/plupload/plupload.silverlight.xap
M msupload.body.php
M msupload.i18n.php
M msupload.php
A plupload/Moxie.swf
A plupload/Moxie.xap
A plupload/plupload.full.min.js
59 files changed, 1,200 insertions(+), 1,521 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsUpload 
refs/changes/71/174071/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I751ab3f5e187d55a6c89fc3ff580c0670e0cddf7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsUpload
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com

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

[MediaWiki-commits] [Gerrit] Draft translations - save translations and resume from dashb... - change (mediawiki...ContentTranslation)

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

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

Change subject: Draft translations - save translations and resume from dashboard
..


Draft translations - save translations and resume from dashboard

* Translations can be saved as draft before publishing.
* Saved translation can be restored from the dashboard.

* Modified ApiQueryContentTranslation to get a specific
  translation with draft content if translation id is passed.
  But I see a possibility of an API dedicated to drafts when
  we start supporting deleting.

Saving translations:
* Instead of publish button a save button will be shown. Once
  saved, the button changes to Publish
* Once published if translator changes anything, Save button activates
  again
* Control+S shortcut is remapped to Save feature from Publish feature
* Non-empty sections from translation column alone saved as draft content.
* The HTML DOM will reflect all translation workflow state trackers
  such as progress information, MT/Human/Source annotations
* Translation id is reused as draft id as well.
* There is only one version of draft at any time - latest version
* Translation drafts are not connected to translators. Same is the case
  of translation. For a given source-target language pair and source
  page, there exists only one translation. Only one draft exists.
  This means, for that pair somebody else can overwrite others drafts.
  This need to be addressed later.

Resuming translation:
* In translation view, if draft id is passed as URL parameter, the draft
  content will be loaded and aligned using a best try approach: by matching
  data-source attributes. If no match found, skip.
* Translation dashboard's translation listing provides a link to resume 
translations

The draft feature will be disabled, if the CX common database is not configured.
The save button will not be presented in that case. There is no translation
listing either when common database not configured.

Change-Id: If97c80f6df69dab9eac68faf7d9a4fc0097df837
---
M Autoload.php
M ContentTranslation.hooks.php
M Resources.php
M api/ApiContentTranslationPublish.php
M api/ApiQueryContentTranslation.php
M hooks.md
M i18n/en.json
M i18n/qqq.json
A includes/Draft.php
M includes/Translation.php
M modules/dashboard/ext.cx.translationlist.js
A modules/draft/ext.cx.draft.js
M modules/editor/ext.cx.editor.js
M modules/header/ext.cx.header.js
M modules/header/styles/ext.cx.header.less
M modules/publish/ext.cx.publish.js
M modules/tools/ext.cx.tools.mt.js
M modules/translation/ext.cx.translation.js
M modules/translationview/ext.cx.translationview.js
M sql/contenttranslation.sql
20 files changed, 391 insertions(+), 74 deletions(-)

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



diff --git a/Autoload.php b/Autoload.php
index e853bdb..b2c8bd6 100644
--- a/Autoload.php
+++ b/Autoload.php
@@ -15,6 +15,7 @@
'ApiQueryContentTranslation' = 
$dir/api/ApiQueryContentTranslation.php,
'ContentTranslationHooks' = $dir/ContentTranslation.hooks.php,
'ContentTranslation\Database' = $dir/includes/Database.php,
+   'ContentTranslation\Draft' = $dir/includes/Draft.php,
'ContentTranslation\GlobalUser' = $dir/includes/GlobalUser.php,
'ContentTranslation\SiteMapper' = $dir/includes/SiteMapper.php,
'ContentTranslation\Stats' = $dir/includes/Stats.php,
diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index 5be3f6a..513b5ca 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -76,6 +76,7 @@
global $wgContentTranslationServerURL,
$wgContentTranslationTranslateInTarget,
$wgContentTranslationExperimentalFeatures,
+   $wgContentTranslationDatabase,
$wgContentTranslationSiteTemplates;
 
// Temporary BC code for old configuration
@@ -86,5 +87,6 @@
$vars['wgContentTranslationSiteTemplates'] = 
$wgContentTranslationSiteTemplates;
$vars['wgContentTranslationTranslateInTarget'] = 
$wgContentTranslationTranslateInTarget;
$vars['wgContentTranslationExperimentalFeatures'] = 
$wgContentTranslationExperimentalFeatures;
+   $vars['wgContentTranslationDatabase'] = 
$wgContentTranslationDatabase;
}
 }
diff --git a/Resources.php b/Resources.php
index cf831e4..b0562fa 100644
--- a/Resources.php
+++ b/Resources.php
@@ -100,6 +100,7 @@
'cx-error-page-not-found',
'cx-header-new-translation',
'cx-publish-button',
+   'cx-save-draft-button',
'cx-special-login-error',
'cx-translation-target-page-exists',
'login',
@@ -408,6 +409,19 @@
),
 ) + $resourcePaths;
 
+$wgResourceModules['ext.cx.draft'] = array(
+   'scripts' = array(
+

[MediaWiki-commits] [Gerrit] Reimaging script improvements - change (operations/puppet)

2014-11-18 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Reimaging script improvements
..


Reimaging script improvements

Clean up/sign salt keys as well when FORCE is requested
Use ipmitool to force PXE and reboot the box
Add one more argument (the .mgmt name) for ipmitool to work

Change-Id: Icd1fb181db49d3e73942cb3cbc4a35e807591267
---
M modules/puppetmaster/files/reimage.sh
1 file changed, 33 insertions(+), 5 deletions(-)

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



diff --git a/modules/puppetmaster/files/reimage.sh 
b/modules/puppetmaster/files/reimage.sh
index 822065a..faec1f2 100755
--- a/modules/puppetmaster/files/reimage.sh
+++ b/modules/puppetmaster/files/reimage.sh
@@ -26,11 +26,16 @@
 
 function clean_salt {
 nodename=${1}
+force_yes=${2}
 log cleaning salt key cache for ${nodename}
 # delete the key only if it has been accepted already, we are going to
 # ask confirmation later about unaccepted keys
 if salt-key --list accepted | fgrep -q ${nodename}; then
-salt-key --delete ${nodename}
+if [ ${force_yes} -eq 1 ]; then
+salt-key -y --delete ${nodename}
+else
+salt-key --delete ${nodename}
+fi
 fi
 # salt-key --delete above exits 0 regardless, double check
 if salt-key --list accepted | fgrep -q ${nodename}; then
@@ -70,6 +75,7 @@
 
 function sign_salt {
 nodename=${1}
+force_yes=${2}
 while true; do
 log Seeking the node key to add
 if ! salt-key --list unaccepted | fgrep -q ${nodename}; then
@@ -77,13 +83,32 @@
 sleep $SLEEPTIME
 continue
 fi;
-salt-key -a ${nodename}
+if [ ${force_yes} -eq 1 ]; then
+salt-key -y -a ${nodename}
+else
+salt-key -a ${nodename}
+fi
 break
 done
 }
 
+function set_pxe_and_reboot {
+mgmtname=${1}
+if [ -z $IPMI_PASSWORD ]; then
+   echo WARNING: IPMI_PASSWORD not found. Assuming bash, do: 
+   echo HISTCONTROL=ignorebothenter
+   echo spaceexport IPMI_PASSWORD='supersecretpass'
+   echo WARNING: Continuing without auto rebooting the box
+   return
+fi
+export IPMI_PASSWORD
+ipmitool -I lanplus -H ${mgmtname} -U root -E chassis bootdev pxe
+ipmitool -I lanplus -H ${mgmtname} -U root -E chassis power cycle
+
+}
+
 function usage {
-echo Usage: $0 [-y][-s SECONDS] nodename; exit 1;
+echo Usage: $0 [-y][-s SECONDS] nodename mgmtname; exit 1;
 }
 
 ## Main script
@@ -103,12 +128,15 @@
 done
 shift $((OPTIND-1))
 nodename=$1
+mgmtname=$2
 test -z ${nodename}  usage
+test -z ${mgmtname}  usage
 log Preparing reimaging of node ${nodename}
 
 clean_puppet $nodename
-clean_salt $nodename
+clean_salt $nodename $FORCE
+set_pxe_and_reboot $mgmtname
 sign_puppet $nodename $FORCE
-sign_salt $nodename
+sign_salt $nodename $FORCE
 
 log Node ${nodename} is now signed and both puppet and salt should work.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icd1fb181db49d3e73942cb3cbc4a35e807591267
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] LaTeXML: prevent automatic rerendering of SVG - change (mediawiki...Math)

2014-11-18 Thread Physikerwelt (Code Review)

Physikerwelt has uploaded a new change for review.

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

Change subject: LaTeXML: prevent automatic rerendering of SVG
..

LaTeXML: prevent automatic rerendering of SVG

MathMathML::renderingRequired called the getSvg
function in MathLaTeXML that caused an automatic
rerendering of the SVG image if it was not cached.
That this rendering is triggered from the function
renderingRequired is contra intutive and should be
avoided.

Change-Id: Ifa14f50193a05b3058624a18974c56897fcec09e
---
M MathLaTeXML.php
M MathMathML.php
2 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/MathLaTeXML.php b/MathLaTeXML.php
index 4915058..b9d7f86 100644
--- a/MathLaTeXML.php
+++ b/MathLaTeXML.php
@@ -197,8 +197,8 @@
 * Lazy evaluation: If no SVG image exists it's generated on the fly
 * @return string XML-Document of the rendered SVG
 */
-   public function getSvg() {
-   if ( $this-isPurge() || $this-svg == '' ) {
+   public function getSvg( $render = true ) {
+   if ( $render  ( $this-isPurge() || $this-svg == '' ) ) {
$this-calulateSvg();
}
return $this-svg;
diff --git a/MathMathML.php b/MathMathML.php
index 6707059..63f2b26 100644
--- a/MathMathML.php
+++ b/MathMathML.php
@@ -108,7 +108,7 @@
if ( $dbres ) {
if ( $this-isValidMathML( $this-getMathml() ) 
) {
wfDebugLog( Math, Valid MathML entry 
found in database. );
-   if ( $this-getSvg() ) {
+   if ( $this-getSvg( false ) ) {
wfDebugLog( Math, 
SVG-fallback found in database. );
return false;
} else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa14f50193a05b3058624a18974c56897fcec09e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de

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

[MediaWiki-commits] [Gerrit] Add missing inclusion of resource definition file - change (mediawiki...Wikibase)

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

Adrian Lang has uploaded a new change for review.

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

Change subject: Add missing inclusion of resource definition file
..

Add missing inclusion of resource definition file

Change-Id: Icb8ae5550d08f1528adab95fa7e9dbc5a7559ac3
---
M lib/resources/Resources.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index f417191..f1e463b 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -121,6 +121,7 @@
include( __DIR__ . '/deprecated/resources.php' ),
include( __DIR__ . '/experts/resources.php' ),
include( __DIR__ . '/jquery.wikibase/resources.php' ),
+   include( __DIR__ . '/jquery.wikibase-shared/resources.php' ),
include( __DIR__ . '/wikibase.RepoApi/resources.php' )
);
 

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

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

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

[MediaWiki-commits] [Gerrit] Add logging table - change (mediawiki...Math)

2014-11-18 Thread Physikerwelt (Code Review)

Physikerwelt has uploaded a new change for review.

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

Change subject: Add logging table
..

Add logging table

Adds a database table to store log entries in the database

Change-Id: I7935f33e04a1c9d7d4f1dbbc600e840f07c19dad
---
A db/mathlog.mysql.sql
1 file changed, 20 insertions(+), 0 deletions(-)


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

diff --git a/db/mathlog.mysql.sql b/db/mathlog.mysql.sql
new file mode 100644
index 000..d0ed74c
--- /dev/null
+++ b/db/mathlog.mysql.sql
@@ -0,0 +1,20 @@
+--
+-- Used by the math module to oganize the log files from
+-- different rendering engines
+--
+CREATE TABLE /*_*/mathlog (
+  -- Binary MD5 hash of math_inputtex, used as an identifier key.
+  math_inputhash varbinary(16) NOT NULL,
+  -- the log input
+  math_log text NOT NULL,
+  -- the post request sent
+  math_post text,
+  -- MW_MATH_(MAHML|LATEXML)
+  math_mode tinyint
+  -- time needed to answer the request in ms
+  math_postime int,
+  -- timestamp
+  math_timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE 
CURRENT_TIMESTAMP,
+  -- key
+  key ( math_inputhash, math_mode )
+) /*$wgDBTableOptions*/;
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7935f33e04a1c9d7d4f1dbbc600e840f07c19dad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de

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

[MediaWiki-commits] [Gerrit] Add missing inclusion of resource definition file - change (mediawiki...Wikibase)

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

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

Change subject: Add missing inclusion of resource definition file
..


Add missing inclusion of resource definition file

Change-Id: Icb8ae5550d08f1528adab95fa7e9dbc5a7559ac3
---
M lib/resources/Resources.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index f417191..f1e463b 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -121,6 +121,7 @@
include( __DIR__ . '/deprecated/resources.php' ),
include( __DIR__ . '/experts/resources.php' ),
include( __DIR__ . '/jquery.wikibase/resources.php' ),
+   include( __DIR__ . '/jquery.wikibase-shared/resources.php' ),
include( __DIR__ . '/wikibase.RepoApi/resources.php' )
);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icb8ae5550d08f1528adab95fa7e9dbc5a7559ac3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Create debugging table onLoadExtensionSchemaUpdates - change (mediawiki...Math)

2014-11-18 Thread Physikerwelt (Code Review)

Physikerwelt has uploaded a new change for review.

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

Change subject: Create debugging table onLoadExtensionSchemaUpdates
..

Create debugging table onLoadExtensionSchemaUpdates

* Creates the mathlog table if the mathdebug mode is enabled
* Replaces dirname( __FILE__ ) - __DIR__

Change-Id: I215e150452066f10458c1405ebddc9276e5596c8
---
M Math.hooks.php
1 file changed, 11 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math 
refs/changes/76/174076/1

diff --git a/Math.hooks.php b/Math.hooks.php
index 213ac8f..95d6b00 100644
--- a/Math.hooks.php
+++ b/Math.hooks.php
@@ -216,7 +216,7 @@
 * @return bool
 */
static function onLoadExtensionSchemaUpdates( $updater = null ) {
-   global $wgMathValidModes;
+   global $wgMathValidModes, $wgMathDebug;
if ( is_null( $updater ) ) {
throw new MWException( 'Math extension is only 
necessary in 1.18 or above' );
}
@@ -226,14 +226,14 @@
$type = $updater-getDB()-getType();
 
if ( in_array( $type, $map ) ) {
-   $sql = dirname( __FILE__ ) . '/db/math.' . $type . 
'.sql';
+   $sql = __DIR__ . '/db/math.' . $type . '.sql';
$updater-addExtensionTable( 'math', $sql );
if ( in_array( MW_MATH_LATEXML, $wgMathValidModes ) ) {
if ( in_array( $type, array( 'mysql', 'sqlite', 
'postgres' ) ) ) {
-   $sql = dirname( __FILE__ ) . 
'/db/mathlatexml.' . $type . '.sql';
+   $sql = __DIR__ . '/db/mathlatexml.' . 
$type . '.sql';
$updater-addExtensionTable( 
'mathlatexml', $sql );
if ( $type == 'mysql' ){
-   $sql = dirname( __FILE__ ) . 
'/db/patches/mathlatexml.mathml-length-adjustment.mysql.sql';
+   $sql = __DIR__ . 
'/db/patches/mathlatexml.mathml-length-adjustment.mysql.sql';
$updater-modifyExtensionField( 
'mathlatexml', 'math_mathml', $sql );
}
} else {
@@ -242,12 +242,18 @@
}
if ( in_array( MW_MATH_MATHML, $wgMathValidModes ) ) {
if ( in_array( $type, array( 'mysql', 'sqlite', 
'postgres' ) ) ) {
-   $sql = dirname( __FILE__ ) . 
'/db/mathoid.' . $type . '.sql';
+   $sql = __DIR__ . '/db/mathoid.' . $type 
. '.sql';
$updater-addExtensionTable( 'mathoid', 
$sql );
} else {
throw new MWException( Math extension 
does not currently support $type database for Mathoid. );
}
}
+   if( $wgMathDebug ) {
+   if( $type == 'mysql' ) {
+   $sql = __DIR__ . 'db/mathlog.mysql.sql';
+   $updater-addExtensionTable( 'mathlog', 
$sql );
+   }
+   }
} else {
throw new MWException( Math extension does not 
currently support $type database. );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I215e150452066f10458c1405ebddc9276e5596c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de

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

[MediaWiki-commits] [Gerrit] Apply page deletions to the repo - change (mediawiki...Wikibase)

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

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

Change subject: Apply page deletions to the repo
..


Apply page deletions to the repo

Very similar (and shares code with) the page move propagation.

Requires If99be002973e6 in MediaWiki to notify the user of what
happened (but it works without that).

Bug: 49100
Change-Id: Ie03a845f1849a7343f7d7ecc8a35e44cb03fee39
---
M client/WikibaseClient.hooks.php
M client/WikibaseClient.php
M client/i18n/en.json
M client/i18n/qqq.json
A client/includes/UpdateRepo/UpdateRepoOnDelete.php
A client/includes/hooks/DeletePageNoticeCreator.php
M client/includes/hooks/MovePageNotice.php
A client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteTest.php
M client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveTest.php
A client/tests/phpunit/includes/hooks/DeletePageNoticeCreatorTest.php
10 files changed, 485 insertions(+), 8 deletions(-)

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



diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index 6fc0d62..5cbd1ba 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -25,17 +25,22 @@
 use UnexpectedValueException;
 use User;
 use Wikibase\Client\Changes\ChangeHandler;
+use WikiPage;
+use Content;
+use ManualLogEntry;
 use Wikibase\Client\Hooks\BaseTemplateAfterPortletHandler;
 use Wikibase\Client\Hooks\BeforePageDisplayHandler;
 use Wikibase\Client\Hooks\ChangesPageWikibaseFilterHandler;
 use Wikibase\Client\Hooks\InfoActionHookHandler;
 use Wikibase\Client\Hooks\SpecialWatchlistQueryHandler;
 use Wikibase\Client\MovePageNotice;
+use Wikibase\Client\DeletePageNoticeCreator;
 use Wikibase\Client\RecentChanges\ChangeLineFormatter;
 use Wikibase\Client\RecentChanges\ExternalChangeFactory;
 use Wikibase\Client\RecentChanges\RecentChangesFilterOptions;
 use Wikibase\Client\RepoItemLinkGenerator;
 use Wikibase\Client\UpdateRepo\UpdateRepoOnMove;
+use Wikibase\Client\UpdateRepo\UpdateRepoOnDelete;
 use Wikibase\Client\WikibaseClient;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\SiteLink;
@@ -698,11 +703,18 @@
 * @param User $user
 * @param integer $pageId database ID of the page that's been moved
 * @param integer $redirectId database ID of the created redirect
+* @param string $reason
 *
 * @return bool
 */
-   public static function onTitleMoveComplete( Title $oldTitle, Title 
$newTitle, User $user,
-   $pageId, $redirectId ) {
+   public static function onTitleMoveComplete(
+   Title $oldTitle,
+   Title $newTitle,
+   User $user,
+   $pageId,
+   $redirectId,
+   $reason
+   ) {
 
if ( !self::isWikibaseEnabled( $oldTitle-getNamespace() )
 !self::isWikibaseEnabled( $newTitle-getNamespace() 
) ) {
@@ -761,6 +773,112 @@
}
 
/**
+* After a page has been deleted also update the item on the repo
+* This only works with CentralAuth
+*
+* @see 
https://www.mediawiki.org/wiki/Manual:Hooks/ArticleDeleteComplete
+*
+* @param WikiPage $article
+* @param User $user
+* @param string $reason
+* @param int $id id of the article that was deleted
+* @param Content $content
+* @param ManualLogEntry $logEntry
+*
+* @return bool
+*/
+   public static function onArticleDeleteComplete(
+   WikiPage $article,
+   User $user,
+   $reason,
+   $id,
+   Content $content,
+   ManualLogEntry $logEntry
+   ) {
+   $title = $article-getTitle();
+
+   if ( !self::isWikibaseEnabled( $title-getNamespace() ) ) {
+   // shorten out
+   return true;
+   }
+
+   wfProfileIn( __METHOD__ );
+
+   $wikibaseClient = WikibaseClient::getDefaultInstance();
+   $settings = $wikibaseClient-getSettings();
+
+   if ( $settings-getSetting( 'propagateChangesToRepo' ) !== true 
) {
+   wfProfileOut( __METHOD__ );
+   return true;
+   }
+
+   $repoDB = $settings-getSetting( 'repoDatabase' );
+   $siteLinkLookup = 
$wikibaseClient-getStore()-getSiteLinkTable();
+   $jobQueueGroup = JobQueueGroup::singleton( $repoDB );
+
+   if ( !$jobQueueGroup ) {
+   wfLogWarning( Failed to acquire a JobQueueGroup for 
$repoDB );
+   wfProfileOut( __METHOD__ );
+   return true;
+   }
+
+   $updateRepo = new UpdateRepoOnDelete(
+   $repoDB,
+   $siteLinkLookup,
+

[MediaWiki-commits] [Gerrit] Fix editing of empty sitelinklistviews - change (mediawiki...Wikibase)

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

Adrian Lang has uploaded a new change for review.

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

Change subject: Fix editing of empty sitelinklistviews
..

Fix editing of empty sitelinklistviews

Change-Id: Ic9c6874ce8add3aa12dfed08211da4f5466345ac
---
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index cc9a911..520528b 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -502,7 +502,7 @@
foundOne = true;
}
} );
-   if( !foundOne ) {
+   if( !foundOne  listview.items().length  0 ) {
lia.liInstance( $( listview.items()[0] ) 
).startEditing();
}
},

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

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

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

[MediaWiki-commits] [Gerrit] eqiad: add missing forward for graphite1001 - change (operations/dns)

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

Filippo Giunchedi has submitted this change and it was merged.

Change subject: eqiad: add missing forward for graphite1001
..


eqiad: add missing forward for graphite1001

RT #8881

Change-Id: I4a72932a2a2de07e1f082def3d690624d735533b
---
M templates/wmnet
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/wmnet b/templates/wmnet
index 10bd3dd..66e92a6 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -953,7 +953,7 @@
 wmf3076 1H  IN A10.65.6.15
 db1016  1H  IN A10.65.6.16
 wmf3075 1H  IN A10.65.6.16
-db1017  1H  IN A10.65.6.17
+graphite1001   1H  IN A10.65.6.17
 wmf3269 1H  IN A10.65.6.17
 db1018  1H  IN A10.65.6.18
 wmf3268 1H  IN A10.65.6.18

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a72932a2a2de07e1f082def3d690624d735533b
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@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 path to i18n - change (mediawiki...MsUpload)

2014-11-18 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Fix path to i18n
..

Fix path to i18n

* This fixes the path to i18n the problem was introduced in the latest
* release.

* Renames msupload.php to MsUpload.php
* Renames msupload.i18n.php to MsUpload.i18n.php

Change-Id: I2ae068381e915f2b02378bef043ac767d27571f7
---
M .gitignore
A MsUpload.css
R MsUpload.i18n.php
A MsUpload.js
A MsUpload.php
D README.TXT
A README.md
D css/images/ui-bg_flat_0_aa_40x100.png
D css/images/ui-bg_flat_75_ff_40x100.png
D css/images/ui-bg_glass_55_fbf9ee_1x400.png
D css/images/ui-bg_glass_65_ff_1x400.png
D css/images/ui-bg_glass_75_dadada_1x400.png
D css/images/ui-bg_glass_75_e6e6e6_1x400.png
D css/images/ui-bg_glass_95_fef1ec_1x400.png
D css/images/ui-bg_highlight-soft_75_cc_1x100.png
D css/jquery.css
D css/msupload.css
M i18n/de.json
M i18n/en.json
M i18n/es.json
A i18n/fr.json
A i18n/he.json
M i18n/it.json
M i18n/ja.json
A i18n/lt.json
M i18n/pt-br.json
A i18n/qqq.json
M i18n/ru.json
M i18n/zh-hans.json
M i18n/zh-hant.json
M images/msu_close.png
M images/msu_document-film.png
M images/msu_document-globe.png
M images/msu_document-image.png
M images/msu_document-music.png
M images/msu_document-pdf.png
M images/msu_document.png
M images/msu_error-small.png
M images/msu_error.png
M images/msu_loading.png
M images/msu_progress_stripe.png
M images/msu_tick.png
M images/msu_upload_button.png
A images/msu_upload_button_old.gif
M images/msu_upload_icon.png
D js/msupload.insert.js
D js/msupload.js
D js/plupload/plupload.flash.js
D js/plupload/plupload.flash.swf
D js/plupload/plupload.full.js
D js/plupload/plupload.html4.js
D js/plupload/plupload.html5.js
D js/plupload/plupload.js
D js/plupload/plupload.silverlight.js
D js/plupload/plupload.silverlight.xap
M msupload.body.php
D msupload.php
A plupload/Moxie.swf
A plupload/Moxie.xap
A plupload/plupload.full.min.js
60 files changed, 1,214 insertions(+), 1,535 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ae068381e915f2b02378bef043ac767d27571f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsUpload
Gerrit-Branch: REL1_24
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com

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

[MediaWiki-commits] [Gerrit] Add 'composer test' to run PHPUnit - change (cdb)

2014-11-18 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Add 'composer test' to run PHPUnit
..

Add 'composer test' to run PHPUnit

A very lame composer 'test' entry point which runs PHPUnit. Will let us
craft a Jenkins job to easily install dependencies and run tests.

Bug: 73541
Change-Id: I431850b34206f307fe294afbec981643fd46376c
---
M composer.json
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/cdb refs/changes/80/174080/1

diff --git a/composer.json b/composer.json
index fed2a4f..34d6034 100644
--- a/composer.json
+++ b/composer.json
@@ -22,5 +22,8 @@
 },
 autoload: {
 classmap: [src/]
-}
+},
+   scripts: {
+   test: phpunit test
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I431850b34206f307fe294afbec981643fd46376c
Gerrit-PatchSet: 1
Gerrit-Project: cdb
Gerrit-Branch: master
Gerrit-Owner: 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] Revert Update Malayalam fonts - change (mediawiki...UniversalLanguageSelector)

2014-11-18 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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

Change subject: Revert Update Malayalam fonts
..

Revert Update Malayalam fonts

This reverts commit d546f6e71fb3b402b050a77636c13ce130300bbd.
Noted line height variations between WOFF and WOFF2.
Reverting till we investigate this
Similar to https://gerrit.wikimedia.org/r/#/c/174081/

Change-Id: I31e1a2dfe643fcd979953acc5cb6f93e872a2a87
---
M data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.eot
M data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.ttf
M data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff
D data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff2
M data/fontrepo/fonts/AnjaliOldLipi/font.ini
M data/fontrepo/fonts/Meera/Meera.eot
M data/fontrepo/fonts/Meera/Meera.ttf
M data/fontrepo/fonts/Meera/Meera.woff
D data/fontrepo/fonts/Meera/Meera.woff2
M data/fontrepo/fonts/Meera/font.ini
M resources/js/ext.uls.webfonts.repository.js
11 files changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.eot 
b/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.eot
index 78139a7..d8595ed 100644
--- a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.eot
+++ b/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.eot
Binary files differ
diff --git a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.ttf 
b/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.ttf
index 4f56677..6c76fa7 100644
--- a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.ttf
+++ b/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.ttf
Binary files differ
diff --git a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff 
b/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff
index b10e9d3..835a05e 100644
--- a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff
+++ b/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff
Binary files differ
diff --git a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff2 
b/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff2
deleted file mode 100644
index c828596..000
--- a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff2
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/AnjaliOldLipi/font.ini 
b/data/fontrepo/fonts/AnjaliOldLipi/font.ini
index 85c55d7..b3852fa 100644
--- a/data/fontrepo/fonts/AnjaliOldLipi/font.ini
+++ b/data/fontrepo/fonts/AnjaliOldLipi/font.ini
@@ -1,6 +1,6 @@
 [AnjaliOldLipi]
 languages=ml
-version=6.1.1
+version=.0.730
 license=OFL-1.1
 licensefile=OFL.txt
-url=https://smc.org.in
+url=https://sites.google.com/site/cibu/anjalioldlipi-font
diff --git a/data/fontrepo/fonts/Meera/Meera.eot 
b/data/fontrepo/fonts/Meera/Meera.eot
index 07b2264..c88b7a7 100644
--- a/data/fontrepo/fonts/Meera/Meera.eot
+++ b/data/fontrepo/fonts/Meera/Meera.eot
Binary files differ
diff --git a/data/fontrepo/fonts/Meera/Meera.ttf 
b/data/fontrepo/fonts/Meera/Meera.ttf
index c518651..c54a55b 100644
--- a/data/fontrepo/fonts/Meera/Meera.ttf
+++ b/data/fontrepo/fonts/Meera/Meera.ttf
Binary files differ
diff --git a/data/fontrepo/fonts/Meera/Meera.woff 
b/data/fontrepo/fonts/Meera/Meera.woff
index e6d3749..cef8b92 100644
--- a/data/fontrepo/fonts/Meera/Meera.woff
+++ b/data/fontrepo/fonts/Meera/Meera.woff
Binary files differ
diff --git a/data/fontrepo/fonts/Meera/Meera.woff2 
b/data/fontrepo/fonts/Meera/Meera.woff2
deleted file mode 100644
index 93c5acc..000
--- a/data/fontrepo/fonts/Meera/Meera.woff2
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/Meera/font.ini 
b/data/fontrepo/fonts/Meera/font.ini
index b0c555f..1b56134 100644
--- a/data/fontrepo/fonts/Meera/font.ini
+++ b/data/fontrepo/fonts/Meera/font.ini
@@ -1,6 +1,6 @@
 [Meera]
 languages=ml
-version=6.1.1
+version=6.0
 license=GPL-3.0.0+-with-font-exception
 licensefile=gpl-3.0.txt
-url=https://smc.org.in
+url=https://savannah.nongnu.org/projects/smc
diff --git a/resources/js/ext.uls.webfonts.repository.js 
b/resources/js/ext.uls.webfonts.repository.js
index fd5fcb0..670a2e0 100644
--- a/resources/js/ext.uls.webfonts.repository.js
+++ b/resources/js/ext.uls.webfonts.repository.js
@@ -1,5 +1,5 @@
 // Do not edit! This file is generated from data/fontrepo by 
data/fontrepo/scripts/compile.php
 ( function ( $ ) {
$.webfonts = $.webfonts || {};
-   $.webfonts.repository = 
{base:..\/data\/fontrepo\/fonts\/,languages:{adx:[Jomolhari],af:[system,ComicNeue,OpenDyslexic],ahr:[Lohit
 
Marathi],akk:[Akkadian],am:[AbyssinicaSIL],ang:[system,Junicode],ar:[system,Amiri],arb:[system,Amiri],arc:[Estrangelo
 Edessa,East Syriac Adiabene,SertoUrhoy],as:[system,Lohit 
Assamese],bbc:[system,Pangururan],bh:[Lohit 
Devanagari],bho:[Lohit 
Devanagari],bk:[system,ComicNeue,OpenDyslexic],bn:[Siyam 
Rupali,Lohit Bengali],bo:[Jomolhari],bod:[Jomolhari],bpy:[Siyam 
Rupali,Lohit

[MediaWiki-commits] [Gerrit] Update type hint in interface - change (mediawiki...Wikibase)

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

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

Change subject: Update type hint in interface
..


Update type hint in interface

Change-Id: Iede16f8e8386bb94ceeed04fcc317f65dcecaca7
---
M lib/includes/store/EntityLookup.php
M lib/includes/store/RedirectResolvingEntityLookup.php
M lib/includes/store/RevisionBasedEntityLookup.php
M lib/tests/phpunit/MockRepository.php
4 files changed, 8 insertions(+), 7 deletions(-)

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



diff --git a/lib/includes/store/EntityLookup.php 
b/lib/includes/store/EntityLookup.php
index 52e6a54..b8c941a 100644
--- a/lib/includes/store/EntityLookup.php
+++ b/lib/includes/store/EntityLookup.php
@@ -2,7 +2,7 @@
 
 namespace Wikibase\Lib\Store;
 
-use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Entity\EntityDocument;
 use Wikibase\DataModel\Entity\EntityId;
 
 /**
@@ -29,7 +29,7 @@
 * @param EntityId $entityId
 *
 * @throws StorageException
-* @return Entity|null
+* @return EntityDocument|null
 */
public function getEntity( EntityId $entityId );
 
diff --git a/lib/includes/store/RedirectResolvingEntityLookup.php 
b/lib/includes/store/RedirectResolvingEntityLookup.php
index 9b33c3c..b52e7a3 100644
--- a/lib/includes/store/RedirectResolvingEntityLookup.php
+++ b/lib/includes/store/RedirectResolvingEntityLookup.php
@@ -2,7 +2,7 @@
 
 namespace Wikibase\Lib\Store;
 
-use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Entity\EntityDocument;
 use Wikibase\DataModel\Entity\EntityId;
 
 /**
@@ -44,7 +44,7 @@
 * @param EntityId $entityId
 *
 * @throws StorageException
-* @return Entity|null
+* @return EntityDocument|null
 */
public function getEntity( EntityId $entityId ) {
return $this-lookup-getEntity( $entityId );
diff --git a/lib/includes/store/RevisionBasedEntityLookup.php 
b/lib/includes/store/RevisionBasedEntityLookup.php
index ef455a3..d9922b4 100644
--- a/lib/includes/store/RevisionBasedEntityLookup.php
+++ b/lib/includes/store/RevisionBasedEntityLookup.php
@@ -2,7 +2,7 @@
 
 namespace Wikibase\Lib\Store;
 
-use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Entity\EntityDocument;
 use Wikibase\DataModel\Entity\EntityId;
 
 /**
@@ -35,7 +35,7 @@
 * @param EntityId $entityId
 *
 * @throws StorageException
-* @return Entity|null
+* @return EntityDocument|null
 */
public function getEntity( EntityId $entityId ) {
$revision = $this-lookup-getEntityRevision( $entityId );
diff --git a/lib/tests/phpunit/MockRepository.php 
b/lib/tests/phpunit/MockRepository.php
index a4b9ef9..c82a5f8 100644
--- a/lib/tests/phpunit/MockRepository.php
+++ b/lib/tests/phpunit/MockRepository.php
@@ -7,6 +7,7 @@
 use User;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Entity\EntityDocument;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
@@ -93,7 +94,7 @@
 *
 * @param EntityID $entityId
 *
-* @return Entity|null
+* @return EntityDocument|null
 *
 * @throws StorageException
 */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iede16f8e8386bb94ceeed04fcc317f65dcecaca7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Remove not needed variable assignment - change (mediawiki...Wikibase)

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

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

Change subject: Remove not needed variable assignment
..


Remove not needed variable assignment

Change-Id: I3a28b3c9ff871e83157fd0a90d3c3cedc77118a2
---
M lib/includes/store/RevisionBasedEntityLookup.php
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/lib/includes/store/RevisionBasedEntityLookup.php 
b/lib/includes/store/RevisionBasedEntityLookup.php
index ef455a3..082b78b 100644
--- a/lib/includes/store/RevisionBasedEntityLookup.php
+++ b/lib/includes/store/RevisionBasedEntityLookup.php
@@ -51,8 +51,7 @@
 * @return bool
 */
public function hasEntity( EntityId $entityId ) {
-   $latest = $this-lookup-getLatestRevisionId( $entityId );
-   return $latest !== false;
+   return $this-lookup-getLatestRevisionId( $entityId ) !== 
false;
 
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a28b3c9ff871e83157fd0a90d3c3cedc77118a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Limit fix of padding of mw-ui-input and -button to Special:S... - change (mediawiki...chameleon)

2014-11-18 Thread Foxtrott (Code Review)

Foxtrott has submitted this change and it was merged.

Change subject: Limit fix of padding of mw-ui-input and -button to 
Special:Search
..


Limit fix of padding of mw-ui-input and -button to Special:Search

Also some minor restructuring of styles.

Bug: 73509
Followup: Id57e514abb1910d6059
Change-Id: I943ba03dc116fa2247a5b49613f08a60ff7993df
---
M resources/styles/core.less
M resources/styles/forms.less
M resources/styles/images.less
M resources/styles/screen.less
D resources/styles/thumbnails.less
5 files changed, 73 insertions(+), 101 deletions(-)

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



diff --git a/resources/styles/core.less b/resources/styles/core.less
index dd0a3be..89a190d 100644
--- a/resources/styles/core.less
+++ b/resources/styles/core.less
@@ -29,7 +29,6 @@
 @import utils;
 @import images;
 @import forms;
-@import thumbnails;
 @import screen;
 @import specialpages;
 @import print;
diff --git a/resources/styles/forms.less b/resources/styles/forms.less
index 6f03ffd..73dbe25 100644
--- a/resources/styles/forms.less
+++ b/resources/styles/forms.less
@@ -31,3 +31,9 @@
border: none;
margin: 0;
 }
+
+.skin-chameleon.mw-special-Search {
+   .mw-ui-input, .mw-ui-button {
+   padding: 0.5em 1em;
+   }
+}
diff --git a/resources/styles/images.less b/resources/styles/images.less
index 21b764d..3712b2a 100644
--- a/resources/styles/images.less
+++ b/resources/styles/images.less
@@ -35,3 +35,70 @@
}
 }
 
+.thumbinner {
+   .thumbnail;
+
+   overflow: hidden;
+}
+
+/* Default styles when there's no .mw-content-ltr or .mw-content-rtl, 
overridden below */
+.thumbcaption {
+   .thumbnail  .caption;
+   text-align: left;
+}
+
+div.magnify {
+   float: right;
+   margin-left: 0.3em;
+   margin-right: 0;
+
+   a {
+   .glyphicon;
+   .glyphicon-zoom-in;
+
+   color: lighten( @thumbnail-caption-color, 15% );
+   top: 4px;
+
+   :hover {
+   text-decoration: none;
+   color: @thumbnail-caption-color;
+   }
+
+   * {
+   display: none;
+   }
+
+   /* Don't annoy people who copy-paste everything too much */
+   .user-select(none);
+   }
+}
+
+
+/* Directionality-specific styles for thumbnails - their positioning depends 
on content language */
+
+/* @noflip */
+.mw-content-ltr{
+   .thumbcaption {
+   text-align: left;
+   }
+
+   div.magnify {
+   float: right;
+   margin-left: 0.3em;
+   margin-right: 0;
+   }
+}
+
+/* @noflip */
+.mw-content-rtl{
+   .thumbcaption {
+   text-align: right;
+   }
+
+   div.magnify {
+   float: left;
+   margin-left: 0;
+   margin-right: 0.3em;
+   .scale(-1, 1); // flip magnifying glass
+   }
+}
diff --git a/resources/styles/screen.less b/resources/styles/screen.less
index fd9bbdb..458b387 100644
--- a/resources/styles/screen.less
+++ b/resources/styles/screen.less
@@ -442,9 +442,3 @@
 table.mw-recentchanges-table {
width: 100%;
 }
-
-.skin-chameleon {
-   .mw-ui-input, .mw-ui-button {
-   padding: 0.5em 1em;
-   }
-}
diff --git a/resources/styles/thumbnails.less b/resources/styles/thumbnails.less
deleted file mode 100644
index fa60d05..000
--- a/resources/styles/thumbnails.less
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * MediaWiki Thumbnails
- *
- * This file is part of the MediaWiki skin Chameleon.
- *
- * @copyright 2013 - 2014, Stephan Gambke
- * @license   GNU General Public License, version 3 (or any later version)
- *
- * The Chameleon skin is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the 
Free
- * Software Foundation, either version 3 of the License, or (at your option) 
any
- * later version.
- *
- * The Chameleon skin is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for 
more
- * details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see http://www.gnu.org/licenses/.
- *
- * @author Stephan Gambke
- * @since 1.0
- * @ingroup Skins
- */
-
-
-.thumbinner {
-   .thumbnail;
-
-   overflow: hidden;
-}
-
-/* Default styles when there's no .mw-content-ltr or .mw-content-rtl, 
overridden below */
-.thumbcaption {
-   .thumbnail  .caption;
-   text-align: left;
-}
-
-div.magnify {
-   float: right;
-   margin-left: 0.3em;
-   margin-right: 0;
-
-   a {
-   .glyphicon;
-   .glyphicon-zoom-in;
-
-

[MediaWiki-commits] [Gerrit] Move tipsy images to jquery.wikibase-shared - change (mediawiki...Wikibase)

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

Adrian Lang has uploaded a new change for review.

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

Change subject: Move tipsy images to jquery.wikibase-shared
..

Move tipsy images to jquery.wikibase-shared

Change-Id: I65050e702eaa05af710f6ccadbbd4928efc91d19
---
R lib/resources/jquery.wikibase-shared/themes/default/images/tipsy-error.png
R lib/resources/jquery.wikibase-shared/themes/default/images/tipsy.png
2 files changed, 0 insertions(+), 0 deletions(-)


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

diff --git 
a/lib/resources/jquery.wikibase/themes/default/images/tipsy-error.png 
b/lib/resources/jquery.wikibase-shared/themes/default/images/tipsy-error.png
similarity index 100%
rename from lib/resources/jquery.wikibase/themes/default/images/tipsy-error.png
rename to 
lib/resources/jquery.wikibase-shared/themes/default/images/tipsy-error.png
Binary files differ
diff --git a/lib/resources/jquery.wikibase/themes/default/images/tipsy.png 
b/lib/resources/jquery.wikibase-shared/themes/default/images/tipsy.png
similarity index 100%
rename from lib/resources/jquery.wikibase/themes/default/images/tipsy.png
rename to lib/resources/jquery.wikibase-shared/themes/default/images/tipsy.png
Binary files differ

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

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

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

[MediaWiki-commits] [Gerrit] Optimized sticknode mechanisms - change (mediawiki...Wikibase)

2014-11-18 Thread Henning Snater (Code Review)

Henning Snater has uploaded a new change for review.

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

Change subject: Optimized sticknode mechanisms
..

Optimized sticknode mechanisms

$.sticknode now handles local height changes instead of changes in the document 
height only.
This prevents jitter when fixing a node while the document height does not 
change along.

Change-Id: I1e9f2cf09c078f85dc037fd10613c44eb899011c
---
M repo/resources/jquery/jquery.sticknode.js
1 file changed, 17 insertions(+), 19 deletions(-)


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

diff --git a/repo/resources/jquery/jquery.sticknode.js 
b/repo/resources/jquery/jquery.sticknode.js
index 5265f4b..6b181aa 100644
--- a/repo/resources/jquery/jquery.sticknode.js
+++ b/repo/resources/jquery/jquery.sticknode.js
@@ -92,6 +92,11 @@
$node: null,
 
/**
+* @type {jQuery|null}
+*/
+   _$clone: null,
+
+   /**
 * @type {Object}
 */
_options: null,
@@ -116,6 +121,8 @@
'.' + PLUGIN_NAME
);
this.$node.removeData( PLUGIN_NAME );
+   this._$clone.remove();
+   this._$clone = null;
},
 
/**
@@ -176,6 +183,12 @@
width: this.$node.css( 'width' )
};
 
+   // Cannot fix the clone instead of the original node since the 
clone does not feature event
+   // bindings.
+   this._$clone = this.$node.clone()
+   .css( 'visibility', 'hidden' )
+   .insertBefore( this.$node );
+
this.$node
.css( 'left', this._initialAttributes.offset.left + 'px' )
.css( 'top', this.$node.outerHeight() - this.$node.outerHeight( 
true ) )
@@ -184,6 +197,9 @@
},
 
_unfix: function() {
+   this._$clone.remove();
+   this._$clone = null;
+
this.$node
.css( 'left', this._initialAttributes.left )
.css( 'top', this._initialAttributes.top )
@@ -210,10 +226,7 @@
 * @return {boolean}
 */
update: function( scrollTop, force ) {
-   var changedState = false,
-   $document = $( document ),
-   initialDocumentHeight = $document.height(),
-   newDocumentHeight;
+   var changedState = false;
 
if( force  this.isFixed() ) {
this._unfix();
@@ -225,14 +238,6 @@
 !this._isScrolledAfterContainer()
) {
this._fix();
-
-   newDocumentHeight = $document.height();
-   if( newDocumentHeight  initialDocumentHeight ) {
-   $window.scrollTop( scrollTop - ( 
initialDocumentHeight - newDocumentHeight ) );
-   initialDocumentHeight = newDocumentHeight;
-   this._changesDocumentHeight = true;
-   }
-
changedState = true;
}
 
@@ -241,13 +246,6 @@
|| this._clipsContainer()
) {
this._unfix();
-
-   newDocumentHeight = $document.height();
-   if( newDocumentHeight  initialDocumentHeight ) {
-   $window.scrollTop( scrollTop + ( 
newDocumentHeight - initialDocumentHeight ) );
-   this._changesDocumentHeight = true;
-   }
-
changedState = !changedState;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e9f2cf09c078f85dc037fd10613c44eb899011c
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] Switch oojs-ui to ruby 2.0 linter - change (integration/config)

2014-11-18 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Switch oojs-ui to ruby 2.0 linter
..

Switch oojs-ui to ruby 2.0 linter

The browser tests are no more using ruby 1.9, bump to 2.0.

Follow up d57d0721

Change-Id: Ie74e6bddedc2c6ddeba2e9def30527f83ec615e8
---
M jjb/misc.yaml
M zuul/layout.yaml
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/86/174086/1

diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 8a6c26d..a6b7980 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -83,7 +83,7 @@
  - '{name}-bundle-{bundlecommand}':
  bundlecommand:
   - rubocop
- - '{name}-ruby1.9.3lint'
+ - '{name}-ruby2.0lint'
  - 'oojs-ui-jsduck'
  - 'oojs-ui-jsduck-publish'
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index b9bae3b..a66828b 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5974,21 +5974,21 @@
 check:
   - oojs-ui-jslint
   - oojs-ui-phplint
-  - oojs-ui-ruby1.9.3lint
+  - oojs-ui-ruby2.0lint
 test:
   - oojs-ui-bundle-rubocop
   - oojs-ui-npm
   - oojs-ui-phplint
   - oojs-ui-phpcs-HEAD
   - oojs-ui-jsduck
-  - oojs-ui-ruby1.9.3lint
+  - oojs-ui-ruby2.0lint
 gate-and-submit:
   - oojs-ui-bundle-rubocop
   - oojs-ui-npm
   - oojs-ui-phplint
   - oojs-ui-phpcs-HEAD
   - oojs-ui-jsduck
-  - oojs-ui-ruby1.9.3lint
+  - oojs-ui-ruby2.0lint
 postmerge:
   - oojs-ui-jsduck-publish
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie74e6bddedc2c6ddeba2e9def30527f83ec615e8
Gerrit-PatchSet: 1
Gerrit-Project: integration/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] Restore target title while saving translation as draft - change (mediawiki...ContentTranslation)

2014-11-18 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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

Change subject: Restore target title while saving translation as draft
..

Restore target title while saving translation as draft

Change-Id: I14a87755acfb2df43756ba8655fedb2a8e7d48b6
---
M modules/dashboard/ext.cx.translationlist.js
M modules/draft/ext.cx.draft.js
2 files changed, 2 insertions(+), 3 deletions(-)


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

diff --git a/modules/dashboard/ext.cx.translationlist.js 
b/modules/dashboard/ext.cx.translationlist.js
index 7da8183..efdb887 100644
--- a/modules/dashboard/ext.cx.translationlist.js
+++ b/modules/dashboard/ext.cx.translationlist.js
@@ -125,6 +125,7 @@
from: 
translation.sourceLanguage,
to: translation.targetLanguage,
page: translation.sourceTitle,
+   targettitle: 
translation.targetTitle,
draft: translation.status === 
'draft' ? translation.id : undefined
} ).toString(),
} ).text( translation.sourceTitle );
diff --git a/modules/draft/ext.cx.draft.js b/modules/draft/ext.cx.draft.js
index 5adad15..2e4e945 100644
--- a/modules/draft/ext.cx.draft.js
+++ b/modules/draft/ext.cx.draft.js
@@ -87,13 +87,11 @@
 */
ContentTranslationDraft.prototype.save = function () {
var self = this,
-   translatedTitle,
draftContent, targetTitle, params, apiParams,
api = new mw.Api();
 
-   translatedTitle = $( '.cx-column--translation  h2' ).text();
+   targetTitle = $( '.cx-column--translation  h2' ).text();
draftContent = $( '.cx-column--translation .cx-column__content' 
).clone();
-   targetTitle = 'User:' + mw.user.getName() + '/' + 
translatedTitle;
 
this.$draftButton
.prop( 'disabled', true )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I14a87755acfb2df43756ba8655fedb2a8e7d48b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com

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

[MediaWiki-commits] [Gerrit] Switch oojs-ui to ruby 2.0 linter - change (integration/config)

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

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

Change subject: Switch oojs-ui to ruby 2.0 linter
..


Switch oojs-ui to ruby 2.0 linter

The browser tests are no more using ruby 1.9, bump lint to 2.0. Make the
jobs only run on *.rb file changes.

Follow up d57d0721

Change-Id: Ie74e6bddedc2c6ddeba2e9def30527f83ec615e8
---
M jjb/misc.yaml
M zuul/layout.yaml
2 files changed, 7 insertions(+), 4 deletions(-)

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



diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 8a6c26d..a6b7980 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -83,7 +83,7 @@
  - '{name}-bundle-{bundlecommand}':
  bundlecommand:
   - rubocop
- - '{name}-ruby1.9.3lint'
+ - '{name}-ruby2.0lint'
  - 'oojs-ui-jsduck'
  - 'oojs-ui-jsduck-publish'
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index b9bae3b..2a6e324 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -361,6 +361,9 @@
   - name: '^.*-ruby1.9.3lint$'
 files:
  - '^.*\.rb$'
+  - name: '^.*-ruby2.0lint$'
+files:
+ - '^.*\.rb$'
 
   - name: ^php-composer-validate$
 files:
@@ -5974,21 +5977,21 @@
 check:
   - oojs-ui-jslint
   - oojs-ui-phplint
-  - oojs-ui-ruby1.9.3lint
+  - oojs-ui-ruby2.0lint
 test:
   - oojs-ui-bundle-rubocop
   - oojs-ui-npm
   - oojs-ui-phplint
   - oojs-ui-phpcs-HEAD
   - oojs-ui-jsduck
-  - oojs-ui-ruby1.9.3lint
+  - oojs-ui-ruby2.0lint
 gate-and-submit:
   - oojs-ui-bundle-rubocop
   - oojs-ui-npm
   - oojs-ui-phplint
   - oojs-ui-phpcs-HEAD
   - oojs-ui-jsduck
-  - oojs-ui-ruby1.9.3lint
+  - oojs-ui-ruby2.0lint
 postmerge:
   - oojs-ui-jsduck-publish
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie74e6bddedc2c6ddeba2e9def30527f83ec615e8
Gerrit-PatchSet: 2
Gerrit-Project: integration/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] Revert Add WOFF2 version of all fonts - change (mediawiki...UniversalLanguageSelector)

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

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

Change subject: Revert Add WOFF2 version of all fonts
..


Revert Add WOFF2 version of all fonts

This reverts commit 90519fa8db445c63149b74a80148fe121a30bde1.

Noted line height variations between WOFF and WOFF2. Reverting till we 
investigate this

Change-Id: I706c6b552f9045a4f36dd947d6339840b6d2665c
---
D data/fontrepo/fonts/AbyssinicaSIL/AbyssinicaSIL-R.woff2
D data/fontrepo/fonts/Akkadian/Akkadian.woff2
D data/fontrepo/fonts/Alef/Alef-Bold.woff2
D data/fontrepo/fonts/Alef/Alef-Regular.woff2
M data/fontrepo/fonts/Alef/font.ini
D data/fontrepo/fonts/Artaxerxes/Artaxerxes.woff2
D data/fontrepo/fonts/Autonym/Autonym.woff2
D data/fontrepo/fonts/CharisSIL/CharisSIL-R.woff2
D data/fontrepo/fonts/ComicNeue/ComicNeue-Bold.woff2
D data/fontrepo/fonts/ComicNeue/ComicNeue-Regular-Oblique.woff2
D data/fontrepo/fonts/ComicNeue/ComicNeue-Regular.woff2
M data/fontrepo/fonts/ComicNeue/font.ini
D data/fontrepo/fonts/DoulosSIL/DoulosSIL-R.woff2
D data/fontrepo/fonts/EastSyriacAdiabene/SyrCOMAdiabene.woff2
D data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.woff2
D data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana-Bold.woff2
D data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana.woff2
M data/fontrepo/fonts/FreeFontThana/font.ini
D data/fontrepo/fonts/GentiumPlus/GentiumPlus-I.woff2
D data/fontrepo/fonts/GentiumPlus/GentiumPlus-R.woff2
M data/fontrepo/fonts/GentiumPlus/font.ini
D data/fontrepo/fonts/Gubbi/Gubbi.woff2
D data/fontrepo/fonts/Hanuman/Hanuman.woff2
D data/fontrepo/fonts/Hanuman/Hanumanb.woff2
M data/fontrepo/fonts/Hanuman/font.ini
D data/fontrepo/fonts/HussainiNastaleeq/hussaini-nastaleeq.woff2
M data/fontrepo/fonts/IranianSans/font.ini
D data/fontrepo/fonts/IranianSans/irsans.woff2
D data/fontrepo/fonts/IranianSans/irsansb.woff2
M data/fontrepo/fonts/IranianSerif/font.ini
D data/fontrepo/fonts/IranianSerif/irseri.woff2
D data/fontrepo/fonts/Jomolhari/Jomolhari.woff2
D data/fontrepo/fonts/Junicode/Junicode-Bold.woff2
D data/fontrepo/fonts/Junicode/Junicode-BoldItalic.woff2
D data/fontrepo/fonts/Junicode/Junicode-Italic.woff2
D data/fontrepo/fonts/Junicode/Junicode.woff2
M data/fontrepo/fonts/Junicode/font.ini
D data/fontrepo/fonts/KhmerOS/KhmerOS.woff2
D data/fontrepo/fonts/KhmerOSbattambang/KhmerOSbattambang.woff2
D data/fontrepo/fonts/Lateef/LateefRegOT.woff2
M data/fontrepo/fonts/Lateef/font.ini
D data/fontrepo/fonts/LinuxLibertine/LinLibertine_RBIah.woff2
D data/fontrepo/fonts/LinuxLibertine/LinLibertine_RBah.woff2
D data/fontrepo/fonts/LinuxLibertine/LinLibertine_RIah.woff2
D data/fontrepo/fonts/LinuxLibertine/LinLibertine_Rah.woff2
M data/fontrepo/fonts/LinuxLibertine/font.ini
D data/fontrepo/fonts/LohitAssamese/Lohit-Assamese.woff2
D data/fontrepo/fonts/LohitBengali/Lohit-Bengali.woff2
D data/fontrepo/fonts/LohitDevanagari/Lohit-Devanagari.woff2
D data/fontrepo/fonts/LohitGujarati/Lohit-Gujarati.woff2
D data/fontrepo/fonts/LohitKannada/Lohit-Kannada.woff2
D data/fontrepo/fonts/LohitMarathi/Lohit-Marathi.woff2
D data/fontrepo/fonts/LohitNepali/Lohit-Nepali.woff2
D data/fontrepo/fonts/LohitOdia/Lohit-Odia.woff2
D data/fontrepo/fonts/LohitPunjabi/Lohit-Punjabi.woff2
D data/fontrepo/fonts/LohitTamil/Lohit-Tamil.woff2
D data/fontrepo/fonts/LohitTamilClassical/Lohit-Tamil-Classical.woff2
D data/fontrepo/fonts/LohitTelugu/Lohit-Telugu.woff2
D data/fontrepo/fonts/MiriamCLM/MiriamCLM-Book.woff2
D data/fontrepo/fonts/Myanmar3/Myanmar3.woff2
D data/fontrepo/fonts/NafeesWeb/NafeesWeb.woff2
D data/fontrepo/fonts/Nazli/Nazli-bold.woff2
D data/fontrepo/fonts/Nazli/Nazli.woff2
M data/fontrepo/fonts/Nazli/font.ini
D data/fontrepo/fonts/Nokora/Nokora-Bold.woff2
D data/fontrepo/fonts/Nokora/Nokora-Regular.woff2
M data/fontrepo/fonts/Nokora/font.ini
D data/fontrepo/fonts/NuosuSIL/NuosuSIL.woff2
M data/fontrepo/fonts/NuosuSIL/font.ini
D data/fontrepo/fonts/OpenDyslexic/OpenDyslexic-Bold.woff2
D data/fontrepo/fonts/OpenDyslexic/OpenDyslexic-BoldItalic.woff2
D data/fontrepo/fonts/OpenDyslexic/OpenDyslexic-Italic.woff2
D data/fontrepo/fonts/OpenDyslexic/OpenDyslexic-Regular.woff2
M data/fontrepo/fonts/OpenDyslexic/font.ini
M data/fontrepo/fonts/OskiEast/font.ini
D data/fontrepo/fonts/OskiEast/oskie.woff2
D data/fontrepo/fonts/OskiEast/oskiebold.woff2
D data/fontrepo/fonts/OskiEast/oskiebolditalic.woff2
D data/fontrepo/fonts/OskiEast/oskieitalic.woff2
D data/fontrepo/fonts/Padauk/Padauk-Regular.woff2
D data/fontrepo/fonts/Pagul/Pagul.woff2
D data/fontrepo/fonts/Pangururan/Pangururan.woff2
M data/fontrepo/fonts/Pangururan/font.ini
D data/fontrepo/fonts/Phetsarath/Phetsarath-Bold.woff2
D data/fontrepo/fonts/Phetsarath/Phetsarath-Regular.woff2
M data/fontrepo/fonts/Phetsarath/font.ini
D data/fontrepo/fonts/RailwaySans/RailwaySans.woff2
M data/fontrepo/fonts/RailwaySans/font.ini
D data/fontrepo/fonts/Saab/Saab.woff2
D data/fontrepo/fonts/Scheherazade/Scheherazade-R.woff2
M

[MediaWiki-commits] [Gerrit] Revert Update Malayalam fonts - change (mediawiki...UniversalLanguageSelector)

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

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

Change subject: Revert Update Malayalam fonts
..


Revert Update Malayalam fonts

This reverts commit d546f6e71fb3b402b050a77636c13ce130300bbd.
Noted line height variations between WOFF and WOFF2.
Reverting till we investigate this
Similar to https://gerrit.wikimedia.org/r/#/c/174081/

Change-Id: I31e1a2dfe643fcd979953acc5cb6f93e872a2a87
---
M data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.eot
M data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.ttf
M data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff
D data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff2
M data/fontrepo/fonts/AnjaliOldLipi/font.ini
M data/fontrepo/fonts/Meera/Meera.eot
M data/fontrepo/fonts/Meera/Meera.ttf
M data/fontrepo/fonts/Meera/Meera.woff
D data/fontrepo/fonts/Meera/Meera.woff2
M data/fontrepo/fonts/Meera/font.ini
M resources/js/ext.uls.webfonts.repository.js
11 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.eot 
b/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.eot
index 78139a7..d8595ed 100644
--- a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.eot
+++ b/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.eot
Binary files differ
diff --git a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.ttf 
b/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.ttf
index 4f56677..6c76fa7 100644
--- a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.ttf
+++ b/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.ttf
Binary files differ
diff --git a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff 
b/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff
index b10e9d3..835a05e 100644
--- a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff
+++ b/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff
Binary files differ
diff --git a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff2 
b/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff2
deleted file mode 100644
index c828596..000
--- a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff2
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/AnjaliOldLipi/font.ini 
b/data/fontrepo/fonts/AnjaliOldLipi/font.ini
index 85c55d7..b3852fa 100644
--- a/data/fontrepo/fonts/AnjaliOldLipi/font.ini
+++ b/data/fontrepo/fonts/AnjaliOldLipi/font.ini
@@ -1,6 +1,6 @@
 [AnjaliOldLipi]
 languages=ml
-version=6.1.1
+version=.0.730
 license=OFL-1.1
 licensefile=OFL.txt
-url=https://smc.org.in
+url=https://sites.google.com/site/cibu/anjalioldlipi-font
diff --git a/data/fontrepo/fonts/Meera/Meera.eot 
b/data/fontrepo/fonts/Meera/Meera.eot
index 07b2264..c88b7a7 100644
--- a/data/fontrepo/fonts/Meera/Meera.eot
+++ b/data/fontrepo/fonts/Meera/Meera.eot
Binary files differ
diff --git a/data/fontrepo/fonts/Meera/Meera.ttf 
b/data/fontrepo/fonts/Meera/Meera.ttf
index c518651..c54a55b 100644
--- a/data/fontrepo/fonts/Meera/Meera.ttf
+++ b/data/fontrepo/fonts/Meera/Meera.ttf
Binary files differ
diff --git a/data/fontrepo/fonts/Meera/Meera.woff 
b/data/fontrepo/fonts/Meera/Meera.woff
index e6d3749..cef8b92 100644
--- a/data/fontrepo/fonts/Meera/Meera.woff
+++ b/data/fontrepo/fonts/Meera/Meera.woff
Binary files differ
diff --git a/data/fontrepo/fonts/Meera/Meera.woff2 
b/data/fontrepo/fonts/Meera/Meera.woff2
deleted file mode 100644
index 93c5acc..000
--- a/data/fontrepo/fonts/Meera/Meera.woff2
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/Meera/font.ini 
b/data/fontrepo/fonts/Meera/font.ini
index b0c555f..1b56134 100644
--- a/data/fontrepo/fonts/Meera/font.ini
+++ b/data/fontrepo/fonts/Meera/font.ini
@@ -1,6 +1,6 @@
 [Meera]
 languages=ml
-version=6.1.1
+version=6.0
 license=GPL-3.0.0+-with-font-exception
 licensefile=gpl-3.0.txt
-url=https://smc.org.in
+url=https://savannah.nongnu.org/projects/smc
diff --git a/resources/js/ext.uls.webfonts.repository.js 
b/resources/js/ext.uls.webfonts.repository.js
index fd5fcb0..670a2e0 100644
--- a/resources/js/ext.uls.webfonts.repository.js
+++ b/resources/js/ext.uls.webfonts.repository.js
@@ -1,5 +1,5 @@
 // Do not edit! This file is generated from data/fontrepo by 
data/fontrepo/scripts/compile.php
 ( function ( $ ) {
$.webfonts = $.webfonts || {};
-   $.webfonts.repository = 
{base:..\/data\/fontrepo\/fonts\/,languages:{adx:[Jomolhari],af:[system,ComicNeue,OpenDyslexic],ahr:[Lohit
 
Marathi],akk:[Akkadian],am:[AbyssinicaSIL],ang:[system,Junicode],ar:[system,Amiri],arb:[system,Amiri],arc:[Estrangelo
 Edessa,East Syriac Adiabene,SertoUrhoy],as:[system,Lohit 
Assamese],bbc:[system,Pangururan],bh:[Lohit 
Devanagari],bho:[Lohit 
Devanagari],bk:[system,ComicNeue,OpenDyslexic],bn:[Siyam 
Rupali,Lohit Bengali],bo:[Jomolhari],bod:[Jomolhari],bpy:[Siyam 
Rupali,Lohit

[MediaWiki-commits] [Gerrit] Merge rubocop related changes - change (oojs/ui)

2014-11-18 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Merge rubocop related changes
..

Merge rubocop related changes

Change-Id: Ia37e84cf30a0b278dac009d902cb6870b25d7a83
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/88/174088/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia37e84cf30a0b278dac009d902cb6870b25d7a83
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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] Fixed RuboCop Style/AsciiComments offense - change (oojs/ui)

2014-11-18 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: Fixed RuboCop Style/AsciiComments offense
..


Fixed RuboCop Style/AsciiComments offense

Bug: 72841
Change-Id: I0f4cc4e8ab2ccb3b6b2d674e7912dd16ad411726
---
M .rubocop_todo.yml
M bin/doccomparer.rb
2 files changed, 1 insertion(+), 5 deletions(-)

Approvals:
  Hashar: Looks good to me, approved



diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f2ed405..356a496 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -32,10 +32,6 @@
 Metrics/PerceivedComplexity:
   Max: 48
 
-# Offense count: 1
-Style/AsciiComments:
-  Enabled: false
-
 # Offense count: 8
 # Cop supports --auto-correct.
 Style/Blocks:
diff --git a/bin/doccomparer.rb b/bin/doccomparer.rb
index e5bfb94..9c33616 100644
--- a/bin/doccomparer.rb
+++ b/bin/doccomparer.rb
@@ -1,7 +1,7 @@
 require 'pp'
 require_relative 'docparser'
 
-# convert [ {name: 'foo'}, … ] to { foo: {name: 'foo'}, … }
+# convert [ {name: 'foo'}, ... ] to { foo: {name: 'foo'}, ... }
 def reindex arg
if arg.is_a?(Array)  arg.all?{|v| v.is_a? Hash }
Hash[ arg.map{|v| [ v[:name], reindex(v) ] } ]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f4cc4e8ab2ccb3b6b2d674e7912dd16ad411726
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Jforrester jforres...@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 RuboCop Style/SpaceAroundEqualsInParameterDefault offense - change (oojs/ui)

2014-11-18 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: Fixed RuboCop Style/SpaceAroundEqualsInParameterDefault offense
..


Fixed RuboCop Style/SpaceAroundEqualsInParameterDefault offense

Bug: 72841
Change-Id: Icc43cc1fc14f92368fb3c714b42b595e615efc58
---
M .rubocop_todo.yml
M bin/doccomparer.rb
2 files changed, 1 insertion(+), 7 deletions(-)

Approvals:
  Hashar: Looks good to me, approved



diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 59c62a5..68400c9 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -101,12 +101,6 @@
 Style/SpaceAfterComma:
   Enabled: false
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles.
-Style/SpaceAroundEqualsInParameterDefault:
-  EnforcedStyle: no_space
-
 # Offense count: 8
 # Cop supports --auto-correct.
 Style/SpaceAroundOperators:
diff --git a/bin/doccomparer.rb b/bin/doccomparer.rb
index e5104b5..d2e6fa9 100644
--- a/bin/doccomparer.rb
+++ b/bin/doccomparer.rb
@@ -98,7 +98,7 @@
smart_compare a, b, a_name, b_name, :property
 end
 
-def compare_hash a, b, a_name, b_name, nested=:compare_hash
+def compare_hash a, b, a_name, b_name, nested = :compare_hash
keys = (a ? a.keys: []) + (b ? b.keys : [])
out = keys.to_a.sort.uniq.map do |key|
a_val = a ? canonicalize(a[key]) : nil

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc43cc1fc14f92368fb3c714b42b595e615efc58
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Jforrester jforres...@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 RuboCop Style/SignalException offense - change (oojs/ui)

2014-11-18 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: Fixed RuboCop Style/SignalException offense
..


Fixed RuboCop Style/SignalException offense

Bug: 72841
Change-Id: Ibea1bbf8bb9a34ee8fa6852899754c1436e0ad30
---
M .rubocop_todo.yml
M bin/docparser.rb
2 files changed, 1 insertion(+), 7 deletions(-)

Approvals:
  Hashar: Looks good to me, approved



diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 93a9fcb..59c62a5 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -96,12 +96,6 @@
 Style/RegexpLiteral:
   MaxSlashes: 3
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/SignalException:
-  Enabled: false
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/SpaceAfterComma:
diff --git a/bin/docparser.rb b/bin/docparser.rb
index b82c0db..0955df5 100644
--- a/bin/docparser.rb
+++ b/bin/docparser.rb
@@ -148,7 +148,7 @@
when 'abstract', 'inheritable', 'deprecated', 
'singleton', 'throws', 'chainable', 'fires', 'localdoc', 'inheritdoc'
# skip
else
-   raise unrecognized keyword: #{keyword}
+   fail unrecognized keyword: #{keyword}
end
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibea1bbf8bb9a34ee8fa6852899754c1436e0ad30
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Jforrester jforres...@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 RuboCop Style/NegatedIf offense - change (oojs/ui)

2014-11-18 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: Fixed RuboCop Style/NegatedIf offense
..


Fixed RuboCop Style/NegatedIf offense

Bug: 72841
Change-Id: I99b7bc859e2051de03af9dcf4e1c385f1b6aa560
---
M .rubocop_todo.yml
M bin/docparser.rb
2 files changed, 1 insertion(+), 6 deletions(-)

Approvals:
  Hashar: Looks good to me, approved



diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 1798b3f..93a9fcb 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -76,11 +76,6 @@
 Style/MultilineOperationIndentation:
   Enabled: false
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/NegatedIf:
-  Enabled: false
-
 # Offense count: 2
 # Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
 Style/Next:
diff --git a/bin/docparser.rb b/bin/docparser.rb
index 1a39ec8..b82c0db 100644
--- a/bin/docparser.rb
+++ b/bin/docparser.rb
@@ -69,7 +69,7 @@
c.sub!(/^[ \t]*\*[ \t]?/, '') # strip leading *
 
m = c.match(/^@(\w+)[ \t]*(.*)/)
-   if !m
+   unless m
previous_item[:description]  c + \n
next
end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I99b7bc859e2051de03af9dcf4e1c385f1b6aa560
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Jforrester jforres...@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 RuboCop Style/EmptyLines offense - change (oojs/ui)

2014-11-18 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: Fixed RuboCop Style/EmptyLines offense
..


Fixed RuboCop Style/EmptyLines offense

Bug: 72841
Change-Id: If7619c1d47555b8d5c8314bd8396f7f753acf729
---
M .rubocop_todo.yml
M bin/doccomparer.rb
2 files changed, 0 insertions(+), 6 deletions(-)

Approvals:
  Hashar: Looks good to me, approved



diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6597d85..1798b3f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -42,11 +42,6 @@
 Style/CommentIndentation:
   Enabled: false
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/EmptyLines:
-  Enabled: false
-
 # Offense count: 3
 # Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
diff --git a/bin/doccomparer.rb b/bin/doccomparer.rb
index 0d6251e..e5104b5 100644
--- a/bin/doccomparer.rb
+++ b/bin/doccomparer.rb
@@ -130,7 +130,6 @@
out.compact.join \n
 end
 
-
 if ARGV.empty? || ARGV == ['-h'] || ARGV == ['--help']
$stderr.puts usage: ruby [-v] #{$0} dirA dirB nameA nameB
$stderr.putsruby #{$0} src php JS PHP  compare.txt

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If7619c1d47555b8d5c8314bd8396f7f753acf729
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Jforrester jforres...@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 RuboCop Style/EmptyLineBetweenDefs offence - change (oojs/ui)

2014-11-18 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: Fixed RuboCop Style/EmptyLineBetweenDefs offence
..


Fixed RuboCop Style/EmptyLineBetweenDefs offence

Bug: 72841
Change-Id: I9541ae1b5081bca4d9a4b55ca81fc805f20022d8
---
M .rubocop_todo.yml
M bin/doccomparer.rb
2 files changed, 1 insertion(+), 6 deletions(-)

Approvals:
  Hashar: Looks good to me, approved



diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 356a496..6597d85 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -44,12 +44,6 @@
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: AllowAdjacentOneLineDefs.
-Style/EmptyLineBetweenDefs:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
 Style/EmptyLines:
   Enabled: false
 
diff --git a/bin/doccomparer.rb b/bin/doccomparer.rb
index 9c33616..0d6251e 100644
--- a/bin/doccomparer.rb
+++ b/bin/doccomparer.rb
@@ -93,6 +93,7 @@
 def smart_compare_methods a, b, a_name, b_name
smart_compare a, b, a_name, b_name, :method
 end
+
 def smart_compare_properties a, b, a_name, b_name
smart_compare a, b, a_name, b_name, :property
 end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9541ae1b5081bca4d9a4b55ca81fc805f20022d8
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Jforrester jforres...@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] Merge rubocop related changes - change (oojs/ui)

2014-11-18 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: Merge rubocop related changes
..


Merge rubocop related changes

Change-Id: Ia37e84cf30a0b278dac009d902cb6870b25d7a83
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Looks good to me, approved




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia37e84cf30a0b278dac009d902cb6870b25d7a83
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Jforrester jforres...@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 RuboCop Style/AndOr offense - change (oojs/ui)

2014-11-18 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: Fixed RuboCop Style/AndOr offense
..


Fixed RuboCop Style/AndOr offense

Used auto correct:

$ bundle exec rubocop --auto-correct

Bug: 72841
Change-Id: I9746cf39f81cbaa8125407cee91758724474d60f
---
M .rubocop_todo.yml
M bin/doccomparer.rb
2 files changed, 1 insertion(+), 7 deletions(-)

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



diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 5fb54e1..f2ed405 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -33,12 +33,6 @@
   Max: 48
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/AndOr:
-  Enabled: false
-
-# Offense count: 1
 Style/AsciiComments:
   Enabled: false
 
diff --git a/bin/doccomparer.rb b/bin/doccomparer.rb
index 4bb52cc..e5bfb94 100644
--- a/bin/doccomparer.rb
+++ b/bin/doccomparer.rb
@@ -107,7 +107,7 @@
a_val, b_val = {}, {}
end
 
-   if a_val.is_a? Hash and b_val.is_a? Hash
+   if a_val.is_a?(Hash)  b_val.is_a?(Hash)
comparison_result = indent method(nested).call(a_val, 
b_val, a_name, b_name), 2
if comparison_result.strip == ''
#{key}: match if $VERBOSE

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9746cf39f81cbaa8125407cee91758724474d60f
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Jforrester jforres...@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 RuboCop Style/TrailingBlankLines offense - change (oojs/ui)

2014-11-18 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: Fixed RuboCop Style/TrailingBlankLines offense
..


Fixed RuboCop Style/TrailingBlankLines offense

Bug: 72841
Change-Id: Ie686dd58275e8c00652cab0e64c1aeddd1dc3b8a
---
M .rubocop_todo.yml
M bin/doccomparer.rb
M bin/testsuitegenerator.rb
3 files changed, 0 insertions(+), 8 deletions(-)

Approvals:
  Hashar: Looks good to me, approved



diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4578fe3..ce8ae0e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -140,12 +140,6 @@
 Style/Tab:
   Enabled: false
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/TrailingBlankLines:
-  Enabled: false
-
 # Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
diff --git a/bin/doccomparer.rb b/bin/doccomparer.rb
index 4cb52e7..b356f49 100644
--- a/bin/doccomparer.rb
+++ b/bin/doccomparer.rb
@@ -159,4 +159,3 @@
end
end
 end
-
diff --git a/bin/testsuitegenerator.rb b/bin/testsuitegenerator.rb
index c804392..dc1246a 100644
--- a/bin/testsuitegenerator.rb
+++ b/bin/testsuitegenerator.rb
@@ -98,4 +98,3 @@
 
puts JSON.pretty_generate tests
 end
-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie686dd58275e8c00652cab0e64c1aeddd1dc3b8a
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Jforrester jforres...@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 RuboCop Style/SpaceAfterComma offense - change (oojs/ui)

2014-11-18 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: Fixed RuboCop Style/SpaceAfterComma offense
..


Fixed RuboCop Style/SpaceAfterComma offense

Bug: 72841
Change-Id: Ib6e4c481a4224014253578beffa1ddfba487cbb4
---
M .rubocop_todo.yml
M bin/docparser.rb
2 files changed, 2 insertions(+), 7 deletions(-)

Approvals:
  Hashar: Looks good to me, approved



diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 99686a5..4578fe3 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -91,11 +91,6 @@
 Style/RegexpLiteral:
   MaxSlashes: 3
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/SpaceAfterComma:
-  Enabled: false
-
 # Offense count: 8
 # Cop supports --auto-correct.
 Style/SpaceAroundOperators:
diff --git a/bin/docparser.rb b/bin/docparser.rb
index 0955df5..2a54ab4 100644
--- a/bin/docparser.rb
+++ b/bin/docparser.rb
@@ -178,7 +178,7 @@
if current_class
output  current_class
end
-   current_class = data.select{|k,v| 
valid_per_kind[:class].include? k }
+   current_class = data.select{|k, v| 
valid_per_kind[:class].include? k }
current_class[:description] = js_class_constructor_desc 
if js_class_constructor_desc != ''
previous_item = current_class
end
@@ -195,7 +195,7 @@
property: :properties,
event: :events,
}
-   current_class[keys[kind]]  data.select{|k,v| 
valid_per_kind[kind].include? k }
+   current_class[keys[kind]]  data.select{|k, v| 
valid_per_kind[kind].include? k }
previous_item = current_class[keys[kind]]
end
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6e4c481a4224014253578beffa1ddfba487cbb4
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Jforrester jforres...@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] Factored out error output generation from wbtooltip - change (mediawiki...Wikibase)

2014-11-18 Thread Henning Snater (Code Review)

Henning Snater has uploaded a new change for review.

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

Change subject: Factored out error output generation from wbtooltip
..

Factored out error output generation from wbtooltip

Change-Id: I02a2898f7a9f5ec7b8c9e5ced38fe0a8ca3ed777
---
M lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
M lib/resources/jquery.wikibase/resources.php
M lib/resources/jquery.wikibase/themes/default/jquery.wikibase.wbtooltip.css
M repo/resources/utilities/resources.php
M repo/resources/utilities/wikibase.utilities.ui.css
M repo/resources/utilities/wikibase.utilities.ui.js
6 files changed, 60 insertions(+), 45 deletions(-)


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

diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
index b51474e..dc1b0f7 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
@@ -2,7 +2,7 @@
  * @licence GNU GPL v2+
  * @author H. Snater  mediaw...@snater.com 
  */
-( function( mw, $ ) {
+( function( mw, wb, $ ) {
 
 'use strict';
 
@@ -12,7 +12,7 @@
  * Tooltip widget enhancing jQuery.tipsy.
  * @since 0.4
  *
- * @option content {string|jQuery|wb.Error} The tooltip balloon's content.
+ * @option content {string|jQuery|Error} The tooltip balloon's content.
  * (REQUIRED)
  *
  * @option permanent {boolean} Whether the tooltip shall be visible 
permanently (only closing with a
@@ -283,29 +283,8 @@
 * @TODO: Error tooltip should be a separate tooltip derivative.
 */
_buildErrorTooltip: function() {
-   var $message = $( 'div/' ).addClass( 'wb-error ' + 
this.widgetFullName + '-error' ),
-   $mainMessage = $( 'div/' ).text( 
this.options.content.message ).appendTo( $message );
-
-   // Append detailed error message if given; hide it behind 
toggle:
-   if( this.options.content.detailedMessage ) {
-   $mainMessage.addClass( this.widgetFullName + 
'-error-top-message' );
-
-   var $detailedMessage = $( 'div/', {
-   'class': this.widgetFullName + '-error-details',
-   html: this.options.content.detailedMessage
-   } )
-   .hide();
-
-   var $toggler = $( 'a/' )
-   .addClass( this.widgetFullName + 
'-error-details-link' )
-   .text( mw.msg( 'wikibase-tooltip-error-details' 
) )
-   .toggler( { $subject: $detailedMessage, 
duration: 'fast' } );
-
-   $toggler.appendTo( $message );
-   $detailedMessage.appendTo( $message );
-   }
-
-   return $message;
+   return wb.utilities.ui.buildErrorOutput( this.options.content )
+   .addClass( this.widgetFullName + '-error' );
},
 
/**
@@ -321,4 +300,4 @@
 
 } );
 
-} )( mediaWiki, jQuery );
+} )( mediaWiki, wikibase, jQuery );
diff --git a/lib/resources/jquery.wikibase/resources.php 
b/lib/resources/jquery.wikibase/resources.php
index 18cf39d..53f81c5 100644
--- a/lib/resources/jquery.wikibase/resources.php
+++ b/lib/resources/jquery.wikibase/resources.php
@@ -467,11 +467,8 @@
),
'dependencies' = array(
'jquery.tipsy',
-   'jquery.ui.toggler',
'jquery.ui.widget',
-   ),
-   'messages' = array(
-   'wikibase-tooltip-error-details',
+   'wikibase.utilities',
),
),
 
diff --git 
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.wbtooltip.css 
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.wbtooltip.css
index 429aef1..47bee02 100644
--- a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.wbtooltip.css
+++ b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.wbtooltip.css
@@ -33,19 +33,4 @@
border-color: #B27631;
 }
 
-.wikibase-wbtooltip-tip .wikibase-wbtooltip-error-top-message {
-   border-bottom:1px dotted #B27631;
-   padding-bottom:1em;
-}
-
-.wikibase-wbtooltip-tip .wikibase-wbtooltip-error-details {
-   margin-top: .2em;
-   margin-bottom: .5em;
-   font-family: 'Courier New', Courier, 'Andale Mono', serif;
-   background-color: #FFF2E4;
-   padding: .2em;
-   border-radius: 5px;
-   font-size: .9em;
-}
-
 /* /ERROR TOOLTIP */
diff --git a/repo/resources/utilities/resources.php 
b/repo/resources/utilities/resources.php
index

[MediaWiki-commits] [Gerrit] Restore target title while resuming translation from draft - change (mediawiki...ContentTranslation)

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

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

Change subject: Restore target title while resuming translation from draft
..


Restore target title while resuming translation from draft

* While saving, just save target title alone - without the
  user namespace prefix
* While opening translation view, open with targettitle URL
  parameter set. If that is not set, target title will fallback
  to source title.

Change-Id: I14a87755acfb2df43756ba8655fedb2a8e7d48b6
---
M modules/dashboard/ext.cx.translationlist.js
M modules/draft/ext.cx.draft.js
2 files changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/modules/dashboard/ext.cx.translationlist.js 
b/modules/dashboard/ext.cx.translationlist.js
index 7da8183..efdb887 100644
--- a/modules/dashboard/ext.cx.translationlist.js
+++ b/modules/dashboard/ext.cx.translationlist.js
@@ -125,6 +125,7 @@
from: 
translation.sourceLanguage,
to: translation.targetLanguage,
page: translation.sourceTitle,
+   targettitle: 
translation.targetTitle,
draft: translation.status === 
'draft' ? translation.id : undefined
} ).toString(),
} ).text( translation.sourceTitle );
diff --git a/modules/draft/ext.cx.draft.js b/modules/draft/ext.cx.draft.js
index 5adad15..2e4e945 100644
--- a/modules/draft/ext.cx.draft.js
+++ b/modules/draft/ext.cx.draft.js
@@ -87,13 +87,11 @@
 */
ContentTranslationDraft.prototype.save = function () {
var self = this,
-   translatedTitle,
draftContent, targetTitle, params, apiParams,
api = new mw.Api();
 
-   translatedTitle = $( '.cx-column--translation  h2' ).text();
+   targetTitle = $( '.cx-column--translation  h2' ).text();
draftContent = $( '.cx-column--translation .cx-column__content' 
).clone();
-   targetTitle = 'User:' + mw.user.getName() + '/' + 
translatedTitle;
 
this.$draftButton
.prop( 'disabled', true )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14a87755acfb2df43756ba8655fedb2a8e7d48b6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] install server: cp3001 cp3002 fqdn update - change (operations/puppet)

2014-11-18 Thread Gage (Code Review)

Gage has uploaded a new change for review.

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

Change subject: install server: cp3001  cp3002 fqdn update
..

install server: cp3001  cp3002 fqdn update

Change-Id: Ic5429514beb55931b69dfc12e898c72bb52f9cad
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/174091/1

diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index bb343fe..8d0b463 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -604,12 +604,12 @@
 
 host cp3001 {
hardware ethernet 78:2b:cb:45:4a:31;
-   fixed-address cp3001.esams.wikimedia.org;
+   fixed-address cp3001.esams.wmnet;
 }
 
 host cp3002 {
hardware ethernet 78:2b:cb:45:3a:7d;
-   fixed-address cp3002.esams.wikimedia.org;
+   fixed-address cp3002.esams.wmnet;
 }
 
 host cp3003 {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5429514beb55931b69dfc12e898c72bb52f9cad
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gage jger...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Conf for doxygen - change (cdb)

2014-11-18 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Conf for doxygen
..

Conf for doxygen

MediaWiki core is using Doxygen to generates it is documentation. It is
reasonably fast.

Provide a Doxyfile generated with version 1.8.8 with all comments and
default settings stripped out.

Assumes Graphviz is installed by setting HAVE_DOT = YES.

The documentation is generated by running doxygen at the root of this
repository, the doc is made available at doc/html/index.html

The setup is the same I have made for oojs/ui:
https://gerrit.wikimedia.org/r/#/c/168490/

Bug: 73530
Change-Id: I3377a370bad65307968dd3f90433277daffebabb
---
M .gitignore
A Doxyfile
A doc/README
3 files changed, 32 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/cdb refs/changes/92/174092/1

diff --git a/.gitignore b/.gitignore
index d1502b0..1dd7ea5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+/doc/html
 vendor/
 composer.lock
diff --git a/Doxyfile b/Doxyfile
new file mode 100644
index 000..95de898
--- /dev/null
+++ b/Doxyfile
@@ -0,0 +1,30 @@
+# Configuration file for Doxygen
+
+PROJECT_NAME   = CDB
+PROJECT_BRIEF  = CDB functions for PHP
+
+OUTPUT_DIRECTORY   = doc
+
+JAVADOC_AUTOBRIEF  = YES
+QT_AUTOBRIEF   = YES
+
+WARN_NO_PARAMDOC   = YES
+
+INPUT  = src/
+FILE_PATTERNS  = *.php
+RECURSIVE  = YES
+
+HTML_DYNAMIC_SECTIONS  = YES
+GENERATE_TREEVIEW  = YES
+TREEVIEW_WIDTH = 250
+
+GENERATE_LATEX = NO
+
+HAVE_DOT   = YES
+DOT_FONTNAME   = Helvetica
+DOT_FONTSIZE   = 10
+TEMPLATE_RELATIONS = YES
+CALL_GRAPH = NO
+CALLER_GRAPH   = NO
+# Makes dot run faster. Requires graphviz 1.8.10
+DOT_MULTI_TARGETS  = YES
diff --git a/doc/README b/doc/README
new file mode 100644
index 000..15ee3b7
--- /dev/null
+++ b/doc/README
@@ -0,0 +1 @@
+Placeholder for doxygen documentation

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3377a370bad65307968dd3f90433277daffebabb
Gerrit-PatchSet: 1
Gerrit-Project: cdb
Gerrit-Branch: master
Gerrit-Owner: 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 README.md as doxygen main page - change (cdb)

2014-11-18 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Use README.md as doxygen main page
..

Use README.md as doxygen main page

From doxygen documentation:
http://www.stack.nl/~dimitri/doxygen/manual/config.html#cfg_use_mdfile_as_mainpage

USE_MDFILE_AS_MAINPAGE

If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file
that is part of the input, its contents will be placed on the main page
(index.html). This can be useful if you have a project on for instance
GitHub and want to reuse the introduction page also for the doxygen
output.

Bug: 73530
Change-Id: I812a32f0bd11f05aa10a73db334bccd49875adca
---
M Doxyfile
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/cdb refs/changes/93/174093/1

diff --git a/Doxyfile b/Doxyfile
index 95de898..e77e75a 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -10,9 +10,11 @@
 
 WARN_NO_PARAMDOC   = YES
 
-INPUT  = src/
+INPUT  = README.md src/
 FILE_PATTERNS  = *.php
 RECURSIVE  = YES
+# Requires doxygen 1.8.3+
+USE_MDFILE_AS_MAINPAGE = README.md
 
 HTML_DYNAMIC_SECTIONS  = YES
 GENERATE_TREEVIEW  = YES

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I812a32f0bd11f05aa10a73db334bccd49875adca
Gerrit-PatchSet: 1
Gerrit-Project: cdb
Gerrit-Branch: master
Gerrit-Owner: 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] WIP: ULS for source and target selectors - change (mediawiki...ContentTranslation)

2014-11-18 Thread Amire80 (Code Review)

Amire80 has uploaded a new change for review.

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

Change subject: WIP: ULS for source and target selectors
..

WIP: ULS for source and target selectors

Change-Id: I435a4c039a538c4391c4c9d19ea117e441c43d93
---
M Resources.php
M modules/source/ext.cx.source.selector.js
M modules/source/styles/ext.cx.source.selector.less
3 files changed, 117 insertions(+), 48 deletions(-)


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

diff --git a/Resources.php b/Resources.php
index cf831e4..3f65111 100644
--- a/Resources.php
+++ b/Resources.php
@@ -142,7 +142,7 @@
'ext.cx.sitemapper',
'jquery.suggestions',
'jquery.throttle-debounce',
-   'jquery.uls.data',
+   'ext.uls.mediawiki',
),
'messages' = array(
'cx-sourceselector-dialog-new-translation',
diff --git a/modules/source/ext.cx.source.selector.js 
b/modules/source/ext.cx.source.selector.js
index cc1dfb1..790fb2b 100644
--- a/modules/source/ext.cx.source.selector.js
+++ b/modules/source/ext.cx.source.selector.js
@@ -35,6 +35,22 @@
}
 
/**
+* Return an object of languages indexed by language code.
+* @param {array} languages An array of language codes.
+* return {object} Autonyms indexed by language code.
+*/
+   function getAutonyms( languages ) {
+   var i,
+   autonyms = {};
+
+   for ( i = 0; i  languages.length; i++ ) {
+   autonyms[ languages[ i ] ] = $.uls.data.getAutonym( 
languages[ i ] );
+   }
+
+   return autonyms;
+   }
+
+   /**
 * Initialize the plugin.
 */
CXSourceSelector.prototype.init = function () {
@@ -88,40 +104,73 @@
};
 
/**
+* Check whether a language is available as a target language
+* for the currently selected source language.
+* @param {array} language A language code.
+* return {boolean} true if the language is available.
+*/
+   CXSourceSelector.prototype.isValidTarget = function ( language ) {
+   return ( $.inArray(
+   language,
+   this.languagePairs[ this.sourceLanguage() ]
+   )  -1 );
+   };
+
+   /**
+* Get the current source language code.
+* return {string} Language code. Empty string if not set.
+*/
+   CXSourceSelector.prototype.sourceLanguage = function ( language ) {
+   return this.sourceLanguage();
+   };
+
+   /**
+* Get the current target language code.
+* return {string} Language code. Empty string if not set.
+*/
+   CXSourceSelector.prototype.sourceLanguage = function ( language ) {
+   return this.sourceLanguage();
+   };
+
+   /**
 * Fill the target language dropdown with target languages that have
 * language tools compatible with the source language.
 */
CXSourceSelector.prototype.fillTargetLanguages = function () {
-   var index, targetLanguage, $option,
-   sourceLanguage = this.$sourceLanguage.val(),
+   var i, targetLanguage, $option,
+   cxSourceSelector = this,
+   targetUlsClass = 'cx-sourceselector-uls-target',
+   sourceLanguage = this.sourceLanguage(),
enabledOptions = [],
disabledOptions = [];
 
-   this.$targetLanguage.empty();
-   for ( index in this.targetLanguages ) {
-   targetLanguage = this.targetLanguages[ index ];
+   // Delete the old target ULS
+   $( '.' + targetUlsClass ).remove();
+   this.$targetLanguage.data( 'uls', null );
 
-   // Skip the same language
-   if ( targetLanguage === sourceLanguage ) {
-   continue;
-   }
+   // Create a new target ULS
+   this.$targetLanguage.uls( {
+   languages: getAutonyms( this.targetLanguages ),
+   onSelect: function ( language ) {
+   cxSourceSelector.$targetLanguage
+   .prop( {
+   lang: language,
+   dir: $.uls.data.getDir( 
language )
+   } )
+   .text( $.uls.data.getAutonym( language 
) );
 
-   $option = $( 'option' )
-   .attr( 'value', targetLanguage )
-   .text(

[MediaWiki-commits] [Gerrit] cp3001 cp3002: move to private IP - change (operations/dns)

2014-11-18 Thread Gage (Code Review)

Gage has submitted this change and it was merged.

Change subject: cp3001  cp3002: move to private IP
..


cp3001  cp3002: move to private IP

Change-Id: I4ec90b4fcddc8e1a1e86ce46d273a430aea18373
---
M templates/10.in-addr.arpa
M templates/174.198.91.in-addr.arpa
M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
M templates/wmnet
5 files changed, 8 insertions(+), 8 deletions(-)

Approvals:
  Mark Bergsma: Looks good to me, but someone else must approve
  Gage: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index b2d0ce4..f7c4b95 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -88,6 +88,8 @@
 19  1H  IN PTR  ms-be3003.esams.wmnet.
 20  1H  IN PTR  ms-be3004.esams.wmnet.
 
+111 1H  IN PTR  cp3001.esams.wmnet.
+112 1H  IN PTR  cp3002.esams.wmnet.
 113 1H  IN PTR  cp3013.esams.wmnet.
 114 1H  IN PTR  cp3014.esams.wmnet.
 115 1H  IN PTR  cp3015.esams.wmnet.
diff --git a/templates/174.198.91.in-addr.arpa 
b/templates/174.198.91.in-addr.arpa
index 3f054e1..0fd1a54 100644
--- a/templates/174.198.91.in-addr.arpa
+++ b/templates/174.198.91.in-addr.arpa
@@ -58,8 +58,6 @@
 91  1H IN PTR   cp3021.esams.wikimedia.org.
 92  1H IN PTR   cp3022.esams.wikimedia.org.
 
-100 1H IN PTR   cp3001.esams.wikimedia.org.
-101 1H IN PTR   cp3002.esams.wikimedia.org.
 102 1H IN PTR   ssl3001.esams.wikimedia.org.
 103 1H IN PTR   ssl3002.esams.wikimedia.org.
 104 1H IN PTR   ssl3003.esams.wikimedia.org.
diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 323bbf0..3832f7d 100644
--- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -56,8 +56,6 @@
 0.9.0.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   cp3020.esams.wikimedia.org.
 1.9.0.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   cp3021.esams.wikimedia.org.
 2.9.0.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   cp3022.esams.wikimedia.org.
-0.0.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   cp3001.esams.wikimedia.org.
-1.0.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   cp3002.esams.wikimedia.org.
 2.0.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   ssl3001.esams.wikimedia.org.
 3.0.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   ssl3002.esams.wikimedia.org.
 4.0.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   ssl3003.esams.wikimedia.org.
@@ -81,6 +79,8 @@
 3.1.0.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   lvs3003.esams.wmnet.
 4.1.0.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   lvs3004.esams.wmnet.
 
+1.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3001.esams.wmnet.
+2.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3002.esams.wmnet.
 3.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3013.esams.wmnet.
 4.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3014.esams.wmnet.
 5.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3015.esams.wmnet.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 66965a5..d633ab0 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -766,10 +766,6 @@
 amssq62 1H  IN A91.198.174.72
 1H  IN  2620:0:862:1:91:198:174:72
 
-cp3001  1H  IN A91.198.174.100
-1H  IN  2620:0:862:1:91:198:174:100
-cp3002  1H  IN A91.198.174.101
-1H  IN  2620:0:862:1:91:198:174:101
 cp3003  1H  IN A91.198.174.73
 1H  IN  2620:0:862:1:91:198:174:73
 cp3004  1H  IN A91.198.174.74
diff --git a/templates/wmnet b/templates/wmnet
index 66e92a6..29ac26d 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2476,6 +2476,10 @@
 ms-be3003   1H  IN A10.20.0.19
 ms-be3004   1H  IN A10.20.0.20
 
+cp3001  1H  IN A10.20.0.111
+1H  IN  2620:0:862:102:10:20:0:111
+cp3002  1H  IN A10.20.0.112
+1H  IN  2620:0:862:102:10:20:0:112
 cp3013  1H  IN A10.20.0.113
 1H  IN  2620:0:862:102:10:20:0:113
 cp3014  1H  IN A10.20.0.114

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ec90b4fcddc8e1a1e86ce46d273a430aea18373
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Gage jger...@wikimedia.org
Gerrit-Reviewer: Gage jger...@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] Updating and debugging the extension - change (mediawiki...MsUpload)

2014-11-18 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Updating and debugging the extension
..

Updating and debugging the extension

* Updates to 9.5.1

Languges added

* French (fr)
* Hebrew (he)
* Lithuanian (lt)
* Added qqq

Source of update is http://www.ratin.de/msupload.html

Change-Id: I45eb72813e57dd18dd25be98891dad77b79ccfeb
---
M .gitignore
M .gitreview
A MsUpload.body.php
A MsUpload.css
R MsUpload.i18n.php
A MsUpload.js
A MsUpload.php
D README.TXT
A README.md
D css/images/ui-bg_flat_0_aa_40x100.png
D css/images/ui-bg_flat_75_ff_40x100.png
D css/images/ui-bg_glass_55_fbf9ee_1x400.png
D css/images/ui-bg_glass_65_ff_1x400.png
D css/images/ui-bg_glass_75_dadada_1x400.png
D css/images/ui-bg_glass_75_e6e6e6_1x400.png
D css/images/ui-bg_glass_95_fef1ec_1x400.png
D css/images/ui-bg_highlight-soft_75_cc_1x100.png
D css/jquery.css
D css/msupload.css
M i18n/de.json
M i18n/en.json
M i18n/es.json
A i18n/fr.json
A i18n/he.json
M i18n/it.json
M i18n/ja.json
A i18n/lt.json
M i18n/pt-br.json
A i18n/qqq.json
M i18n/ru.json
M i18n/zh-hans.json
M i18n/zh-hant.json
M images/msu_close.png
M images/msu_document-film.png
M images/msu_document-globe.png
M images/msu_document-image.png
M images/msu_document-music.png
M images/msu_document-pdf.png
M images/msu_document.png
M images/msu_error-small.png
M images/msu_error.png
M images/msu_loading.png
M images/msu_progress_stripe.png
M images/msu_tick.png
M images/msu_upload_button.png
A images/msu_upload_button_old.gif
M images/msu_upload_icon.png
D js/msupload.insert.js
D js/msupload.js
D js/plupload/plupload.flash.js
D js/plupload/plupload.flash.swf
D js/plupload/plupload.full.js
D js/plupload/plupload.html4.js
D js/plupload/plupload.html5.js
D js/plupload/plupload.js
D js/plupload/plupload.silverlight.js
D js/plupload/plupload.silverlight.xap
D msupload.body.php
D msupload.php
A plupload/Moxie.swf
A plupload/Moxie.xap
A plupload/plupload.full.min.js
62 files changed, 1,224 insertions(+), 1,545 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45eb72813e57dd18dd25be98891dad77b79ccfeb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsUpload
Gerrit-Branch: REL1_23
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com

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

[MediaWiki-commits] [Gerrit] Remove superfluous parseInt() - change (mediawiki...TimedMediaHandler)

2014-11-18 Thread TheDJ (Code Review)

TheDJ has uploaded a new change for review.

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

Change subject: Remove superfluous parseInt()
..

Remove superfluous parseInt()

Requires testing. If this was for rounding, we should use Math.round
or floor/ceil instead (and probably for the other corresponding dimension
as well.

Change-Id: I7ff3e85fcdb7646f9ebe62bdd7d928d46db6bac3
---
M resources/mw.MediaWikiPlayerSupport.js
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/resources/mw.MediaWikiPlayerSupport.js 
b/resources/mw.MediaWikiPlayerSupport.js
index 65247dd..8d50d65 100644
--- a/resources/mw.MediaWikiPlayerSupport.js
+++ b/resources/mw.MediaWikiPlayerSupport.js
@@ -91,7 +91,7 @@
// Set the width height
// Make sure we have an accurate aspect ratio
if ( imageinfo.height != 0  imageinfo.width 
!= 0 ) {
-   embedPlayer.height = parseInt( 
embedPlayer.width * ( imageinfo.height / imageinfo.width ) );
+   embedPlayer.height = embedPlayer.width 
* ( imageinfo.height / imageinfo.width );
}
 
// Update the css for the player interface
@@ -176,7 +176,7 @@
imgSize.height = imgSize.width = ( 
embedPlayer.controlBuilder.getOverlayWidth()  250 ) ? 45 : 80;
} else {
imgSize.width = ( 
embedPlayer.controlBuilder.getOverlayWidth()  250 ) ? 45 : 120;
-   imgSize.height = parseInt( imgSize.width * ( 
embedPlayer.getHeight() / embedPlayer.getWidth() ) );
+   imgSize.height = imgSize.width * ( 
embedPlayer.getHeight() / embedPlayer.getWidth() );
}
return $( 'div/' ).addClass( 'creditline' )
.append(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ff3e85fcdb7646f9ebe62bdd7d928d46db6bac3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: TheDJ hartman.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] Updating and debugging the extension - change (mediawiki...MsUpload)

2014-11-18 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Updating and debugging the extension
..

Updating and debugging the extension

* Updates to 9.5.1

Languges added

* French (fr)
* Hebrew (he)
* Lithuanian (lt)
* Added qqq

Source of update is http://www.ratin.de/msupload.html

Change-Id: Id5b617a4f35ad44a5cc81c25cc2fb4b8a147d87f
---
M .gitignore
A MsUpload.css
A MsUpload.js
D README.TXT
A README.md
D css/images/ui-bg_flat_0_aa_40x100.png
D css/images/ui-bg_flat_75_ff_40x100.png
D css/images/ui-bg_glass_55_fbf9ee_1x400.png
D css/images/ui-bg_glass_65_ff_1x400.png
D css/images/ui-bg_glass_75_dadada_1x400.png
D css/images/ui-bg_glass_75_e6e6e6_1x400.png
D css/images/ui-bg_glass_95_fef1ec_1x400.png
D css/images/ui-bg_highlight-soft_75_cc_1x100.png
D css/jquery.css
D css/msupload.css
M i18n/de.json
M i18n/en.json
M i18n/es.json
A i18n/fr.json
A i18n/he.json
M i18n/it.json
M i18n/ja.json
A i18n/lt.json
M i18n/pt-br.json
A i18n/qqq.json
M i18n/ru.json
M i18n/zh-hans.json
M i18n/zh-hant.json
M images/msu_close.png
M images/msu_document-film.png
M images/msu_document-globe.png
M images/msu_document-image.png
M images/msu_document-music.png
M images/msu_document-pdf.png
M images/msu_document.png
M images/msu_error-small.png
M images/msu_error.png
M images/msu_loading.png
M images/msu_progress_stripe.png
M images/msu_tick.png
M images/msu_upload_button.png
A images/msu_upload_button_old.gif
M images/msu_upload_icon.png
D js/msupload.insert.js
D js/msupload.js
D js/plupload/plupload.flash.js
D js/plupload/plupload.flash.swf
D js/plupload/plupload.full.js
D js/plupload/plupload.html4.js
D js/plupload/plupload.html5.js
D js/plupload/plupload.js
D js/plupload/plupload.silverlight.js
D js/plupload/plupload.silverlight.xap
M msupload.body.php
M msupload.i18n.php
M msupload.php
A plupload/Moxie.swf
A plupload/Moxie.xap
A plupload/plupload.full.min.js
59 files changed, 1,200 insertions(+), 1,521 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsUpload 
refs/changes/99/174099/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5b617a4f35ad44a5cc81c25cc2fb4b8a147d87f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsUpload
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com

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

[MediaWiki-commits] [Gerrit] Updating and debugging the extension - change (mediawiki...MsUpload)

2014-11-18 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Updating and debugging the extension
..

Updating and debugging the extension

* Updates to 9.5.1

Languges added

* French (fr)
* Hebrew (he)
* Lithuanian (lt)
* Added qqq

Source of update is http://www.ratin.de/msupload.html

Change-Id: Ia7b2c7b71df9881f7aeca0527a3e69af8e5c8692
---
M .gitignore
A MsUpload.css
A MsUpload.js
D README.TXT
A README.md
D css/images/ui-bg_flat_0_aa_40x100.png
D css/images/ui-bg_flat_75_ff_40x100.png
D css/images/ui-bg_glass_55_fbf9ee_1x400.png
D css/images/ui-bg_glass_65_ff_1x400.png
D css/images/ui-bg_glass_75_dadada_1x400.png
D css/images/ui-bg_glass_75_e6e6e6_1x400.png
D css/images/ui-bg_glass_95_fef1ec_1x400.png
D css/images/ui-bg_highlight-soft_75_cc_1x100.png
D css/jquery.css
D css/msupload.css
M i18n/de.json
M i18n/en.json
M i18n/es.json
A i18n/fr.json
A i18n/he.json
M i18n/it.json
M i18n/ja.json
A i18n/lt.json
M i18n/pt-br.json
A i18n/qqq.json
M i18n/ru.json
M i18n/zh-hans.json
M i18n/zh-hant.json
M images/msu_close.png
M images/msu_document-film.png
M images/msu_document-globe.png
M images/msu_document-image.png
M images/msu_document-music.png
M images/msu_document-pdf.png
M images/msu_document.png
M images/msu_error-small.png
M images/msu_error.png
M images/msu_loading.png
M images/msu_progress_stripe.png
M images/msu_tick.png
M images/msu_upload_button.png
A images/msu_upload_button_old.gif
M images/msu_upload_icon.png
D js/msupload.insert.js
D js/msupload.js
D js/plupload/plupload.flash.js
D js/plupload/plupload.flash.swf
D js/plupload/plupload.full.js
D js/plupload/plupload.html4.js
D js/plupload/plupload.html5.js
D js/plupload/plupload.js
D js/plupload/plupload.silverlight.js
D js/plupload/plupload.silverlight.xap
M msupload.body.php
M msupload.i18n.php
M msupload.php
A plupload/Moxie.swf
A plupload/Moxie.xap
A plupload/plupload.full.min.js
59 files changed, 1,200 insertions(+), 1,521 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsUpload 
refs/changes/00/174100/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7b2c7b71df9881f7aeca0527a3e69af8e5c8692
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsUpload
Gerrit-Branch: REL1_23
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com

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

[MediaWiki-commits] [Gerrit] mediawiki.action.history.diff: Rework print styles - change (mediawiki/core)

2014-11-18 Thread Code Review

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

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

Change subject: mediawiki.action.history.diff: Rework print styles
..

mediawiki.action.history.diff: Rework print styles

* Remove extremely old print styles for diffs from commonPrint.css,
  added back in r6970. These were created for the old yellow-green-red
  diff styles and look terrible now.
* Add new, minimal print styles, that replace background colors with
  text decoration (underline for inserted text, line-through for
  deleted). Motivation is the same as in r6970: light colored backgrounds
  work great on displays, but not very well in black-and-white print.
* Fixed diff styles demo (mediawiki.action.history.diff.html), updated
  with print styles and better example.

Bug: 73544
Change-Id: Ibf08fa11f84ac0cf8c7ed4da8af2b8804de6ab6f
---
M docs/uidesign/mediawiki.action.history.diff.html
M resources/Resources.php
M resources/src/mediawiki.action/mediawiki.action.history.diff.css
A resources/src/mediawiki.action/mediawiki.action.history.diff.print.css
M resources/src/mediawiki.legacy/commonPrint.css
5 files changed, 92 insertions(+), 77 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/01/174101/1

diff --git a/docs/uidesign/mediawiki.action.history.diff.html 
b/docs/uidesign/mediawiki.action.history.diff.html
index 5edcfb8..2c1c36d 100644
--- a/docs/uidesign/mediawiki.action.history.diff.html
+++ b/docs/uidesign/mediawiki.action.history.diff.html
@@ -1,57 +1,91 @@
 !DOCTYPE html
 html lang=en dir=ltr
 head
-   link rel=stylesheet 
href=../../resources/mediawiki.action/mediawiki.action.history.diff.css
+   meta charset=utf-8
+   link rel=stylesheet 
href=../../resources/src/mediawiki.action/mediawiki.action.history.diff.css
+   link rel=stylesheet media=print 
href=../../resources/src/mediawiki.action/mediawiki.action.history.diff.print.css
 /head
-body style=background-color: #C0C0C0;
-p
-This show various styles for our diff action, the background being hardcoded 
to gray (code#C0C0C0/code) The reference style sheet is:/p
-p
-codea 
href=../../resources/mediawiki.action/mediawiki.action.history.diff.cssresources/mediawiki.action/mediawiki.action.history.diff.css/a/code.
-/p
-p
-This file might help us fix our diff colors which have been a recurring issues 
among the community for a lng time./p
+body
+   
+pThis show various styles for our diff action. Style sheet: codea 
href=../../resources/src/mediawiki.action/mediawiki.action.history.diff.cssresources/src/mediawiki.action/mediawiki.action.history.diff.css/a/code./p
+pThis file might help us fix our diff colors which have been a recurring 
issues among the community for a lng time./p
+pTry it out in print mode, too. Style sheet: codea 
href=../../resources/src/mediawiki.action/mediawiki.action.history.diff.print.cssresources/src/mediawiki.action/mediawiki.action.history.diff.print.css/a/code./p
 
-p
-First, show the diff mostly like it would be chown on a wiki/p
-table class=diff
+pPractical example copied from MediaWiki's HTML output:/p
+
+table class=diff diff-contentalign-left
+   colgroupcol class=diff-marker
+   col class=diff-content
+   col class=diff-marker
+   col class=diff-content
+   /colgroup
+tbody
 tr
-   td class=diff-marker-/td
-   td class=diff-deletedlinediv
-   Some content span class=diffchange diffchange-inlinedeleted 
/ replaced/span
-   /div/td
+   td class=diff-marker−/td
+   td class=diff-deletedlinedivLorem ipsum dolor sit ametdel 
class=diffchange diffchange-inline, consectetur adipisicing elit/del, sed 
do eiusmod tempor incididunt ut labore et dolore magna aliqua./div/td
td class=diff-marker+/td
-   td class=diff-addedlinediv
-   Some content span class=diffchange diffchange-inlineadded / 
replacement/span
-   /div/td
+   td class=diff-addedlinedivLorem ipsum dolor sit amet, sed do 
eiusmod tempor incididunt ut labore et dolore magna aliqua./div/td
 /tr
-/table
+tr
+   td class=diff-marker−/td
+   td class=diff-deletedline/td
+   td colspan=2 class=diff-emptynbsp;/td
+/tr
+tr
+   td class=diff-marker−/td
+   td class=diff-deletedlinedivUt enim ad minim veniam, quis nostrud 
exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat./div/td
+   td colspan=2 class=diff-emptynbsp;/td
+/tr
+tr
+   td class=diff-markernbsp;/td
+   td class=diff-context/td
+   td class=diff-markernbsp;/td
+   td class=diff-context/td
+/tr
+tr
+   td class=diff-markernbsp;/td
+   td class=diff-contextdivDuis aute irure dolor in reprehenderit in 
voluptate velit esse cillum dolore eu fugiat nulla pariatur./div/td
+   td class=diff-markernbsp;/td
+   td class=diff-contextdivDuis aute irure dolor in reprehenderit in 
voluptate velit esse cillum dolore eu fugiat

[MediaWiki-commits] [Gerrit] build: Update various devDependencies to latest - change (oojs/ui)

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

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

Change subject: build: Update various devDependencies to latest
..


build: Update various devDependencies to latest

grunt-contrib-less: 0.11.4 - 0.12.0
grunt-jscs: 0.7.1 - 0.8.1
karma: 0.12.24 - 0.12.25
q: 1.0.1 - 1.1.1

No-op; note that the grunt-jscs change switches us from jscs 1.6.0 to
1.7.2, which provides some new options (unused in the Wikimedia preset).

Change-Id: Ibbd6a4ab8ac7f3c48f2bb7ad2aba02e286e069bd
---
M package.json
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/package.json b/package.json
index 9ab928a..febb450 100644
--- a/package.json
+++ b/package.json
@@ -30,22 +30,22 @@
 grunt-contrib-csslint: 0.3.1,
 grunt-contrib-cssmin: 0.10.0,
 grunt-contrib-jshint: 0.10.0,
-grunt-contrib-less: 0.11.4,
+grunt-contrib-less: 0.12.0,
 grunt-contrib-uglify: 0.6.0,
 grunt-contrib-watch: 0.6.1,
 grunt-csscomb: 3.0.0,
 grunt-cssjanus: 0.2.2,
 grunt-file-exists: 0.1.1,
-grunt-jscs: 0.7.1,
+grunt-jscs: 0.8.1,
 grunt-svg2png: 0.2.5,
 grunt-karma: 0.9.0,
 grunt-promise-q: 0.1.1,
-karma: 0.12.24,
+karma: 0.12.25,
 karma-chrome-launcher: 0.1.5,
 karma-coverage: 0.2.6,
 karma-firefox-launcher: 0.1.3,
 karma-qunit: 0.1.4,
-q: 1.0.1,
+q: 1.1.1,
 qunitjs: 1.15.0
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibbd6a4ab8ac7f3c48f2bb7ad2aba02e286e069bd
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@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] build: Update various devDependencies to latest - change (oojs/core)

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

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

Change subject: build: Update various devDependencies to latest
..


build: Update various devDependencies to latest

grunt-jscs: 0.7.1 - 0.8.1
karma: 0.12.23 - 0.12.25
karma-chrome-launcher: 0.1.4 - 0.1.5
qunit: 0.7.2 - 0.7.5

No-op; note that the grunt-jscs change switches us from jscs 1.6.0 to
1.7.2, which provides some new options (unused in the Wikimedia preset).

Change-Id: I2784c1ed5340e8b4aaea639e736a1812a36e2610
---
M package.json
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/package.json b/package.json
index 0dc6c12..7fe51f6 100644
--- a/package.json
+++ b/package.json
@@ -32,16 +32,16 @@
 grunt-contrib-concat: 0.5.0,
 grunt-contrib-jshint: 0.10.0,
 grunt-contrib-watch: 0.6.1,
-grunt-jscs: 0.7.1,
+grunt-jscs: 0.8.1,
 grunt-karma: 0.9.0,
-karma: 0.12.23,
-karma-chrome-launcher: 0.1.4,
+karma: 0.12.25,
+karma-chrome-launcher: 0.1.5,
 karma-coverage: 0.2.6,
 karma-firefox-launcher: 0.1.3,
 karma-phantomjs-launcher: 0.1.4,
 karma-qunit: 0.1.4,
 karma-sauce-launcher: 0.2.10,
-qunit: 0.7.2,
+qunit: 0.7.5,
 qunitjs: 1.15.0
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2784c1ed5340e8b4aaea639e736a1812a36e2610
Gerrit-PatchSet: 2
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4807d4c..12f183a - change (mediawiki/extensions)

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

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

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

Change subject: Syncronize VisualEditor: 4807d4c..12f183a
..

Syncronize VisualEditor: 4807d4c..12f183a

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/03/174103/1

diff --git a/VisualEditor b/VisualEditor
index 4807d4c..12f183a 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 4807d4c8471a67a48786b1cb3f43e5f9f4ae09aa
+Subproject commit 12f183a20cb0bc3e02a8eb0794565016a00d450a

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

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

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

[MediaWiki-commits] [Gerrit] build: Update grunt-jscs devDependency to latest - change (mediawiki...VisualEditor)

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

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

Change subject: build: Update grunt-jscs devDependency to latest
..


build: Update grunt-jscs devDependency to latest

grunt-jscs: 0.7.1 - 0.8.1

No-op; note that this switches us from jscs 1.6.0 to 1.7.2, which provides
some new options (unused in the Wikimedia preset).

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

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



diff --git a/package.json b/package.json
index 1ea6c59..554ff70 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,6 @@
 grunt-contrib-csslint: 0.3.1,
 grunt-contrib-jshint: 0.10.0,
 grunt-contrib-watch: 0.6.1,
-grunt-jscs: 0.7.1
+grunt-jscs: 0.8.1
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1d0db2568ff673ff8b8bba9549b06c005eb7186b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4807d4c..12f183a - change (mediawiki/extensions)

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

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

Change subject: Syncronize VisualEditor: 4807d4c..12f183a
..


Syncronize VisualEditor: 4807d4c..12f183a

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

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 4807d4c..12f183a 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 4807d4c8471a67a48786b1cb3f43e5f9f4ae09aa
+Subproject commit 12f183a20cb0bc3e02a8eb0794565016a00d450a

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

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

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

[MediaWiki-commits] [Gerrit] build: Update various devDependencies to latest - change (VisualEditor/VisualEditor)

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

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

Change subject: build: Update various devDependencies to latest
..


build: Update various devDependencies to latest

grunt-css-url-embed: 1.0.3 - 1.0.4 (1.1.0 and above will need local changes)
grunt-jscs: 0.7.1 - 0.8.1
karma: 0.12.24 - 0.12.25

No-op; note that the grunt-jscs change switches us from jscs 1.6.0 to
1.7.2, which provides some new options (unused in the Wikimedia preset).

Change-Id: Iffde19b7b55969c480b4d64826f4aecbe346746f
---
M package.json
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/package.json b/package.json
index 045df1f..20e20ab 100644
--- a/package.json
+++ b/package.json
@@ -25,11 +25,11 @@
 grunt-contrib-csslint: 0.3.1,
 grunt-contrib-jshint: 0.10.0,
 grunt-contrib-watch: 0.6.1,
-grunt-css-url-embed: 1.0.3,
+grunt-css-url-embed: 1.0.4,
 grunt-cssjanus: 0.2.2,
-grunt-jscs: 0.7.1,
+grunt-jscs: 0.8.1,
 grunt-karma: 0.9.0,
-karma: 0.12.24,
+karma: 0.12.25,
 karma-chrome-launcher: 0.1.5,
 karma-coverage: 0.2.6,
 karma-firefox-launcher: 0.1.3,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iffde19b7b55969c480b4d64826f4aecbe346746f
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@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] Category.py: upcast from Page to Category - change (pywikibot/core)

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

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

Change subject: Category.py: upcast from Page to Category
..


Category.py: upcast from Page to Category

Instantiate directly a Category, instead of a Page with ns=14.

Change-Id: Iff7d591c0877140fa50c4a939e5430bf44c4d21b
---
M scripts/category.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/scripts/category.py b/scripts/category.py
index 429fc8a..dc1bcdf 100755
--- a/scripts/category.py
+++ b/scripts/category.py
@@ -348,7 +348,7 @@
 newcat = self.newcat
 if not self.current_page.site.nocapitalize:
 newcat = newcat[:1].upper() + newcat[1:]
-catpl = pywikibot.Page(self.current_page.site, newcat, ns=14)
+catpl = pywikibot.Category(self.current_page.site, newcat)
 if catpl in cats:
 pywikibot.output(u%s is already in %s.
  % (self.current_page.title(), catpl.title()))

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff7d591c0877140fa50c4a939e5430bf44c4d21b
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa mpaa.w...@gmail.com
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Mpaa mpaa.w...@gmail.com
Gerrit-Reviewer: Xqt i...@gno.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Updating and debugging the extension - change (mediawiki...MsUpload)

2014-11-18 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Updating and debugging the extension
..

Updating and debugging the extension

* Updates to 9.5.1

Languges added

* French (fr)
* Hebrew (he)
* Lithuanian (lt)
* Added qqq

Source of update is http://www.ratin.de/msupload.html

Change-Id: I889c627eb1ffc75e4bdc25a49beddacce56106bb
---
M .gitignore
A MsUpload.css
A MsUpload.js
D README.TXT
A README.md
D css/images/ui-bg_flat_0_aa_40x100.png
D css/images/ui-bg_flat_75_ff_40x100.png
D css/images/ui-bg_glass_55_fbf9ee_1x400.png
D css/images/ui-bg_glass_65_ff_1x400.png
D css/images/ui-bg_glass_75_dadada_1x400.png
D css/images/ui-bg_glass_75_e6e6e6_1x400.png
D css/images/ui-bg_glass_95_fef1ec_1x400.png
D css/images/ui-bg_highlight-soft_75_cc_1x100.png
D css/jquery.css
D css/msupload.css
M i18n/de.json
M i18n/en.json
M i18n/es.json
A i18n/fr.json
A i18n/he.json
M i18n/it.json
M i18n/ja.json
A i18n/lt.json
M i18n/pt-br.json
A i18n/qqq.json
M i18n/ru.json
M i18n/zh-hans.json
M i18n/zh-hant.json
A images/msu_upload_button_old.gif
D js/msupload.insert.js
D js/msupload.js
D js/plupload/plupload.flash.js
D js/plupload/plupload.flash.swf
D js/plupload/plupload.full.js
D js/plupload/plupload.html4.js
D js/plupload/plupload.html5.js
D js/plupload/plupload.js
D js/plupload/plupload.silverlight.js
D js/plupload/plupload.silverlight.xap
M msupload.body.php
M msupload.i18n.php
M msupload.php
A plupload/Moxie.swf
A plupload/Moxie.xap
A plupload/plupload.full.min.js
45 files changed, 1,214 insertions(+), 1,531 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsUpload 
refs/changes/04/174104/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I889c627eb1ffc75e4bdc25a49beddacce56106bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsUpload
Gerrit-Branch: REL1_23
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com

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

[MediaWiki-commits] [Gerrit] WIP added the simplest test for view history link - change (mediawiki/core)

2014-11-18 Thread Lubaochuan (Code Review)

Lubaochuan has uploaded a new change for review.

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

Change subject: WIP added the simplest test for view history link
..

WIP added the simplest test for view history link

Change-Id: I5f58a6e84e85b7d69aaa37fbb80c49d81c64dd4a
---
M tests/browser/features/view_history.feature
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/05/174105/1

diff --git a/tests/browser/features/view_history.feature 
b/tests/browser/features/view_history.feature
index ba61ebd..4c47b36 100644
--- a/tests/browser/features/view_history.feature
+++ b/tests/browser/features/view_history.feature
@@ -1,6 +1,10 @@
 @chrome @clean @firefox @phantomjs
 Feature: View History
 
+  Scenario: View history link is present
+When I go to a random page 
+Then View history link should be present
+  
   Scenario: Edit page and view history
 Given I go to the History Test Page page with content This is a page 
that will have history
 When I click Edit

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f58a6e84e85b7d69aaa37fbb80c49d81c64dd4a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Lubaochuan lubaoch...@gmail.com

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

[MediaWiki-commits] [Gerrit] Implement dashboard filters - change (mediawiki...ContentTranslation)

2014-11-18 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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

Change subject: Implement dashboard filters
..

Implement dashboard filters

This commit includes some refactoring.

* Store references to the filters as well as rendered translation list elements
* Removed unused parameter in getLinkImage
* Add listen(), execute render() earlier
* Populate language filters with values present in translations
* Helper function for filter creation

The filters are additive (all must match).

Possible improvements in the future:
* Use translated language name
* Simplify the format returned by the API
* Use ULS for the language filters
* Display a message when filters hide all items
* Show a spinner while list items are being loaded via API

Change-Id: I7da54754c511ab2a742594b87d52facba654c577
---
M modules/dashboard/ext.cx.translationlist.js
1 file changed, 157 insertions(+), 24 deletions(-)


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

diff --git a/modules/dashboard/ext.cx.translationlist.js 
b/modules/dashboard/ext.cx.translationlist.js
index efdb887..d3f4c46 100644
--- a/modules/dashboard/ext.cx.translationlist.js
+++ b/modules/dashboard/ext.cx.translationlist.js
@@ -18,17 +18,49 @@
this.$container = $( element );
this.siteMapper = siteMapper;
this.translations = [];
+   this.filters = {
+   status: null,
+   sourceLanguage: null,
+   targetLanguage: null
+   };
+
+   this.$statusFilter = null;
+   this.$sourceLanguageFilter = null;
+   this.$targetLanguageFilter = null;
+
this.init();
+   this.render();
+   this.listen();
}
 
CXTranslationList.prototype.init = function () {
var translationList = this;
 
-   this.getTranslations( mw.user.getName() )
-   .done( function ( response ) {
-   translationList.translations = 
response.query.contenttranslation.translations;
-   translationList.render();
-   } );
+   this.getTranslations(
+   mw.user.getName()
+   ).done( function ( response ) {
+   translationList.getTranslationsCallback( 
response.query.contenttranslation.translations );
+   } );
+   };
+
+   /**
+* Populates various UI components with data in the given translations.
+*/
+   CXTranslationList.prototype.getTranslationsCallback = function ( 
translations ) {
+   var sourceLanguages, targetLanguages;
+
+   // Remove unnecessary object wrapping to get plain list of 
objects
+   translations = $.map( translations, function ( e ) { return 
e.translation; } );
+
+   this.translations = translations;
+
+   this.listTranslations( translations );
+   this.applyFilters( this.filters, translations );
+
+   sourceLanguages = $.map( translations, function ( e ) { return 
e.sourceLanguage; } );
+   this.populateLanguageFilter( this.$sourceLanguageFilter, 
unique( sourceLanguages ) );
+   targetLanguages = $.map( translations, function ( e ) { return 
e.targetLanguage; } );
+   this.populateLanguageFilter( this.$targetLanguageFilter, 
unique( targetLanguages ) );
};
 
/**
@@ -38,7 +70,7 @@
 * @param {string} title Title
 * @return {jQuery.Promise}
 */
-   CXTranslationList.prototype.getLinkImage = function ( id, language, 
title ) {
+   CXTranslationList.prototype.getLinkImage = function ( language, title ) 
{
return this.siteMapper.getApi( language ).get( {
action: 'query',
titles: title,
@@ -75,7 +107,7 @@
 * @param {Object} translation
 */
CXTranslationList.prototype.showTitleImage = function ( translation ) {
-   this.getLinkImage( translation.id, translation.sourceLanguage, 
translation.sourceTitle )
+   this.getLinkImage( translation.sourceLanguage, 
translation.sourceTitle )
.done( function ( response ) {
var pageId, page, imgSrc;
 
@@ -86,7 +118,6 @@
$( '#' + translation.id ).find( 
'.image' ).attr( 'src', imgSrc );
}
} );
-
};
 
/**
@@ -99,7 +130,7 @@
 
for ( i = 0; i  translations.length; i++ ) {
 
-   translation = translations[ i ].translation;
+   translation = translations[ i ];

[MediaWiki-commits] [Gerrit] [FIX] Allow deprecation of all parameters - change (pywikibot/core)

2014-11-18 Thread XZise (Code Review)

XZise has uploaded a new change for review.

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

Change subject: [FIX] Allow deprecation of all parameters
..

[FIX] Allow deprecation of all parameters

With 7aa43ba4a0c8e12bda4a62e32e062672ec8851fa the parameters of several
methods have been deprecated leaving just 'self'. Because only one or
two parameters were used before, the possibility is high that they were
used positionally (without the parameter name) and the @deprecated_args
syntax can't support that (reliably).

This adds a decorator to deprecate all parameters (except self) of a
function, so if any parameters are given at all, it'll drop them and
issue a warning.

Bug: 73489
Change-Id: I9035f3b6be86fe7b34e515e19affe8ef1a9a558e
---
M pywikibot/page.py
M pywikibot/site.py
M pywikibot/tools.py
3 files changed, 58 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/07/174107/1

diff --git a/pywikibot/page.py b/pywikibot/page.py
index 68bfd5c..ee6ebc5 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -49,7 +49,8 @@
 SiteDefinitionError
 )
 from pywikibot.tools import (
-ComparableMixin, deprecated, deprecate_arg, deprecated_args
+ComparableMixin, deprecated, deprecate_arg, deprecated_args,
+remove_all_args
 )
 from pywikibot import textlib
 
@@ -241,7 +242,7 @@
 title = title.replace(forbidden, '_')
 return title
 
-@deprecated_args(decode=None, underscore=None)
+@remove_all_args(['decode', 'underscore'], True)
 def section(self):
 Return the name of the section this Page refers to.
 
@@ -536,7 +537,7 @@
 
 return self._lastNonBotUser
 
-@deprecated_args(datetime=None)
+@remove_all_args(['datetime'], True)
 def editTime(self):
 Return timestamp of last revision to page.
 
@@ -1273,7 +1274,7 @@
 return self.site.pageimages(self, step=step, total=total,
 content=content)
 
-@deprecate_arg(get_redirect, None)
+@remove_all_args(['get_redirect'], True)
 def templatesWithParams(self):
 Iterate templates used on this Page.
 
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 4a139fa..6249e00 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -29,7 +29,7 @@
 import pywikibot.family
 from pywikibot.tools import (
 itergroup, deprecated, deprecate_arg, UnicodeMixin, ComparableMixin,
-redirect_func, add_decorated_full_name, deprecated_args,
+redirect_func, add_decorated_full_name, deprecated_args, remove_all_args,
 SelfCallDict, SelfCallString,
 )
 from pywikibot.tools import MediaWikiVersion as LV
@@ -707,17 +707,17 @@
old_name='normalizeNamespace',
class_name='BaseSite')
 
-@deprecated_args(default=None)
+@remove_all_args(('default', ), True)
 def redirect(self):
 Return list of localized redirect tags for the site.
 return [uREDIRECT]
 
-@deprecated_args(default=None)
+@remove_all_args(('default', ), True)
 def pagenamecodes(self):
 Return list of localized PAGENAME tags for the site.
 return [uPAGENAME]
 
-@deprecated_args(default=None)
+@remove_all_args(('default', ), True)
 def pagename2codes(self):
 Return list of localized PAGENAMEE tags for the site.
 return [uPAGENAMEE]
@@ -2001,7 +2001,7 @@
 else:
 return [word]
 
-@deprecated_args(default=None)
+@remove_all_args(('default', ), True)
 def redirect(self):
 Return the localized #REDIRECT keyword.
 # return the magic word without the preceding '#' character
@@ -2024,12 +2024,12 @@
 pattern = None
 return BaseSite.redirectRegex(self, pattern)
 
-@deprecated_args(default=None)
+@remove_all_args(('default', ), True)
 def pagenamecodes(self):
 Return list of localized PAGENAME tags for the site.
 return self.getmagicwords(pagename)
 
-@deprecated_args(default=None)
+@remove_all_args(('default', ), True)
 def pagename2codes(self):
 Return list of localized PAGENAMEE tags for the site.
 return self.getmagicwords(pagenamee)
diff --git a/pywikibot/tools.py b/pywikibot/tools.py
index ad890eb..60d1857 100644
--- a/pywikibot/tools.py
+++ b/pywikibot/tools.py
@@ -656,6 +656,52 @@
 return decorator
 
 
+def remove_all_args(arg_names, has_self):
+
+Decorator to declare all args deprecated and drop them.
+
+@param arg_names: The names of all arguments.
+@param has_self: Don't drop the first positional argument.
+
+def decorator(obj):
+Outer wrapper.
+
+The outer wrapper is used to create the decorating wrapper.
+
+@param obj: function being wrapped
+@type obj: object
+
+def wrapper(*__args, **__kw):
+

[MediaWiki-commits] [Gerrit] Use README.md as doxygen main page - change (oojs/ui)

2014-11-18 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Use README.md as doxygen main page
..

Use README.md as doxygen main page

From doxygen documentation:
http://www.stack.nl/~dimitri/doxygen/manual/config.html#cfg_use_mdfile_as_mainpage

USE_MDFILE_AS_MAINPAGE

If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file
that is part of the input, its contents will be placed on the main page
(index.html). This can be useful if you have a project on for instance
GitHub and want to reuse the introduction page also for the doxygen
output.

Adjusted the markdown to use fenced code block. Confirmed Github
recognize it properly via a gist.

Change-Id: I812a32f0bd11f05aa10a73db334bccd49875adca
---
M Doxyfile
M README.md
2 files changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/08/174108/1

diff --git a/Doxyfile b/Doxyfile
index 2c78ca5..cf83192 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -11,9 +11,11 @@
 
 WARN_NO_PARAMDOC   = YES
 
-INPUT  = php/
+INPUT  = README.md php/
 FILE_PATTERNS  = *.php
 RECURSIVE  = YES
+# Requires doxygen 1.8.3+
+USE_MDFILE_AS_MAINPAGE = README.md
 
 HTML_DYNAMIC_SECTIONS  = YES
 GENERATE_TREEVIEW  = YES
diff --git a/README.md b/README.md
index 70f35be..5e45ad4 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,8 @@
 --
 
 Release process:
-pre lang=bash
+
+~~~bash
 $ cd path/to/oojs-ui/
 $ git remote update
 $ git checkout -b release -t origin/master
@@ -55,4 +56,4 @@
 $ git tag vX.X.X
 $ git push --tags
 $ npm publish
-/pre
+~~~

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I812a32f0bd11f05aa10a73db334bccd49875adca
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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] logstash: Update regex in 'exception' grokker - change (operations/puppet)

2014-11-18 Thread Gage (Code Review)

Gage has submitted this change and it was merged.

Change subject: logstash: Update regex in 'exception' grokker
..


logstash: Update regex in 'exception' grokker

Follows-up 399ba2fecf in mediawiki-core which changes the message
from Exception from line ... to {ClassName} from line 

Change-Id: I895e8dba1d532a55c0730598c13d8e9c2048ced9
---
M files/logstash/filter-mw-via-udp2log.conf
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/files/logstash/filter-mw-via-udp2log.conf 
b/files/logstash/filter-mw-via-udp2log.conf
index a7cb6f0..ee902d8 100644
--- a/files/logstash/filter-mw-via-udp2log.conf
+++ b/files/logstash/filter-mw-via-udp2log.conf
@@ -254,7 +254,7 @@
   grok {
 match = [
   message,
-  ^(?m)\[(?exception_id\w+)\] %{NOTSPACE:url}\s+Exception from line 
%{NUMBER:line} of %{NOTSPACE:file}: 
%{GREEDYDATA:message}\n%{GREEDYDATA:backtrace}$
+  ^(?m)\[(?exception_id\w+)\] %{NOTSPACE:url}\s+\w+ from line 
%{NUMBER:line} of %{NOTSPACE:file}: 
%{GREEDYDATA:message}\n%{GREEDYDATA:backtrace}$
 ]
 overwrite = [ message ]
   }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I895e8dba1d532a55c0730598c13d8e9c2048ced9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Gage jger...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Replace some deprecated setClaims with getStatements - change (mediawiki...Wikibase)

2014-11-18 Thread WMDE

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

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

Change subject: Replace some deprecated setClaims with getStatements
..

Replace some deprecated setClaims with getStatements

Change-Id: Ifb57318b61f7a9e9f11176aed56db14fdd2364c4
---
M repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimRemoveTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
M repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
M repo/tests/phpunit/includes/api/ClaimModificationHelperTest.php
M repo/tests/phpunit/includes/api/SetClaimTest.php
10 files changed, 58 insertions(+), 61 deletions(-)


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

diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimRemoveTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimRemoveTest.php
index 4026582..7fabcc2 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimRemoveTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimRemoveTest.php
@@ -78,11 +78,12 @@
$item = Item::newEmpty();
$item-setId( new ItemId( $itemIdString ) );
 
-   $claim = $item-newClaim( $snak );
-   $claim-setGuid( $item-getId()-getSerialization() . 
'$D8404CDA-25E4-4334-AG93-A3290BCD9C0P' );
-   $claims = new Claims();
-   $claims-addClaim( $claim );
-   $item-setClaims( $claims );
+   $item-getStatements()-addNewStatement(
+   $snak,
+   null,
+   null,
+   $item-getId()-getSerialization() . 
'$D8404CDA-25E4-4334-AG93-A3290BCD9C0P'
+   );
 
return $item;
}
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
index e600cbd..f8c0c10 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
@@ -183,11 +183,12 @@
$item = Item::newEmpty();
$item-setId( new ItemId( $itemIdString ) );
 
-   $claim = $item-newClaim( $snak );
-   $claim-setGuid( 
$this-mockProvider-getGuidGenerator()-newGuid( $item-getId() ) );
-   $claims = new Claims();
-   $claims-addClaim( $claim );
-   $item-setClaims( $claims );
+   $item-getStatements()-addNewStatement(
+   $snak,
+   null,
+   null,
+   $this-mockProvider-getGuidGenerator()-newGuid( 
$item-getId() )
+   );
 
return $item;
}
diff --git 
a/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
index 4f6fd94..15349f1 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
@@ -81,13 +81,14 @@
$item = Item::newEmpty();
$item-setId( new ItemId( $itemIdString ) );
 
-   $claim = $item-newClaim( $snak );
-   $claim-setGuid( $itemIdString . 
'$D8404CDA-25E4-4334-AG03-A3290BCD9CQP' );
-   $claims = new Claims();
-   $claims-addClaim( $claim );
-   $item-setClaims( $claims );
+   $item-getStatements()-addNewStatement(
+   $snak,
+   null,
+   null,
+   $itemIdString . '$D8404CDA-25E4-4334-AG03-A3290BCD9CQP'
+   );
 
return $item;
}
 
-} 
\ No newline at end of file
+}
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
index b861e2a..beb309e 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
@@ -148,11 +148,12 @@
$item = Item::newEmpty();
$item-setId( 123 );
 
-   $claim = $item-newClaim( $snak );
-   $claim-setGuid( $item-getId()-getSerialization() . 
'$D8404CDA-25E4-4334-AG03-A3290BCD9CQP' );
-   $claims = new Claims();
-   $claims-addClaim( $claim );
-   $item-setClaims( $claims );
+

[MediaWiki-commits] [Gerrit] Reduce inheritance in EntityContentTest - change (mediawiki...Wikibase)

2014-11-18 Thread WMDE

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

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

Change subject: Reduce inheritance in EntityContentTest
..

Reduce inheritance in EntityContentTest

Especially the redirect stuff is only needed in ItemContentTest.

Change-Id: If76715ff5275c7ecb381413dd4f073aef0603b4e
---
M repo/includes/content/ItemContent.php
M repo/tests/phpunit/includes/content/EntityContentTest.php
M repo/tests/phpunit/includes/content/ItemContentTest.php
M repo/tests/phpunit/includes/content/PropertyContentTest.php
4 files changed, 58 insertions(+), 72 deletions(-)


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

diff --git a/repo/includes/content/ItemContent.php 
b/repo/includes/content/ItemContent.php
index 46cd222..4f59b97 100644
--- a/repo/includes/content/ItemContent.php
+++ b/repo/includes/content/ItemContent.php
@@ -3,15 +3,12 @@
 namespace Wikibase;
 
 use InvalidArgumentException;
-use Language;
 use LogicException;
 use MWException;
 use Title;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\Lib\Store\EntityRedirect;
 use Wikibase\Repo\ItemSearchTextGenerator;
-use Wikibase\Repo\View\ClaimsView;
-use Wikibase\Repo\View\FingerprintView;
 
 /**
  * Content object for articles representing Wikibase items.
diff --git a/repo/tests/phpunit/includes/content/EntityContentTest.php 
b/repo/tests/phpunit/includes/content/EntityContentTest.php
index 7028b28..e7b8b6c 100644
--- a/repo/tests/phpunit/includes/content/EntityContentTest.php
+++ b/repo/tests/phpunit/includes/content/EntityContentTest.php
@@ -69,45 +69,16 @@
}
 
/**
-* @return string
-*/
-   protected abstract function getContentClass();
-
-   /**
 * @return EntityId
 */
protected abstract function getDummyId();
 
/**
-* @param EntityId $id
+* @param EntityId $entityId
 *
 * @return EntityContent
 */
-   protected function newEmpty( EntityId $id = null ) {
-   $class = $this-getContentClass();
-   $empty = $class::newEmpty();
-
-   if ( $id ) {
-   $empty-getEntity()-setId( $id );
-   }
-
-   return $empty;
-   }
-
-   /**
-* @param EntityId $id
-* @param EntityId $target
-*
-* @return EntityContent
-*/
-   protected function newRedirect( EntityId $id, EntityId $target ) {
-   //FIXME: use the respective EntityHandler instead of going via 
the global title lookup!
-   $titleLookup = 
WikibaseRepo::getDefaultInstance()-getEntityTitleLookup();
-   $title = $titleLookup-getTitleForId( $target );
-
-   $class = $this-getContentClass();
-   return $class::newFromRedirect( new EntityRedirect( $id, 
$target ), $title );
-   }
+   protected abstract function newEmpty( EntityId $entityId = null );
 
/**
 * @dataProvider getTextForSearchIndexProvider
diff --git a/repo/tests/phpunit/includes/content/ItemContentTest.php 
b/repo/tests/phpunit/includes/content/ItemContentTest.php
index 7437fc1..c541520 100644
--- a/repo/tests/phpunit/includes/content/ItemContentTest.php
+++ b/repo/tests/phpunit/includes/content/ItemContentTest.php
@@ -8,7 +8,6 @@
 use Diff\DiffOp\DiffOpRemove;
 use Title;
 use Wikibase\DataModel\Claim\Claim;
-use Wikibase\DataModel\Claim\Claims;
 use Wikibase\DataModel\Entity\Diff\EntityDiff;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\ItemId;
@@ -21,6 +20,7 @@
 use Wikibase\ItemContent;
 use Wikibase\Lib\Store\EntityRedirect;
 use Wikibase\Repo\Content\EntityContentDiff;
+use Wikibase\Repo\WikibaseRepo;
 
 /**
  * @covers Wikibase\ItemContent
@@ -45,17 +45,39 @@
}
 
/**
-* @see EntityContentTest::getContentClass
-*/
-   protected function getContentClass() {
-   return '\Wikibase\ItemContent';
-   }
-
-   /**
-* @return EntityId
+* @return ItemId
 */
protected function getDummyId() {
return new ItemId( 'Q100' );
+   }
+
+   /**
+* @param EntityId $itemId
+*
+* @return ItemContent
+*/
+   protected function newEmpty( EntityId $itemId = null ) {
+   $empty = ItemContent::newEmpty();
+
+   if ( $itemId !== null ) {
+   $empty-getItem()-setId( $itemId );
+   }
+
+   return $empty;
+   }
+
+   /**
+* @param ItemId $itemId
+* @param ItemId $targetId
+*
+* @return ItemContent
+*/
+   private function newRedirect( ItemId $itemId, ItemId $targetId ) {
+   // FIXME: Use the respective EntityHandler instead of going via 
the global title lookup!
+   $titleLookup =

[MediaWiki-commits] [Gerrit] Update .gitreview - change (mediawiki...MsUpload)

2014-11-18 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Update .gitreview
..

Update .gitreview

* Change branch from master to REL1_22

Change-Id: I4d70fbff52068ad451ba573cb53d026653229212
---
A .gitignore
A .gitreview
2 files changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsUpload 
refs/changes/11/174111/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..98b092a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.svn
+*~
+*.kate-swp
+.*.swp
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..45e3d9c
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/extensions/MsUpload.git
+defaultbranch=REL1_22
+defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d70fbff52068ad451ba573cb53d026653229212
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsUpload
Gerrit-Branch: REL1_22
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com

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

[MediaWiki-commits] [Gerrit] Repair error handling for transcode reset - change (mediawiki...TimedMediaHandler)

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

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

Change subject: Repair error handling for transcode reset
..


Repair error handling for transcode reset

Follow up to change Ie1aef55e40150a91ddd24fa3121de1a6e8a8a86e

Change-Id: I9c2816c51581d024e327d1e7dfa77f9c93da679c
---
M resources/ext.tmh.transcodetable.js
1 file changed, 9 insertions(+), 11 deletions(-)

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



diff --git a/resources/ext.tmh.transcodetable.js 
b/resources/ext.tmh.transcodetable.js
index 346c78f..1a4d65a 100644
--- a/resources/ext.tmh.transcodetable.js
+++ b/resources/ext.tmh.transcodetable.js
@@ -56,19 +56,17 @@
'transcodekey' : tKey,
'title' : mw.config.get('wgPageName')
} ).done( function ( data ) {
-   if( data  data['success'] ){
-   // refresh the page
-   window.location.reload();
+   // refresh the page
+   window.location.reload();
+   } ).fail( function ( code, data ) {
+   if( data.error  data.error.info ){
+   $( _thisDialog ).text( data.error.info 
);
} else {
-   if( data.error  data.error.info ){
-   $( _thisDialog ).text( 
data.error.info );
-   } else {
-   $( _thisDialog ).text( mw.msg( 
'timedmedia-reset-error' ) );
-   }
-   var okBtn = {};
-   okBtn[ mw.msg('mwe-ok') ] = function() 
{ $(this).dialog( 'close' ); }
-   $( _thisDialog ).dialog( 'option', 
'buttons', okBtn );
+   $( _thisDialog ).text( mw.msg( 
'timedmedia-reset-error' ) );
}
+   var okBtn = {};
+   okBtn[ mw.msg('mwe-ok') ] = function() { 
$(this).dialog( 'close' ); }
+   $( _thisDialog ).dialog( 'option', 'buttons', 
okBtn );
} );
};
buttons[ mw.msg( 'mwe-cancel' ) ] = function () {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c2816c51581d024e327d1e7dfa77f9c93da679c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: TheDJ hartman.w...@gmail.com
Gerrit-Reviewer: Gilles gdu...@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] Drop optional empty array() constructor parameters - change (mediawiki...Wikibase)

2014-11-18 Thread WMDE

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

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

Change subject: Drop optional empty array() constructor parameters
..

Drop optional empty array() constructor parameters

Change-Id: Ibf6405642110272aece50814c8a4259ffc7c346c
---
M lib/tests/phpunit/TermTest.php
M repo/tests/phpunit/includes/Validators/CompositeFingerprintValidatorTest.php
M 
repo/tests/phpunit/includes/Validators/LabelDescriptionUniquenessValidatorTest.php
M repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
M repo/tests/phpunit/includes/Validators/TermValidatorFactoryTest.php
M repo/tests/phpunit/includes/api/EntityTestHelper.php
M repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
7 files changed, 27 insertions(+), 27 deletions(-)


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

diff --git a/lib/tests/phpunit/TermTest.php b/lib/tests/phpunit/TermTest.php
index a28dd9b..863deb1 100644
--- a/lib/tests/phpunit/TermTest.php
+++ b/lib/tests/phpunit/TermTest.php
@@ -82,8 +82,8 @@
$tests = array();
 
$tests[] = array( // #0
-   new Term( array() ),
-   new Term( array() ),
+   new Term(),
+   new Term(),
true
);
 
@@ -166,19 +166,19 @@
public static function provideEquals() {
$tests = array(
array( // #0
-   new Term( array() ),
+   new Term(),
null,
false
),
 
array( // #1
-   new Term( array() ),
+   new Term(),
false,
false
),
 
array( // #2
-   new Term( array() ),
+   new Term(),
,
false
),
diff --git 
a/repo/tests/phpunit/includes/Validators/CompositeFingerprintValidatorTest.php 
b/repo/tests/phpunit/includes/Validators/CompositeFingerprintValidatorTest.php
index fe84366..2479e8d 100644
--- 
a/repo/tests/phpunit/includes/Validators/CompositeFingerprintValidatorTest.php
+++ 
b/repo/tests/phpunit/includes/Validators/CompositeFingerprintValidatorTest.php
@@ -48,9 +48,9 @@
 */
public function testValidateFingerprint( $validators, $expected ) {
$fingerprint = new Fingerprint(
-   new TermList( array() ),
-   new TermList( array() ),
-   new AliasGroupList( array() )
+   new TermList(),
+   new TermList(),
+   new AliasGroupList()
);
 
$validator = new CompositeFingerprintValidator( $validators );
diff --git 
a/repo/tests/phpunit/includes/Validators/LabelDescriptionUniquenessValidatorTest.php
 
b/repo/tests/phpunit/includes/Validators/LabelDescriptionUniquenessValidatorTest.php
index 04bce91..45e5223 100644
--- 
a/repo/tests/phpunit/includes/Validators/LabelDescriptionUniquenessValidatorTest.php
+++ 
b/repo/tests/phpunit/includes/Validators/LabelDescriptionUniquenessValidatorTest.php
@@ -43,8 +43,8 @@
'no description' = array(
new Fingerprint(
new TermList( array( new Term( 'de', 
'DUPE' ) ) ),
-   new TermList( array() ),
-   new AliasGroupList( array() )
+   new TermList(),
+   new AliasGroupList()
),
$q99
),
@@ -52,7 +52,7 @@
new Fingerprint(
new TermList( array( new Term( 'de', 
'DUPE' ) ) ),
new TermList( array( new Term( 'de', 
'Foo' ) ) ),
-   new AliasGroupList( array() )
+   new AliasGroupList()
),
$q99
),
@@ -62,7 +62,7 @@
new Fingerprint(
new TermList( array( new Term( 'de', 
'DUPE' ) ) ),
new TermList( array( new Term( 'de', 
'DUPE' ) ) ),
-   new AliasGroupList( array() )
+   new AliasGroupList()

[MediaWiki-commits] [Gerrit] Lazy initialize OtherProjectsSidebarGenerator in hook handlers - change (mediawiki...Wikibase)

2014-11-18 Thread Aude (Code Review)

Aude has uploaded a new change for review.

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

Change subject: Lazy initialize OtherProjectsSidebarGenerator in hook handlers
..

Lazy initialize OtherProjectsSidebarGenerator in hook handlers

also split ParserAfterParser hook handling from SidebarHookHandlers,
so we don't need to initialize stuff like LangLinkHandler for
hooks called outside of parsing.

Bug: 56602
Change-Id: If99ab8cf9629b4bcb59e10f4c0495d6bb004cb69
---
M client/WikibaseClient.php
M client/includes/WikibaseClient.php
A client/includes/hooks/ParserAfterParseHookHandler.php
M client/includes/hooks/SidebarHookHandlers.php
M client/tests/phpunit/includes/WikibaseClientTest.php
A client/tests/phpunit/includes/hooks/ParserAfterParserHookHandlerTest.php
M client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
7 files changed, 618 insertions(+), 329 deletions(-)


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

diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index b6f9f92..1acb2bc 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -92,7 +92,7 @@
$wgHooks['OldChangesListRecentChangesLine'][]   = 
'\Wikibase\ClientHooks::onOldChangesListRecentChangesLine';
$wgHooks['OutputPageParserOutput'][]= 
'\Wikibase\Client\Hooks\SidebarHookHandlers::onOutputPageParserOutput';
$wgHooks['SkinTemplateGetLanguageLink'][]   = 
'\Wikibase\Client\Hooks\SidebarHookHandlers::onSkinTemplateGetLanguageLink';
-   $wgHooks['ParserAfterParse'][]  = 
'\Wikibase\Client\Hooks\SidebarHookHandlers::onParserAfterParse';
+   $wgHooks['ParserAfterParse'][]  = 
'\Wikibase\Client\Hooks\ParserAfterParseHookHandler::onParserAfterParse';
$wgHooks['SidebarBeforeOutput'][] = 
'\Wikibase\Client\Hooks\SidebarHookHandlers::onSidebarBeforeOutput';
$wgHooks['ParserAfterParse'][]  = 
'\Wikibase\Client\Hooks\DataUpdateHookHandlers::onParserAfterParse';
$wgHooks['ParserFirstCallInit'][]   = 
'\Wikibase\ClientHooks::onParserFirstCallInit';
diff --git a/client/includes/WikibaseClient.php 
b/client/includes/WikibaseClient.php
index a9b29a5..cd37523 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -637,10 +637,10 @@
 */
public function getOtherProjectsSidebarGenerator() {
return new OtherProjectsSidebarGenerator(
-   $this-settings-getSetting( 'siteGlobalID' ),
+   $this-getSettings()-getSetting( 'siteGlobalID' ),
$this-getStore()-getSiteLinkTable(),
$this-getSiteStore()-getSites(),
-   $this-settings-getSetting( 'otherProjectsLinks' )
+   $this-getSettings()-getSetting( 'otherProjectsLinks' )
);
}
 
diff --git a/client/includes/hooks/ParserAfterParseHookHandler.php 
b/client/includes/hooks/ParserAfterParseHookHandler.php
new file mode 100644
index 000..4e3b452
--- /dev/null
+++ b/client/includes/hooks/ParserAfterParseHookHandler.php
@@ -0,0 +1,161 @@
+?php
+
+namespace Wikibase\Client\Hooks;
+
+use Exception;
+use OutputPage;
+use Parser;
+use ParserOutput;
+use StripState;
+use StubUserLang;
+use Title;
+use Wikibase\Client\WikibaseClient;
+use Wikibase\InterwikiSorter;
+use Wikibase\LangLinkHandler;
+use Wikibase\NamespaceChecker;
+use Wikibase\NoLangLinkHandler;
+use Wikibase\SettingsArray;
+
+/**
+ * @since 0.5.
+ *
+ * @license GPL 2+
+ * @author Katie Filbert  aude.w...@gmail.com 
+ * @author Daniel Kinzler
+ * @author Jeroen De Dauw  jeroended...@gmail.com 
+ * @author Marius Hoch  h...@online.de 
+ */
+class ParserAfterParseHookHandler {
+
+   /**
+* @var NamespaceChecker
+*/
+   private $namespaceChecker;
+
+   /**
+* @var LangLinkHandler
+*/
+   private $langLinkHandler;
+
+   /**
+* @var InterwikiSorter
+*/
+   private $interwikiSorter;
+
+   /**
+* @var bool
+*/
+   private $alwaysSort;
+
+   public static function newFromGlobalState() {
+   global $wgLang;
+   StubUserLang::unstub( $wgLang );
+
+   $wikibaseClient = WikibaseClient::getDefaultInstance();
+   $settings = $wikibaseClient-getSettings();
+
+   $interwikiSorter = new InterwikiSorter(
+   $settings-getSetting( 'sort' ),
+   $settings-getSetting( 'interwikiSortOrders' ),
+   $settings-getSetting( 'sortPrepend' )
+   );
+
+   return new ParserAfterParseHookHandler(
+   $wikibaseClient-getNamespaceChecker(),
+

[MediaWiki-commits] [Gerrit] Move tipsy images to jquery.wikibase-shared - change (mediawiki...Wikibase)

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

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

Change subject: Move tipsy images to jquery.wikibase-shared
..


Move tipsy images to jquery.wikibase-shared

Change-Id: I65050e702eaa05af710f6ccadbbd4928efc91d19
---
R lib/resources/jquery.wikibase-shared/themes/default/images/tipsy-error.png
R lib/resources/jquery.wikibase-shared/themes/default/images/tipsy.png
2 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git 
a/lib/resources/jquery.wikibase/themes/default/images/tipsy-error.png 
b/lib/resources/jquery.wikibase-shared/themes/default/images/tipsy-error.png
similarity index 100%
rename from lib/resources/jquery.wikibase/themes/default/images/tipsy-error.png
rename to 
lib/resources/jquery.wikibase-shared/themes/default/images/tipsy-error.png
Binary files differ
diff --git a/lib/resources/jquery.wikibase/themes/default/images/tipsy.png 
b/lib/resources/jquery.wikibase-shared/themes/default/images/tipsy.png
similarity index 100%
rename from lib/resources/jquery.wikibase/themes/default/images/tipsy.png
rename to lib/resources/jquery.wikibase-shared/themes/default/images/tipsy.png
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65050e702eaa05af710f6ccadbbd4928efc91d19
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Migrate to ganglia_new::web::view - change (operations/puppet)

2014-11-18 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Migrate to ganglia_new::web::view
..

Migrate to ganglia_new::web::view

One more step towards deprecating ganglia.pp. Delete the old definition
and create a new one with tests and simplified calling
Use this to enable the misc::monitoring::views class inclusion on
uranium that was disabled in d7ae62d

Change-Id: I498c2849eb1872ba0394d8f40050526dfe82a78c
---
M manifests/ganglia.pp
M manifests/misc/monitoring.pp
M manifests/site.pp
M modules/ganglia_new/manifests/web.pp
A modules/ganglia_new/manifests/web/view.pp
R modules/ganglia_new/templates/ganglia_view.json.erb
A modules/ganglia_new/tests/view.pp
7 files changed, 116 insertions(+), 99 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/174114/1

diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 32775ef..eb4cc6e 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -634,90 +634,6 @@
 }
 
 
-# == Define ganglia::view
-# Defines a Ganglia view JSON file.
-# See 
http://sourceforge.net/apps/trac/ganglia/wiki/ganglia-web-2#JSONdefinitionforviews
-# for documentation on Ganglia view JSON format.
-#
-# == Parameters:
-# $graphs   - Shortcut for describing items that represent 
aggregate_graphs.
-# $items- Should match exactly the JSON structure expected by Ganglia 
for views.
-# $view_type- If you are using aggregate_graphs, this must be set to 
'standard'.
-# 'regex' will allow you to use non-aggregate graphs and match 
hostnames by regex.
-# Default: 'standard'.
-# $default_size - Default size for graphs.  Default: 'large'.
-# $conf_dir - Path to directory where ganglia view JSON files should live.
-# Defaults to the appropriate directory based on WMF $::realm. 
 Default: /var/lib/ganglia/conf.
-# $template - The ERB template to use for the JSON file.  Only change this 
if you need to do fancier things than this define allows.
-#
-# == Examples:
-# # A 'regex' (non-aggregate graph) view:
-# # Note that no aggregate_graphs are used.
-# # This will add 4 graphs to the 'cpu' view.
-# # (i.e. cpu_user and cpu_system for each myhost0 and myhost1)
-# $host_regex = 'myhost[01]'
-# ganglia::view { 'cpu':
-#   view_type = 'regex',
-#   items = [
-# {
-#   'metric'   = 'cpu_user',
-#   'hostname' = $host_regex,
-# }
-# {
-#   'metric'   = 'cpu_system',
-#   'hostname' = $host_regex,
-# }
-#   ],
-# }
-#
-#
-# # Use the $graphs parameter to describe aggregate graphs.
-# # You can describe the same graphs to add with $items.
-# # $graphs is just a shortcut.  aggregate_graphs in $items
-# # are a bit overly verbose.
-# $host_regex = 'erbium|oxygen|gadolinium'
-# ganglia::view { 'udp2log':
-#   graphs = [
-# {
-#   'host_regex'   = $host_regex,
-#   'metric_regex' = 'packet_loss_average',
-# }
-# {
-#   'host_regex'   = $host_regex,
-#   'metric_regex' = 'drops',
-# }
-# {
-#   'host_regex'   = $host_regex,
-#   'metric_regex' = 'packet_loss_90th',
-# }
-#   ],
-# }
-#
-define ganglia::view(
-$graphs   = [],
-$items= [],
-$view_type= 'standard',
-$default_size = 'large',
-$conf_dir = ${ganglia::web::ganglia_confdir}/conf,
-$template = 'ganglia/ganglia_view.json.erb',
-$description  = undef,
-$ensure   = 'present'
-)
-{
-require ganglia::web
-
-# require ganglia::web
-if $description {
-$view_name = $description
-} else {
-$view_name = $name
-}
-file { ${conf_dir}/view_${name}.json:
-ensure  = $ensure,
-content = template($template),
-}
-}
-
 # == Define ganglia::plugin::python
 #
 # Installs a Ganglia python plugin
diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp
index b333799..375a5d3 100644
--- a/manifests/misc/monitoring.pp
+++ b/manifests/misc/monitoring.pp
@@ -67,7 +67,6 @@
 # Ganglia views that should be
 # avaliable on ganglia.wikimedia.org
 class misc::monitoring::views {
-require ganglia::web
 include role::analytics::kafka::config
 
 misc::monitoring::view::udp2log { 'udp2log':
@@ -99,7 +98,7 @@
 $auth_dns_host_regex = '^(rubidium|baham|eeden.esams).wikimedia.org$'
 $rec_dns_host_regex = '^(chromium|hydrogen).wikimedia.org$'
 
-ganglia::view { 'authoritative_dns':
+ganglia_new::web::view { 'authoritative_dns':
 ensure  = 'present',
 description = 'DNS Authoritative',
 graphs  = [
@@ -142,7 +141,7 @@
 ]
 }
 
-ganglia::view { 'recursive_dns':
+ganglia_new::web::view { 'recursive_dns':
 ensure  = 'present',
 description = 'DNS Recursive',
 graphs  = [
@@ -193,16 +192,16 @@
 }
 
 # == Define

[MediaWiki-commits] [Gerrit] Updating MsUpload to 9.5.1 - change (mediawiki...MsUpload)

2014-11-18 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Updating MsUpload to 9.5.1
..

Updating MsUpload to 9.5.1

* Updates to 9.5.1

Languges added

* French (fr)
* Hebrew (he)
* Lithuanian (lt)
* Added qqq

Source of update is http://www.ratin.de/msupload.html

Change-Id: I07dc5fbc6d8480bdb8386cb1cea8f6b6b8942505
---
M .gitreview
M README.TXT
M css/msupload.css
A images/msu_upload_button_old.gif
D js/msupload.insert.js
M js/msupload.js
A js/plupload/Moxie.swf
A js/plupload/Moxie.xap
A js/plupload/moxie.js
A js/plupload/moxie.min.js
D js/plupload/plupload.flash.js
D js/plupload/plupload.flash.swf
D js/plupload/plupload.full.js
A js/plupload/plupload.full.min.js
D js/plupload/plupload.html4.js
D js/plupload/plupload.html5.js
D js/plupload/plupload.js
D js/plupload/plupload.silverlight.js
D js/plupload/plupload.silverlight.xap
M msupload.body.php
M msupload.i18n.php
M msupload.php
22 files changed, 10,841 insertions(+), 317 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07dc5fbc6d8480bdb8386cb1cea8f6b6b8942505
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsUpload
Gerrit-Branch: REL1_22
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com

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

[MediaWiki-commits] [Gerrit] Bug fixes for view terms view more and the caption ellipsis - change (mediawiki...MultimediaViewer)

2014-11-18 Thread Gilles (Code Review)

Gilles has uploaded a new change for review.

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

Change subject: Bug fixes for view terms view more and the caption ellipsis
..

Bug fixes for view terms view more and the caption ellipsis

This is a compilation of the following commits:

89efe125a41428a0645df1d6dacf5a02de0cea93
62d21f0d6783e8bf2b976c097ea6c550e32003f3
f5d77badef57acf1f6074c75f2d5d5736a77e881

Change-Id: Ief9aa1c7e982ee21030380551b956c6435d665e9
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/987
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/988
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/985
---
M resources/mmv/ui/mmv.ui.metadataPanel.js
M resources/mmv/ui/mmv.ui.permission.js
M resources/mmv/ui/mmv.ui.truncatableTextField.less
3 files changed, 14 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer 
refs/changes/16/174116/1

diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.js 
b/resources/mmv/ui/mmv.ui.metadataPanel.js
index 793a6ff..82c5ab3 100644
--- a/resources/mmv/ui/mmv.ui.metadataPanel.js
+++ b/resources/mmv/ui/mmv.ui.metadataPanel.js
@@ -196,7 +196,7 @@
 
this.initializeCredit();
this.description = new mw.mmv.ui.Description( 
this.$imageMetadataLeft );
-   this.permission = new mw.mmv.ui.Permission( 
this.$imageMetadataLeft );
+   this.permission = new mw.mmv.ui.Permission( 
this.$imageMetadataLeft, this.scroller );
this.initializeImageLinks();
};
 
@@ -284,7 +284,7 @@
.hide()
.on( 'click', function() {
panel.permission.grow();
-   panel.scroller.scrollIntoView( 
panel.permission.$box, 500 );
+   panel.scroller.toggle( 'up' );
return false;
} );
};
diff --git a/resources/mmv/ui/mmv.ui.permission.js 
b/resources/mmv/ui/mmv.ui.permission.js
index 4e103a8..74919af 100644
--- a/resources/mmv/ui/mmv.ui.permission.js
+++ b/resources/mmv/ui/mmv.ui.permission.js
@@ -27,8 +27,9 @@
 * @extends mw.mmv.ui.Element
 * @constructor
 * @param {jQuery} $container
+* @param {mw.mmv.ui.MetadataPanelScroller} scroller
 */
-   function Permission( $container ) {
+   function Permission( $container, scroller ) {
var permission = this;
 
mw.mmv.ui.Element.call( this, $container );
@@ -64,6 +65,7 @@
.on( 'click', '.mw-mmv-permission-text-viewmore', 
function( e ) {
e.preventDefault();
permission.grow();
+   permission.scroller.toggle( 'up' );
} )
;
 
@@ -99,6 +101,12 @@
permission.shrink();
} )
.appendTo( this.$box );
+
+   /**
+* Panel scroller from the metadata panel object.
+* @property {mw.mmv.ui.MetadataPanelScroller}
+*/
+   this.scroller = scroller;
}
oo.inheritClass( Permission, mw.mmv.ui.Element );
P = Permission.prototype;
diff --git a/resources/mmv/ui/mmv.ui.truncatableTextField.less 
b/resources/mmv/ui/mmv.ui.truncatableTextField.less
index 0519319..fc401fd 100644
--- a/resources/mmv/ui/mmv.ui.truncatableTextField.less
+++ b/resources/mmv/ui/mmv.ui.truncatableTextField.less
@@ -1,3 +1,4 @@
+@import mediawiki.mixins;
 @import ../mmv.mixins;
 
 .mw-mmv-ttf-container {
@@ -41,6 +42,7 @@
background-repeat: no-repeat;
/* @embed */
background-image: url(img/ellipsis_lightgray.svg);
+   .box-shadow( -4px 6px 0 0 white);
 
// Hovering over .mw-mmv-ttf-ellipsis-container will make the 
ellipsis more visible to attract
// attention to it. Since it has to be set on a parent element 
which is not under control of
@@ -63,8 +65,7 @@
display: block;
content: '';
 
-   height: 1.2em; // 1em would not cover high glyphs
-   margin-top: -0.1em; // center
+   height: 1.6em; // 1em would not cover high glyphs
 
width: @fade-length;
margin-left: -@fade-length;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief9aa1c7e982ee21030380551b956c6435d665e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: wmf/1.25wmf8
Gerrit-Owner: Gilles

[MediaWiki-commits] [Gerrit] Move getLanguageNameByCode out of wikibase.js - change (mediawiki...Wikibase)

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

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

Change subject: Move getLanguageNameByCode out of wikibase.js
..


Move getLanguageNameByCode out of wikibase.js

Change-Id: I00ce9e98bb10e66c2654afa70fcd593b6c9f13d8
---
M lib/resources/Resources.php
M lib/resources/jquery.wikibase/resources.php
M lib/resources/wikibase.js
M lib/tests/qunit/wikibase.tests.js
M repo/resources/Resources.php
A repo/resources/wikibase.getLanguageNameByCode.js
M repo/tests/qunit/resources.php
A repo/tests/qunit/wikibase.getLanguageNameByCode.tests.js
8 files changed, 107 insertions(+), 82 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  Henning Snater: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index d183f6c..e9d33e8 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -126,7 +126,6 @@
);
 
if ( defined( 'ULS_VERSION' ) ) {
-   $modules['wikibase']['dependencies'][] = 'ext.uls.mediawiki';
$modules['wikibase.Site']['dependencies'][] = 
'ext.uls.mediawiki';
}
 
diff --git a/lib/resources/jquery.wikibase/resources.php 
b/lib/resources/jquery.wikibase/resources.php
index b75eca7..0e9ca51 100644
--- a/lib/resources/jquery.wikibase/resources.php
+++ b/lib/resources/jquery.wikibase/resources.php
@@ -78,7 +78,6 @@
'jquery.wikibase.claimlistview',
'jquery.wikibase.listview',
'jquery.wikibase.toolbarcontroller',
-   'wikibase',
'wikibase.datamodel',
),
),
@@ -94,7 +93,6 @@
'jquery.wikibase.listview',
'jquery.wikibase.statementview',
'jquery.wikibase.toolbarcontroller',
-   'wikibase',
'wikibase.datamodel',
'wikibase.templates',
'wikibase.utilities',
@@ -134,8 +132,8 @@
'jquery.ui.TemplatedWidget',
'jquery.wikibase.edittoolbar',
'jquery.wikibase.toolbarcontroller',
-   'wikibase',
'wikibase.datamodel.Term',
+   'wikibase.getLanguageNameByCode',
),
'messages' = array(
'wikibase-description-edit-placeholder',
@@ -182,9 +180,9 @@
'jquery.wikibase.toolbarcontroller',
'jquery.wikibase.sitelinkgrouplistview',
'jquery.wikibase.statementview',
-   'wikibase',
'wikibase.datamodel.MultiTerm',
'wikibase.datamodel.Term',
+   'wikibase.getLanguageNameByCode',
'wikibase.templates',
),
'messages' = array(
@@ -217,9 +215,9 @@

'themes/default/jquery.wikibase.fingerprintlistview.css',
),
'dependencies' = array(
-   'wikibase',
'jquery.ui.TemplatedWidget',
'jquery.wikibase.fingerprintview',
+   'wikibase.getLanguageNameByCode',
),
'messages' = array(
'wikibase-fingerprintview-input-help-message',
@@ -240,7 +238,7 @@
'jquery.wikibase.labelview',
'jquery.wikibase.toolbarcontroller',
'mediawiki.Title',
-   'wikibase',
+   'wikibase.getLanguageNameByCode',
),
'messages' = array(
'wikibase-fingerprintview-input-help-message',
@@ -258,8 +256,8 @@
'jquery.ui.TemplatedWidget',
'jquery.wikibase.edittoolbar',
'jquery.wikibase.toolbarcontroller',
-   'wikibase',
'wikibase.datamodel.Term',
+   'wikibase.getLanguageNameByCode',
),
'messages' = array(
'parentheses',
@@ -357,7 +355,6 @@
'jquery.wikibase.listview',

[MediaWiki-commits] [Gerrit] Bug fixes for view terms view more and the caption ellipsis - change (mediawiki...MultimediaViewer)

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

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

Change subject: Bug fixes for view terms view more and the caption ellipsis
..


Bug fixes for view terms view more and the caption ellipsis

This is a compilation of the following commits:

89efe125a41428a0645df1d6dacf5a02de0cea93
62d21f0d6783e8bf2b976c097ea6c550e32003f3
f5d77badef57acf1f6074c75f2d5d5736a77e881

Change-Id: Ief9aa1c7e982ee21030380551b956c6435d665e9
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/987
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/988
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/985
---
M resources/mmv/ui/mmv.ui.metadataPanel.js
M resources/mmv/ui/mmv.ui.permission.js
M resources/mmv/ui/mmv.ui.truncatableTextField.less
3 files changed, 14 insertions(+), 5 deletions(-)

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



diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.js 
b/resources/mmv/ui/mmv.ui.metadataPanel.js
index 793a6ff..82c5ab3 100644
--- a/resources/mmv/ui/mmv.ui.metadataPanel.js
+++ b/resources/mmv/ui/mmv.ui.metadataPanel.js
@@ -196,7 +196,7 @@
 
this.initializeCredit();
this.description = new mw.mmv.ui.Description( 
this.$imageMetadataLeft );
-   this.permission = new mw.mmv.ui.Permission( 
this.$imageMetadataLeft );
+   this.permission = new mw.mmv.ui.Permission( 
this.$imageMetadataLeft, this.scroller );
this.initializeImageLinks();
};
 
@@ -284,7 +284,7 @@
.hide()
.on( 'click', function() {
panel.permission.grow();
-   panel.scroller.scrollIntoView( 
panel.permission.$box, 500 );
+   panel.scroller.toggle( 'up' );
return false;
} );
};
diff --git a/resources/mmv/ui/mmv.ui.permission.js 
b/resources/mmv/ui/mmv.ui.permission.js
index 4e103a8..74919af 100644
--- a/resources/mmv/ui/mmv.ui.permission.js
+++ b/resources/mmv/ui/mmv.ui.permission.js
@@ -27,8 +27,9 @@
 * @extends mw.mmv.ui.Element
 * @constructor
 * @param {jQuery} $container
+* @param {mw.mmv.ui.MetadataPanelScroller} scroller
 */
-   function Permission( $container ) {
+   function Permission( $container, scroller ) {
var permission = this;
 
mw.mmv.ui.Element.call( this, $container );
@@ -64,6 +65,7 @@
.on( 'click', '.mw-mmv-permission-text-viewmore', 
function( e ) {
e.preventDefault();
permission.grow();
+   permission.scroller.toggle( 'up' );
} )
;
 
@@ -99,6 +101,12 @@
permission.shrink();
} )
.appendTo( this.$box );
+
+   /**
+* Panel scroller from the metadata panel object.
+* @property {mw.mmv.ui.MetadataPanelScroller}
+*/
+   this.scroller = scroller;
}
oo.inheritClass( Permission, mw.mmv.ui.Element );
P = Permission.prototype;
diff --git a/resources/mmv/ui/mmv.ui.truncatableTextField.less 
b/resources/mmv/ui/mmv.ui.truncatableTextField.less
index 0519319..fc401fd 100644
--- a/resources/mmv/ui/mmv.ui.truncatableTextField.less
+++ b/resources/mmv/ui/mmv.ui.truncatableTextField.less
@@ -1,3 +1,4 @@
+@import mediawiki.mixins;
 @import ../mmv.mixins;
 
 .mw-mmv-ttf-container {
@@ -41,6 +42,7 @@
background-repeat: no-repeat;
/* @embed */
background-image: url(img/ellipsis_lightgray.svg);
+   .box-shadow( -4px 6px 0 0 white);
 
// Hovering over .mw-mmv-ttf-ellipsis-container will make the 
ellipsis more visible to attract
// attention to it. Since it has to be set on a parent element 
which is not under control of
@@ -63,8 +65,7 @@
display: block;
content: '';
 
-   height: 1.2em; // 1em would not cover high glyphs
-   margin-top: -0.1em; // center
+   height: 1.6em; // 1em would not cover high glyphs
 
width: @fade-length;
margin-left: -@fade-length;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief9aa1c7e982ee21030380551b956c6435d665e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: wmf/1.25wmf8
Gerrit-Owner: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org

[MediaWiki-commits] [Gerrit] autoloader: Remove incorrect documentation comment - change (mediawiki/core)

2014-11-18 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: autoloader: Remove incorrect documentation comment
..

autoloader: Remove incorrect documentation comment

Follows-up I8b1bdb84a969. This is not generated by that script,
the autoload.php file is, but that one has a similar comment
in it already.

Change-Id: Icb44f3dab356820f1e3aa5ba56949219af1b5719
---
M includes/AutoLoader.php
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/17/174117/1

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 9c6f1f0..6344c27 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -24,7 +24,6 @@
  * Locations of core classes
  * Extension classes are specified with $wgAutoloadClasses
  * This array is a global instead of a static member of AutoLoader to work 
around a bug in APC
- * This array is now generated by maintenance/generateLocalAutoload.php
  */
 require_once __DIR__ . '/../autoload.php';
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb44f3dab356820f1e3aa5ba56949219af1b5719
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] Backport Media Viewer bugfixes - change (mediawiki/core)

2014-11-18 Thread Gilles (Code Review)

Gilles has uploaded a new change for review.

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

Change subject: Backport Media Viewer bugfixes
..

Backport Media Viewer bugfixes

Change-Id: Ib444bcd36309196f8203cb65a5496c9866632d73
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/987
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/988
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/985
---
M extensions/MultimediaViewer
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/18/174118/1

diff --git a/extensions/MultimediaViewer b/extensions/MultimediaViewer
index 88073fb..29c25d5 16
--- a/extensions/MultimediaViewer
+++ b/extensions/MultimediaViewer
-Subproject commit 88073fb31ffe45a1fab9311db75910fb13855246
+Subproject commit 29c25d58b3a90946a8a82623075c2e5597f1ccc1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib444bcd36309196f8203cb65a5496c9866632d73
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf8
Gerrit-Owner: Gilles gdu...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add macro for asserting DOC_SUBPATH is set - change (integration/config)

2014-11-18 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Add macro for asserting DOC_SUBPATH is set
..

Add macro for asserting DOC_SUBPATH is set

The builder assert-env-doc_subpath let us ensure DOC_SUBPATH is
available. It is set by Zuul and used when generating documentation:

https://www.mediawiki.org/wiki/CI/Documentation_generation

Change-Id: Ibceb6fc700848283acc96a80b4adeae367a85cc0
---
M jjb/macro.yaml
M jjb/mediawiki.yaml
2 files changed, 10 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/19/174119/1

diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 2394ebf..e9cf869 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -216,6 +216,15 @@
 npm install
 npm test
 
+- builder:
+name: assert-env-doc_subpath
+builders:
+ - shell: |
+ if [ -z $DOC_SUBPATH ]; then
+ echo \$DOC_SUBPATH is missing. Can not publish.
+ exit 1
+ fi
+
 # Assert node version matches a basic regular expressions
 #
 # Parameter:
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 45525f5..a78f3f3 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -98,11 +98,7 @@
 triggers:
  - zuul
 builders:
- - shell: |
- if [ -z $DOC_SUBPATH ]; then
- echo \$DOC_SUBPATH is missing. Can not publish.
- exit 1
- fi
+ - assert-env-doc_subpath
  - zuul-cloner:
  projects: 
  mediawiki/core

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibceb6fc700848283acc96a80b4adeae367a85cc0
Gerrit-PatchSet: 1
Gerrit-Project: integration/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] Migrate mw jsduck to Zuul cloner and labs - change (integration/config)

2014-11-18 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Migrate mw jsduck to Zuul cloner and labs
..

Migrate mw jsduck to Zuul cloner and labs

Job is no more boud to gallium by using the push-doc macro see doc
https://www.mediawiki.org/wiki/CI/Documentation_generation

Use DOC_SUBPATH generated by Zuul which is the version extracted from
the branch or tag refspec.

Change-Id: I737c72ef4a3481f36945b8a10a28963640532ad8
---
M jjb/mediawiki.yaml
1 file changed, 9 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/20/174120/1

diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index a78f3f3..25aeb4d 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -72,24 +72,22 @@
 
 - job:
 name: 'mediawiki-core-jsduck-publish'
-node: gallium
-defaults: use-zuul
+node: contintLabsSlave  UbuntuTrusty
 concurrent: false
 logrotate:
 daysToKeep: 15
-scm:
- - git-mwcore
 triggers:
  - zuul
 builders:
+ - assert-env-doc_subpath
+ - zuul-cloner:
+ projects: mediawiki/core
  - shell: |
-$WORKSPACE/maintenance/mwjsduck-gen --version $ZUUL_BRANCH
-rsync --recursive --delete-after --force $WORKSPACE/resources/ 
$WORKSPACE/docs/js/modules/
- - documentation-sync-subdir:
-src: '$WORKSPACE/docs/js'
-project: 'mediawiki-core'
-version: '$ZUUL_BRANCH'
-subdir: 'js/'
+$WORKSPACE/maintenance/mwjsduck-gen --version $DOC_SUBPATH
+rsync --recursive --delete-after --force $WORKSPACE/resources/ 
$WORKSPACE/src/docs/js/modules/
+ - push-doc:
+ docsrc: 'src/docs/js'
+ docdest: 'mediawiki-core/$DOC_SUBPATH/js'
 
 - job:
 name: 'mediawiki-core-doxygen-publish'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I737c72ef4a3481f36945b8a10a28963640532ad8
Gerrit-PatchSet: 1
Gerrit-Project: integration/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] add graphite role to graphite1001 - change (operations/puppet)

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

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: add graphite role to graphite1001
..

add graphite role to graphite1001

Change-Id: I26667c99343f40262b98c7016e9269e5e19c32eb
---
M manifests/site.pp
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/174121/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 7786ed8..8810482 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2801,6 +2801,15 @@
 include role::performance
 }
 
+# graphite test machine, currently with SSD caching + spinning disks
+node 'graphite1001.eqiad.wmnet' {
+include admin
+include standard
+include role::graphite::production
+include role::txstatsd
+include role::gdash
+}
+
 # Labs Graphite and StatsD host
 node 'labmon1001.eqiad.wmnet' {
 include standard

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26667c99343f40262b98c7016e9269e5e19c32eb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] add graphite role to graphite1001 - change (operations/puppet)

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

Filippo Giunchedi has submitted this change and it was merged.

Change subject: add graphite role to graphite1001
..


add graphite role to graphite1001

Change-Id: I26667c99343f40262b98c7016e9269e5e19c32eb
---
M manifests/site.pp
1 file changed, 9 insertions(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 7786ed8..8810482 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2801,6 +2801,15 @@
 include role::performance
 }
 
+# graphite test machine, currently with SSD caching + spinning disks
+node 'graphite1001.eqiad.wmnet' {
+include admin
+include standard
+include role::graphite::production
+include role::txstatsd
+include role::gdash
+}
+
 # Labs Graphite and StatsD host
 node 'labmon1001.eqiad.wmnet' {
 include standard

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I26667c99343f40262b98c7016e9269e5e19c32eb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@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] Make tox output verbose - change (integration/config)

2014-11-18 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Make tox output verbose
..

Make tox output verbose

tox -v

Change-Id: I0d896481cdd99aa96cf8368decb7d20cbfcf03a7
---
M jjb/integration.yaml
M jjb/macro.yaml
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/22/174122/1

diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index ac78866..9fb4cd1 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -97,11 +97,11 @@
 export PY_COLORS=1
 
 echo Generating config for proposed patchset...
-tox -e venv -- jenkins-jobs test $WORKSPACE/config/jjb -o 
$WORKSPACE/output-proposed
+tox -v -e venv -- jenkins-jobs test $WORKSPACE/config/jjb -o 
$WORKSPACE/output-proposed
 
 echo Generating reference config from parent...
 (cd $WORKSPACE/config; git checkout HEAD^)
-tox -e venv -- jenkins-jobs test $WORKSPACE/config/jjb -o 
$WORKSPACE/output-parent
+tox -v -e venv -- jenkins-jobs test $WORKSPACE/config/jjb -o 
$WORKSPACE/output-parent
 
 echo 
 echo File changed:
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 2394ebf..0f925b0 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -643,7 +643,7 @@
 rm -fR log
 mkdir -p log
 set -o pipefail
-tox -e {venv} | tee log/{venv}.log
+tox -v -e {venv} | tee log/{venv}.log
 set +o pipefail
 
 # Some jobs are not using the git plugin which let us easily wipe

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d896481cdd99aa96cf8368decb7d20cbfcf03a7
Gerrit-PatchSet: 1
Gerrit-Project: integration/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] Add macro for asserting DOC_SUBPATH is set - change (integration/config)

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

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

Change subject: Add macro for asserting DOC_SUBPATH is set
..


Add macro for asserting DOC_SUBPATH is set

The builder assert-env-doc_subpath let us ensure DOC_SUBPATH is
available. It is set by Zuul and used when generating documentation:

https://www.mediawiki.org/wiki/CI/Documentation_generation

Change-Id: Ibceb6fc700848283acc96a80b4adeae367a85cc0
---
M jjb/macro.yaml
M jjb/mediawiki.yaml
2 files changed, 10 insertions(+), 5 deletions(-)

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



diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 2394ebf..e9cf869 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -216,6 +216,15 @@
 npm install
 npm test
 
+- builder:
+name: assert-env-doc_subpath
+builders:
+ - shell: |
+ if [ -z $DOC_SUBPATH ]; then
+ echo \$DOC_SUBPATH is missing. Can not publish.
+ exit 1
+ fi
+
 # Assert node version matches a basic regular expressions
 #
 # Parameter:
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 45525f5..a78f3f3 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -98,11 +98,7 @@
 triggers:
  - zuul
 builders:
- - shell: |
- if [ -z $DOC_SUBPATH ]; then
- echo \$DOC_SUBPATH is missing. Can not publish.
- exit 1
- fi
+ - assert-env-doc_subpath
  - zuul-cloner:
  projects: 
  mediawiki/core

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibceb6fc700848283acc96a80b4adeae367a85cc0
Gerrit-PatchSet: 1
Gerrit-Project: integration/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] Fix possible NPE in Nearby - change (apps...wikipedia)

2014-11-18 Thread Dbrant (Code Review)

Dbrant has submitted this change and it was merged.

Change subject: Fix possible NPE in Nearby
..


Fix possible NPE in Nearby

When coming back to app or rotating.

java.lang.NullPointerException
at 
org.wikipedia.nearby.NearbyFragment.onCreateOptionsMenu(NearbyFragment.java:496)

Change-Id: Ie1d5dcf488056036ab836e34d696d39afa2f21d1
---
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java 
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index a77e780..8be5418 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -493,7 +493,7 @@
 
 @Override
 public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-if (((PageActivity)getActivity()).isSearching()) {
+if (!isAdded() || ((PageActivity)getActivity()).isSearching()) {
 return;
 }
 inflater.inflate(R.menu.menu_nearby, menu);
@@ -506,7 +506,7 @@
 @Override
 public void onPrepareOptionsMenu(Menu menu) {
 super.onPrepareOptionsMenu(menu);
-if (((PageActivity)getActivity()).isSearching()) {
+if (!isAdded() || ((PageActivity)getActivity()).isSearching()) {
 return;
 }
 menu.findItem(R.id.menu_refresh_nearby).setEnabled(!refreshing);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1d5dcf488056036ab836e34d696d39afa2f21d1
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@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] Bring empty screen in nearby back - change (apps...wikipedia)

2014-11-18 Thread Dbrant (Code Review)

Dbrant has submitted this change and it was merged.

Change subject: Bring empty screen in nearby back
..


Bring empty screen in nearby back

Instead of throwing an exception just return the empty list,
so the empty layout will be shown when there is no
query object in the JSON response.

 Also removed unused variable.

Change-Id: I8ea09f3b51dd543f96d5f0b128465dd11600b790
---
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyResult.java
2 files changed, 2 insertions(+), 4 deletions(-)

Approvals:
  Dbrant: Looks good to me, approved



diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java 
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
index 742e48d..c931614 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
@@ -25,7 +25,6 @@
 private static final String LIMIT = 50;
 /** requested thumbnail size in pixel */
 private static final String THUMBNAIL_WIDTH = 144;
-private final WikipediaApp app;
 private final Location location;
 
 public NearbyFetchTask(Context context, Site site, Location location) {
@@ -33,7 +32,6 @@
 SINGLE_THREAD,
 ((WikipediaApp) 
context.getApplicationContext()).getAPIForSite(site)
 );
-this.app = (WikipediaApp) context.getApplicationContext();
 this.location = location;
 }
 
diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyResult.java 
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyResult.java
index b3b5483..718a39f 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyResult.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyResult.java
@@ -27,11 +27,11 @@
 list = new ArrayListNearbyPage();
 JSONObject query = jsonObject.optJSONObject(query);
 if (query == null) {
-throw new JSONException(Received malformed response with no 
error.);
+return;
 }
+
 JSONObject pagesMap = query.optJSONObject(pages);
 Iterator iterator = pagesMap.keys();
-
 while (iterator.hasNext()) {
 NearbyPage newPage = new 
NearbyPage(pagesMap.getJSONObject((String) iterator.next()));
 list.add(newPage);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ea09f3b51dd543f96d5f0b128465dd11600b790
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@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] More descriptive names for $repo variables and methods - change (mediawiki...Wikibase)

2014-11-18 Thread WMDE

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

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

Change subject: More descriptive names for $repo variables and methods
..

More descriptive names for $repo variables and methods

This is split from If6c96e0 to make it easier to review and find
out what makes jenkins fail.

Change-Id: I85e183b51cdc3d3f4870704de19e5f3242ff86fe
---
M client/includes/UpdateRepo/UpdateRepoOnMove.php
M client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
M repo/tests/phpunit/includes/EntityViewTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataTestProvider.php
M repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
6 files changed, 38 insertions(+), 33 deletions(-)


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

diff --git a/client/includes/UpdateRepo/UpdateRepoOnMove.php 
b/client/includes/UpdateRepo/UpdateRepoOnMove.php
index 319f249..272ca41 100644
--- a/client/includes/UpdateRepo/UpdateRepoOnMove.php
+++ b/client/includes/UpdateRepo/UpdateRepoOnMove.php
@@ -63,4 +63,5 @@
'user' = $this-user-getName()
);
}
+
 }
diff --git a/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php 
b/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
index 46fb334..0b58453 100644
--- a/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
+++ b/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
@@ -105,16 +105,16 @@
}
 
/**
-* @param array[] $links
+* @param array[] $siteLinksPerItem
 *
 * @return MockRepository
 */
-   private function getMockRepo( $links ) {
+   private function getMockRepository( $siteLinksPerItem ) {
$repo = new MockRepository();
 
-   foreach ( $links as $itemKey = $itemLinks ) {
-   $itemId = new ItemId( $itemKey );
-   $item = $this-newItem( $itemId, $itemLinks );
+   foreach ( $siteLinksPerItem as $idString = $siteLinks ) {
+   $itemId = new ItemId( $idString );
+   $item = $this-newItem( $itemId, $siteLinks );
$repo-putEntity( $item );
}
 
@@ -165,7 +165,7 @@
private function newSidebarHookHandlers( array $settings = array() ) {
$badgeId = $this-getBadgeItem()-getId();
 
-   $links = array(
+   $siteLinksPerItem = array(
'Q1' = array(
new SiteLink( 'dewiki', 'Sauerstoff', array( 
$badgeId ) ),
new SiteLink( 'enwiki', 'Oxygen' ),
@@ -189,7 +189,7 @@
$namespaceChecker = new NamespaceChecker( array(), $namespaces 
);
$siteStore = $this-getSiteStore();
 
-   $mockRepo = $this-getMockRepo( $links );
+   $mockRepo = $this-getMockRepository( $siteLinksPerItem );
$mockRepo-putEntity( $this-getBadgeItem() );
 
$otherProjectsSidebarGenerator = new 
OtherProjectsSidebarGenerator(
diff --git a/repo/tests/phpunit/includes/EntityViewTest.php 
b/repo/tests/phpunit/includes/EntityViewTest.php
index 8030900..65917c9 100644
--- a/repo/tests/phpunit/includes/EntityViewTest.php
+++ b/repo/tests/phpunit/includes/EntityViewTest.php
@@ -48,7 +48,10 @@
  */
 abstract class EntityViewTest extends \MediaWikiLangTestCase {
 
-   protected static $mockRepo;
+   /**
+* @var MockRepository
+*/
+   private $mockRepository;
 
protected function newEntityIdParser() {
// The data provides use P123 and Q123 IDs, so the parser needs 
to understand these.
@@ -123,10 +126,10 @@
$languageFallbackChain = $factory-newFromLanguage( 
Language::factory( $langCode ) );
}
 
-   $mockRepo = $this-getMockRepo();
+   $mockRepository = $this-getMockRepository();
 
if ( !$entityInfoBuilderFactory ) {
-   $entityInfoBuilderFactory = $mockRepo;
+   $entityInfoBuilderFactory = $mockRepository;
}
 
if ( !$entityTitleLookup ) {
@@ -158,7 +161,7 @@
$entityView = new $class(
$context,
$snakFormatter,
-   $mockRepo,
+   $mockRepository,
$entityInfoBuilderFactory,
$entityTitleLookup,
$options,
@@ -179,25 +182,25 @@
return $options;
}
 
-   protected function getMockRepo() {
-   if ( !isset( self::$mockRepo ) ) {
-   $mockRepo = new

[MediaWiki-commits] [Gerrit] Fix SecurePollContent handling - change (mediawiki...SecurePoll)

2014-11-18 Thread Anomie (Code Review)

Anomie has uploaded a new change for review.

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

Change subject: Fix SecurePollContent handling
..

Fix SecurePollContent handling

It was accidentally creating an instance of the parent class,
JsonContent, instead.

Change-Id: I5a0f7eaad1143b39c9045337d88cdfeb1bcb8f82
(cherry picked from commit 176992c8d129aa8ddc1d715b4099e7ea909bf864)
---
M includes/main/SecurePollContent.php
M includes/main/SecurePollContentHandler.php
2 files changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll 
refs/changes/25/174125/1

diff --git a/includes/main/SecurePollContent.php 
b/includes/main/SecurePollContent.php
index c0c7445..b02ead3 100644
--- a/includes/main/SecurePollContent.php
+++ b/includes/main/SecurePollContent.php
@@ -10,4 +10,7 @@
  */
 
 class SecurePollContent extends JsonContent {
+   public function __construct( $text, $modelId = 'SecurePoll' ) {
+   parent::__construct( $text, $modelId );
+   }
 }
diff --git a/includes/main/SecurePollContentHandler.php 
b/includes/main/SecurePollContentHandler.php
index 12a6b15..236ecfb 100644
--- a/includes/main/SecurePollContentHandler.php
+++ b/includes/main/SecurePollContentHandler.php
@@ -176,4 +176,8 @@
'unprotect' = false,
);
}
+
+   protected function getContentClass() {
+   return 'SecurePollContent';
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a0f7eaad1143b39c9045337d88cdfeb1bcb8f82
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: wmf/1.25wmf8
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] Fix SecurePollContent handling - change (mediawiki...SecurePoll)

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

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

Change subject: Fix SecurePollContent handling
..


Fix SecurePollContent handling

It was accidentally creating an instance of the parent class,
JsonContent, instead.

Change-Id: I5a0f7eaad1143b39c9045337d88cdfeb1bcb8f82
(cherry picked from commit 176992c8d129aa8ddc1d715b4099e7ea909bf864)
---
M includes/main/SecurePollContent.php
M includes/main/SecurePollContentHandler.php
2 files changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/includes/main/SecurePollContent.php 
b/includes/main/SecurePollContent.php
index c0c7445..b02ead3 100644
--- a/includes/main/SecurePollContent.php
+++ b/includes/main/SecurePollContent.php
@@ -10,4 +10,7 @@
  */
 
 class SecurePollContent extends JsonContent {
+   public function __construct( $text, $modelId = 'SecurePoll' ) {
+   parent::__construct( $text, $modelId );
+   }
 }
diff --git a/includes/main/SecurePollContentHandler.php 
b/includes/main/SecurePollContentHandler.php
index 12a6b15..236ecfb 100644
--- a/includes/main/SecurePollContentHandler.php
+++ b/includes/main/SecurePollContentHandler.php
@@ -176,4 +176,8 @@
'unprotect' = false,
);
}
+
+   protected function getContentClass() {
+   return 'SecurePollContent';
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a0f7eaad1143b39c9045337d88cdfeb1bcb8f82
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: wmf/1.25wmf8
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update SecurePoll with [[gerrit:174125]] - change (mediawiki/core)

2014-11-18 Thread Anomie (Code Review)

Anomie has uploaded a new change for review.

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

Change subject: Update SecurePoll with [[gerrit:174125]]
..

Update SecurePoll with [[gerrit:174125]]

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/26/174126/1

diff --git a/extensions/SecurePoll b/extensions/SecurePoll
index ce36fc4..aa9d461 16
--- a/extensions/SecurePoll
+++ b/extensions/SecurePoll
-Subproject commit ce36fc4db65541af0819fb76ae54172f5eaad345
+Subproject commit aa9d461762c3615ca7ff925f42f4a8aef2e6d573

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf7cfff6f8c6797dc3709e8fc4fd59fa0b9fe21c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf8
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] gdash: install rubygems only trusty - change (operations/puppet)

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

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: gdash: install rubygems only trusty
..

gdash: install rubygems only trusty

Change-Id: I29af0e539ae487a07403d877b06b1549dd5e5591
---
M modules/gdash/manifests/init.pp
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/174127/1

diff --git a/modules/gdash/manifests/init.pp b/modules/gdash/manifests/init.pp
index 18029ee..29a566d 100644
--- a/modules/gdash/manifests/init.pp
+++ b/modules/gdash/manifests/init.pp
@@ -53,7 +53,11 @@
 provider = 'trebuchet',
 }
 
-package { [ 'ruby-rack', 'ruby-sinatra', 'rubygems' ]: }
+if ubuntu_version(' trusty') {
+package { [ 'ruby-rack', 'ruby-sinatra', 'rubygems' ]: }
+} else {
+package { [ 'ruby-rack', 'ruby-sinatra' ]: }
+}
 
 file { '/etc/gdash':
 ensure = directory,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I29af0e539ae487a07403d877b06b1549dd5e5591
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Make tox output verbose - change (integration/config)

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

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

Change subject: Make tox output verbose
..


Make tox output verbose

tox -v

Change-Id: I0d896481cdd99aa96cf8368decb7d20cbfcf03a7
---
M jjb/integration.yaml
M jjb/macro.yaml
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index ac78866..9fb4cd1 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -97,11 +97,11 @@
 export PY_COLORS=1
 
 echo Generating config for proposed patchset...
-tox -e venv -- jenkins-jobs test $WORKSPACE/config/jjb -o 
$WORKSPACE/output-proposed
+tox -v -e venv -- jenkins-jobs test $WORKSPACE/config/jjb -o 
$WORKSPACE/output-proposed
 
 echo Generating reference config from parent...
 (cd $WORKSPACE/config; git checkout HEAD^)
-tox -e venv -- jenkins-jobs test $WORKSPACE/config/jjb -o 
$WORKSPACE/output-parent
+tox -v -e venv -- jenkins-jobs test $WORKSPACE/config/jjb -o 
$WORKSPACE/output-parent
 
 echo 
 echo File changed:
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index e9cf869..f108f7b 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -652,7 +652,7 @@
 rm -fR log
 mkdir -p log
 set -o pipefail
-tox -e {venv} | tee log/{venv}.log
+tox -v -e {venv} | tee log/{venv}.log
 set +o pipefail
 
 # Some jobs are not using the git plugin which let us easily wipe

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d896481cdd99aa96cf8368decb7d20cbfcf03a7
Gerrit-PatchSet: 2
Gerrit-Project: integration/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] gdash: install rubygems only trusty - change (operations/puppet)

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

Filippo Giunchedi has submitted this change and it was merged.

Change subject: gdash: install rubygems only trusty
..


gdash: install rubygems only trusty

Change-Id: I29af0e539ae487a07403d877b06b1549dd5e5591
---
M modules/gdash/manifests/init.pp
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/modules/gdash/manifests/init.pp b/modules/gdash/manifests/init.pp
index 18029ee..29a566d 100644
--- a/modules/gdash/manifests/init.pp
+++ b/modules/gdash/manifests/init.pp
@@ -53,7 +53,11 @@
 provider = 'trebuchet',
 }
 
-package { [ 'ruby-rack', 'ruby-sinatra', 'rubygems' ]: }
+if ubuntu_version(' trusty') {
+package { [ 'ruby-rack', 'ruby-sinatra', 'rubygems' ]: }
+} else {
+package { [ 'ruby-rack', 'ruby-sinatra' ]: }
+}
 
 file { '/etc/gdash':
 ensure = directory,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I29af0e539ae487a07403d877b06b1549dd5e5591
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@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] filebackend: Log more details about backend-fail-internal er... - change (mediawiki/core)

2014-11-18 Thread Gilles (Code Review)

Gilles has uploaded a new change for review.

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

Change subject: filebackend: Log more details about backend-fail-internal errors
..

filebackend: Log more details about backend-fail-internal errors

Bug: 73094
Change-Id: I9e45284e3cfd55bc34d87009387a2c1766e2db4a
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/991
---
M includes/filebackend/FileBackendMultiWrite.php
M includes/filebackend/SwiftFileBackend.php
2 files changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/28/174128/1

diff --git a/includes/filebackend/FileBackendMultiWrite.php 
b/includes/filebackend/FileBackendMultiWrite.php
index bfffcc0..8b6eaca 100644
--- a/includes/filebackend/FileBackendMultiWrite.php
+++ b/includes/filebackend/FileBackendMultiWrite.php
@@ -314,6 +314,8 @@
$mStat = $mBackend-getFileStat( array( 'src' = 
$mPath, 'latest' = true ) );
if ( $mStat === null || ( $mSha1 !== false  !$mStat ) 
) { // sanity
$status-fatal( 'backend-fail-internal', 
$this-name );
+   wfDebugLog( 'FileOperation', __METHOD__
+   . ': File is not available on the 
master backend' );
continue; // file is not available on the 
master backend...
}
// Check of all clone backends agree with the master...
@@ -326,6 +328,8 @@
$cStat = $cBackend-getFileStat( array( 'src' 
= $cPath, 'latest' = true ) );
if ( $cStat === null || ( $cSha1 !== false  
!$cStat ) ) { // sanity
$status-fatal( 
'backend-fail-internal', $cBackend-getName() );
+   wfDebugLog( 'FileOperation', __METHOD__
+   . ': File is not available on the clone 
backend' );
continue; // file is not available on 
the clone backend...
}
if ( $mSha1 === $cSha1 ) {
diff --git a/includes/filebackend/SwiftFileBackend.php 
b/includes/filebackend/SwiftFileBackend.php
index 625b9b4..7234474 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -537,6 +537,7 @@
return $status; // already there
} elseif ( $stat === null ) {
$status-fatal( 'backend-fail-internal', $this-name );
+   wfDebugLog( 'SwiftBackend', __METHOD__ . ': cannot get 
container stat' );
 
return $status;
}
@@ -568,6 +569,7 @@
$status-fatal( 'backend-fail-usable', $params['dir'] );
} else {
$status-fatal( 'backend-fail-internal', $this-name );
+   wfDebugLog( 'SwiftBackend', __METHOD__ . ': cannot get 
container stat' );
}
 
return $status;
@@ -588,6 +590,7 @@
$status-fatal( 'backend-fail-usable', $params['dir'] );
} else {
$status-fatal( 'backend-fail-internal', $this-name );
+   wfDebugLog( 'SwiftBackend', __METHOD__ . ': cannot get 
container stat' );
}
 
return $status;
@@ -607,6 +610,7 @@
return $status; // ok, nothing to do
} elseif ( !is_array( $stat ) ) {
$status-fatal( 'backend-fail-internal', $this-name );
+   wfDebugLog( 'SwiftBackend', __METHOD__ . ': cannot get 
container stat' );
 
return $status;
}
@@ -1253,6 +1257,7 @@
 
if ( $rcode != 204  $rcode !== 202 ) {
$status-fatal( 'backend-fail-internal', $this-name );
+   wfDebugLog( 'SwiftBackend', __METHOD__ . ': unexpected 
rcode value (' . $rcode . ')' );
}
 
return $status;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e45284e3cfd55bc34d87009387a2c1766e2db4a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf8
Gerrit-Owner: Gilles gdu...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] [FIX] Upload: Convert unicode to ASCII - change (pywikibot/core)

2014-11-18 Thread XZise (Code Review)

XZise has uploaded a new change for review.

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

Change subject: [FIX] Upload: Convert unicode to ASCII
..

[FIX] Upload: Convert unicode to ASCII

If using MIME the header must be ASCII, but when the file name is using
non-ASCII letters those will be directly added and the server can't
interpret them. The server returns with a rather confusing message:

  missingparam: One of the parameters filekey, file, url, statuskey is
  required

This patch is encoding the parameters which aren't compatible with ASCII
with the site's encoding and then using urllib(.parse).quote to convert
them into ASCII strings.

Change-Id: Ifb0eb96051c6f4f29676ef2d5a7d4658302ddf5c
---
M pywikibot/data/api.py
M tests/dry_api_tests.py
2 files changed, 20 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/29/174129/1

diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 8aa97b4..a5a52df 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -39,7 +39,7 @@
 # unless the fix is not backported to py3.x versions that should
 # instead support PWB.
 basestring = (str, )
-from urllib.parse import urlencode, unquote
+from urllib.parse import urlencode, quote, unquote
 unicode = str
 
 from io import BytesIO
@@ -75,7 +75,7 @@
 
 MIMEMultipart = CTEBinaryMIMEMultipart
 else:
-from urllib import urlencode, unquote
+from urllib import urlencode, quote, unquote
 from email.mime.multipart import MIMEMultipart
 
 _logger = data.api
@@ -803,7 +803,8 @@
 return message == ERR_MSG
 
 @staticmethod
-def _generate_MIME_part(key, content, keytype=None, headers=None):
+def _generate_MIME_part(encoding, key, content, keytype=None,
+headers=None):
 if not keytype:
 try:
 content.encode(ascii)
@@ -813,7 +814,15 @@
 submsg = MIMENonMultipart(*keytype)
 content_headers = {'name': key}
 if headers:
-content_headers.update(headers)
+for header_key, header_value in headers.items():
+try:
+header_value.encode('ascii')
+except UnicodeError:
+header_value = header_value.encode(encoding)
+except AttributeError:
+pass  # header_value is already a bytes object
+header_value = quote(header_value)
+content_headers[header_key] = header_value
 submsg.add_header(Content-disposition, form-data,
   **content_headers)
 
@@ -824,7 +833,7 @@
 return submsg
 
 @staticmethod
-def _build_mime_request(params, mime_params):
+def _build_mime_request(params, mime_params, encoding):
 Construct a MIME multipart form post.
 
 @param params: HTTP request params
@@ -837,10 +846,10 @@
 # construct a MIME message containing all API key/values
 container = MIMEMultipart(_subtype='form-data')
 for key, value in params.items():
-submsg = Request._generate_MIME_part(key, value)
+submsg = Request._generate_MIME_part(encoding, key, value)
 container.attach(submsg)
 for key, value in mime_params.items():
-submsg = Request._generate_MIME_part(key, *value)
+submsg = Request._generate_MIME_part(encoding, key, *value)
 container.attach(submsg)
 
 # strip the headers to get the HTTP message body
@@ -919,7 +928,8 @@
 try:
 if self.mime:
 (headers, body) = Request._build_mime_request(
-self._encoded_items(), self.mime_params)
+self._encoded_items(), self.mime_params,
+self.site.encoding())
 use_get = False  # MIME requests require HTTP POST
 else:
 headers = {'Content-Type': 
'application/x-www-form-urlencoded'}
diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py
index 3b3afe4..a63fd3f 100644
--- a/tests/dry_api_tests.py
+++ b/tests/dry_api_tests.py
@@ -192,7 +192,7 @@
 with open(local_filename, 'rb') as f:
 file_content = f.read()
 submsg = Request._generate_MIME_part(
-'file', file_content, ('image', 'png'),
+'utf8', 'file', file_content, ('image', 'png'),
 {'filename': local_filename})
 self.assertEqual(file_content, submsg.get_payload(decode=True))
 
@@ -203,7 +203,7 @@
 body = Request._build_mime_request({}, {
 'file': (file_content, ('image', 'png'),
  {'filename': local_filename})
-})[1]
+}, 'utf8')[1]
 self.assertNotEqual(body.find(file_content), -1)
 
 

-- 
To view, visit https://gerrit.wikimedia.org/r/174129
To

[MediaWiki-commits] [Gerrit] Style tweaks - change (mediawiki...HSTS)

2014-11-18 Thread Seb35 (Code Review)

Seb35 has submitted this change and it was merged.

Change subject: Style tweaks
..


Style tweaks

Some code simplification

Change-Id: I0c5fdd4cffc65ff7abb7e4e42e45e609a2bdac56
---
M HSTS.php
1 file changed, 36 insertions(+), 26 deletions(-)

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



diff --git a/HSTS.php b/HSTS.php
index 4499db2..cac11ce 100644
--- a/HSTS.php
+++ b/HSTS.php
@@ -17,7 +17,6 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry 
point.' );
 }
 
-
 /**
  * CONFIGURATION
  * These variables may be overridden in LocalSettings.php after you include the
@@ -101,17 +100,20 @@
 *
 * @var User $user Current user
 * @var array $preferences Description of the preferences
-* @return true
+* @return bool true
 */
-   static function getPreferences( $user, $preferences ) {
-
+   public static function getPreferences( $user, $preferences ) {
global $wgHSTSBetaFeature, $wgHSTSForUsers;
 
// If HSTS is activated as a Beta Feature, do not add it here
-   if( AutoLoader::loadClass( 'BetaFeatures' )  
$wgHSTSBetaFeature ) return true;
+   if( AutoLoader::loadClass( 'BetaFeatures' )  
$wgHSTSBetaFeature ) {
+   return true;
+   }
 
// If HSTS is mandatory, do not display the choice
-   if( $wgHSTSForUsers ) return true;
+   if( $wgHSTSForUsers ) {
+   return true;
+   }
 
// Add the checkbox in the 'basic informations' section
$preferences['hsts'] = array(
@@ -122,7 +124,6 @@
 
// Enable this preference only if we are on HTTPS
if( $user-getRequest()-detectProtocol() !== 'https' ) {
-
$preferences['hsts']['label-message'] = 
'hsts-https-tog';
$preferences['hsts']['disabled'] = true;
}
@@ -135,19 +136,22 @@
 *
 * @var User $user Current user
 * @var array $preferences Description of the Beta Features
-* @return true
+* @return bool true
 *
 * @todo Add a screenshot (a padlock?)
 */
-   static function getBetaFeaturePreferences( $user, $preferences ) {
-
+   public static function getBetaFeaturePreferences( $user, $preferences 
) {
global $wgHSTSBetaFeature, $wgHSTSForUsers;
 
// If HSTS is activated as a Beta Feature, do not add it here
-   if( !$wgHSTSBetaFeature ) return true;
+   if( !$wgHSTSBetaFeature ) {
+   return true;
+   }
 
// If HSTS is mandatory, do not display the choice
-   if( $wgHSTSForUsers ) return true;
+   if( $wgHSTSForUsers ) {
+   return true;
+   }
 
$preferences['hsts'] = array(
'label-message' = 'hsts-beta-feature-message',
@@ -163,25 +167,29 @@
/**
 * Add the STS header
 *
-* @var Output $output Output object
-* @return true
+* @var OutputPage $output Output page object
+* @return bool true
 */
-   static function addHeader( $output ) {
-
+   public static function addHeader( $output ) {
global $wgHSTSForAnons, $wgHSTSForUsers, 
$wgHSTSIncludeSubdomains, $wgHSTSMaxAge;
 
// Check if the user will get STS header
-   if( $output-getRequest()-detectProtocol() !== 'https' ) 
return true;
-   if( $output-getUser()-isAnon()  !$wgHSTSForAnons ) return 
true;
-   if( $output-getUser()-isLoggedIn()  !$wgHSTSForUsers  
!$output-getUser()-getOption('hsts') ) return true;
+   if(
+   $output-getRequest()-detectProtocol() !== 'https'
+   || ( $output-getUser()-isAnon()  !$wgHSTSForAnons )
+   || ( $output-getUser()-isLoggedIn()  
!$wgHSTSForUsers  !$output-getUser()-getOption( 'hsts' ) )
+   ) {
+   return true;
+   }
 
// Compute the max-age property
-   $maxage = 0;
-   if( is_int( $wgHSTSMaxAge ) ) $maxage = max( $wgHSTSMaxAge, 0 );
-   else {
+   if( is_int( $wgHSTSMaxAge ) ) {
+   $maxage = max( $wgHSTSMaxAge, 0 );
+   } else {
$maxage = wfTimestamp( TS_UNIX, $wgHSTSMaxAge );
-   if( $maxage !== false ) $maxage -= wfTimestamp();
-   else {
+   if( $maxage !== false ) {
+   $maxage -= wfTimestamp();
+   } else {
wfDebug( '[HSTS] Bad value of the parameter

[MediaWiki-commits] [Gerrit] [doc] Shortcuts for action command and further explanations. - change (pywikibot/core)

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

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

Change subject: [doc] Shortcuts for action command and further explanations.
..


[doc] Shortcuts for action command and further explanations.

Change-Id: I0c07d6739981628012f77a79a8d7fbdfe636cbd1
---
M scripts/redirect.py
1 file changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/scripts/redirect.py b/scripts/redirect.py
index 0fde4ab..39212a7 100755
--- a/scripts/redirect.py
+++ b/scripts/redirect.py
@@ -12,13 +12,17 @@
 
 where action can be one of these:
 
-double Fix redirects which point to other redirects
+double Fix redirects which point to other redirects.
+do Shortcut action command is do.
+
 broken Tries to fix broken redirect to the last moved target of the
-   destination page. If this fails and -delete option is given
+br destination page. If this fails and -delete option is given
it deletes redirects where targets don't exist if bot has
admin rights otherwise it marks the page with a speedy deletion
-   template if available.
-both   Both of the above.
+   template if available. Shortcut action command is br.
+
+both   Both of the above. Retrieves redirect pages from live wiki,
+   not from a special page.
 
 and arguments can be:
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0c07d6739981628012f77a79a8d7fbdfe636cbd1
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: Xqt i...@gno.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] More descriptive names for $repo variables and methods - change (mediawiki...Wikibase)

2014-11-18 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has submitted this change and it was merged.

Change subject: More descriptive names for $repo variables and methods
..


More descriptive names for $repo variables and methods

This is split from If6c96e0 to make it easier to review and find
out what makes jenkins fail.

Change-Id: I85e183b51cdc3d3f4870704de19e5f3242ff86fe
---
M client/includes/UpdateRepo/UpdateRepoOnMove.php
M client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
M repo/tests/phpunit/includes/EntityViewTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataTestProvider.php
M repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
6 files changed, 38 insertions(+), 33 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved



diff --git a/client/includes/UpdateRepo/UpdateRepoOnMove.php 
b/client/includes/UpdateRepo/UpdateRepoOnMove.php
index 319f249..272ca41 100644
--- a/client/includes/UpdateRepo/UpdateRepoOnMove.php
+++ b/client/includes/UpdateRepo/UpdateRepoOnMove.php
@@ -63,4 +63,5 @@
'user' = $this-user-getName()
);
}
+
 }
diff --git a/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php 
b/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
index 46fb334..0b58453 100644
--- a/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
+++ b/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
@@ -105,16 +105,16 @@
}
 
/**
-* @param array[] $links
+* @param array[] $siteLinksPerItem
 *
 * @return MockRepository
 */
-   private function getMockRepo( $links ) {
+   private function getMockRepository( $siteLinksPerItem ) {
$repo = new MockRepository();
 
-   foreach ( $links as $itemKey = $itemLinks ) {
-   $itemId = new ItemId( $itemKey );
-   $item = $this-newItem( $itemId, $itemLinks );
+   foreach ( $siteLinksPerItem as $idString = $siteLinks ) {
+   $itemId = new ItemId( $idString );
+   $item = $this-newItem( $itemId, $siteLinks );
$repo-putEntity( $item );
}
 
@@ -165,7 +165,7 @@
private function newSidebarHookHandlers( array $settings = array() ) {
$badgeId = $this-getBadgeItem()-getId();
 
-   $links = array(
+   $siteLinksPerItem = array(
'Q1' = array(
new SiteLink( 'dewiki', 'Sauerstoff', array( 
$badgeId ) ),
new SiteLink( 'enwiki', 'Oxygen' ),
@@ -189,7 +189,7 @@
$namespaceChecker = new NamespaceChecker( array(), $namespaces 
);
$siteStore = $this-getSiteStore();
 
-   $mockRepo = $this-getMockRepo( $links );
+   $mockRepo = $this-getMockRepository( $siteLinksPerItem );
$mockRepo-putEntity( $this-getBadgeItem() );
 
$otherProjectsSidebarGenerator = new 
OtherProjectsSidebarGenerator(
diff --git a/repo/tests/phpunit/includes/EntityViewTest.php 
b/repo/tests/phpunit/includes/EntityViewTest.php
index 8030900..65917c9 100644
--- a/repo/tests/phpunit/includes/EntityViewTest.php
+++ b/repo/tests/phpunit/includes/EntityViewTest.php
@@ -48,7 +48,10 @@
  */
 abstract class EntityViewTest extends \MediaWikiLangTestCase {
 
-   protected static $mockRepo;
+   /**
+* @var MockRepository
+*/
+   private $mockRepository;
 
protected function newEntityIdParser() {
// The data provides use P123 and Q123 IDs, so the parser needs 
to understand these.
@@ -123,10 +126,10 @@
$languageFallbackChain = $factory-newFromLanguage( 
Language::factory( $langCode ) );
}
 
-   $mockRepo = $this-getMockRepo();
+   $mockRepository = $this-getMockRepository();
 
if ( !$entityInfoBuilderFactory ) {
-   $entityInfoBuilderFactory = $mockRepo;
+   $entityInfoBuilderFactory = $mockRepository;
}
 
if ( !$entityTitleLookup ) {
@@ -158,7 +161,7 @@
$entityView = new $class(
$context,
$snakFormatter,
-   $mockRepo,
+   $mockRepository,
$entityInfoBuilderFactory,
$entityTitleLookup,
$options,
@@ -179,25 +182,25 @@
return $options;
}
 
-   protected function getMockRepo() {
-   if ( !isset( self::$mockRepo ) ) {
-   $mockRepo = new MockRepository();
+   private function getMockRepository() {
+   if (

[MediaWiki-commits] [Gerrit] Add libboost-regex-dev, libboost-system-dev and libyaml-cpp0... - change (operations/puppet)

2014-11-18 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: Add libboost-regex-dev, libboost-system-dev and libyaml-cpp0.3 
to stat1002 and 1003 for Ironholds
..

Add libboost-regex-dev, libboost-system-dev and libyaml-cpp0.3 to stat1002 and 
1003 for Ironholds

Change-Id: Ibeaedcdb900c34486ebfdaf3b0fd259fc3698b4a
---
M manifests/misc/statistics.pp
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/174131/1

diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index 33c4db8..ab3ddbd 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -94,6 +94,9 @@
 'php5-mysql',
 'sqlite3', # For storing and interacting with intermediate results
 'libbz2-dev' # for compiling some python libs.  RT 8278
+'libboost-regex-dev',  # Ironholds wants these
+'libboost-system-dev',
+'libyaml-cpp0.3',
 ]:
 ensure = 'latest',
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibeaedcdb900c34486ebfdaf3b0fd259fc3698b4a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org

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

1 2 3 4 5 >

1 - 100 of 426 matches

Mail list logo