date:20161025

[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: Use booleans in function signatures

2016-10-25 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Use booleans in function signatures
..


Use booleans in function signatures

Only cast to int just before dropping stuff in the db.
TODO: cast to boolean immediately after reading from db.

Change-Id: Ided377e93e43a569496ed3840ebc255c9c09f768
---
M includes/Banner.php
M includes/Campaign.php
M special/SpecialCentralNotice.php
M special/SpecialCentralNoticeBanners.php
M tests/CentralNoticeTest.php
M tests/CentralNoticeTestFixtures.php
6 files changed, 39 insertions(+), 43 deletions(-)

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



diff --git a/includes/Banner.php b/includes/Banner.php
index 583cea3..e8c981f 100644
--- a/includes/Banner.php
+++ b/includes/Banner.php
@@ -1313,17 +1313,18 @@
 * @param $name string name of banner
 * @param $body string content of banner
 * @param $user User causing the change
-* @param $displayAnon  integer flag for display to anonymous users
-* @param $displayAccount   integer flag for display to logged in users
-* @param $fundraising  integer flag for fundraising banner 
(optional)
+* @param $displayAnon  boolean flag for display to anonymous users
+* @param $displayAccount   boolean flag for display to logged in users
+* @param $fundraising  boolean flag for fundraising banner 
(optional)
 * @param $mixins   array list of mixins (optional)
 * @param $priorityLangsarray Array of priority languages for the 
translate extension
 * @param $devices  array Array of device names this banner is 
targeted at
+* @param $summary  string|null Optional summary of changes for 
logging
 *
 * @return bool true or false depending on whether banner was 
successfully added
 */
static function addTemplate( $name, $body, $user, $displayAnon,
-   $displayAccount, $fundraising = 0,
+   $displayAccount, $fundraising = false,
$mixins = array(), $priorityLangs = array(), $devices = null,
$summary = null
) {
@@ -1343,7 +1344,7 @@
}
 
$banner->setAllocation( $displayAnon, $displayAccount );
-   $banner->setCategory( ( $fundraising == 1 ) ? 'fundraising' : 
'{{{campaign}}}' );
+   $banner->setCategory( $fundraising ? 'fundraising' : 
'{{{campaign}}}' );
$banner->setDevices( $devices );
$banner->setPriorityLanguages( $priorityLangs );
$banner->setBodyContent( $body );
diff --git a/includes/Campaign.php b/includes/Campaign.php
index 04d29e6..ca3c0e9 100644
--- a/includes/Campaign.php
+++ b/includes/Campaign.php
@@ -812,11 +812,11 @@
 * Add a new campaign to the database
 *
 * @param $noticeNamestring: Name of the campaign
-* @param $enabled   int: Boolean setting, 0 or 1
+* @param $enabled   bool: Boolean setting, true or false
 * @param $startTs   string: Campaign start in UTC
 * @param $projects  array: Targeted project types (wikipedia, 
wikibooks, etc.)
 * @param $project_languages array: Targeted project languages (en, de, 
etc.)
-* @param $geotargeted   int: Boolean setting, 0 or 1
+* @param $geotargeted   bool: Boolean setting, true or false
 * @param $geo_countries array: Targeted countries
 * @param $throttle  int: limit allocations, 0 - 100
 * @param $priority  int: priority level, LOW_PRIORITY - 
EMERGENCY_PRIORITY
@@ -851,10 +851,10 @@
 
$dbw->insert( 'cn_notices',
array( 'not_name'=> $noticeName,
-   'not_enabled' => $enabled,
+   'not_enabled' => (int)$enabled,
'not_start'   => $dbw->timestamp( $startTs ),
'not_end' => $dbw->timestamp( $endTs ),
-   'not_geo' => $geotargeted,
+   'not_geo' => (int)$geotargeted,
'not_throttle' => $throttle,
'not_preferred' => $priority,
)
@@ -898,10 +898,10 @@
'countries' => implode( ", ", $geo_countries ),
'start' => $dbw->timestamp( $startTs ),
'end'   => $dbw->timestamp( $endTs ),
-   'enabled'   => $enabled,
+   'enabled'   => (int)$enabled,
'preferred' => 0,
'locked'=> 0,
-

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Fix empty groups params

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Fix empty groups params
..


Fix empty groups params

Bug: T149145
Change-Id: Iff04ab436cb208bb6dea53a4478ba52258f7ff64
---
M includes/Tag/MapFrame.php
M tests/parserTests.txt
2 files changed, 24 insertions(+), 22 deletions(-)

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



diff --git a/includes/Tag/MapFrame.php b/includes/Tag/MapFrame.php
index ced690c..ee368fd 100644
--- a/includes/Tag/MapFrame.php
+++ b/includes/Tag/MapFrame.php
@@ -142,12 +142,12 @@
$staticLat = 30;
$staticLon = 0;
}
+
if ( $this->showGroups ) {
$attrs['data-overlays'] = 
FormatJson::encode( $this->showGroups, false,
FormatJson::ALL_OK );
+   $this->state->addInteractiveGroups( 
$this->showGroups );
}
-
-   $this->state->addInteractiveGroups( 
$this->showGroups );
break;
default:
throw new UnexpectedValueException(
@@ -159,11 +159,13 @@
$containerClass .= ' mw-kartographer-full';
}
 
-   $title = urlencode( 
$this->parser->getTitle()->getPrefixedText() );
-   $groupList = implode( ',', $this->showGroups );
-
$bgUrl = 
"{$wgKartographerMapServer}/img/{$this->mapStyle},{$staticZoom},{$staticLat},{$staticLon},{$staticWidth}x{$this->height}.png";
-   $bgUrl .= 
"?domain={$wgServerName}={$title}={$groupList}";
+   if ( $this->showGroups ) {
+   $title = urlencode( 
$this->parser->getTitle()->getPrefixedText() );
+   $groupList = urlencode( implode( ',', $this->showGroups 
) );
+   $bgUrl .= 
"?domain={$wgServerName}={$title}={$groupList}";
+   }
+
$attrs['style'] = "background-image: url({$bgUrl});";
 
if ( !$framed ) {
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index a1890bb..26588a5 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -125,18 +125,18 @@
 
 
 !! result
-https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png?domain=example.orgtitle=Parser+testgroups=);
 height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png?domain=example.orgtitle=Parser+testgroups=);
 height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png?domain=example.orgtitle=Parser+testgroups=);
 height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,300x480.png?domain=example.orgtitle=Parser+testgroups=);
 height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,800x480.png?domain=example.orgtitle=Parser+testgroups=);
 height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,800x480.png?domain=example.orgtitle=Parser+testgroups=);
 height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png?domain=example.orgtitle=Parser+testgroups=);
 height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png?domain=example.orgtitle=Parser+testgroups=);
 width: 640px; height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png?domain=example.orgtitle=Parser+testgroups=);
 width: 640px; height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,300x480.png?domain=example.orgtitle=Parser+testgroups=);
 width: 300px; height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,800x480.png?domain=example.orgtitle=Parser+testgroups=);
 width: 100%; height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,800x480.png?domain=example.orgtitle=Parser+testgroups=);
 width: 100%; height: 480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png); height: 
480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png); height: 
480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png); height: 
480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,300x480.png); height: 
480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,800x480.png); height: 
480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,800x480.png); height: 
480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png); height: 
480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png); width: 
640px; height: 480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png); width: 
640px; height: 480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,300x480.png); width: 
300px; height: 480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,800x480.png); width: 100%;

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[wmf/1.28.0-wmf.23]: Fix empty groups params

2016-10-25 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Fix empty groups params
..

Fix empty groups params

Bug: T149145
Change-Id: Iff04ab436cb208bb6dea53a4478ba52258f7ff64
---
M includes/Tag/MapFrame.php
M tests/parserTests.txt
2 files changed, 24 insertions(+), 22 deletions(-)


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

diff --git a/includes/Tag/MapFrame.php b/includes/Tag/MapFrame.php
index ced690c..ee368fd 100644
--- a/includes/Tag/MapFrame.php
+++ b/includes/Tag/MapFrame.php
@@ -142,12 +142,12 @@
$staticLat = 30;
$staticLon = 0;
}
+
if ( $this->showGroups ) {
$attrs['data-overlays'] = 
FormatJson::encode( $this->showGroups, false,
FormatJson::ALL_OK );
+   $this->state->addInteractiveGroups( 
$this->showGroups );
}
-
-   $this->state->addInteractiveGroups( 
$this->showGroups );
break;
default:
throw new UnexpectedValueException(
@@ -159,11 +159,13 @@
$containerClass .= ' mw-kartographer-full';
}
 
-   $title = urlencode( 
$this->parser->getTitle()->getPrefixedText() );
-   $groupList = implode( ',', $this->showGroups );
-
$bgUrl = 
"{$wgKartographerMapServer}/img/{$this->mapStyle},{$staticZoom},{$staticLat},{$staticLon},{$staticWidth}x{$this->height}.png";
-   $bgUrl .= 
"?domain={$wgServerName}={$title}={$groupList}";
+   if ( $this->showGroups ) {
+   $title = urlencode( 
$this->parser->getTitle()->getPrefixedText() );
+   $groupList = urlencode( implode( ',', $this->showGroups 
) );
+   $bgUrl .= 
"?domain={$wgServerName}={$title}={$groupList}";
+   }
+
$attrs['style'] = "background-image: url({$bgUrl});";
 
if ( !$framed ) {
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index a1890bb..26588a5 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -125,18 +125,18 @@
 
 
 !! result
-https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png?domain=example.orgtitle=Parser+testgroups=);
 height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png?domain=example.orgtitle=Parser+testgroups=);
 height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png?domain=example.orgtitle=Parser+testgroups=);
 height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,300x480.png?domain=example.orgtitle=Parser+testgroups=);
 height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,800x480.png?domain=example.orgtitle=Parser+testgroups=);
 height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,800x480.png?domain=example.orgtitle=Parser+testgroups=);
 height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png?domain=example.orgtitle=Parser+testgroups=);
 height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png?domain=example.orgtitle=Parser+testgroups=);
 width: 640px; height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png?domain=example.orgtitle=Parser+testgroups=);
 width: 640px; height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,300x480.png?domain=example.orgtitle=Parser+testgroups=);
 width: 300px; height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,800x480.png?domain=example.orgtitle=Parser+testgroups=);
 width: 100%; height: 480px;">
-https://maps.wikimedia.org/img/osm-intl,13,10,20,800x480.png?domain=example.orgtitle=Parser+testgroups=);
 width: 100%; height: 480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png); height: 
480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png); height: 
480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png); height: 
480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,300x480.png); height: 
480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,800x480.png); height: 
480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,800x480.png); height: 
480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png); height: 
480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png); width: 
640px; height: 480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,640x480.png); width: 
640px; height: 480px;">
+https://maps.wikimedia.org/img/osm-intl,13,10,20,300x480.png); width: 
300px; height: 480px;">

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Remove attribute lang from #firstHeading

2016-10-25 Thread Fomafix (Code Review)

Fomafix has uploaded a new change for review.

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

Change subject: Remove attribute lang from #firstHeading
..

Remove attribute lang from #firstHeading

Since I0ff707d5f04218bef5721e6fc162c6359bb7538a the lang attribute gets set
in core.

Change-Id: Id6916d0141aa26df46443d894c687907d77ed6c3
Depends-On: I0ff707d5f04218bef5721e6fc162c6359bb7538a
---
M VectorTemplate.php
1 file changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/43/318043/1

diff --git a/VectorTemplate.php b/VectorTemplate.php
index 5b27141..51d2b00 100644
--- a/VectorTemplate.php
+++ b/VectorTemplate.php
@@ -88,9 +88,6 @@
array_reverse( $this->data['personal_urls'] );
}
 
-   $this->data['pageLanguage'] =
-   
$this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
-
// Output HTML Page
$this->html( 'headelement' );
?>
@@ -113,7 +110,7 @@
// Loose comparison with '!=' is intentional, to catch 
null and false too, but not '0'
if ( $this->data['title'] != '' ) {
?>
-   html( 'title' )
?>
https://gerrit.wikimedia.org/r/318043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6916d0141aa26df46443d894c687907d77ed6c3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fixes T109618. Show actual dev setting name instead of dev s...

2016-10-25 Thread Anirudh24seven (Code Review)

Anirudh24seven has uploaded a new change for review.

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

Change subject: Fixes T109618. Show actual dev setting name instead of dev 
string.
..

Fixes T109618. Show actual dev setting name instead of dev string.

I was able to verify only some preferences in the UI. I made changes to almost 
all the strings anyway.

Bug: T109618
Change-Id: I148d13e41ea54784e1dbce31f6e3576a7536865d
---
M app/src/main/res/values/preference_keys.xml
M app/src/main/res/xml/developer_preferences.xml
2 files changed, 46 insertions(+), 46 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/42/318042/1

diff --git a/app/src/main/res/values/preference_keys.xml 
b/app/src/main/res/values/preference_keys.xml
index 1a78135..c07c032 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -1,50 +1,50 @@
 
 http://schemas.android.com/tools; 
tools:ignore="MissingTranslation">
-content_language
-cookie_domains
-cookies_for_domain_%1$s
-edittoken_wikis
-edittoken_for_wiki_%1$s
 zero_warn_when_leaving
+Content language
+Cookie domains
+Cookes for domain 
%1$s
+Edit token wikis
+Edit token for 
wiki %1$s
 org.wikipedia.zero.zeroOnNoticePresented
-remote_config
-eventlogging_opt_in
-readingAppInstallID
-textSizeMultiplier
-colorTheme
-channel
-languageMru
-selectTextTutorialEnabled
-shareTutorialEnabled
-readingListTutorialEnabled
-tocTutorialEnabled
-showImages
-useRestbase
-useRestbase_setManually
-restbaseTicket
-requestSuccesses
-RESTBaseUriFormat
-mediaWikiBaseUri
-mediaWikiBaseUriSupportsLangCode
-retrofitLog
-dailyEventTask
-username
-password
-userID
-groups
-showDeveloperSettings
-%s-lastrun
-tabs
-showLinkPreviews
-session_data
-session_timeout
-remoteLog
-crashedBeforeActivityCreated
+Remote config
+Event logging opt 
in
+Reading App Install 
ID
+Text size 
multiplier
+Color Theme
+Channel
+Language MRU
+Select Text 
Tutorial enabled
+Share Tutorial 
enabled
+Reading List 
Tutorial enabled
+ToC Tutorial 
enabled
+Show Images
+Use RESTBase
+Use RESTBase set 
manually
+RESTBase Ticket
+Request Successes
+RESTBase URI 
Format
+MediaWiki Base 
URI
+MediaWiki Base URI 
supports Lang Code
+Retrofit log 
level
+Daily Event 
Task
+Username
+Password
+User ID
+Groups
+Show Developer 
Settings
+ %s- last run
+Tabs
+Show link 
previews
+Session data
+Session timeout
+Remote log
+Crashed 
before Activity created
 
-always_send_crash_reports
-readingListSortMode
-readingListPageSortMode
-readingListPageDeleteTutorialEnabled
-pageLastShown
-feedHiddenCards
+Always send crash 
reports
+Reading List sort 
mode
+Reading List 
Page sort mode
+Reading List 
Page Delete Tutorial enabled
+Page last shown
+Feed hidden cards
 
diff --git a/app/src/main/res/xml/developer_preferences.xml 
b/app/src/main/res/xml/developer_preferences.xml
index 4672489..4318455 100644
--- a/app/src/main/res/xml/developer_preferences.xml
+++ b/app/src/main/res/xml/developer_preferences.xml
@@ -112,8 +112,8 @@
 
 
+android:key="Daily Event Task - last run"
+android:title="Daily Event Task - last run" />
 
 https://gerrit.wikimedia.org/r/318042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I148d13e41ea54784e1dbce31f6e3576a7536865d
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Anirudh24seven 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update trigger mysql

2016-10-25 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Update trigger mysql
..

Update trigger mysql

Updating the trigger mysql to reflect new prospect fields. Once committed I 
will get Jeff to
run on live to start tracking.

Also, caught up in this is a new benefactor field which was created today it 
seems.

There are also changes to the contribution_page table, dashboard tables, price 
set tables
& pledge block. The correct mysql trigger script was run after the last update
but the tidy up task of updating the committed code didn't happen.

I also note a custom group has been removed. Presumably the trigger still 
exists for
civicrm_value_1_note_11 but I don't have permission to see it. Removing fields
without removing the trigger would normally cause lots of errors. I'm not
quite sure whether the trigger is gone or whether we escaped errors because
the whole table is gone & hence there are no updates to it. I left the drop 
commands in the
trigger sql in case they are there.

Bug: T147985
Bug: T142624
Change-Id: I8714fbcfbc3375e5bd4237c311fd826a23b63efb
---
M sites/all/modules/wmf_civicrm/scripts/4.7.trigger.mysql
1 file changed, 21 insertions(+), 45 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/41/318041/1

diff --git a/sites/all/modules/wmf_civicrm/scripts/4.7.trigger.mysql 
b/sites/all/modules/wmf_civicrm/scripts/4.7.trigger.mysql
index 8e86c94..9f3d6ef 100644
--- a/sites/all/modules/wmf_civicrm/scripts/4.7.trigger.mysql
+++ b/sites/all/modules/wmf_civicrm/scripts/4.7.trigger.mysql
@@ -3959,7 +3959,7 @@
 DELIMITER ;
 
 DELIMITER //
-CREATE TRIGGER civicrm_contribution_page_after_insert after insert ON 
civicrm_contribution_page FOR EACH ROW BEGIN  IF ( @civicrm_disable_logging IS 
NULL OR @civicrm_disable_logging = 0 ) THEN INSERT INTO 
log_civicrm_contribution_page (id, title, intro_text, financial_type_id, 
payment_processor, is_credit_card_only, is_monetary, is_recur, 
recur_frequency_unit, is_recur_interval, is_pay_later, pay_later_text, 
pay_later_receipt, is_allow_other_amount, default_amount_id, min_amount, 
max_amount, goal_amount, thankyou_title, thankyou_text, thankyou_footer, 
is_email_receipt, receipt_from_name, receipt_from_email, cc_receipt, 
bcc_receipt, receipt_text, is_active, footer_text, amount_block_is_active, 
start_date, end_date, created_id, created_date, currency, campaign_id, 
is_share, is_confirm_enabled, is_recur_installments, is_partial_payment, 
min_initial_amount, initial_amount_label, initial_amount_help_text, 
is_billing_required, log_conn_id, log_user_id, log_action) VALUES ( NEW.id, 
NEW.title, NEW.intro_text, NEW.financial_type_id, NEW.payment_processor, 
NEW.is_credit_card_only, NEW.is_monetary, NEW.is_recur, 
NEW.recur_frequency_unit, NEW.is_recur_interval, NEW.is_pay_later, 
NEW.pay_later_text, NEW.pay_later_receipt, NEW.is_allow_other_amount, 
NEW.default_amount_id, NEW.min_amount, NEW.max_amount, NEW.goal_amount, 
NEW.thankyou_title, NEW.thankyou_text, NEW.thankyou_footer, 
NEW.is_email_receipt, NEW.receipt_from_name, NEW.receipt_from_email, 
NEW.cc_receipt, NEW.bcc_receipt, NEW.receipt_text, NEW.is_active, 
NEW.footer_text, NEW.amount_block_is_active, NEW.start_date, NEW.end_date, 
NEW.created_id, NEW.created_date, NEW.currency, NEW.campaign_id, NEW.is_share, 
NEW.is_confirm_enabled, NEW.is_recur_installments, NEW.is_partial_payment, 
NEW.min_initial_amount, NEW.initial_amount_label, NEW.initial_amount_help_text, 
NEW.is_billing_required, COALESCE(@uniqueID, LEFT(CONCAT('c_', 
unix_timestamp()/3600, CONNECTION_ID()), 17)), @civicrm_user_id, 'insert'); END 
IF; END //
+CREATE TRIGGER civicrm_contribution_page_after_insert after insert ON 
civicrm_contribution_page FOR EACH ROW BEGIN  IF ( @civicrm_disable_logging IS 
NULL OR @civicrm_disable_logging = 0 ) THEN INSERT INTO 
log_civicrm_contribution_page (id, title, intro_text, financial_type_id, 
payment_processor, is_credit_card_only, is_monetary, is_recur, 
recur_frequency_unit, is_recur_interval, is_pay_later, pay_later_text, 
pay_later_receipt, is_allow_other_amount, default_amount_id, min_amount, 
max_amount, goal_amount, thankyou_title, thankyou_text, thankyou_footer, 
is_email_receipt, receipt_from_name, receipt_from_email, cc_receipt, 
bcc_receipt, receipt_text, is_active, footer_text, amount_block_is_active, 
start_date, end_date, created_id, created_date, currency, campaign_id, 
is_share, is_confirm_enabled, is_recur_installments, adjust_recur_start_date, 
is_partial_payment, min_initial_amount, initial_amount_label, 
initial_amount_help_text, is_billing_required, log_conn_id, log_user_id, 
log_action) VALUES ( NEW.id, NEW.title, NEW.intro_text, NEW.financial_type_id, 
NEW.payment_processor, NEW.is_credit_card_only, NEW.is_monetary, NEW.is_recur, 
NEW.recur_frequency_unit, NEW.is_recur_interval, NEW.is_pay_later,

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[wmf/1.28.0-wmf.23]: Fix external links

2016-10-25 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Fix external links
..

Fix external links

Bug: T149154
Change-Id: I123977eabddaf726832d269fafd2959e62bec2d8
(cherry picked from commit e3e7d12b5355b1d7ed8bd8250d4566e8ffae9561)
---
M lib/wikimedia-mapdata.js
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/40/318040/1

diff --git a/lib/wikimedia-mapdata.js b/lib/wikimedia-mapdata.js
index c007739..d1652f9 100644
--- a/lib/wikimedia-mapdata.js
+++ b/lib/wikimedia-mapdata.js
@@ -252,9 +252,6 @@
   throw new Error( 'Unknown externalData service ' + data.service );
   }
 
-  delete data.service;
-  delete data.url;
-
   if ( mwMsg ) {
 group.parseAttribution();
   }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I123977eabddaf726832d269fafd2959e62bec2d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: wmf/1.28.0-wmf.23
Gerrit-Owner: Yurik 

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Fix external links

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Fix external links
..


Fix external links

Bug: T149154
Change-Id: I123977eabddaf726832d269fafd2959e62bec2d8
---
M lib/wikimedia-mapdata.js
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/lib/wikimedia-mapdata.js b/lib/wikimedia-mapdata.js
index c007739..d1652f9 100644
--- a/lib/wikimedia-mapdata.js
+++ b/lib/wikimedia-mapdata.js
@@ -252,9 +252,6 @@
   throw new Error( 'Unknown externalData service ' + data.service );
   }
 
-  delete data.service;
-  delete data.url;
-
   if ( mwMsg ) {
 group.parseAttribution();
   }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I123977eabddaf726832d269fafd2959e62bec2d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Yurik 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Fix external links

2016-10-25 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Fix external links
..

Fix external links

Bug: T149154
Change-Id: I123977eabddaf726832d269fafd2959e62bec2d8
---
M lib/wikimedia-mapdata.js
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/39/318039/1

diff --git a/lib/wikimedia-mapdata.js b/lib/wikimedia-mapdata.js
index c007739..d1652f9 100644
--- a/lib/wikimedia-mapdata.js
+++ b/lib/wikimedia-mapdata.js
@@ -252,9 +252,6 @@
   throw new Error( 'Unknown externalData service ' + data.service );
   }
 
-  delete data.service;
-  delete data.url;
-
   if ( mwMsg ) {
 group.parseAttribution();
   }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I123977eabddaf726832d269fafd2959e62bec2d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Yurik 

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Human-readable transaction summary, for debug

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Human-readable transaction summary, for debug
..


Human-readable transaction summary, for debug

Change-Id: I6920514df81c304a02a672a2eabffb91a8f1e5e7
---
M src/ve.debug.js
1 file changed, 47 insertions(+), 0 deletions(-)

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



diff --git a/src/ve.debug.js b/src/ve.debug.js
index aacc6c0..cc0d092 100644
--- a/src/ve.debug.js
+++ b/src/ve.debug.js
@@ -99,3 +99,50 @@
add( domNode );
return html.join( '' );
 };
+
+/**
+ * Get a human-readable summary of a transaction
+ *
+ * @param {ve.dm.Transaction} tx A transaction
+ * @return {string} Human-readable summary
+ */
+ve.summarizeTransaction = function ( tx ) {
+   var annotations = 0;
+   function summarizeItems( items ) {
+   return '\'' + items.map( function ( item ) {
+   if ( item.type ) {
+   return '<' + item.type + '>';
+   } else if ( Array.isArray( item ) ) {
+   return item[ 0 ];
+   } else if ( typeof item === 'string' ) {
+   return item;
+   } else {
+   throw new Error( 'Unknown item type: ' + item );
+   }
+   } ).join( '' ) + '\'';
+   }
+   return '(' + tx.operations.map( function ( op ) {
+   if ( op.type === 'retain' ) {
+   return ( annotations ? 'annotate ' : 'retain ' ) + 
op.length;
+   } else if ( op.type === 'replace' ) {
+   if ( op.remove.length === 0 ) {
+   return 'insert ' + summarizeItems( op.insert );
+   } else if ( op.insert.length === 0 ) {
+   return 'remove ' + summarizeItems( op.remove );
+   } else {
+   return 'replace ' + summarizeItems( op.remove ) 
+
+   ' -> ' + summarizeItems( op.insert );
+   }
+   } else if ( op.type === 'attribute' ) {
+   return 'attribute';
+   } else if ( op.type === 'annotate' ) {
+   annotations += op.bias === 'start' ? 1 : -1;
+   return 'annotate';
+   } else if ( op.type.endsWith( 'Metadata' ) ) {
+   // We don't care much because we're deprecating 
metadata ops
+   return 'metadata';
+   } else {
+   throw new Error( 'Unknown op type: ' + op.type );
+   }
+   } ).join( ', ' ) + ')';
+};

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6920514df81c304a02a672a2eabffb91a8f1e5e7
Gerrit-PatchSet: 3
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec 
Gerrit-Reviewer: Divec 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add new prospect custom fields to custom fields declaration.

2016-10-25 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Add new prospect custom fields to custom fields declaration.
..

Add new prospect custom fields to custom fields declaration.

I also added the other fields on live not previously declared. I stopped short 
of enumerating
all the option value lists for every field to avoid too much scope creep.

Bug: T147985
Change-Id: I7e3793d9f9f8fcc428a8bfc308e52e3ecf76acd1
---
M sites/all/modules/wmf_civicrm/update_custom_fields.php
1 file changed, 331 insertions(+), 88 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/38/318038/1

diff --git a/sites/all/modules/wmf_civicrm/update_custom_fields.php 
b/sites/all/modules/wmf_civicrm/update_custom_fields.php
index c9b2547..8329ded 100644
--- a/sites/all/modules/wmf_civicrm/update_custom_fields.php
+++ b/sites/all/modules/wmf_civicrm/update_custom_fields.php
@@ -13,101 +13,344 @@
   'extends' => 'Contact',
   'style' => 'tab',
   'is_active' => 1,
-  ));
-   }
-// We mostly are trying to ensure a unique weight since weighting can be 
re-orded in the UI but it gets messy
-// if they are all set to 1.
-$weight = CRM_Core_DAO::singleValueQuery('SELECT max(weight) FROM 
civicrm_custom_field WHERE custom_group_id = %1',
-array(1 => array($customGroup['id'], 'Integer'))
-);
+));
+  }
+  // We mostly are trying to ensure a unique weight since weighting can be 
re-orded in the UI but it gets messy
+  // if they are all set to 1.
+  $weight = CRM_Core_DAO::singleValueQuery('SELECT max(weight) FROM 
civicrm_custom_field WHERE custom_group_id = %1',
+array(1 => array($customGroup['id'], 'Integer'))
+  );
 
-foreach (_wmf_civicrm_get_prospect_fields() as $field) {
-  if (!civicrm_api3('CustomField', 'getcount', array(
-'custom_group_id' => $customGroup['id'],
-'name' => $field['name'],
-))){
-$weight++;
-civicrm_api3('CustomField', 'create', array_merge(
-  $field,
-  array(
-'custom_group_id' => $customGroup['id'],
-'weight' => $weight,
-  )
-));
-  }
+  foreach (_wmf_civicrm_get_prospect_fields() as $field) {
+if (!civicrm_api3('CustomField', 'getcount', array(
+  'custom_group_id' => $customGroup['id'],
+  'name' => $field['name'],
+))
+) {
+  $weight++;
+  civicrm_api3('CustomField', 'create', array_merge(
+$field,
+array(
+  'custom_group_id' => $customGroup['id'],
+  'weight' => $weight,
+)
+  ));
 }
+  }
 }
 
 function _wmf_civicrm_get_prospect_fields() {
   return array(
-  'ask_amount' => array(
-  'name' => 'ask_amount',
-  'label' => 'Ask Amount',
-  'data_type' => 'Money',
-  'html_type' => 'Text',
-  'is_searchable' => 1,
-  'is_search_range' => 1,
+'Origin' => array(
+  'name' => 'Origin',
+  'label' => 'Origin',
+  'data_type' => 'String',
+  'html_type' => 'Select',
+  'help_post' => 'How do we know about the prospect?',
+  'text_length' => 255,
+  'note_columns' => 60,
+  'note_rows' => 4,
+  //"option_group_id":"65",
+),
+'Steward' => array(
+  'name'=> 'Steward',
+  'label' => 'Steward',
+  'data_type' => 'String',
+  'html_type' => 'Select',
+  'is_searchable' => 1,
+  'default_value' => 5,
+  'note_columns' => 60,
+  'note_rows' => 4,
+  //"option_group_id":"44",
+),
+'Solicitor' => array(
+  'name' => 'Solicitor',
+  'label' => 'Solicitor',
+  'data_type' => 'String',
+  'html_type' => 'Select',
+  'is_searchable' => 1,
+  'note_columns' => 60,
+  'note_rows' => 4,
+  //"option_group_id":"45",
+),
+'Prior_WMF_Giving' => array(
+  'name' => 'Prior_WMF_Giving',
+  'label' => 'Prior WMF Giving',
+  'data_type' => 'Boolean',
+  'html_type' => 'Radio',
+  'text_length' => 255,
+  'note_columns' => 60,
+  'note_rows' => 4,
+),
+'Biography' => array(
+  'name' => 'Biography',
+  'label' => 'Biography',
+  "data_type" => 'Memo',
+  'html_type' => 'RichTextEditor',
+  'is_searchable' => 1,
+  'help_post' => 'Who they are, what they do.',
+  'attributes' => 'rows=4, cols=60',
+  'text_length' => 255,
+  'note_columns' => 60,
+  'note_rows' => 4,
+),
+'Estimated_Net_Worth' => array(
+  'name' => 'Estimated_Net_Worth',
+  'label' => 'Estimated Net Worth',
+  'data_type' => 'String',
+  'html_type' => 'Select',
+  'text_length' => 255,
+  'note_columns' => 60,
+  'note_rows' => 4,
+  'option_values' => array(
+1 => '$20 Million +',
+2 => '$10 Million - $19.99 Million',
+3 => '$5 Million - $9.99 Million',
+

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Fix empty groups params

2016-10-25 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Fix empty groups params
..

Fix empty groups params

Bug: T149145
Change-Id: Iff04ab436cb208bb6dea53a4478ba52258f7ff64
---
M includes/Tag/MapFrame.php
1 file changed, 7 insertions(+), 4 deletions(-)


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

diff --git a/includes/Tag/MapFrame.php b/includes/Tag/MapFrame.php
index ced690c..1250d6a 100644
--- a/includes/Tag/MapFrame.php
+++ b/includes/Tag/MapFrame.php
@@ -142,12 +142,12 @@
$staticLat = 30;
$staticLon = 0;
}
+
if ( $this->showGroups ) {
$attrs['data-overlays'] = 
FormatJson::encode( $this->showGroups, false,
FormatJson::ALL_OK );
+   $this->state->addInteractiveGroups( 
$this->showGroups );
}
-
-   $this->state->addInteractiveGroups( 
$this->showGroups );
break;
default:
throw new UnexpectedValueException(
@@ -160,10 +160,13 @@
}
 
$title = urlencode( 
$this->parser->getTitle()->getPrefixedText() );
-   $groupList = implode( ',', $this->showGroups );
 
$bgUrl = 
"{$wgKartographerMapServer}/img/{$this->mapStyle},{$staticZoom},{$staticLat},{$staticLon},{$staticWidth}x{$this->height}.png";
-   $bgUrl .= 
"?domain={$wgServerName}={$title}={$groupList}";
+   if ( $this->showGroups ) {
+   $groupList = implode( ',', $this->showGroups );
+   $bgUrl .= 
"?domain={$wgServerName}={$title}={$groupList}";
+   }
+
$attrs['style'] = "background-image: url({$bgUrl});";
 
if ( !$framed ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff04ab436cb208bb6dea53a4478ba52258f7ff64
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Yurik 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: wikitech: Set wgMWOAuthCentralWiki = false

2016-10-25 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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

Change subject: wikitech: Set wgMWOAuthCentralWiki = false
..

wikitech: Set wgMWOAuthCentralWiki = false

MWOauthHooks::onSetupAfterCache will set $wgMWOAuthSharedUserIDs = true
if $wgMWOAuthCentralWiki is anything other than false. This causes an
extra indirection through CentralIdLookup when creating the user in
MWOAuthUtils::getCentralUserNameFromId which is unneeded. As an
unintended side effect it will also break things by attempting to
verify the OAuth tokens and nonce twice.

Bug: T149150
Change-Id: I38e72794c4830a97fecde58d097d694e8c4ef1aa
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index a6d245d..2961682 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3105,7 +3105,7 @@
wfLoadExtension( 'OAuth' );
if ( in_array( $wgDBname, [ 'labswiki', 'labtestwiki' ] ) ) {
// Wikitech and its testing variant use local OAuth tables
-   $wgMWOAuthCentralWiki = $wgDBname;
+   $wgMWOAuthCentralWiki = false;
} else {
$wgMWOAuthCentralWiki = 'metawiki';
$wgMWOAuthSharedUserSource = 'CentralAuth';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38e72794c4830a97fecde58d097d694e8c4ef1aa
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: decom lead

2016-10-25 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: decom lead
..

decom lead

Change-Id: I10c613e55aa8fe0789746cbb4c834e1b27bc521f
---
M modules/contint/manifests/firewall.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 3 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/35/318035/1

diff --git a/modules/contint/manifests/firewall.pp 
b/modules/contint/manifests/firewall.pp
index cf00490..79c6a99 100644
--- a/modules/contint/manifests/firewall.pp
+++ b/modules/contint/manifests/firewall.pp
@@ -47,10 +47,10 @@
 srange => $nodepool_host,
 }
 
-ferm::service { 'lead_cobalt_gerrit_ssh':
+ferm::service { 'cobalt_gerrit_ssh':
 proto  => 'tcp',
 port   => '29418',
-srange => '@resolve((lead.wikimedia.org cobalt.wikimedia.org 
gerrit.wikimedia.org))',
+srange => '@resolve((cobalt.wikimedia.org gerrit.wikimedia.org))',
 }
 
 # ALLOWS:
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 32b8dd1..b05f770 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -85,7 +85,7 @@
 kafka1013|kafka1014|kafka1020) echo partman/raid1-30G.cfg ;; \
 kafka100[1-2]|kafka200[1-2]|stat1004) echo 
partman/raid10-gpt-srv-ext4.cfg ;; \
 kubernetes100[1-4]) echo partman/docker-host.cfg ;; \
-
auth[1-2]001|contint1001|einsteinium|labcontrol100[1-2]|labnodepool1001|lead|mira|neodymium|oresrdb100[1-2]|phab2001|rdb200[1-6]|wmf474[7-9]|wmf4750)
 echo partman/raid1-lvm-ext4-srv.cfg ;; \
+
auth[1-2]001|contint1001|einsteinium|labcontrol100[1-2]|labnodepool1001|mira|neodymium|oresrdb100[1-2]|phab2001|rdb200[1-6]|wmf474[7-9]|wmf4750)
 echo partman/raid1-lvm-ext4-srv.cfg ;; \
 kafka1003|labmon1001) echo partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
 labnet100[1-2]) echo partman/lvm.cfg ;; \
 labsdb100[45]) echo partman/osmlabsdb.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 04b353a..64d5f0b 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2950,11 +2950,6 @@
 filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
-host lead {
-hardware ethernet C8:1F:66:BF:71:66;
-fixed-address lead.wikimedia.org;
-}
-
 host lithium {
 hardware ethernet C8:1F:66:BF:7F:EA;
 fixed-address lithium.eqiad.wmnet;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10c613e55aa8fe0789746cbb4c834e1b27bc521f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: remove palladium.eqiad, keep palladium.mgmt.eqiad

2016-10-25 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: remove palladium.eqiad, keep palladium.mgmt.eqiad
..

remove palladium.eqiad, keep palladium.mgmt.eqiad

Bug: T147320
Change-Id: Ia80a98953a0ebb5417a776ff5fa7e16d6f7ccb75
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/34/318034/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 54e1567..6ec35e8 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -580,7 +580,6 @@
 157 1H IN PTR   pc1002.eqiad.wmnet.
 158 1H IN PTR   pc1003.eqiad.wmnet.
 159 1H IN PTR   dbproxy1006.eqiad.wmnet.
-160 1H IN PTR   palladium.eqiad.wmnet.
 161 1H IN PTR   osm-cp1003.eqiad.wmnet.
 162 1H IN PTR   osm-cp1004.eqiad.wmnet.
 163 1H IN PTR   ms-be1016.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 6faddbc..3b52247 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -720,7 +720,6 @@
 osm-web1004 1H  IN A10.64.32.96
 osmium  1H  IN A10.64.32.146
 oxygen  1H  IN A10.64.0.222
-palladium   1H  IN A10.64.16.160
 pc1001  1H  IN A10.64.16.156
 pc1002  1H  IN A10.64.16.157
 pc1003  1H  IN A10.64.16.158

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia80a98953a0ebb5417a776ff5fa7e16d6f7ccb75
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: remove lead.wikimedia.org, keep lead.mgmt.eqiad

2016-10-25 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: remove lead.wikimedia.org, keep lead.mgmt.eqiad
..

remove lead.wikimedia.org, keep lead.mgmt.eqiad

Bug:T147905
Change-Id: I2e15c4d33d1e9807785f74ad8ed61fe1e2f5a6c4
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
3 files changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/33/318033/1

diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 2e241dd..ff420b0 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -64,7 +64,6 @@
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   lists.wikimedia.org. ; service IP 
for lists on fermium
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae3-1003.cr1-eqiad.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae3-1003.cr2-eqiad.wikimedia.org.
-9.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   lead.wikimedia.org.
 1.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   cobalt.wikimedia.org.
 0.9.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   polonium.wikimedia.org.
 1.9.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   wiki-mail-eqiad.wikimedia.org.
diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index 4f853f4..8926be5 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -67,7 +67,7 @@
 79  1H  IN PTR  seaborgium.wikimedia.org. ; VM on the ganeti01.svc.eqiad.wmnet 
cluster
 80  1H  IN PTR  aluminium.wikimedia.org. ; VM on the ganeti01.svc.eqiad.wmnet 
cluster
 81  1H  IN PTR  cobalt.wikimedia.org.
-82  1H  IN PTR  lead.wikimedia.org.
+
 83  1H  IN PTR  install1001.wikimedia.org. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 84  1H  IN PTR  ununpentium.wikimedia.org. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 85  1H  IN PTR  gerrit.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 7fdba7c..9674825 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -146,8 +146,6 @@
 labservices1001 1H  IN A208.80.155.117
 labtestcontrol2001  1H  IN A208.80.153.47
 labtestservices2001 1H  IN A208.80.153.48
-lead1H  IN A208.80.154.82
-lead1H  IN  2620:0:861:3:208:80:154:82
 lvs1001 1H  IN A208.80.154.55
 lvs1002 1H  IN A208.80.154.56
 lvs1003 1H  IN A208.80.154.57

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e15c4d33d1e9807785f74ad8ed61fe1e2f5a6c4
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Fix schema for sqlite

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Fix schema for sqlite
..


Fix schema for sqlite

Change-Id: Iacc26fb2dc6b31914d000a186f61be8244405b47
---
M linter.sql
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/linter.sql b/linter.sql
index 515e7f7..8c4484c 100644
--- a/linter.sql
+++ b/linter.sql
@@ -1,6 +1,6 @@
 CREATE TABLE /*_*/linter (
-- primary key
-   linter_id int UNSIGNED AUTO_INCREMENT PRIMARY KEY not null,
+   linter_id int UNSIGNED PRIMARY KEY not null AUTO_INCREMENT,
-- page id
linter_page int UNSIGNED not null,
-- error category

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iacc26fb2dc6b31914d000a186f61be8244405b47
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs...wikibugs2[master]: Report WMDE team boards to wmde tech chan

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Report WMDE team boards to wmde tech chan
..


Report WMDE team boards to wmde tech chan

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

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



diff --git a/channels.yaml b/channels.yaml
index 3d7a96c..b3b471b 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -58,6 +58,7 @@
 - Attribution-Generator
 - CatWatch
 - Cognate
+- WMDE-(.*)-Team(-Board)?
 
 "#wikimedia-commtech":
 - Community-Tech(-.*)?

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I63e2010ac3eb059cf89a24e46470e168eb29a992
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs...wikibugs2[master]: Report Cognate to wmde tech chan

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Report Cognate to wmde tech chan
..


Report Cognate to wmde tech chan

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

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



diff --git a/channels.yaml b/channels.yaml
index 5e1a42a..3d7a96c 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -57,6 +57,7 @@
 - Revision-Slider
 - Attribution-Generator
 - CatWatch
+- Cognate
 
 "#wikimedia-commtech":
 - Community-Tech(-.*)?

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I128097a041ea2851ad7c21413157a63aa2568a6c
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: MariaDB strict mode

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: MariaDB strict mode
..


MariaDB strict mode

Turned on strict mode locally and tried to do all the things, also
looked over all the insert, update, and upsert calls in the code.

The only literal SQL in the codebase was transitional, and marked
as 'mysql-only', so I deleted that. Other failures were all mismatched
datatypes - strings or booleans being inserted into integer columns.
I grepped a list of integer columns out of CentralNotice.sql and
checked every place they were being used to make sure the values were
integer data type. Finally, strict mode complained when trying to
insert NULL into a varchar column, even though it was nullable. I
believe the only optional strings we insert are the log summaries,
so I added a check around those to avoid inserting nulls.

Adds a couple of PHPDoc annotations to assist inspections.

Bug: T145591
Change-Id: Ib4e5531acf8dd250feff84bdff2394e95c30aa1d
---
M CentralNoticeBannerLogPager.php
M includes/Banner.php
M includes/Campaign.php
M tests/CentralNoticeTestFixtures.php
M tests/data/AllocationsFixtures.json
5 files changed, 68 insertions(+), 80 deletions(-)

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



diff --git a/CentralNoticeBannerLogPager.php b/CentralNoticeBannerLogPager.php
index a95bb35..f03ac95 100644
--- a/CentralNoticeBannerLogPager.php
+++ b/CentralNoticeBannerLogPager.php
@@ -203,7 +203,7 @@
'*',
array( 'tmplog_template_id' => 
$newrow->tmplog_template_id, "tmplog_id < {$newrow->tmplog_id}" ),
__METHOD__,
-   array( 'ORDER BY' => 'tmplog_id DESC', 'LIMIT' 
=> '1' )
+   array( 'ORDER BY' => 'tmplog_id DESC', 'LIMIT' 
=> 1 )
);
}
 
diff --git a/includes/Banner.php b/includes/Banner.php
index 3c37227..848f4d5 100644
--- a/includes/Banner.php
+++ b/includes/Banner.php
@@ -379,7 +379,7 @@
array(
 'tmp_display_anon'=> 
(int)$this->allocateAnon,
 'tmp_display_account' => 
(int)$this->allocateLoggedIn,
-'tmp_archived'=> 
$this->archived,
+'tmp_archived'=> 
(int)$this->archived,
 'tmp_category'=> 
$this->category,
),
array(
@@ -1362,6 +1362,11 @@
 
ChoiceDataProvider::invalidateCache();
 
+   // Summary shouldn't actually come in null, but just in case...
+   if ( $summary === null ) {
+   $summary = '';
+   }
+
$endSettings = array();
if ( $action !== 'removed' ) {
$endSettings = Banner::getBannerSettings( 
$this->getName(), true );
@@ -1376,19 +1381,8 @@
'tmplog_template_id'   => $this->getId(),
'tmplog_template_name' => $this->getName(),
'tmplog_content_change'=> 
(int)$this->dirtyFlags['content'],
+   'tmplog_comment'   => $summary,
);
-
-   // TODO temporary code for soft dependency on schema change
-   // Note: MySQL-specific
-   global $wgDBtype;
-   if ( $wgDBtype === 'mysql' && $dbw->query(
-   'SHOW COLUMNS FROM ' .
-   $dbw->tableName( 'cn_template_log' )
-   . ' LIKE ' . $dbw->addQuotes( 'tmplog_comment' )
-   )->numRows() === 1 ) {
-
-   $log['tmplog_comment'] = $summary;
-   }
 
foreach ( $endSettings as $key => $value ) {
if ( is_array( $value ) ) {
diff --git a/includes/Campaign.php b/includes/Campaign.php
index e77d1d5..04d29e6 100644
--- a/includes/Campaign.php
+++ b/includes/Campaign.php
@@ -1,7 +1,5 @@
 getId() > 0 ) { // User::getID returns 0 for 
anonymous or non-existant users
@@ -1345,20 +1350,9 @@
'notlog_user_id'   => $user->getId(),
'notlog_action'=> $action,
'notlog_not_id'=> $campaignId,
-   'notlog_not_name'  => Campaign::getNoticeName( 
$campaignId )
+   'notlog_not_name'  => Campaign::getNoticeName( 
$campaignId ),
+   'notlog_comment'   => $summary,
);
-
-   // TODO temporary code for soft dependency on schema 
change
-   // Note: MySQL-specific
-

[MediaWiki-commits] [Gerrit] integration/config[master]: Add ParserFunctions as a dependency for Kartographer

2016-10-25 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Add ParserFunctions as a dependency for Kartographer
..

Add ParserFunctions as a dependency for Kartographer

Bug: T147575
Change-Id: Ia8df7e1d5f1a025026569056303327fa1895006c
---
M zuul/parameter_functions.py
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index c371a83..2ab2b88 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -108,7 +108,7 @@
 'GuidedTour': ['EventLogging'],
 'GWToolset': ['SyntaxHighlight_GeSHi', 'Scribunto', 'TemplateData'],
 'ImageMetrics': ['EventLogging'],
-'Kartographer': ['WikimediaMessages', 'VisualEditor'],
+'Kartographer': ['ParserFunctions', 'VisualEditor', 'WikimediaMessages'],
 'LanguageTool': ['VisualEditor'],
 'LifeWeb': ['LifeWebCore'],
 'LightweightRDFa': ['WikiEditor'],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8df7e1d5f1a025026569056303327fa1895006c
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Differentiate tracking categories by namespace

2016-10-25 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Differentiate tracking categories by namespace
..

Differentiate tracking categories by namespace

While this was in principle supported before, add an
explicit check for ParserFunctions presence to avoid logspam.
Differentiate by file/page so far, will require more fixups via
WikimediaMessages to highlight content namespaces/use "articles"
on Wikipedia.

Bug: T147575
Change-Id: I1ecec8ed14c6a9d6f38ec6e7447ab13cfa803076
---
M i18n/en.json
M includes/Tag/TagHandler.php
2 files changed, 25 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/31/318031/1

diff --git a/i18n/en.json b/i18n/en.json
index 214de08..04d61d9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -17,7 +17,7 @@
"kartographer-attribution": "Wikimedia maps | Map data © 
[https://www.openstreetmap.org/copyright OpenStreetMap contributors]",
"kartographer-attribution-externaldata": "$1: $2",
"kartographer-attribution-externaldata-query": "query",
-   "kartographer-broken-category": "Pages with broken maps",
+   "kartographer-broken-category": 
"{{#switch:{{NAMESPACE}}|{{ns:File}}=Files|#default=Pages}} with broken maps",
"kartographer-broken-category-desc": "The page includes an invalid map 
usage",
"kartographer-desc": "Allows maps to be added to the wiki pages",
"kartographer-error-context": "$1: $2",
@@ -28,7 +28,7 @@
"kartographer-error-bad_data": "The JSON content is not valid 
GeoJSON+simplestyle",
"kartographer-error-latlon": "Either both \"latitude\" and 
\"longitude\" parameters should be supplied or neither of them",
"kartographer-error-service-name": "Invalid cartographic service 
\"$1\"",
-   "kartographer-tracking-category": "Pages with maps",
+   "kartographer-tracking-category": 
"{{#switch:{{NAMESPACE}}|{{ns:File}}=Files|#default=Pages}} with maps",
"kartographer-tracking-category-desc": "The page includes a map",
"kartographer-coord-combined": "$1 $2",
"kartographer-coord-dms": "$1°$2′$3″",
diff --git a/includes/Tag/TagHandler.php b/includes/Tag/TagHandler.php
index 6996a41..3b75e79 100644
--- a/includes/Tag/TagHandler.php
+++ b/includes/Tag/TagHandler.php
@@ -10,6 +10,7 @@
 namespace Kartographer\Tag;
 
 use Exception;
+use ExtensionRegistry;
 use FormatJson;
 use Html;
 use Kartographer\SimpleStyleParser;
@@ -295,10 +296,10 @@
}
 
if ( $state->hasBrokenTags() ) {
-   $output->addTrackingCategory( 
'kartographer-broken-category', $parser->getTitle() );
+   self::addTrackingCategory( $parser, 
'kartographer-broken-category' );
}
if ( $state->hasValidTags() ) {
-   $output->addTrackingCategory( 
'kartographer-tracking-category', $parser->getTitle() );
+   self::addTrackingCategory( $parser, 
'kartographer-tracking-category' );
}
 
// https://phabricator.wikimedia.org/T145615 - include all data 
in previews
@@ -328,6 +329,26 @@
}
 
/**
+* Adds tracking category with extra checks
+*
+* @param Parser $parser
+* @param string $categoryMsg
+*/
+   private static function addTrackingCategory( Parser $parser, 
$categoryMsg ) {
+   static $hasParserFunctions;
+
+   // Our tracking categories rely on ParserFunctions to 
differentiate per namespace,
+   // avoid log noise if it's not installed
+   if ( $hasParserFunctions === null ) {
+   $hasParserFunctions = 
ExtensionRegistry::getInstance()->isLoaded( 'ParserFunctions' );
+   }
+
+   if ( $hasParserFunctions ) {
+   $parser->getOutput()->addTrackingCategory( 
$categoryMsg, $parser->getTitle() );
+   }
+   }
+
+   /**
 * @return string
 * @throws Exception
 */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ecec8ed14c6a9d6f38ec6e7447ab13cfa803076
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: let icinga own /var/log/icinga

2016-10-25 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: icinga: let icinga own /var/log/icinga
..

icinga: let icinga own /var/log/icinga

Let icinga own /var/log/icinga and set the permissions
as they were on neon. On einsteinium the log dir was owned
by 'nagios' and that meant the irc.log, raid_handler.log files
could not be written, so icinga-wm was silent on IRC.

Puppetize the manual fix.

Change-Id: Ibec3aa9ae5f92e300f9efb9ea17311eba05226bb
---
M modules/icinga/manifests/init.pp
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/318030/1

diff --git a/modules/icinga/manifests/init.pp b/modules/icinga/manifests/init.pp
index 8cb01f1..4cf0fb7 100644
--- a/modules/icinga/manifests/init.pp
+++ b/modules/icinga/manifests/init.pp
@@ -161,6 +161,14 @@
 mode   => '0664',
 }
 
+# ensure icinga can write logs for ircecho, raid_handler etc.
+file { '/var/log/icinga':
+ensure => 'directory',
+owner  => 'icinga',
+group  => 'adm',
+mode   => '2755',
+}
+
 # Check that the icinga config is sane
 monitoring::service { 'check_icinga_config':
 description=> 'Check correctness of the icinga configuration',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibec3aa9ae5f92e300f9efb9ea17311eba05226bb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Make Kartographer depend on ParserFunctions

2016-10-25 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Make Kartographer depend on ParserFunctions
..

Make Kartographer depend on ParserFunctions

Bug: T147575
Change-Id: I91341bdc0e9a69ec767a32e3f0a3bf7e1f60c9bc
---
M puppet/modules/role/manifests/kartographer.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/29/318029/1

diff --git a/puppet/modules/role/manifests/kartographer.pp 
b/puppet/modules/role/manifests/kartographer.pp
index fff8bbd..f55243a 100644
--- a/puppet/modules/role/manifests/kartographer.pp
+++ b/puppet/modules/role/manifests/kartographer.pp
@@ -1,7 +1,7 @@
 # == Class: role::kartographer
 # Configures Kartographer, an extension for display maps in wiki pages
 class role::kartographer {
-
+include ::role::parserfunctions
 include ::role::wikimediamessages
 
 mediawiki::extension { 'Kartographer':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91341bdc0e9a69ec767a32e3f0a3bf7e1f60c9bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] utfnormal[master]: build: Remove PHP 5.3.3 from Travis CI matrix (keep PHP 5.3)

2016-10-25 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: build: Remove PHP 5.3.3 from Travis CI matrix (keep PHP 5.3)
..

build: Remove PHP 5.3.3 from Travis CI matrix (keep PHP 5.3)

The 5.3.3 image in Travis CI doesn't come with openssl which is
required for "composer install" and "composer test" to work.

We keep PHP 5.3 so backward-compatibility is still insured, though
we should probably just drop that from composer.json and bump it
to PHP 5.4 or higher.

Change-Id: I28525463a5e5d74b5e137f690ffec0b53adfdde3
---
M .travis.yml
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/utfnormal refs/changes/28/318028/1

diff --git a/.travis.yml b/.travis.yml
index 3d4019f..1f162d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: php
 php:
-  - "5.3.3"
   - "5.3"
   - "5.4"
   - "5.5"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I28525463a5e5d74b5e137f690ffec0b53adfdde3
Gerrit-PatchSet: 1
Gerrit-Project: utfnormal
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add missing configuration files in noc.

2016-10-25 Thread Dereckson (Code Review)

Dereckson has uploaded a new change for review.

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

Change subject: Add missing configuration files in noc.
..

Add missing configuration files in noc.

Change-Id: Ic105734cd0829bcc6cfbb63ccd3b90cddf40bad9
---
A docroot/noc/conf/logging-labs.php.txt
A docroot/noc/conf/proofreadpage.php.txt
A docroot/noc/conf/session-labs.php.txt
A docroot/noc/conf/session.php.txt
4 files changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/docroot/noc/conf/logging-labs.php.txt 
b/docroot/noc/conf/logging-labs.php.txt
new file mode 12
index 000..95c1aa0
--- /dev/null
+++ b/docroot/noc/conf/logging-labs.php.txt
@@ -0,0 +1 @@
+../../../wmf-config/logging-labs.php
\ No newline at end of file
diff --git a/docroot/noc/conf/proofreadpage.php.txt 
b/docroot/noc/conf/proofreadpage.php.txt
new file mode 12
index 000..26cde3a
--- /dev/null
+++ b/docroot/noc/conf/proofreadpage.php.txt
@@ -0,0 +1 @@
+../../../wmf-config/proofreadpage.php
\ No newline at end of file
diff --git a/docroot/noc/conf/session-labs.php.txt 
b/docroot/noc/conf/session-labs.php.txt
new file mode 12
index 000..b6463ff
--- /dev/null
+++ b/docroot/noc/conf/session-labs.php.txt
@@ -0,0 +1 @@
+../../../wmf-config/session-labs.php
\ No newline at end of file
diff --git a/docroot/noc/conf/session.php.txt b/docroot/noc/conf/session.php.txt
new file mode 12
index 000..86761a8
--- /dev/null
+++ b/docroot/noc/conf/session.php.txt
@@ -0,0 +1 @@
+../../../wmf-config/session.php
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic105734cd0829bcc6cfbb63ccd3b90cddf40bad9
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 

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

[MediaWiki-commits] [Gerrit] mediawiki...OAuth[master]: Avoid suppressed-username permission check in local user lookup

2016-10-25 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Avoid suppressed-username permission check in local user lookup
..

Avoid suppressed-username permission check in local user lookup

...in MWOAuthUtils::getLocalUserFromCentralId().

It's not happening in the $wgMWOAuthSharedUserIDs === false case,
so it's presumably safe to do.

Bug: T149150
Change-Id: I83e6f0dd309917a90bcc8111b655568fb5215ffd
---
M backend/MWOAuthUtils.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth 
refs/changes/26/318026/1

diff --git a/backend/MWOAuthUtils.php b/backend/MWOAuthUtils.php
index 0987ebe..5ee11c9 100644
--- a/backend/MWOAuthUtils.php
+++ b/backend/MWOAuthUtils.php
@@ -276,7 +276,7 @@
}
 
if ( $lookup ) {
-   $user = $lookup->localUserFromCentralId( 
$userId );
+   $user = $lookup->localUserFromCentralId( 
$userId, \CentralIdLookup::AUDIENCE_RAW );
if ( $user === null ||
!$lookup->isAttached( $user ) || 
!$lookup->isAttached( $user, $wgMWOAuthCentralWiki )
) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I83e6f0dd309917a90bcc8111b655568fb5215ffd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Do not return unsafe users from CentralIdLookup::checkAudien...

2016-10-25 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Do not return unsafe users from CentralIdLookup::checkAudience()
..

Do not return unsafe users from CentralIdLookup::checkAudience()

It would result in an infinite loop when the lookup is performed
in a session provider.

Bug: T149150
Change-Id: I8fb79f8ca5eca43d4e109e40b36c886795f7700e
---
M includes/user/CentralIdLookup.php
M tests/phpunit/includes/user/CentralIdLookupTest.php
2 files changed, 15 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/25/318025/1

diff --git a/includes/user/CentralIdLookup.php 
b/includes/user/CentralIdLookup.php
index 2ced6e2..7809e7b 100644
--- a/includes/user/CentralIdLookup.php
+++ b/includes/user/CentralIdLookup.php
@@ -20,6 +20,8 @@
  * @file
  */
 
+use MediaWiki\Logger\LoggerFactory;
+
 /**
  * The CentralIdLookup service allows for connecting local users with
  * cluster-wide IDs.
@@ -86,7 +88,13 @@
 */
protected function checkAudience( $audience ) {
if ( $audience instanceof User ) {
-   return $audience;
+   if ( !$audience->isSafeToLoad() ) {
+   LoggerFactory::getInstance( 'centralid' 
)->warning( 'unsafe user passed to '
+   . __METHOD__ );
+   return new User;
+   } else {
+   return $audience;
+   }
}
if ( $audience === self::AUDIENCE_PUBLIC ) {
return new User;
diff --git a/tests/phpunit/includes/user/CentralIdLookupTest.php 
b/tests/phpunit/includes/user/CentralIdLookupTest.php
index feac641..592f52f 100644
--- a/tests/phpunit/includes/user/CentralIdLookupTest.php
+++ b/tests/phpunit/includes/user/CentralIdLookupTest.php
@@ -54,6 +54,12 @@
 
$this->assertNull( $mock->checkAudience( 
CentralIdLookup::AUDIENCE_RAW ) );
 
+   $unsafeUser = $this->getMock( 'User' );
+   $unsafeUser->expects( $this->any() )->method( 'isSafeToLoad' 
)->willReturn( false );
+   $user = $mock->checkAudience( $unsafeUser );
+   $this->assertSame( 0, $user->getId() );
+   $this->assertNotSame( $unsafeUser, $user );
+
try {
$mock->checkAudience( 100 );
$this->fail( 'Expected exception not thrown' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fb79f8ca5eca43d4e109e40b36c886795f7700e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Fix handling of API responses

2016-10-25 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Fix handling of API responses
..

Fix handling of API responses

NWE can return data in 'visualeditoredit' instead of
'visualeditor'. We may want to change this later.

Also restore removed hack code that popuplates missing
VE API data when requesting wikitext.

Change-Id: I9a782a85444d37a3e21c071db7e175ee9b0b1c4f
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
3 files changed, 15 insertions(+), 4 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 39304d5..1858107 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -352,7 +352,7 @@
this.suppressNormalStartupDialogs = true;
}
 
-   data = response ? response.visualeditor : {};
+   data = response ? ( response.visualeditor || response.visualeditoredit 
) : {};
 
this.checkboxFields = [];
this.checkboxesByName = {};
diff --git 
a/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
index 6d5c855..3106049 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
@@ -65,7 +65,18 @@
);
} else {
this.serialize( this.getDocToSave() );
-   dataPromise = this.serializing;
+   dataPromise = this.serializing.then( function ( response ) {
+   // HACK - add parameters the API doesn't provide for a 
VE->WT switch
+   var data = response.visualeditoredit;
+   data.etag = target.etag;
+   data.fromEditedState = modified;
+   data.notices = target.remoteNotices;
+   data.protectedClasses = target.protectedClasses;
+   data.basetimestamp = target.baseTimeStamp;
+   data.starttimestamp = target.startTimeStamp;
+   data.oldid = target.revid;
+   return response;
+   } );
}
this.setMode( 'source' );
this.reloadSurface( dataPromise );
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 371605e..d7635d0 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -244,9 +244,9 @@
  */
 ve.init.mw.ArticleTarget.prototype.loadSuccess = function ( response ) {
var i, len, linkData, aboutDoc, docRevId, docRevIdMatches,
-   data = response ? response.visualeditor : null;
+   data = response ? ( response.visualeditor || 
response.visualeditoredit ) : null;
 
-   if ( typeof data.content !== 'string' ) {
+   if ( !data || typeof data.content !== 'string' ) {
this.loadFail( 'No HTML content in response from server', 
've-api' );
} else {
ve.track( 'trace.parseResponse.enter' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a782a85444d37a3e21c071db7e175ee9b0b1c4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] wikimedia...discernatron[master]: Change items inserted in scoring queue to match reality

2016-10-25 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: Change items inserted in scoring queue to match reality
..

Change items inserted in scoring queue to match reality

We have been inserting a bunch of items into the scoring queue that we
don't actually expect to ever be done. Rather than injecting the 5 times
we 'hope' the query will be scored, insert 2 to match what we actually
expect to happen. This should make it easier to write the code for
injecting new items to the queue for queries without enough agreement.

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/discernatron 
refs/changes/22/318022/1

diff --git a/app.php b/app.php
index ca4af5a..7dcf793 100644
--- a/app.php
+++ b/app.php
@@ -70,7 +70,7 @@
 'search.wikis' => [
 'enwiki' => 'https://en.wikipedia.org/w/api.php',
 ],
-'search.default_scoring_slots' => [1,1,3,4,5],
+'search.default_scoring_slots' => [5,5],
 ]);
 $app->mount('/', $relevanceScoringProvider);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fa781f1054f55b618698352d998e95ed59a0e15
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/discernatron
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] wikimedia...discernatron[master]: Track reliability of query scores

2016-10-25 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: Track reliability of query scores
..

Track reliability of query scores

There can be problems where we have a large disagreement between users
about what should or should not be relevant for a query. Try to resolve
that by adding the query back into the scoring queue to get a couple
more users to look at it.

Also adds a 'reliable' column to the scores, so that relevance forge can
filter on it and only pull in scores that have been deemed reliable. The
current method is very naive, but might be "good enough".

Bug: T146189
Change-Id: I36091436acb81b343a14ca0801ce77924055a654
---
M schema.mysql.sql
M src/RelevanceScoring/QueriesManager.php
M src/RelevanceScoring/RelevanceScoringProvider.php
M src/RelevanceScoring/Repository/ScoresRepository.php
M src/RelevanceScoring/Repository/ScoringQueueRepository.php
5 files changed, 102 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/discernatron 
refs/changes/24/318024/1

diff --git a/schema.mysql.sql b/schema.mysql.sql
index 72f3fb2..e3ff2f6 100644
--- a/schema.mysql.sql
+++ b/schema.mysql.sql
@@ -42,13 +42,14 @@
 UNIQUE KEY `results_source_results_id_source` (`results_id`, `source`),
 KEY `results_sources_snippet_order` (`query_id`, `results_id`, 
`snippet_score`)
 ) CHARSET=utf8mb4;
-CREATE TABLE IF NOT EXISTS scores (
+CREATE TABLE IF NOT EXISTS `scores` (
 id INTEGER UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
 user_id INTEGER UNSIGNED NOT NULL,
 result_id INTEGER UNSIGNED NOT NULL,
 query_id INTEGER UNSIGNED NOT NULL,
 score TINYINT UNSIGNED,
 created INTEGER UNSIGNED NOT NULL,
+reliable TINYINY UNSIGNED NOT NULL,
 FOREIGN KEY `scores_user_id` (user_id) REFERENCES users(id),
 FOREIGN KEY `scores_result_id` (result_id) REFERENCES results(id),
 FOREIGN KEY `scores_query_id` (query_id) REFERENCES queries(id),
diff --git a/src/RelevanceScoring/QueriesManager.php 
b/src/RelevanceScoring/QueriesManager.php
index 4a642a7..53a90f2 100644
--- a/src/RelevanceScoring/QueriesManager.php
+++ b/src/RelevanceScoring/QueriesManager.php
@@ -27,14 +27,30 @@
 private $queriesRepo;
 /** @var UsersRepository */
 private $usersRepo;
+/** @var int */
+private $maxScoresPerQuery;
+/** @var int */
+private $queuePriority;
 
+/**
+ * @param User $user
+ * @param QueriesRepository $queriesRepo
+ * @param ResultsRepository $resultsRepo
+ * @param ScoresRepository $scoresRepo
+ * @param ScoringQueueRepository $scoringQueueRepo
+ * @param UsersRepository $usersRepo
+ * @param int $maxScoresPerQuery
+ * @param int $queuePriority
+ */
 public function __construct(
 User $user,
 QueriesRepository $queriesRepo,
 ResultsRepository $resultsRepo,
 ScoresRepository $scoresRepo,
 ScoringQueueRepository $scoringQueueRepo,
-UsersRepository $usersRepo
+UsersRepository $usersRepo,
+$maxScoresPerQuery,
+$queuePriority
 ) {
 $this->user = $user;
 $this->resultsRepo = $resultsRepo;
@@ -42,6 +58,8 @@
 $this->scoringQueueRepo = $scoringQueueRepo;
 $this->queriesRepo = $queriesRepo;
 $this->usersRepo = $usersRepo;
+$this->maxScoresPerQuery = $maxScoresPerQuery;
+$this->queuePriority = $queuePriority;
 }
 
 public function nextQueryId() {
@@ -73,6 +91,7 @@
 public function saveScores($queryId, array $scores) {
 $this->scoresRepo->storeQueryScores($this->user, $queryId, $scores);
 $this->scoringQueueRepo->markScored($this->user, $queryId);
+$this->updateReliability($queryId);
 }
 
 public function updateUserStorage() {
@@ -119,4 +138,38 @@
 
 return $array;
 }
+
+private function updateReliability($queryId) {
+// If there are still pending scores do nothing
+$pendingCount = $this->scoringQueueRepo->getNumberPending([$queryId]);
+if ( isset( $pendingCount[$queryId] ) ) {
+return;
+}
+
+$reliable = $this->scoresRepo->checkReliability($queryId);
+if ( $reliable ) {
+$this->scoresRepo->markReliable($queryId);
+return;
+}
+
+// Query is unreliable and there are no pending scores.
+$numberOfScores = 
$this->scoringQueueRepo->getNumberOfScores([$queryId]);
+if ( !isset( $numberOfScores[$queryId])) {
+// what?!?!
+return;
+}
+
+if ( $numberOfScores[$queryId] > $this->maxScoresPerQuery ) {
+// we have plenty of scores and this is still unreliable...just 
leave it.
+// We should probably have some page that reports these so we can 
manually
+// review/fix them.
+return;
+}
+
+

[MediaWiki-commits] [Gerrit] wikimedia...discernatron[master]: Refactor repositories out of QueriesController

2016-10-25 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: Refactor repositories out of QueriesController
..

Refactor repositories out of QueriesController

This class had quite a few repositories, and i was about to add one
more. In a (perhaps misguided) attempt at the single responsibility
principle pull all the repositories out of QueriesController into a
class with less responsibilities, QueriesManager. Now QueriesController
can handle the forms/templating/etc end of things, and QueriesManager
can handle shuffling data back and forth from the database.

Change-Id: Ia5fb71aedf3d13f5c9376394555d6ae9a2bf0ddc
---
M src/RelevanceScoring/Controller/QueriesController.php
A src/RelevanceScoring/QueriesManager.php
M src/RelevanceScoring/RelevanceScoringProvider.php
3 files changed, 147 insertions(+), 85 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/discernatron 
refs/changes/23/318023/1

diff --git a/src/RelevanceScoring/Controller/QueriesController.php 
b/src/RelevanceScoring/Controller/QueriesController.php
index fd2b822..172f4cb 100644
--- a/src/RelevanceScoring/Controller/QueriesController.php
+++ b/src/RelevanceScoring/Controller/QueriesController.php
@@ -8,11 +8,7 @@
 use WikiMedia\OAuth\User;
 use WikiMedia\RelevanceScoring\Application;
 use WikiMedia\RelevanceScoring\Assert\MinimumSubmitted;
-use WikiMedia\RelevanceScoring\Repository\QueriesRepository;
-use WikiMedia\RelevanceScoring\Repository\ResultsRepository;
-use WikiMedia\RelevanceScoring\Repository\ScoresRepository;
-use WikiMedia\RelevanceScoring\Repository\ScoringQueueRepository;
-use WikiMedia\RelevanceScoring\Repository\UsersRepository;
+use WikiMedia\RelevanceScoring\QueriesManager;
 
 class QueriesController
 {
@@ -24,14 +20,8 @@
 private $twig;
 /** @var FormFactory */
 private $formFactory;
-/** @var QueriesRepository */
-private $queriesRepo;
-/** @var ResultsRepository */
-private $resultsRepo;
-/** @var ScoresRepository */
-private $scoresRepo;
-/** @var UsersRepository */
-private $userRepo;
+/** @var QueriesManager */
+private $queriesManager;
 /** @var string[] */
 private $wikis;
 
@@ -40,22 +30,14 @@
 User $user,
 Twig_Environment $twig,
 FormFactory $formFactory,
-QueriesRepository $queriesRepo,
-ResultsRepository $resultsRepo,
-ScoresRepository $scoresRepo,
-ScoringQueueRepository $scoringQueueRepo,
-UsersRepository $userRepo,
+QueriesManager $queriesManager,
 array $wikis
 ) {
 $this->app = $app;
 $this->user = $user;
 $this->twig = $twig;
 $this->formFactory = $formFactory;
-$this->queriesRepo = $queriesRepo;
-$this->resultsRepo = $resultsRepo;
-$this->scoresRepo = $scoresRepo;
-$this->scoringQueueRepo = $scoringQueueRepo;
-$this->userRepo = $userRepo;
+$this->queriesManager = $queriesManager;
 $this->wikis = $wikis;
 }
 
@@ -66,7 +48,7 @@
 
 public function nextQuery(Request $request)
 {
-$maybeId = $this->scoringQueueRepo->pop($this->user);
+$maybeId = $this->queriesManager->nextQueryId();
 $params = [];
 if ($request->query->get('saved')) {
 $params['saved'] = 1;
@@ -82,7 +64,7 @@
 
 public function skipQueryById(Request $request, $queryId)
 {
-$maybeQuery = $this->queriesRepo->getQuery($queryId);
+$maybeQuery = $this->queriesManager->getQuery($queryId);
 if ($maybeQuery->isEmpty()) {
 // @todo 404
 throw new \Exception('Query not found');
@@ -95,8 +77,7 @@
 // look into adding session based notifications to make it easier to
 // tell users about this.
 if ($form->isValid()) {
-$this->queriesRepo->markQuerySkipped($this->user, $queryId);
-$this->scoringQueueRepo->unassignUser($this->user);
+$this->queriesManager->skipQuery($queryId);
 }
 
 return $this->app->redirect($this->app->path('next_query'));
@@ -104,7 +85,7 @@
 
 public function queryById(Request $request, $queryId)
 {
-$maybeQuery = $this->queriesRepo->getQuery($queryId);
+$maybeQuery = $this->queriesManager->getQuery($queryId);
 if ($maybeQuery->isEmpty()) {
 // @todo 404
 throw new \Exception('Query not found');
@@ -116,20 +97,15 @@
 ]);
 }
 
-$maybeResults = $this->resultsRepo->getQueryResults($queryId);
+$maybeResults = $this->queriesManager->getQueryResults($queryId);
 if ($maybeResults->isEmpty()) {
 throw new \Exception('No results found for query');
 }
 
-$results = $this->shufflePreserveKeys(
-$maybeResults->get(),
-// user id is used to give

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Get rid of some event handler in mw.UploadWizard

2016-10-25 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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

Change subject: Get rid of some event handler in mw.UploadWizard
..

Get rid of some event handler in mw.UploadWizard

Bug: T93895
Change-Id: Ic88ae770b35036d2c5c74b756a4e0b250a2db8c5
---
M resources/controller/uw.controller.Details.js
M resources/controller/uw.controller.Step.js
M resources/controller/uw.controller.Thanks.js
M resources/mw.UploadWizard.js
4 files changed, 38 insertions(+), 88 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/20/318020/1

diff --git a/resources/controller/uw.controller.Details.js 
b/resources/controller/uw.controller.Details.js
index 79c5125..9489b11 100644
--- a/resources/controller/uw.controller.Details.js
+++ b/resources/controller/uw.controller.Details.js
@@ -25,12 +25,15 @@
 * @param {Object} config UploadWizard config object.
 */
uw.controller.Details = function UWControllerDetails( api, config ) {
+   var controller = this;
+
uw.controller.Step.call(
this,
new uw.ui.Details()
-   .connect( this, {
-   'start-details': 'startDetails',
-   'finalize-details-after-removal': [ 
'emit', 'finalize-details-after-removal' ]
+   .on( 'start-details', this.startDetails.bind( 
this ) )
+   .on( 'finalize-details-after-removal', function 
() {
+   controller.removeErrorUploads();
+   controller.moveNext();
} ),
api,
config
@@ -102,6 +105,12 @@
}
};
 
+   uw.controller.Details.prototype.moveNext = function () {
+   this.removeErrorUploads();
+
+   uw.controller.Step.prototype.moveNext.call( this );
+   };
+
uw.controller.Details.prototype.addCopyMetadataFeature = function ( 
uploads ) {
this.copyMetadataWidget = new uw.CopyMetadataWidget( {
copyFrom: uploads[ 0 ],
@@ -133,9 +142,8 @@
if ( valid ) {
details.ui.hideEndButtons();
details.submit();
-   details.emit( 'start-details' );
} else {
-   details.emit( 'details-error' );
+   details.showErrors();
}
} );
};
diff --git a/resources/controller/uw.controller.Step.js 
b/resources/controller/uw.controller.Step.js
index c072ebe..5d7cad4 100644
--- a/resources/controller/uw.controller.Step.js
+++ b/resources/controller/uw.controller.Step.js
@@ -274,4 +274,15 @@
return this.uploads === undefined || this.uploads.length === 0 
|| this.movedFrom;
};
 
+   /**
+* Clear out uploads that are in error mode, perhaps before proceeding 
to the next step
+*/
+   uw.controller.Step.prototype.removeErrorUploads = function () {
+   $.each( this.uploads, function ( i, upload ) {
+   if ( upload !== undefined && upload.state === 'error' ) 
{
+   upload.remove();
+   }
+   } );
+   };
+
 }( mediaWiki, mediaWiki.uploadWizard, OO, jQuery ) );
diff --git a/resources/controller/uw.controller.Thanks.js 
b/resources/controller/uw.controller.Thanks.js
index 6a89a80..8f7f9ea 100644
--- a/resources/controller/uw.controller.Thanks.js
+++ b/resources/controller/uw.controller.Thanks.js
@@ -27,10 +27,7 @@
uw.controller.Thanks = function UWControllerThanks( api, config ) {
uw.controller.Step.call(
this,
-   new uw.ui.Thanks( config )
-   .connect( this, {
-   'reset-wizard': [ 'emit', 
'reset-wizard' ]
-   } ),
+   new uw.ui.Thanks( config ),
api,
config
);
@@ -49,7 +46,7 @@
return;
}
 
-   uw.controller.Step.prototype.moveTo.call( this );
+   uw.controller.Step.prototype.moveTo.call( this, uploads );
 
$.each( uploads, function ( i, upload ) {
thanks.ui.addUpload( upload );
@@ -57,7 +54,15 @@
};
 
uw.controller.Thanks.prototype.moveNext = function () {
-   this.emit( 'reset-wizard' );
+   // remove all existing uploads before moving on
+

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Move this.uploads, addUpload & removeUpload to controllers

2016-10-25 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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

Change subject: Move this.uploads, addUpload & removeUpload to controllers
..

Move this.uploads, addUpload & removeUpload to controllers

Meanwhile also removed a few unused lines of code

Bug: T93895
Change-Id: I01231f625ec8267ce8b844eb690f8eb3ae526cf0
---
M resources/controller/uw.controller.Details.js
M resources/controller/uw.controller.Thanks.js
M resources/controller/uw.controller.Upload.js
M resources/mw.FlickrChecker.js
M resources/mw.UploadWizard.js
M resources/mw.UploadWizardUpload.js
6 files changed, 131 insertions(+), 145 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/19/318019/1

diff --git a/resources/controller/uw.controller.Details.js 
b/resources/controller/uw.controller.Details.js
index b958a55..79c5125 100644
--- a/resources/controller/uw.controller.Details.js
+++ b/resources/controller/uw.controller.Details.js
@@ -83,6 +83,8 @@
if ( successes > 0 ) {
$.each( uploads, function ( i, upload ) {
upload.on( 'remove-upload', function () {
+   details.queue.removeItem( upload );
+
details.removeCopyMetadataFeature();
 
// Make sure we still have more 
multiple uploads adding the
diff --git a/resources/controller/uw.controller.Thanks.js 
b/resources/controller/uw.controller.Thanks.js
index 7f360ad..6a89a80 100644
--- a/resources/controller/uw.controller.Thanks.js
+++ b/resources/controller/uw.controller.Thanks.js
@@ -54,14 +54,12 @@
$.each( uploads, function ( i, upload ) {
thanks.ui.addUpload( upload );
} );
-
-   this.uploads = undefined;
};
 
uw.controller.Thanks.prototype.moveNext = function () {
-   uw.controller.Step.prototype.moveNext.call( this );
-
this.emit( 'reset-wizard' );
+
+   uw.controller.Step.prototype.moveNext.call( this );
};
 
uw.controller.Thanks.prototype.isComplete = function () {
diff --git a/resources/controller/uw.controller.Upload.js 
b/resources/controller/uw.controller.Upload.js
index ffa2635..740e0da 100644
--- a/resources/controller/uw.controller.Upload.js
+++ b/resources/controller/uw.controller.Upload.js
@@ -26,6 +26,8 @@
 * @param {Object} config UploadWizard config object.
 */
uw.controller.Upload = function UWControllerUpload( api, config ) {
+   var step = this;
+
uw.controller.Step.call(
this,
new uw.ui.Upload( config )
@@ -45,6 +47,17 @@
action: this.transitionOne.bind( this )
} );
this.queue.on( 'complete', this.showNext.bind( this ) );
+
+   this.ui.on( 'files-added', function ( files ) {
+   var totalFiles = files.length + step.uploads.length,
+   tooManyFiles = totalFiles > 
step.config.maxUploads;
+
+   if ( tooManyFiles ) {
+   step.showTooManyFilesWarning( totalFiles );
+   } else {
+   step.addUploads( files );
+   }
+   } );
};
 
OO.inheritClass( uw.controller.Upload, uw.controller.Step );
@@ -204,4 +217,105 @@
this.startQueuedUploads();
};
 
+   /**
+* Create the upload interface, a handler to transport it to the 
server, and UI for the upload
+* itself; and immediately fill it with a file and add it to the list 
of uploads.
+*
+* @param {File} file
+* @return {UploadWizardUpload|false} The new upload, or false if it 
can't be added
+*/
+   uw.controller.Upload.prototype.addUpload = function ( file ) {
+   var upload,
+   controller = this;
+
+   if ( this.uploads.length >= this.config.maxUploads ) {
+   return false;
+   }
+
+   upload = new mw.UploadWizardUpload( this )
+   .on( 'filled', function () {
+   controller.setUploadFilled( upload );
+   } )
+
+   .on( 'filename-accepted', function () {
+   controller.updateFileCounts( controller.uploads 
);
+   } )
+
+   .on( 'remove-upload', function () {
+   controller.removeUpload( upload );
+   } );
+
+   upload.fill( file );
+   upload.checkFile( upload.ui.getFilename(), file );
+
+   return

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove 'validate' from enwiki reviewers

2016-10-25 Thread Cenarium (Code Review)

Cenarium has uploaded a new change for review.

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

Change subject: Remove 'validate' from enwiki reviewers
..

Remove 'validate' from enwiki reviewers

'Validate' is a userright related to quality revisions in the default
config of FlaggedRevs. This is not used at all in the enwiki config and
merely confuses users as to its meaning.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d321d8e..58873ca 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7765,7 +7765,7 @@
],
'autoreviewer' => [ 'autopatrol' => true ],
'researcher' => [ 'browsearchive' => true, 'deletedhistory' => 
true, 'apihighlimits' => true ],
-   'reviewer' => [ 'patrol' => true ],
+   'reviewer' => [ 'patrol' => true, 'validate' => false ],
'filemover' => [ 'movefile' => true ], // T29927
'bot' => [
'ipblock-exempt' => true, // T30914

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I35c7dc488dc40b344ea399401a67c88814d99dc0
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Cenarium 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Fix edit source links for NWE

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Fix edit source links for NWE
..


Fix edit source links for NWE

We fixed these to use vesection instead of section.

Change-Id: I0aa6530b6707239c41216421394379301b0878a7
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 6e12059..92ae8dc 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -669,7 +669,7 @@
return target;
} );
} else {
-   section = +( new mw.Uri( e.target.href 
).query.section );
+   section = +( new mw.Uri( e.target.href 
).query.vesection );
targetPromise = targetPromise.then( function ( 
target ) {
target.section = section;
return target;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0aa6530b6707239c41216421394379301b0878a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: CSS styleguide fixes

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: CSS styleguide fixes
..


CSS styleguide fixes

These will be enforced in future versions of stylelint-config.

Change-Id: I0689cbeee6586d2d3dcb0021a3f613dc2ac73691
---
M modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.css
M modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css
M modules/ve-mw/ui/styles/ve.ui.Icons.css
3 files changed, 6 insertions(+), 7 deletions(-)

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



diff --git a/modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.css 
b/modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.css
index f137efe..63431af 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.css
@@ -109,8 +109,7 @@
 }
 
 @media ( max-width: 479px ) {
-   .ve-init-mw-mobileArticleTarget-toolbar
-   .oo-ui-barToolGroup > .oo-ui-toolGroup-tools > 
.oo-ui-tool.oo-ui-iconElement.oo-ui-tool-with-label > .oo-ui-tool-link 
.oo-ui-tool-title {
+   .ve-init-mw-mobileArticleTarget-toolbar .oo-ui-barToolGroup > 
.oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-iconElement.oo-ui-tool-with-label > 
.oo-ui-tool-link .oo-ui-tool-title {
display: none;
}
 }
diff --git a/modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css 
b/modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css
index a787f89..89c3fc7 100644
--- a/modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css
+++ b/modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css
@@ -6,6 +6,6 @@
  */
 
 .ve-ui-mwParameterPage .ve-ui-mwParameter-wikitextFallbackInput {
-   font-family: Monospace;
+   font-family: monospace;
background-color: #ddd;
 }
diff --git a/modules/ve-mw/ui/styles/ve.ui.Icons.css 
b/modules/ve-mw/ui/styles/ve.ui.Icons.css
index bb35eb5..089c2c5 100644
--- a/modules/ve-mw/ui/styles/ve.ui.Icons.css
+++ b/modules/ve-mw/ui/styles/ve.ui.Icons.css
@@ -50,15 +50,15 @@
 }
 
 /* @noflip */
-.ve-ui-dir-block-rtl .oo-ui-icon-page-not-found:lang(he),
-.ve-ui-surface-dir-rtl .oo-ui-icon-page-not-found:lang(he) /* HACK */ {
+.ve-ui-dir-block-rtl .oo-ui-icon-page-not-found:lang( he ),
+.ve-ui-surface-dir-rtl .oo-ui-icon-page-not-found:lang( he ) /* HACK */ {
/* @embed */
background-image: url( images/icons/page-not-found-he-yi.svg );
 }
 
 /* @noflip */
-.ve-ui-dir-block-rtl .oo-ui-icon-page-not-found:lang(yi),
-.ve-ui-surface-dir-rtl .oo-ui-icon-page-not-found:lang(yi) /* HACK */ {
+.ve-ui-dir-block-rtl .oo-ui-icon-page-not-found:lang( yi ),
+.ve-ui-surface-dir-rtl .oo-ui-icon-page-not-found:lang( yi ) /* HACK */ {
/* @embed */
background-image: url( images/icons/page-not-found-he-yi.svg );
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0689cbeee6586d2d3dcb0021a3f613dc2ac73691
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Fix arguments passed to requestPageData when switching

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Fix arguments passed to requestPageData when switching
..


Fix arguments passed to requestPageData when switching

Change-Id: I890d782829fd077096be364c26a41b56ec4a2df3
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git 
a/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
index 6d5c855..36ebb01 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
@@ -48,6 +48,7 @@
dataPromise = mw.libs.ve.targetLoader.requestPageData(
'source',
this.pageName,
+   null, // We may have this.section but VE is always full 
page at the moment
this.requestedRevId,
this.constructor.name
).then(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I890d782829fd077096be364c26a41b56ec4a2df3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Fix toolbar transition

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Fix toolbar transition
..


Fix toolbar transition

The contents of the bar to should appear to move in to place, not
just be revealed.

Change-Id: I01a85e3455462cf70b6c3f25a236ab6cb82c706c
---
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
2 files changed, 21 insertions(+), 9 deletions(-)

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



diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css 
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
index a5566f9..fb22186 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
@@ -7,22 +7,28 @@
 
 /* Toolbar */
 
-.ve-activating .ve-init-mw-desktopArticleTarget-toolbar,
-.ve-deactivating .ve-init-mw-desktopArticleTarget-toolbar {
+.ve-init-mw-desktopArticleTarget-toolbar {
overflow: hidden;
transition: height 0.4s ease; /* stylelint-disable-line 
no-unsupported-browser-features */
 }
 
-.ve-ui-toolbar-floating .oo-ui-toolbar-bar {
+.ve-init-mw-desktopArticleTarget-toolbar > .oo-ui-toolbar-bar {
transform: translateY( -100% );
transition: transform 0.4s ease; /* stylelint-disable-line 
no-unsupported-browser-features */
-   z-index: 4;
 }
 
-.ve-active .ve-ui-toolbar-floating .oo-ui-toolbar-bar {
+.ve-init-mw-desktopArticleTarget-toolbar-opened {
+   overflow: visible;
+}
+
+.ve-init-mw-desktopArticleTarget-toolbar-open > .oo-ui-toolbar-bar {
transform: translateY( 0 );
 }
 
+.ve-ui-toolbar-floating > .oo-ui-toolbar-bar {
+   z-index: 4;
+}
+
 /*!
  * ve-redirect-header is added just outside of the surface, which has its own
  * hiding style during activation.
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 39304d5..1814222 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -248,11 +248,14 @@
ve.track( 'trace.setupToolbar.exit' );
if ( !wasSetup ) {
setTimeout( function () {
-   var height = toolbar.$bar.outerHeight();
-   toolbar.$element.css( 'height', height );
+   toolbar.$element
+   .css( 'height', toolbar.$bar.outerHeight() )
+   .addClass( 
've-init-mw-desktopArticleTarget-toolbar-open' );
setTimeout( function () {
// Clear to allow growth during use and when 
resizing window
-   toolbar.$element.css( 'height', '' );
+   toolbar.$element
+   .css( 'height', '' )
+   .addClass( 
've-init-mw-desktopArticleTarget-toolbar-opened' );
target.toolbarSetupDeferred.resolve();
}, 400 );
} );
@@ -1153,7 +1156,10 @@
deferred = $.Deferred();
this.toolbar.$element.css( 'height', this.toolbar.$bar.outerHeight() );
setTimeout( function () {
-   target.toolbar.$element.css( 'height', '0' );
+   target.toolbar.$element
+   .css( 'height', '0' )
+   .removeClass( 
've-init-mw-desktopArticleTarget-toolbar-open' )
+   .removeClass( 
've-init-mw-desktopArticleTarget-toolbar-opened' );
setTimeout( function () {
target.toolbar.destroy();
target.toolbar = null;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I01a85e3455462cf70b6c3f25a236ab6cb82c706c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add a project namespace on tg.wikipedia

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Add a project namespace on tg.wikipedia
..


Add a project namespace on tg.wikipedia

New namespaces:
* 102: Лоиҳа
* 103: Баҳси Лоиҳа

Bug: T137200
Change-Id: I68cf09bd1bd14f64dabda81880c48e1324009b2f
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index fe7d01c..a553443 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -5330,6 +5330,8 @@
'tgwiki' => [
100 => 'Портал',
101 => 'Баҳси_портал',
+   102 => 'Лоиҳа', // T137200 - Project
+   103 => 'Баҳси_Лоиҳа',
],
'thwiki' => [
100 => 'สถานีย่อย',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68cf09bd1bd14f64dabda81880c48e1324009b2f
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable static maps on testwiki

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Enable static maps on testwiki
..


Enable static maps on testwiki

Bug: T149071
Change-Id: I783dcd70eae5f521b101422bf297d297160557e1
---
M wmf-config/InitialiseSettings.php
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d321d8e..fe7d01c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17590,6 +17590,12 @@
'wikivoyage' => true,
 ],
 
+'wgKartographerStaticMapframe' => [
+   'default' => false,
+   'testwiki' => true,
+   'test2wiki' => true,
+],
+
 'wgKartographerEnableMapFrame' => [
'default' => true,
'wikipedia' => false,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I783dcd70eae5f521b101422bf297d297160557e1
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Yurik 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Fix silly requeue defaults

2016-10-25 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Fix silly requeue defaults
..

Fix silly requeue defaults

Every 10 minutes for 6 hours is a bit excessive. Change defaults to
match old settings in CRM: try every 20 minutes, up to 10 times.

Change-Id: Ia084f6b626b0caf07c79cac22ab2a4d2db0d54ce
---
M SmashPig.yaml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/17/318017/1

diff --git a/SmashPig.yaml b/SmashPig.yaml
index 9350d5c..d088897 100644
--- a/SmashPig.yaml
+++ b/SmashPig.yaml
@@ -192,9 +192,9 @@
 max-messages: 0
 
 # in seconds
-requeue-delay: 600
+requeue-delay: 1200
 
-requeue-max-age: 36000
+requeue-max-age: 12000
 
 adyen:
 logging:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia084f6b626b0caf07c79cac22ab2a4d2db0d54ce
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] wikimedia...wetzel[master]: Fix dash, add log-scaling, switch to data.table

2016-10-25 Thread Bearloga (Code Review)

Bearloga has uploaded a new change for review.

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

Change subject: Fix dash, add log-scaling, switch to data.table
..

Fix dash, add log-scaling, switch to data.table

- Fixes a bug with time frame selection (which was not entirely removed)
- Adds log10-scaling to all the graphs
- Switches to data.table for much faster aggregation across zoom levels
  and styles

Bug: T149127
Change-Id: I3511093a0d79b843aa4ea68a311a8e75a0312273
---
M server.R
M ui.R
M utils.R
A www/stylesheet.css
4 files changed, 82 insertions(+), 54 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/wetzel 
refs/changes/16/318016/1

diff --git a/server.R b/server.R
index 43bad95..754240b 100644
--- a/server.R
+++ b/server.R
@@ -5,28 +5,35 @@
 # Actual server code.
 shinyServer(function(input, output, session) {
 
-  if(Sys.Date() != existing_date){
+  if (Sys.Date() != existing_date) {
+# Create a Progress object
+progress <- shiny::Progress$new()
+progress$set(message = "Downloading EL actions data", value = 0)
 read_actions()
+progress$set(message = "Downloading EL user counts", value = 0.2)
 read_users()
+progress$set(message = "Downloading tile usage data", value = 0.4)
 suppressWarnings(read_tiles())
+progress$set(message = "Downloading geography data", value = 0.8)
 read_countries()
+progress$set(message = "Finished downloading datasets", value = 1)
 existing_date <<- Sys.Date()
+progress$close()
   }
 
   output$tiles_summary_series <- renderDygraph({
-temp <- polloi::data_select(input$tile_summary_automata_check, 
new_tiles_automata, new_tiles_no_automata) %>%
-ddply(.(date), summarize,
-  `total tiles` = sum(total),
-  `total users` = sum(users),
-  `average tiles per user` = `total tiles` / `total users`)
+temp <- polloi::data_select(input$tile_summary_automata_check, 
new_tiles_automata, new_tiles_no_automata)[, list(
+  `total tiles` = sum(total),
+  `total users` = sum(users),
+  `average tiles per user` = sum(total)/sum(users)
+), by = "date"]
 switch(input$tiles_summary_variable,
Users = { temp %<>% dplyr::select(-`total tiles`) },
Tiles = { temp %<>% dplyr::select(-`total users`) })
-temp %<>% polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, 
input$smoothing_tiles_summary_series)) %>%
-  
polloi::subset_by_date_range(time_frame_range(input$tiles_summary_series_timeframe,
 input$tiles_summary_series_timeframe_daterange))
+temp %<>% polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, 
input$smoothing_tiles_summary_series))
 polloi::make_dygraph(temp, "Date", input$tiles_summary_variable, "Tile 
usage") %>%
   dySeries(name = grep('average tiles per user', names(temp), value = 
TRUE), axis = 'y2') %>%
-  dyAxis(name = 'y', drawGrid = FALSE) %>%
+  dyAxis(name = 'y', drawGrid = FALSE, logscale = 
input$tiles_summary_logscale) %>%
   dyAxis(name = 'y2', independentTicks = TRUE, drawGrid = FALSE) %>%
   dyLegend(labelsDiv = "tiles_summary_series_legend", show = "always") %>%
   dyRangeSelector(retainDateWindow = TRUE) %>%
@@ -36,22 +43,32 @@
   })
 
   output$tiles_style_series <- renderDygraph({
-polloi::data_select(input$tile_style_automata_check, new_tiles_automata, 
new_tiles_no_automata) %>%
-ddply(.(date, style), summarize, `total tiles` = sum(total)) %>%
+polloi::data_select(
+  input$tile_style_automata_check,
+  new_tiles_automata,
+  new_tiles_no_automata
+)[, j = list(`total tiles` = sum(total)),
+by = c("date", "style")] %>%
   tidyr::spread(style, `total tiles`, fill = 0) %>%
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, 
input$smoothing_tiles_style_series)) %>%
   polloi::make_dygraph("Date", "Tiles", "Total tiles by style", 
legend_name = "Style") %>%
+  dyAxis("y", logscale = input$tiles_style_logscale) %>%
   dyLegend(labelsDiv = "tiles_style_series_legend", show = "always") %>%
   dyRangeSelector %>%
   dyEvent(as.Date("2015-09-17"), "A (announcement)", labelLoc = "bottom")
   })
 
   output$tiles_users_series <- renderDygraph({
-polloi::data_select(input$tile_users_automata_check, new_tiles_automata, 
new_tiles_no_automata) %>%
-  ddply(.(date, style), summarize, `total users` = sum(users)) %>%
+polloi::data_select(
+  input$tile_users_automata_check,
+  new_tiles_automata,
+  new_tiles_no_automata
+)[, j = list(`total users` = sum(users)),
+by = c("date", "style")] %>%
   tidyr::spread(style, `total users`, fill = 0) %>%
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, 
input$smoothing_tiles_users_series)) %>%
   polloi::make_dygraph("Date", "Users", "Total users by style")

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Stop adding "Category:Uploaded with UploadWizard"

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Stop adding "Category:Uploaded with UploadWizard"
..


Stop adding "Category:Uploaded with UploadWizard"

Wikimedia Commons has discussed and agreed that uploads performed via
Special:UploadWizard should no longer contain this category anymore.
There's also product sign-off to stop adding this category elsewhere.

Bug: T147799
Signed-off-by: James D. Forrester 
Change-Id: Ia8dd3c19d1e06f47ce75d1889f7300c31d29c6bd
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index a622558..a6d245d 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1914,11 +1914,6 @@
$wgUploadStashScalerBaseUrl = 
"//{$wmfHostnames['upload']}/$site/$lang/thumb/temp";
$wgUploadWizardConfig = [
# 'debug' => true,
-   'autoAdd' => [
-   'categories' => [
-   'Uploaded with UploadWizard',
-   ],
-   ],
// Normally we don't include API keys in CommonSettings, but 
this key
// isn't private since it's used on the client-side, i.e. 
anyone can see
// it in the outgoing AJAX requests to Flickr.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8dd3c19d1e06f47ce75d1889f7300c31d29c6bd
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: MarcoAurelio 
Gerrit-Reviewer: Steinsplitter 
Gerrit-Reviewer: Zhuyifei1999 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Bump version number to 1.29.0-alpha for 1.29 development cycle

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Bump version number to 1.29.0-alpha for 1.29 development cycle
..


Bump version number to 1.29.0-alpha for 1.29 development cycle

Branch point was dc0f9b3a3a75e80a0c5f09dd76b4df1fcc05080d

The following commits missed the branch point and should probably
be backported because master reports them as 1.28
 - 4290f686c07265d40718fc3358f196de41bbde57
 - 81698d4c1605f491709e636acd5ca0e6857e3821
 - 40da8bf039019a2845405854a2d636be4bd3b98d
 - 95db9833dd8d75ff3dc44d587fdc3ad80332a500
 - 7bd97758f7e1496c7d4a1fa4e7275c9d6c01c5c3

Change-Id: I51562ba357b5533500ef9dd1e29107dd05cc9e1e
---
A RELEASE-NOTES-1.29
M includes/DefaultSettings.php
M includes/PHPVersionCheck.php
3 files changed, 100 insertions(+), 2 deletions(-)

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



diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
new file mode 100644
index 000..6c53809
--- /dev/null
+++ b/RELEASE-NOTES-1.29
@@ -0,0 +1,98 @@
+== MediaWiki 1.29 ==
+
+THIS IS NOT A RELEASE YET
+
+MediaWiki 1.29 is an alpha-quality branch and is not recommended for use in
+production.
+
+=== Configuration changes in 1.29 ===
+
+=== New features in 1.29 ===
+
+=== External library changes in 1.29 ===
+
+ Upgraded external libraries 
+
+ New external libraries 
+
+ Removed and replaced external libraries 
+
+=== Bug fixes in 1.29 ===
+
+=== Action API changes in 1.29 ===
+
+=== Action API internal changes in 1.29 ===
+
+=== Languages updated in 1.29 ===
+
+MediaWiki supports over 350 languages. Many localisations are updated
+regularly. Below only new and removed languages are listed, as well as
+changes to languages because of Phabricator reports.
+
+=== Other changes in 1.29 ===
+
+== Compatibility ==
+
+MediaWiki 1.29 requires PHP 5.5.9 or later. There is experimental support for
+HHVM 3.6.5 or later.
+
+MySQL is the recommended DBMS. PostgreSQL or SQLite can also be used, but
+support for them is somewhat less mature. There is experimental support for
+Oracle and Microsoft SQL Server.
+
+The supported versions are:
+
+* MySQL 5.0.3 or later
+* PostgreSQL 8.3 or later
+* SQLite 3.3.7 or later
+* Oracle 9.0.1 or later
+* Microsoft SQL Server 2005 (9.00.1399)
+
+== Upgrading ==
+
+1.29 has several database changes since 1.28, and will not work without schema
+updates. Note that due to changes to some very large tables like the revision
+table, the schema update may take quite long (minutes on a medium sized site,
+many hours on a large site).
+
+If upgrading from before 1.11, and you are using a wiki as a commons
+repository, make sure that it is updated as well. Otherwise, errors may arise
+due to database schema changes.
+
+If upgrading from before 1.7, you may want to run refreshLinks.php to ensure
+new database fields are filled with data.
+
+If you are upgrading from MediaWiki 1.4.x or earlier, you should upgrade to
+1.5 first. The upgrade script maintenance/upgrade1_5.php has been removed
+with MediaWiki 1.21.
+
+Don't forget to always back up your database before upgrading!
+
+See the file UPGRADE for more detailed upgrade instructions.
+
+For notes on 1.28.x and older releases, see HISTORY.
+
+== Online documentation ==
+
+Documentation for both end-users and site administrators is available on
+MediaWiki.org, and is covered under the GNU Free Documentation License (except
+for pages that explicitly state that their contents are in the public domain):
+
+   https://www.mediawiki.org/wiki/Special:MyLanguage/Documentation
+
+== Mailing list ==
+
+A mailing list is available for MediaWiki user support and discussion:
+
+   https://lists.wikimedia.org/mailman/listinfo/mediawiki-l
+
+A low-traffic announcements-only list is also available:
+
+   https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce
+
+It's highly recommended that you sign up for one of these lists if you're
+going to run a public MediaWiki, so you can be notified of security fixes.
+
+== IRC help ==
+
+There's usually someone online in #mediawiki on irc.freenode.net.
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2ae33b2..98dd2b7 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@
  * MediaWiki version number
  * @since 1.2
  */
-$wgVersion = '1.28.0-alpha';
+$wgVersion = '1.29.0-alpha';
 
 /**
  * Name of the site. It must be changed in LocalSettings.php
diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php
index 018c6f8..656ba43 100644
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -30,7 +30,7 @@
  * version are hardcoded here
  */
 function wfEntryPointCheck( $entryPoint ) {
-   $mwVersion = '1.28';
+   $mwVersion = '1.29';
$minimumVersionPHP = '5.5.9';
$phpVersion = PHP_VERSION;
 

-- 
To view, visit

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: WIP: show TY page on dead session if potentially paid

2016-10-25 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: WIP: show TY page on dead session if potentially paid
..

WIP: show TY page on dead session if potentially paid

Donors whose sessions time out are making duplicate donations.
For processors who capture the payment without our poking them during
resultswitcher processing, we should never show a fail page due to
a dead session.

TODO: figure out whether missing payments-init messages for these
donors are a problem.

Bug: T120228
Change-Id: If4112da339f4dd32666c5ff5dfb9729627dac2a0
---
M gateway_common/GatewayPage.php
M gateway_common/gateway.adapter.php
M globalcollect_gateway/globalcollect.adapter.php
M paypal_gateway/express_checkout/paypal_express.adapter.php
4 files changed, 57 insertions(+), 17 deletions(-)


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

diff --git a/gateway_common/GatewayPage.php b/gateway_common/GatewayPage.php
index 33a13fe..6a6890b 100644
--- a/gateway_common/GatewayPage.php
+++ b/gateway_common/GatewayPage.php
@@ -354,14 +354,9 @@
//no longer letting people in without these things. If this is
//preventing you from doing something, you almost certainly 
want to be
//somewhere else.
-   $forbidden = false;
+   $deadSession = false;
if ( !$this->adapter->session_hasDonorData() ) {
-   $forbidden = true;
-   $f_message = 'No active donation in the session';
-   }
-
-   if ( $forbidden ) {
-   wfHttpError( 403, 'Forbidden', wfMessage( 
'donate_interface-error-http-403' )->text() );
+   $deadSession = true;
}
$oid = $this->adapter->getData_Unstaged_Escaped( 'order_id' );
 
@@ -379,11 +374,6 @@
$sessionOrderStatus[$oid] = 'liberated';
$request->setSessionData( 'order_status', 
$sessionOrderStatus );
$this->logger->info( "Resultswitcher: Popping out of 
iframe for Order ID " . $oid );
-   //TODO: Move the $forbidden check back to the beginning 
of this if block, once we know this doesn't happen a lot.
-   //TODO: If we get a lot of these messages, we need to 
redirect to something more friendly than FORBIDDEN, RAR RAR RAR.
-   if ( $forbidden ) {
-   $this->logger->error( "Resultswitcher: $oid 
SHOULD BE FORBIDDEN. Reason: $f_message" );
-   }
$this->getOutput()->allowClickjacking();
$this->getOutput()->addModules( 'iframe.liberator' );
return;
@@ -391,8 +381,26 @@
 
$this->setHeaders();
 
-   if ( $forbidden ){
-   throw new RuntimeException( "Resultswitcher: Request 
forbidden. " . $f_message . " Adapter Order ID: $oid" );
+   if ( $deadSession ){
+   if ( $this->adapter->isReturnProcessingRequired() ) {
+   wfHttpError( 403, 'Forbidden', wfMessage( 
'donate_interface-error-http-403' )->text() );
+   throw new RuntimeException(
+   'Resultswitcher: Request forbidden. No 
active donation in the session. ' .
+   "Adapter Order ID: $oid"
+   );
+   }
+   // If it's possible for a donation to go through 
without our
+   // having to do additional processing in the result 
switcher,
+   // we don't want to falsely claim it failed just 
because we
+   // lost the session data. We also don't want to give any
+   // information to scammers hitting this page with no 
session,
+   // so we always show the thank you page.
+   $this->logger->warning(
+   'Resultswitcher: session is dead, but the ' .
+   'donor may have made a successful payment.'
+   );
+   $this->displayThankYouPage( 'dead session' );
+   return;
}
$this->logger->info( "Resultswitcher: OK to process Order ID: " 
. $oid );
 
@@ -412,9 +420,7 @@
switch ( $status ) {
case FinalStatus::COMPLETE:
case FinalStatus::PENDING:
-   $thankYouPage = ResultPages::getThankYouPage( 
$this->adapter );
-   $this->logger->info( "Displaying thank you page 
$thankYouPage for status $status."

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Raise abusefilter condition limit for Meta-Wiki"

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Raise abusefilter condition limit for Meta-Wiki"
..


Revert "Raise abusefilter condition limit for Meta-Wiki"

Pending a further look at performance

This reverts commit ae1d5c5baf8fe134f46c9837ded95da612ffaa51.

Change-Id: Iacc43562c5a1ddb92ff8ed164ce18b6079d9fbc6
---
M wmf-config/abusefilter.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php
index 9042784..8123a46 100644
--- a/wmf-config/abusefilter.php
+++ b/wmf-config/abusefilter.php
@@ -286,7 +286,6 @@
$wgAbuseFilterAnonBlockDuration = '3 months'; // T72828
break;
case 'metawiki':
-   $wgAbuseFilterConditionLimit = 2000; // T147063
$wgGroupPermissions['*']['abusefilter-log-detail'] = true;
$wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = 
true; // T76270
$wgGroupPermissions['sysop']['abusefilter-revert'] = true; // 
T76270

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iacc43562c5a1ddb92ff8ed164ce18b6079d9fbc6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Raise abusefilter condition limit for Meta-Wiki"

2016-10-25 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

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

Change subject: Revert "Raise abusefilter condition limit for Meta-Wiki"
..

Revert "Raise abusefilter condition limit for Meta-Wiki"

Pending a further look at performance

This reverts commit ae1d5c5baf8fe134f46c9837ded95da612ffaa51.

Change-Id: Iacc43562c5a1ddb92ff8ed164ce18b6079d9fbc6
---
M wmf-config/abusefilter.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php
index 9042784..8123a46 100644
--- a/wmf-config/abusefilter.php
+++ b/wmf-config/abusefilter.php
@@ -286,7 +286,6 @@
$wgAbuseFilterAnonBlockDuration = '3 months'; // T72828
break;
case 'metawiki':
-   $wgAbuseFilterConditionLimit = 2000; // T147063
$wgGroupPermissions['*']['abusefilter-log-detail'] = true;
$wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = 
true; // T76270
$wgGroupPermissions['sysop']['abusefilter-revert'] = true; // 
T76270

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacc43562c5a1ddb92ff8ed164ce18b6079d9fbc6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Parser functions now format numbers according to page language

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Parser functions now format numbers according to page language
..


Parser functions now format numbers according to page language

Also fixed incorrect return value documentation.

Bug: T62604
Change-Id: I1e16f20ca79436afe17eba711981b2ae43fed9e1
(cherry picked from commit 4290f686c07265d40718fc3358f196de41bbde57)
---
M RELEASE-NOTES-1.28
M includes/parser/CoreParserFunctions.php
2 files changed, 36 insertions(+), 16 deletions(-)

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



diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 4e445a5..a2a986f 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -223,6 +223,8 @@
   Instead of --keep-uploads, use the same option to parserTests.php, but you
   must specify a directory with --upload-dir.
 * The 'jquery.arrowSteps' ResourceLoader module is now deprecated.
+* (T62604) Core parser functions returning a number now format the number 
according
+  to the page content language, not wiki content language.
 * IP::isConfiguredProxy() and IP::isTrustedProxy() were removed. Callers should
   migrate to using the same functions on a ProxyLookup instance, obtainable 
from
   MediaWikiServices.
diff --git a/includes/parser/CoreParserFunctions.php 
b/includes/parser/CoreParserFunctions.php
index 01cce02..ef26db6 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -487,40 +487,58 @@
return $mwObject->matchStartToEnd( $value );
}
 
-   public static function formatRaw( $num, $raw ) {
+   public static function formatRaw( $num, $raw, Language $language ) {
if ( self::matchAgainstMagicword( 'rawsuffix', $raw ) ) {
return $num;
} else {
-   global $wgContLang;
-   return $wgContLang->formatNum( $num );
+   return $language->formatNum( $num );
}
}
+
public static function numberofpages( $parser, $raw = null ) {
-   return self::formatRaw( SiteStats::pages(), $raw );
+   return self::formatRaw( SiteStats::pages(), $raw, 
$parser->getFunctionLang() );
}
+
public static function numberofusers( $parser, $raw = null ) {
-   return self::formatRaw( SiteStats::users(), $raw );
+   return self::formatRaw( SiteStats::users(), $raw, 
$parser->getFunctionLang() );
}
public static function numberofactiveusers( $parser, $raw = null ) {
-   return self::formatRaw( SiteStats::activeUsers(), $raw );
+   return self::formatRaw( SiteStats::activeUsers(), $raw, 
$parser->getFunctionLang() );
}
+
public static function numberofarticles( $parser, $raw = null ) {
-   return self::formatRaw( SiteStats::articles(), $raw );
+   return self::formatRaw( SiteStats::articles(), $raw, 
$parser->getFunctionLang() );
}
+
public static function numberoffiles( $parser, $raw = null ) {
-   return self::formatRaw( SiteStats::images(), $raw );
+   return self::formatRaw( SiteStats::images(), $raw, 
$parser->getFunctionLang() );
}
+
public static function numberofadmins( $parser, $raw = null ) {
-   return self::formatRaw( SiteStats::numberingroup( 'sysop' ), 
$raw );
+   return self::formatRaw(
+   SiteStats::numberingroup( 'sysop' ),
+   $raw,
+   $parser->getFunctionLang()
+   );
}
+
public static function numberofedits( $parser, $raw = null ) {
-   return self::formatRaw( SiteStats::edits(), $raw );
+   return self::formatRaw( SiteStats::edits(), $raw, 
$parser->getFunctionLang() );
}
+
public static function pagesinnamespace( $parser, $namespace = 0, $raw 
= null ) {
-   return self::formatRaw( SiteStats::pagesInNs( intval( 
$namespace ) ), $raw );
+   return self::formatRaw(
+   SiteStats::pagesInNs( intval( $namespace ) ),
+   $raw,
+   $parser->getFunctionLang()
+   );
}
public static function numberingroup( $parser, $name = '', $raw = null 
) {
-   return self::formatRaw( SiteStats::numberingroup( strtolower( 
$name ) ), $raw );
+   return self::formatRaw(
+   SiteStats::numberingroup( strtolower( $name ) ),
+   $raw,
+   $parser->getFunctionLang()
+   );
}
 
/**
@@ -727,7 +745,7 @@
 
$title = Title::makeTitleSafe( NS_CATEGORY, $name );
if ( !$title ) { # invalid title
-   return

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Raise abusefilter condition limit for Meta-Wiki

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Raise abusefilter condition limit for Meta-Wiki
..


Raise abusefilter condition limit for Meta-Wiki

Bug: T147063
Change-Id: I4f646903997fc309e8eb2906672fb41b628da8bb
---
M wmf-config/abusefilter.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php
index 8123a46..9042784 100644
--- a/wmf-config/abusefilter.php
+++ b/wmf-config/abusefilter.php
@@ -286,6 +286,7 @@
$wgAbuseFilterAnonBlockDuration = '3 months'; // T72828
break;
case 'metawiki':
+   $wgAbuseFilterConditionLimit = 2000; // T147063
$wgGroupPermissions['*']['abusefilter-log-detail'] = true;
$wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = 
true; // T76270
$wgGroupPermissions['sysop']['abusefilter-revert'] = true; // 
T76270

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f646903997fc309e8eb2906672fb41b628da8bb
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Luke081515 
Gerrit-Reviewer: MarcoAurelio 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: decom palladium from puppet, install_server, network constants

2016-10-25 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: decom palladium from puppet, install_server, network constants
..


decom palladium from puppet, install_server, network constants

Bug: T147320
Change-Id: Ic0654f8571cd6cbd3d344f26312082779c8e8c29
---
D files/palladium_deprecation
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/network/manifests/constants.pp
5 files changed, 1 insertion(+), 57 deletions(-)

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



diff --git a/files/palladium_deprecation b/files/palladium_deprecation
deleted file mode 100755
index 4fac389..000
--- a/files/palladium_deprecation
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-cat <<'MOTD'
- _ _   _  ___ __   _ _
-  __| | ___   | \ | |/ _ \_   _|  _   _ ___  ___  | |_| |__ (_)___
-/  _` |/ _ \  |  \| | | | || |   | | | / __|/ _ \ | __| '_ \| / __|
-| (_| | (_) | | |\  | |_| || |   | |_| \__ \  __/ | |_| | | | \__ \
- \__,_|\___/  |_| \_|\___/ |_|\__,_|___/\___|  \__|_| |_|_|___/
-
-  _
- ___  ___ _    _ _ __| |
-/ __|/ _ \ '__\ \ / / _ \ '__| |
-\__ \  __/ |   \ V /  __/ |  |_|
-|___/\___|_|\_/ \___|_|  (_)
-
-
-While it is still working, palladium is NOT the proper server anymore
-
-Head over to puppetmaster1001 or puppetmaster1002. Look at the following
-legend to see where to head to:
-
- * PUPPET CERT SIGNING: should be done ONLY on puppetmaster1001
- * REIMAGING: should be done on neodymium, using the automated script Riccardo 
is working on, or on puppetmaster1001 only
- * CONFCTL: can be done on any puppetmaster frontend, so 
puppetmaster1001.eqiad.wmnet or puppetmaster2001.eqiad.wmnet
- * PUPPET-MERGE: can be done on any  puppetmaster frontend, so 
puppetmaster1001 or puppetmaster2001
- * GIT PRIVATE: can be edited from any puppetmaster frontend, so 
puppetmaster1001 or puppetmaster2001
- * VOLATILE: can be populated ONLY on puppetmaster1001
-
-MOTD
diff --git a/manifests/site.pp b/manifests/site.pp
index fb2fad5..5b81243 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2330,24 +2330,6 @@
 include standard
 }
 
-# Former primary puppet master - to be decommissioned
-node 'palladium.eqiad.wmnet' {
-role(ipmi::mgmt, access_new_install)
-include standard
-include base::firewall
-include role::conftool::master
-interface::add_ip6_mapped { 'main':
-interface => 'eth0',
-}
-# lint:ignore:puppet_url_without_modules
-motd::script { 'deprecation_warning':
-ensure   => present,
-priority => 01,
-source   => 'puppet:///files/palladium_deprecation',
-}
-# lint:endignore
-}
-
 # parser cache databases
 # eqiad
 node 'pc1004.eqiad.wmnet' {
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index d109a0d..32b8dd1 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -54,7 +54,7 @@
 
analytics102[8-9]|analytics103[0-9]|analytics104[0-9]|analytics105[0-9]) echo 
partman/analytics-flex.cfg ;; \
 aqs100[123]) echo partman/raid1-30G.cfg ;; \
 aqs100[456]) echo partman/aqs-cassandra-8ssd-2srv.cfg ;; \
-arsenic|heze|neodymium|oxygen|palladium|promethium|strontium|terbium) 
echo partman/lvm.cfg ;; \
+arsenic|heze|neodymium|oxygen|promethium|strontium|terbium) echo 
partman/lvm.cfg ;; \
 copper|neon|ruthenium|subra|suhail|ocg1003) echo partman/raid1-lvm.cfg 
;; \
 bast[1234]*) echo partman/raid1-lvm-ext4-srv.cfg ;; \
 californium|dbproxy10[0-1][0-9]|install2001|iridium) echo 
partman/raid1.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 77118e7..04b353a 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5628,13 +5628,6 @@
 fixed-address oxygen.eqiad.wmnet;
 }
 
-host palladium {
-hardware ethernet 18:03:73:f1:59:2d;
-fixed-address palladium.eqiad.wmnet;
-option pxelinux.pathprefix "precise-installer/";
-filename "precise-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
 host pc1004 {
 hardware ethernet 14:18:77:42:DF:00;
 fixed-address pc1004.eqiad.wmnet;
diff --git a/modules/network/manifests/constants.pp 
b/modules/network/manifests/constants.pp
index ccbbcff..921df04 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -65,8 +65,6 @@
 '2620:0:860:104:10:192:48:45',  #

[MediaWiki-commits] [Gerrit] operations/puppet[production]: standard: deploy prometheus-node-exporter to eqiad

2016-10-25 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: standard: deploy prometheus-node-exporter to eqiad
..


standard: deploy prometheus-node-exporter to eqiad

Bug: T140646
Change-Id: I26a848a1e49f63fddf9d614e80e351de8c2f6538
---
M modules/standard/manifests/prometheus.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/standard/manifests/prometheus.pp 
b/modules/standard/manifests/prometheus.pp
index 8b86cfe..1c01c8a 100644
--- a/modules/standard/manifests/prometheus.pp
+++ b/modules/standard/manifests/prometheus.pp
@@ -1,6 +1,6 @@
 # standard class for prometheus
 class standard::prometheus {
-if $::site == 'codfw' {
+if $::site == 'codfw' or $::site == 'eqiad' {
 include ::role::prometheus::node_exporter
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I26a848a1e49f63fddf9d614e80e351de8c2f6538
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable static maps on testwiki

2016-10-25 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Enable static maps on testwiki
..

Enable static maps on testwiki

Bug: T149071
Change-Id: I783dcd70eae5f521b101422bf297d297160557e1
---
M wmf-config/InitialiseSettings.php
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d321d8e..fe7d01c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17590,6 +17590,12 @@
'wikivoyage' => true,
 ],
 
+'wgKartographerStaticMapframe' => [
+   'default' => false,
+   'testwiki' => true,
+   'test2wiki' => true,
+],
+
 'wgKartographerEnableMapFrame' => [
'default' => true,
'wikipedia' => false,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I783dcd70eae5f521b101422bf297d297160557e1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Yurik 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Phabricator: Add javascript to files.viewable-mime-t...

2016-10-25 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: Revert "Phabricator: Add javascript to 
files.viewable-mime-types"
..


Revert "Phabricator: Add javascript to files.viewable-mime-types"

This reverts commit 9a2c5f5dfb66b4b238f6376a8d377e48cf475f9e.

Change-Id: I2b250594c9b9856bcf7d18f867cbdedcce5b37da
---
M modules/phabricator/data/fixed_settings.yaml
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/modules/phabricator/data/fixed_settings.yaml 
b/modules/phabricator/data/fixed_settings.yaml
index 2a51f0b..3664abc 100644
--- a/modules/phabricator/data/fixed_settings.yaml
+++ b/modules/phabricator/data/fixed_settings.yaml
@@ -35,7 +35,6 @@
   'audio/mpeg': 'audio/mpeg'
   'text/x-php': 'text/plain; charset=utf-8'
   'text/x-python': 'text/plain; charset=utf-8'
-  'application/javascript': 'text/plain; charset=utf-8'
 
 files.image-mime-types:
 'image/jpeg': true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b250594c9b9856bcf7d18f867cbdedcce5b37da
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Parser functions now format numbers according to page language

2016-10-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Parser functions now format numbers according to page language
..

Parser functions now format numbers according to page language

Also fixed incorrect return value documentation.

Bug: T62604
Change-Id: I1e16f20ca79436afe17eba711981b2ae43fed9e1
(cherry picked from commit 4290f686c07265d40718fc3358f196de41bbde57)
---
M RELEASE-NOTES-1.28
M includes/parser/CoreParserFunctions.php
2 files changed, 36 insertions(+), 16 deletions(-)


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

diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 4e445a5..a2a986f 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -223,6 +223,8 @@
   Instead of --keep-uploads, use the same option to parserTests.php, but you
   must specify a directory with --upload-dir.
 * The 'jquery.arrowSteps' ResourceLoader module is now deprecated.
+* (T62604) Core parser functions returning a number now format the number 
according
+  to the page content language, not wiki content language.
 * IP::isConfiguredProxy() and IP::isTrustedProxy() were removed. Callers should
   migrate to using the same functions on a ProxyLookup instance, obtainable 
from
   MediaWikiServices.
diff --git a/includes/parser/CoreParserFunctions.php 
b/includes/parser/CoreParserFunctions.php
index 01cce02..ef26db6 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -487,40 +487,58 @@
return $mwObject->matchStartToEnd( $value );
}
 
-   public static function formatRaw( $num, $raw ) {
+   public static function formatRaw( $num, $raw, Language $language ) {
if ( self::matchAgainstMagicword( 'rawsuffix', $raw ) ) {
return $num;
} else {
-   global $wgContLang;
-   return $wgContLang->formatNum( $num );
+   return $language->formatNum( $num );
}
}
+
public static function numberofpages( $parser, $raw = null ) {
-   return self::formatRaw( SiteStats::pages(), $raw );
+   return self::formatRaw( SiteStats::pages(), $raw, 
$parser->getFunctionLang() );
}
+
public static function numberofusers( $parser, $raw = null ) {
-   return self::formatRaw( SiteStats::users(), $raw );
+   return self::formatRaw( SiteStats::users(), $raw, 
$parser->getFunctionLang() );
}
public static function numberofactiveusers( $parser, $raw = null ) {
-   return self::formatRaw( SiteStats::activeUsers(), $raw );
+   return self::formatRaw( SiteStats::activeUsers(), $raw, 
$parser->getFunctionLang() );
}
+
public static function numberofarticles( $parser, $raw = null ) {
-   return self::formatRaw( SiteStats::articles(), $raw );
+   return self::formatRaw( SiteStats::articles(), $raw, 
$parser->getFunctionLang() );
}
+
public static function numberoffiles( $parser, $raw = null ) {
-   return self::formatRaw( SiteStats::images(), $raw );
+   return self::formatRaw( SiteStats::images(), $raw, 
$parser->getFunctionLang() );
}
+
public static function numberofadmins( $parser, $raw = null ) {
-   return self::formatRaw( SiteStats::numberingroup( 'sysop' ), 
$raw );
+   return self::formatRaw(
+   SiteStats::numberingroup( 'sysop' ),
+   $raw,
+   $parser->getFunctionLang()
+   );
}
+
public static function numberofedits( $parser, $raw = null ) {
-   return self::formatRaw( SiteStats::edits(), $raw );
+   return self::formatRaw( SiteStats::edits(), $raw, 
$parser->getFunctionLang() );
}
+
public static function pagesinnamespace( $parser, $namespace = 0, $raw 
= null ) {
-   return self::formatRaw( SiteStats::pagesInNs( intval( 
$namespace ) ), $raw );
+   return self::formatRaw(
+   SiteStats::pagesInNs( intval( $namespace ) ),
+   $raw,
+   $parser->getFunctionLang()
+   );
}
public static function numberingroup( $parser, $name = '', $raw = null 
) {
-   return self::formatRaw( SiteStats::numberingroup( strtolower( 
$name ) ), $raw );
+   return self::formatRaw(
+   SiteStats::numberingroup( strtolower( $name ) ),
+   $raw,
+   $parser->getFunctionLang()
+   );
}
 
/**
@@ -727,7 +745,7 @@
 
$title = Title::makeTitleSafe( NS_CATEGORY, $name );
if ( !$title ) { # invalid

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Phabricator: Add javascript to files.viewable-mime-t...

2016-10-25 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: Revert "Phabricator: Add javascript to 
files.viewable-mime-types"
..

Revert "Phabricator: Add javascript to files.viewable-mime-types"

This reverts commit 9a2c5f5dfb66b4b238f6376a8d377e48cf475f9e.

Change-Id: I2b250594c9b9856bcf7d18f867cbdedcce5b37da
---
M modules/phabricator/data/fixed_settings.yaml
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/318011/1

diff --git a/modules/phabricator/data/fixed_settings.yaml 
b/modules/phabricator/data/fixed_settings.yaml
index 2a51f0b..3664abc 100644
--- a/modules/phabricator/data/fixed_settings.yaml
+++ b/modules/phabricator/data/fixed_settings.yaml
@@ -35,7 +35,6 @@
   'audio/mpeg': 'audio/mpeg'
   'text/x-php': 'text/plain; charset=utf-8'
   'text/x-python': 'text/plain; charset=utf-8'
-  'application/javascript': 'text/plain; charset=utf-8'
 
 files.image-mime-types:
 'image/jpeg': true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b250594c9b9856bcf7d18f867cbdedcce5b37da
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: esams: introduce svc records for swift

2016-10-25 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: esams: introduce svc records for swift
..

esams: introduce svc records for swift

There's a swift cluster in esams but it isn't backed by LVS yet, introduce the
corresponding ms-fe.svc records.

Also include a swift.svc CNAME for generic usage, initially for Docker registry.

Bug: T149098
Change-Id: I1ff9ff2dcb9b0fa20eada500272c8a4a686304bd
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/10/318010/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 54e1567..2a3e2d3 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -76,6 +76,8 @@
 
 $ORIGIN 3.2.{{ zonename }}.
 
+27  1H  IN PTR  ms-fe.svc.esams.wmnet.
+
 ; ulsfo svc ips
 
 $ORIGIN 4.2.{{ zonename }}.
diff --git a/templates/wmnet b/templates/wmnet
index 6faddbc..cdc5dc9 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4220,6 +4220,9 @@
 
 $ORIGIN svc.esams.wmnet.
 
+ms-fe   1H  IN A10.2.3.27
+swift   1H  IN CNAMEms-fe.svc.esams.wmnet.
+
 ; ULSFO SERVICES
 
 $ORIGIN svc.ulsfo.wmnet.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ff9ff2dcb9b0fa20eada500272c8a4a686304bd
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Bump version number to 1.29.0-alpha for 1.29 development cycle

2016-10-25 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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

Change subject: Bump version number to 1.29.0-alpha for 1.29 development cycle
..

Bump version number to 1.29.0-alpha for 1.29 development cycle

Branch point was dc0f9b3a3a75e80a0c5f09dd76b4df1fcc05080d

The following commits missed the branch point and should probably
be backported because master reports them as 1.28
 - 4290f686c07265d40718fc3358f196de41bbde57
 - 81698d4c1605f491709e636acd5ca0e6857e3821
 - 40da8bf039019a2845405854a2d636be4bd3b98d
 - 95db9833dd8d75ff3dc44d587fdc3ad80332a500
 - 7bd97758f7e1496c7d4a1fa4e7275c9d6c01c5c3

Change-Id: I51562ba357b5533500ef9dd1e29107dd05cc9e1e
---
M includes/DefaultSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/09/318009/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2ae33b2..98dd2b7 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@
  * MediaWiki version number
  * @since 1.2
  */
-$wgVersion = '1.28.0-alpha';
+$wgVersion = '1.29.0-alpha';
 
 /**
  * Name of the site. It must be changed in LocalSettings.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I51562ba357b5533500ef9dd1e29107dd05cc9e1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: CSS styleguide fixes

2016-10-25 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: CSS styleguide fixes
..

CSS styleguide fixes

These will be enforced in future versions of stylelint-config.

Change-Id: I0689cbeee6586d2d3dcb0021a3f613dc2ac73691
---
M modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.css
M modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css
M modules/ve-mw/ui/styles/ve.ui.Icons.css
3 files changed, 6 insertions(+), 7 deletions(-)


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

diff --git a/modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.css 
b/modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.css
index f137efe..63431af 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.css
@@ -109,8 +109,7 @@
 }
 
 @media ( max-width: 479px ) {
-   .ve-init-mw-mobileArticleTarget-toolbar
-   .oo-ui-barToolGroup > .oo-ui-toolGroup-tools > 
.oo-ui-tool.oo-ui-iconElement.oo-ui-tool-with-label > .oo-ui-tool-link 
.oo-ui-tool-title {
+   .ve-init-mw-mobileArticleTarget-toolbar .oo-ui-barToolGroup > 
.oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-iconElement.oo-ui-tool-with-label > 
.oo-ui-tool-link .oo-ui-tool-title {
display: none;
}
 }
diff --git a/modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css 
b/modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css
index a787f89..89c3fc7 100644
--- a/modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css
+++ b/modules/ve-mw/ui/styles/pages/ve.ui.MWParameterPage.css
@@ -6,6 +6,6 @@
  */
 
 .ve-ui-mwParameterPage .ve-ui-mwParameter-wikitextFallbackInput {
-   font-family: Monospace;
+   font-family: monospace;
background-color: #ddd;
 }
diff --git a/modules/ve-mw/ui/styles/ve.ui.Icons.css 
b/modules/ve-mw/ui/styles/ve.ui.Icons.css
index bb35eb5..089c2c5 100644
--- a/modules/ve-mw/ui/styles/ve.ui.Icons.css
+++ b/modules/ve-mw/ui/styles/ve.ui.Icons.css
@@ -50,15 +50,15 @@
 }
 
 /* @noflip */
-.ve-ui-dir-block-rtl .oo-ui-icon-page-not-found:lang(he),
-.ve-ui-surface-dir-rtl .oo-ui-icon-page-not-found:lang(he) /* HACK */ {
+.ve-ui-dir-block-rtl .oo-ui-icon-page-not-found:lang( he ),
+.ve-ui-surface-dir-rtl .oo-ui-icon-page-not-found:lang( he ) /* HACK */ {
/* @embed */
background-image: url( images/icons/page-not-found-he-yi.svg );
 }
 
 /* @noflip */
-.ve-ui-dir-block-rtl .oo-ui-icon-page-not-found:lang(yi),
-.ve-ui-surface-dir-rtl .oo-ui-icon-page-not-found:lang(yi) /* HACK */ {
+.ve-ui-dir-block-rtl .oo-ui-icon-page-not-found:lang( yi ),
+.ve-ui-surface-dir-rtl .oo-ui-icon-page-not-found:lang( yi ) /* HACK */ {
/* @embed */
background-image: url( images/icons/page-not-found-he-yi.svg );
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0689cbeee6586d2d3dcb0021a3f613dc2ac73691
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Fix arguments passed to requestPageData when switching

2016-10-25 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Fix arguments passed to requestPageData when switching
..

Fix arguments passed to requestPageData when switching

Change-Id: I890d782829fd077096be364c26a41b56ec4a2df3
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git 
a/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
index 6d5c855..36ebb01 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
@@ -48,6 +48,7 @@
dataPromise = mw.libs.ve.targetLoader.requestPageData(
'source',
this.pageName,
+   null, // We may have this.section but VE is always full 
page at the moment
this.requestedRevId,
this.constructor.name
).then(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I890d782829fd077096be364c26a41b56ec4a2df3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Fix edit source links for NWE

2016-10-25 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Fix edit source links for NWE
..

Fix edit source links for NWE

We fixed these to use vesection instead of section.

Change-Id: I0aa6530b6707239c41216421394379301b0878a7
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 6e12059..92ae8dc 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -669,7 +669,7 @@
return target;
} );
} else {
-   section = +( new mw.Uri( e.target.href 
).query.section );
+   section = +( new mw.Uri( e.target.href 
).query.vesection );
targetPromise = targetPromise.then( function ( 
target ) {
target.section = section;
return target;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0aa6530b6707239c41216421394379301b0878a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.23]: Revert Zero extensions to wmf.22

2016-10-25 Thread MaxSem (Code Review)

MaxSem has submitted this change and it was merged.

Change subject: Revert Zero extensions to wmf.22
..


Revert Zero extensions to wmf.22

Change-Id: Id06eaeee1568277c2e4853fa0dada18154cb30ba
---
M extensions/ZeroBanner
M extensions/ZeroPortal
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  MaxSem: Verified; Looks good to me, approved
  Yurik: Looks good to me, approved



diff --git a/extensions/ZeroBanner b/extensions/ZeroBanner
index b8c98f5..f8fca23 16
--- a/extensions/ZeroBanner
+++ b/extensions/ZeroBanner
@@ -1 +1 @@
-Subproject commit b8c98f5a5c7f7f9f1ee8546d1d3f3062a0e8f45e
+Subproject commit f8fca237850cb15116af69a4004f7aab1f71b2b4
diff --git a/extensions/ZeroPortal b/extensions/ZeroPortal
index 076ae7a..43db43d 16
--- a/extensions/ZeroPortal
+++ b/extensions/ZeroPortal
@@ -1 +1 @@
-Subproject commit 076ae7a7279fda38215411f50cb74250704ef205
+Subproject commit 43db43db8dc0f9051207afb7383ac1386cd2f672

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id06eaeee1568277c2e4853fa0dada18154cb30ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.23
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: REL1_28: drop references to no more supported releases

2016-10-25 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: REL1_28: drop references to no more supported releases
..

REL1_28: drop references to no more supported releases

1.24/1.25 are definitely gone.  1.26 kept around for now.

Bug: T148987
Change-Id: Iadaa5a1a7d8f98658641e89f874b786d37fdd36c
---
M zuul/layout.yaml
1 file changed, 7 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/05/318005/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 7525908..f0063f9 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -658,21 +658,11 @@
   - '.*\.rb'
   - '(\.rubocop|\.gemspec|Gemfile)'
   - '.*([Rr]akefile|/spec/)'
-# Rake entry points have not been backported to wmf branches yet
-# -- hashar Nov 10th 2015
-branch: (?!^wmf/1\.27\.0-wmf\.[45])
 skip-if:
   - project: '^mediawiki/core$'
-branch: (?:^REL1_23$|^REL1_24$|^fundraising/REL.*)
-  - project: '^mediawiki/extensions/Flow$'
-branch: (?:^REL1_25$)
+branch: (?:^REL1_23$|^fundraising/REL.*)
   - project: '^VisualEditor/VisualEditor$'
-branch: (?:^REL1_25$|^REL1_26$)
-
-  - name: ^jsduck$
-skip-if:
-  - project: '^mediawiki/extensions/Flow$'
-branch: (?:^REL1_25$)
+branch: (?:^REL1_26$)
 
   # Experiment for analytics/kraken repository
   - name: analytics-kraken-maven
@@ -728,11 +718,11 @@
 
   - name: ^mediawiki.*-hhvm(-composer)?(-trusty|-jessie)?$
 # Release branches do not support hhvm.
-branch: (?!REL1_23|REL1_24|fundraising/REL.*)
+branch: (?!REL1_23|fundraising/REL.*)
 
   - name: ^mwext.*-hhvm$
 # Release branches do not support hhvm.
-branch: (?!REL1_23|REL1_24|fundraising/REL.*)
+branch: (?!REL1_23|fundraising/REL.*)
 
   - name: ^.*php55.*$
 branch: (?!REL1_2[3-6]|fundraising/REL1_2[3-6]$)
@@ -774,15 +764,15 @@
 
   # Extensions tested together, since 1.25alpha ...
   - name: ^mediawiki-extensions-(qunit|hhvm|php53)(-jessie|trusty)?$
-branch: (?!REL1_23|REL1_24|fundraising/REL.*)
+branch: (?!REL1_23|fundraising/REL.*)
 queue-name: mediawiki
 
   - name: ^mediawiki-extensions-php55$
-branch: (?!REL1_23|REL1_24|REL1_25|REL1_26|fundraising/REL.*)
+branch: (?!REL1_23|REL1_26|fundraising/REL.*)
 queue-name: mediawiki
 
   - name: mediawiki-core-phpcs-trusty
-branch: (?!^REL1_23|^REL1_24|^REL1_25|^REL1_26|^fundraising/REL)
+branch: (?!^REL1_23|^REL1_26|^fundraising/REL)
 files:
  - '^.*\.(json|php|php5|phtml|inc|xml)$'
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadaa5a1a7d8f98658641e89f874b786d37fdd36c
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.23]: Revert Zero extensions to wmf.22

2016-10-25 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Revert Zero extensions to wmf.22
..

Revert Zero extensions to wmf.22

Change-Id: Id06eaeee1568277c2e4853fa0dada18154cb30ba
---
M extensions/ZeroBanner
M extensions/ZeroPortal
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/04/318004/1

diff --git a/extensions/ZeroBanner b/extensions/ZeroBanner
index b8c98f5..f8fca23 16
--- a/extensions/ZeroBanner
+++ b/extensions/ZeroBanner
@@ -1 +1 @@
-Subproject commit b8c98f5a5c7f7f9f1ee8546d1d3f3062a0e8f45e
+Subproject commit f8fca237850cb15116af69a4004f7aab1f71b2b4
diff --git a/extensions/ZeroPortal b/extensions/ZeroPortal
index 076ae7a..43db43d 16
--- a/extensions/ZeroPortal
+++ b/extensions/ZeroPortal
@@ -1 +1 @@
-Subproject commit 076ae7a7279fda38215411f50cb74250704ef205
+Subproject commit 43db43db8dc0f9051207afb7383ac1386cd2f672

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id06eaeee1568277c2e4853fa0dada18154cb30ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.23
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert Zero extensions to wmf.22

2016-10-25 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Revert Zero extensions to wmf.22
..

Revert Zero extensions to wmf.22

Change-Id: Id06eaeee1568277c2e4853fa0dada18154cb30ba
---
M extensions/ZeroBanner
M extensions/ZeroPortal
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/03/318003/1

diff --git a/extensions/ZeroBanner b/extensions/ZeroBanner
index b8c98f5..f8fca23 16
--- a/extensions/ZeroBanner
+++ b/extensions/ZeroBanner
@@ -1 +1 @@
-Subproject commit b8c98f5a5c7f7f9f1ee8546d1d3f3062a0e8f45e
+Subproject commit f8fca237850cb15116af69a4004f7aab1f71b2b4
diff --git a/extensions/ZeroPortal b/extensions/ZeroPortal
index 076ae7a..43db43d 16
--- a/extensions/ZeroPortal
+++ b/extensions/ZeroPortal
@@ -1 +1 @@
-Subproject commit 076ae7a7279fda38215411f50cb74250704ef205
+Subproject commit 43db43db8dc0f9051207afb7383ac1386cd2f672

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id06eaeee1568277c2e4853fa0dada18154cb30ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: REL1_28: skip mwext-MobileFrontend-npm-run-lint-modules

2016-10-25 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: REL1_28: skip mwext-MobileFrontend-npm-run-lint-modules
..

REL1_28: skip mwext-MobileFrontend-npm-run-lint-modules

Job is experimental, it is still failling and will in REL1_28, thus keep
skipping it.

Bug: T148987
Change-Id: If412dec4b86aa2c9571235383a4790b130a47fa5
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/02/318002/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 41d2b2e..7525908 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -883,7 +883,7 @@
 branch: ^master$
 
   - name: 'mwext-MobileFrontend-npm-run-lint-modules'
-branch: ^(?!REL1_2[3-7]|wmf/)
+branch: ^(?!REL1_2[3-8]|wmf/)
 
   - name: 'mwext-VisualEditor-publish'
 branch: ^master$

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If412dec4b86aa2c9571235383a4790b130a47fa5
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

851768c Add pager back to damaged message form
8172fc6 Horrible terrible drupal form workaround

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaae291928f33ebc6fc3d27e5051210ff5313473b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-25 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

851768c Add pager back to damaged message form
8172fc6 Horrible terrible drupal form workaround

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/01/318001/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaae291928f33ebc6fc3d27e5051210ff5313473b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: WikibaseRepository has been deleted

2016-10-25 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: WikibaseRepository has been deleted
..

WikibaseRepository has been deleted

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/00/318000/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index cdd9ff2..91abf16 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7136,11 +7136,6 @@
  - name: archived
 
   # Empty repo - 20151127
-  - name: mediawiki/extensions/WikibaseRepository
-template:
- - name: archived
-
-  # Empty repo - 20151127
   - name: mediawiki/extensions/WikibaseView
 template:
  - name: archived

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8437094043a7957f3a12b078d8916471bd4f0bf
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: REL1_28: adjust DonationInterface

2016-10-25 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: REL1_28: adjust DonationInterface
..

REL1_28: adjust DonationInterface

Add a non voting job for Donation Interface. Skip it on 'deploy' branch.
Update the skip-if rule, REL1_25 and PHP Zend 5.3 are no more used.

Create:
mwext-donationinterfacecore-REL1_28-testextension-zend55

Bug: T148987
Change-Id: I3c9a03006cd0340219f413ddc3d1b59f08f517e8
---
M jjb/wm-fundraising.yaml
M zuul/layout.yaml
2 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/99/317999/1

diff --git a/jjb/wm-fundraising.yaml b/jjb/wm-fundraising.yaml
index 715eaf8..6bd5f27 100644
--- a/jjb/wm-fundraising.yaml
+++ b/jjb/wm-fundraising.yaml
@@ -63,6 +63,7 @@
 name: donationinterface-fundraising-branches-php55
 branch:
  - REL1_27
+ - REL1_28
 jobs:
  - mwext-donationinterfacecore-{branch}-testextension-zend55:
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index cdd9ff2..146bed3 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -760,10 +760,13 @@
 skip-if:
   - project: ^mediawiki/extensions/DonationInterface$
 branch: ^deployment$
-  - name: ^mwext-donationinterfacecore-REL1_(25|27)-testextension-zend(53|55)$
+  - name: ^mwext-donationinterfacecore-REL1_(27|28)-testextension-zend55$
 skip-if:
   - project: ^mediawiki/extensions/DonationInterface$
 branch: ^deployment$
+  # FIXME when made voting, add it to gate-and-submit
+  - name: mwext-donationinterfacecore-REL1_28-testextension-zend55
+voting: false
 
   # Jobs testing multiple extensions together
   #
@@ -3218,6 +3221,7 @@
   - jshint
 test:
   - mwext-donationinterfacecore-REL1_27-testextension-zend55
+  - mwext-donationinterfacecore-REL1_28-testextension-zend55
   - php53lint
 gate-and-submit:
   - mwext-donationinterfacecore-REL1_27-testextension-zend55

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c9a03006cd0340219f413ddc3d1b59f08f517e8
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Fix class name

2016-10-25 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Fix class name
..

Fix class name

Change-Id: Ia5de4e8848e0c17aaf5044c8db757fe447eaf051
---
M globalcollect_gateway/globalcollect_resultswitcher.body.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/globalcollect_gateway/globalcollect_resultswitcher.body.php 
b/globalcollect_gateway/globalcollect_resultswitcher.body.php
index bc9218d..bcf88d3 100644
--- a/globalcollect_gateway/globalcollect_resultswitcher.body.php
+++ b/globalcollect_gateway/globalcollect_resultswitcher.body.php
@@ -97,7 +97,7 @@
$sessionOrders = $req->getSessionData( 
'order_status' );

$sessionOrders[$this->qs_oid]['data']['count'] = 
$sessionOrders[$this->qs_oid]['data']['count'] + 1;
$this->logger->error( "Resultswitcher: 
Multiple attempts to process. " . 
$sessionOrders[$this->qs_oid]['data']['count'] );
-   $result = new 
PaymentTransactionResult();
+   $result = new 
PaymentTransactionResponse();
$result->setData( 
$sessionOrders[$this->qs_oid]['data'] );
$result->setMessage( 
$sessionOrders[$this->qs_oid]['message'] );
$result->setErrors( 
$sessionOrders[$this->qs_oid]['errors'] );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5de4e8848e0c17aaf5044c8db757fe447eaf051
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: Add javascript to files.viewable-mime-types

2016-10-25 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: Phabricator: Add javascript to files.viewable-mime-types
..


Phabricator: Add javascript to files.viewable-mime-types

files.viewable-mime-types is allowing you to view the different languges in
raw format.

http://stackoverflow.com/questions/876561/when-serving-javascript-files-is-it-better-to-use-the-application-javascript-or

PS8: amended to add 'application/javascript' only
 (https://www.rfc-editor.org/rfc/rfc4329.txt 7.1 / 7.2)
 text/javascript (obsolete) per RFC

Change-Id: I1932058b0f67ceb6d3f67771dc3031de4e610d18
---
M modules/phabricator/data/fixed_settings.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/phabricator/data/fixed_settings.yaml 
b/modules/phabricator/data/fixed_settings.yaml
index 3664abc..2a51f0b 100644
--- a/modules/phabricator/data/fixed_settings.yaml
+++ b/modules/phabricator/data/fixed_settings.yaml
@@ -35,6 +35,7 @@
   'audio/mpeg': 'audio/mpeg'
   'text/x-php': 'text/plain; charset=utf-8'
   'text/x-python': 'text/plain; charset=utf-8'
+  'application/javascript': 'text/plain; charset=utf-8'
 
 files.image-mime-types:
 'image/jpeg': true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1932058b0f67ceb6d3f67771dc3031de4e610d18
Gerrit-PatchSet: 11
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Fix toolbar transition

2016-10-25 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Fix toolbar transition
..

Fix toolbar transition

The contents of the bar to should appear to move in to place, not
just be revealed.

Change-Id: I01a85e3455462cf70b6c3f25a236ab6cb82c706c
---
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
2 files changed, 26 insertions(+), 8 deletions(-)


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

diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css 
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
index a5566f9..5c09f95 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
@@ -7,19 +7,31 @@
 
 /* Toolbar */
 
-.ve-activating .ve-init-mw-desktopArticleTarget-toolbar,
+.ve-activated .ve-init-mw-desktopArticleTarget-toolbar,
 .ve-deactivating .ve-init-mw-desktopArticleTarget-toolbar {
-   overflow: hidden;
transition: height 0.4s ease; /* stylelint-disable-line 
no-unsupported-browser-features */
 }
 
-.ve-ui-toolbar-floating .oo-ui-toolbar-bar {
+.ve-init-mw-desktopArticleTarget-toolbar > .oo-ui-toolbar-bar {
transform: translateY( -100% );
transition: transform 0.4s ease; /* stylelint-disable-line 
no-unsupported-browser-features */
+}
+
+.ve-ui-toolbar-floating > .oo-ui-toolbar-bar {
+/* transform: translateY( -100% );*/
+   /*transition: transform 0.4s ease;*/ /* stylelint-disable-line 
no-unsupported-browser-features */
z-index: 4;
 }
 
-.ve-active .ve-ui-toolbar-floating .oo-ui-toolbar-bar {
+.ve-init-mw-desktopArticleTarget-toolbar {
+   overflow: hidden;
+}
+
+.ve-init-mw-desktopArticleTarget-toolbar-opened {
+   overflow: visible;
+}
+
+.ve-init-mw-desktopArticleTarget-toolbar-open > .oo-ui-toolbar-bar {
transform: translateY( 0 );
 }
 
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 39304d5..1814222 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -248,11 +248,14 @@
ve.track( 'trace.setupToolbar.exit' );
if ( !wasSetup ) {
setTimeout( function () {
-   var height = toolbar.$bar.outerHeight();
-   toolbar.$element.css( 'height', height );
+   toolbar.$element
+   .css( 'height', toolbar.$bar.outerHeight() )
+   .addClass( 
've-init-mw-desktopArticleTarget-toolbar-open' );
setTimeout( function () {
// Clear to allow growth during use and when 
resizing window
-   toolbar.$element.css( 'height', '' );
+   toolbar.$element
+   .css( 'height', '' )
+   .addClass( 
've-init-mw-desktopArticleTarget-toolbar-opened' );
target.toolbarSetupDeferred.resolve();
}, 400 );
} );
@@ -1153,7 +1156,10 @@
deferred = $.Deferred();
this.toolbar.$element.css( 'height', this.toolbar.$bar.outerHeight() );
setTimeout( function () {
-   target.toolbar.$element.css( 'height', '0' );
+   target.toolbar.$element
+   .css( 'height', '0' )
+   .removeClass( 
've-init-mw-desktopArticleTarget-toolbar-open' )
+   .removeClass( 
've-init-mw-desktopArticleTarget-toolbar-opened' );
setTimeout( function () {
target.toolbar.destroy();
target.toolbar = null;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01a85e3455462cf70b6c3f25a236ab6cb82c706c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Horrible terrible drupal form workaround

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Horrible terrible drupal form workaround
..


Horrible terrible drupal form workaround

Flailing around till somehow bulk operations work whether or not
you've submitted the form previously.

Bug: T142058
Change-Id: I04ab90102572c3bb55fc2f53652c6619b8093c22
---
M sites/all/modules/wmf_common/wmf_common.module
1 file changed, 28 insertions(+), 7 deletions(-)

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



diff --git a/sites/all/modules/wmf_common/wmf_common.module 
b/sites/all/modules/wmf_common/wmf_common.module
index 19b7ed6..5c64489 100644
--- a/sites/all/modules/wmf_common/wmf_common.module
+++ b/sites/all/modules/wmf_common/wmf_common.module
@@ -339,13 +339,20 @@
 }
 
 function wmf_common_damaged_search_form( $form, &$form_state ) {
-   if (
-   isset( $form_state['confirm_delete'] ) &&
-   isset( $form_state['values']['table'] )
-   ) {
-   return wmf_common_damaged_confirm_delete(
-   $form, $form_state['values']['table']
-   );
+   if ( isset( $form_state['confirm_delete'] ) ) {
+   // WTF. If you try to do a bulk operation after loading the form
+   // once, the selected IDs go in $form_state['input']['table']. 
If
+   // you do the bulk operation after submitting a search, they go 
in
+   // $form_state['values']['table']
+   if ( isset( $form_state['values']['table'] ) ) {
+   return wmf_common_damaged_confirm_delete(
+   $form, $form_state['values']['table']
+   );
+   } else if ( isset( $form_state['input']['table'] ) ) {
+   return wmf_common_damaged_confirm_delete(
+   $form, $form_state['input']['table']
+   );
+   }
}
 
$form['gateway'] = array(
@@ -372,6 +379,20 @@
empty( $form_state['input']['op'] ) // Run query on first load
) {
return wmf_common_damaged_perform_query( $form, $form_state );
+   } else {
+   // Terrible hack. If these buttons are not added here, drupal
+   // assumes that the triggering button is always search.
+   $form['resend'] = array(
+   '#type' => 'submit',
+   '#value' => t( 'Resend' ),
+   '#disabled' => 'disabled',
+   '#hidden' => 'true',
+   );
+   $form['delete'] = array(
+   '#type' => 'submit',
+   '#value' => t( 'Delete' ),
+   '#hidden' => 'true',
+   );
}
 
return $form;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I04ab90102572c3bb55fc2f53652c6619b8093c22
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add pager back to damaged message form

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Add pager back to damaged message form
..


Add pager back to damaged message form

Bulk checkboxes are still there, but seem to require clicking delete
twice. Checking to see if this was an issue in the initial draft.

Bug: T142058
Change-Id: Ib5e07153a52273f3b0f1b111e473b9c68051008d
---
M sites/all/modules/wmf_common/wmf_common.module
1 file changed, 17 insertions(+), 8 deletions(-)

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



diff --git a/sites/all/modules/wmf_common/wmf_common.module 
b/sites/all/modules/wmf_common/wmf_common.module
index bbb5a64..19b7ed6 100644
--- a/sites/all/modules/wmf_common/wmf_common.module
+++ b/sites/all/modules/wmf_common/wmf_common.module
@@ -354,7 +354,7 @@
'#maxlength' => 256,
);
 
-   $form['queue'] = array(
+   $form['original_queue'] = array(
'#type' => 'textfield',
'#title' => 'Queue',
'#maxlength' => 256,
@@ -394,21 +394,26 @@
 function wmf_common_damaged_perform_query( $form, &$form_state ) {
$query = Database::getConnection( 'default', 'smashpig' )
->select( 'damaged', 'd' )
-   ->fields( 'd', array(
+   ->extend( 'PagerDefault' );
+
+   $query->fields( 'd', array(
'id', 'original_date', 'damaged_date', 'original_queue',
'gateway', 'order_id', 'gateway_txn_id', 'error'
) )
->orderBy( 'damaged_date', 'DESC' )
->condition( 'retry_date', null );
 
-   if ( !empty( $form_state['input']['gateway'] ) ) {
-   $query->condition( 'gateway', $form_state['input']['gateway'] );
+   $allowedFields = array( 'gateway', 'original_queue' );
+   $parameters = array();
+
+   foreach( $allowedFields as $field ) {
+   if ( !empty( $form_state['input'][$field] ) ) {
+   $query->condition( $field, $form_state['input'][$field] 
);
+   $parameters[$field] = $form_state['input'][$field];
+   }
}
 
-   if ( !empty( $form_state['input']['queue'] ) ) {
-   $query->condition( 'original_queue', 
$form_state['input']['queue'] );
-   }
-
+   $query->limit( 10 );
$rows = $query
->execute()
->fetchAllAssoc( 'id', PDO::FETCH_ASSOC );
@@ -433,6 +438,10 @@
'#options' => $rows,
'#empty' => 'Nothing in the damaged message table!  Be very 
suspicious...',
);
+   $form['pager'] = array(
+   '#theme' => 'pager',
+   '#parameters' => $parameters
+   );
 
$form['resend'] = array(
'#type' => 'submit',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5e07153a52273f3b0f1b111e473b9c68051008d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Rewrite make-extension-branches as make-branches

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Rewrite make-extension-branches as make-branches
..


Rewrite make-extension-branches as make-branches

Needs some more tidying and such but good enough for today

Change-Id: I33fc5439e9fc97c869e134499eded0cade9b6b6d
---
D make-extension-branches/.gitignore
D make-extension-branches/LICENSE
D make-extension-branches/default.conf
D make-extension-branches/make-extension-branches
D make-extension-branches/sample-local.conf
A make-release/make-branches
6 files changed, 36 insertions(+), 231 deletions(-)

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



diff --git a/make-extension-branches/.gitignore 
b/make-extension-branches/.gitignore
deleted file mode 100644
index f21e1b2..000
--- a/make-extension-branches/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-local.conf
diff --git a/make-extension-branches/LICENSE b/make-extension-branches/LICENSE
deleted file mode 100644
index 39a2120..000
--- a/make-extension-branches/LICENSE
+++ /dev/null
@@ -1,13 +0,0 @@
-  DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-  Version 2, December 2004
-
-Copyright (C) 2004 Sam Hocevar 
-
-Everyone is permitted to copy and distribute verbatim or modified
-copies of this license document, and changing it is allowed as long
-as the name is changed.
-
-   DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. You just DO WHAT THE FUCK YOU WANT TO.
diff --git a/make-extension-branches/default.conf 
b/make-extension-branches/default.conf
deleted file mode 100644
index f386f3e..000
--- a/make-extension-branches/default.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-dryRun = true;
-
-$conf->verbose = false;
-
-// Change to 'username@' in local.conf if your shell username is different than
-// your Wikimedia Labs LDAP username
-$conf->extRepoUrlFormat = 'https://gerrit.wikimedia.org/r/p/{repository}.git';
diff --git a/make-extension-branches/make-extension-branches 
b/make-extension-branches/make-extension-branches
deleted file mode 100755
index 649db4f..000
--- a/make-extension-branches/make-extension-branches
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/usr/bin/env php
- ''\n"
-   . "\n"
-   . "Example: $self REL1_21 'Sat Mar 16 12:00:59 2013 +'\n";
-   exit( 1 );
-}
-
-$maker = new MakeExtensionBranches( array(
-   'branchName' => $argv[1],
-   'branchDate' => $argv[2],
-) );
-
-$maker->start();
-
-class MakeExtensionBranches {
-
-   protected $codeDir, $buildDir;
-   protected $conf, $opts;
-   protected $extRepos = array();
-
-   public function __construct( $opts ) {
-   $this->codeDir = __DIR__;
-   $this->buildDir = sys_get_temp_dir() . 
'/make-extension-branches';
-
-   require "{$this->codeDir}/default.conf";
-   if ( file_exists( "{$this->codeDir}/local.conf" ) ) {
-   require "{$this->codeDir}/local.conf";
-   }
-
-   $this->conf = $conf;
-   $this->opts = (object) $opts;
-
-   }
-
-   protected function setup() {
-   // Fetch from Gerit
-   $cmd = 'ssh -p 29418 gerrit.wikimedia.org gerrit ls-projects 
-p';
-   $list = array_merge(
-   explode( "\n", shell_exec( "$cmd mediawiki/extensions" 
) ),
-   explode( "\n", shell_exec( "$cmd mediawiki/skins" ) )
-   );
-   // Trim leading/trailing whitespace
-   $list = array_map( 'trim', $list );
-   // Ignore empty lines
-   $list = array_filter( $list );
-   $list[] = 'mediawiki/vendor';
-   $this->extRepos = $list;
-   }
-
-   public function start() {
-   $this->setup();
-   $this->setupBuildDirectory();
-   array_walk( $this->extRepos, array( $this, 'doExt' ), 
$this->opts->branchName );
-   echo "Done!\n";
-   }
-
-
-   public function doExt( $extRepo, $unusedKey, $branchName ) {
-   // Move back to the build dir in each loop,
-   // otherwise we'll get build/AntiBot/CategoryTree/.. instead of 
build/AntiBot, build/CategoryTree, ..
-   $this->chdir( $this->buildDir );
-   echo "... $extRepo\n";
-   $url = str_replace( '{repository}', $extRepo, 
$this->conf->extRepoUrlFormat );
-   $name = basename( $extRepo );
-   $this->execCmd( 'git', 'clone', '-q', $url, '-b', 'master', 
$name );
-   $this->chdir( $name );
-
-   $out = $exitcode = null;
-   // Check if the branch exists already
-   exec( 'git show-branch origin/' . escapeshellarg( $branchName ) 
. ' 2>&1', $out, $exitcode );
-   if (

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Implement first phase of Kartographer event logging.

2016-10-25 Thread JGirault (Code Review)

JGirault has uploaded a new change for review.

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

Change subject: Implement first phase of Kartographer event logging.
..

Implement first phase of Kartographer event logging.

Bug: T149140
Change-Id: I734cfd2a3b7832b3d6c9f72265ed4da573d029d9
---
M extension.json
A modules/ext.wikimediaEvents.kartographer.js
2 files changed, 184 insertions(+), 0 deletions(-)


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

diff --git a/extension.json b/extension.json
index be79cbe..a33d0b1 100644
--- a/extension.json
+++ b/extension.json
@@ -121,10 +121,16 @@
"schema": "Search",
"revision": 14361785
},
+   "schema.Kartographer": {
+   "class": "ResourceLoaderSchemaModule",
+   "schema": "Kartographer",
+   "revision": 16010805
+   },
"ext.wikimediaEvents": {
"scripts": [
"ext.wikimediaEvents.events.js",
"ext.wikimediaEvents.statsd.js",
+   "ext.wikimediaEvents.kartographer.js",
"ext.wikimediaEvents.rlfeature.js",
"ext.wikimediaEvents.searchSatisfaction.js",
"ext.wikimediaEvents.geoFeatures.js"
diff --git a/modules/ext.wikimediaEvents.kartographer.js 
b/modules/ext.wikimediaEvents.kartographer.js
new file mode 100644
index 000..01c90e6
--- /dev/null
+++ b/modules/ext.wikimediaEvents.kartographer.js
@@ -0,0 +1,178 @@
+/*!
+ * Track Kartographer feature usage
+ *
+ * @see https://meta.wikimedia.org/wiki/Schema:Kartographer
+ */
+( function ( $, mw ) {
+
+   // Track Kartographer maps
+   var isMobile = mw.config.get( 'skin' ) === 'minerva',
+   userToken,
+   trackedFeatures = {},
+   // We only track 1% of the user sessions.
+   // A user session id is defined in a cookie that lasts 10 
minutes.
+   userSampling = 100;
+
+   /**
+* Returns an unique token identifying current user.
+*
+* @return {string}
+* @private
+*/
+   function getToken() {
+   // TODO: shall we change this cookie name?
+   var cookieName = 'GeoFeaturesUser2',
+   token = mw.cookie.get( cookieName );
+
+   if ( token ) {
+   return token;
+   }
+
+   token = mw.user.generateRandomSessionId();
+
+   mw.cookie.set( cookieName, token, { expires: 10 * 60 } );
+
+   return token;
+   }
+
+   // Gets the user session id.
+   userToken = getToken();
+
+   /**
+* Determines whether the sessionId is part of the population size.
+*
+* @param {string} sessionId
+* @param {number} populationSize
+* @return {boolean}
+* @private
+*/
+   function oneIn( sessionId, populationSize ) {
+   // take the first 52 bits of the rand value to match js
+   // integer precision
+   var parsed = parseInt( sessionId.slice( 0, 13 ), 16 );
+   return parsed % populationSize === 0;
+   }
+
+   /**
+* Determines whether a random id is part of the population size.
+*
+* @param {number} populationSize
+* @return {boolean}
+* @private
+*/
+   function randomOneIn( populationSize ) {
+   var rand = mw.user.generateRandomSessionId();
+   return oneIn( rand, populationSize );
+   }
+
+   /**
+* Construct and transmit to a remote server a record of some event
+* having occurred.
+*
+* This method represents the client-side API of Kartographer 
EventLogging.
+*
+* @param {string} featureType
+* @param {string} action
+* @param {boolean} isFullScreen
+* @param {Object} [options]
+* @param {number} [options.duration]
+* @param {number} [options.sampling] Specific sampling applied to 
current event.
+* @param {*} [options.extra]
+* @private
+*/
+   function logEvent( featureType, action, isFullScreen, options ) {
+
+   var event = {
+   feature: featureType,
+   action: action,
+   fullscreen: isFullScreen,
+   mobile: isMobile,
+   // we noticed a number of events get sent multiple
+   // times from javascript, especially when using 
sendBeacon.
+   // This userToken allows for later deduplication.
+   userToken: userToken
+

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Implement first phase of map event logging.

2016-10-25 Thread JGirault (Code Review)

JGirault has uploaded a new change for review.

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

Change subject: Implement first phase of map event logging.
..

Implement first phase of map event logging.

* Uses mw.track to track analytical events.
* Fixes dialog sidebar so it keeps track of sidebar state when switching to 
another map from hash.

Bug: T149140
Change-Id: I66ba00cc2d86d9f1e49cbb46bd9ebd39650e3bea
---
M modules/box/Map.js
M modules/box/openfullscreen_control.js
M modules/dialog-sidebar/sidebar.js
M modules/dialog/dialog.js
M modules/linkbox/Link.js
M modules/mapframe/mapframe.js
M modules/maplink/maplink.js
M modules/staticframe/staticframe.js
M templates/dialog-sidebar-externalservices.mustache
9 files changed, 195 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/95/317995/1

diff --git a/modules/box/Map.js b/modules/box/Map.js
index 3d43045..333cf9a 100644
--- a/modules/box/Map.js
+++ b/modules/box/Map.js
@@ -177,6 +177,19 @@
this.parentMap = options.parentMap || null;
 
/**
+* @property {Kartographer.Box.MapClass} 
[parentLink=null] Reference
+*   to the parent link.
+* @protected
+*/
+   this.parentLink = options.parentLink || null;
+
+   /**
+* @property {string} The feature type identifier.
+* @protected
+*/
+   this.featureType = options.featureType;
+
+   /**
 * @property {Kartographer.Box.MapClass} 
[fullScreenMap=null] Reference
 *   to the child full screen map.
 * @protected
@@ -236,6 +249,13 @@
if ( options.allowFullScreen ) {
// embed maps, and full screen is allowed
this.on( 'dblclick', function () {
+   // We need this hack to differentiate 
these events from `hashopen` events.
+   map.clicked = true;
+   mw.track( 'mediawiki.kartographer', {
+   action: 'open',
+   isFullScreen: true,
+   feature: map
+   } );
map.openFullScreen();
} );
 
@@ -469,6 +489,7 @@
container: L.DomUtil.create( 
'div', 'mw-kartographer-mapDialog-map' ),
center: position.center,
zoom: position.zoom,
+   featureType: this.featureType,
fullscreen: true,
captionText: this.captionText,
fullScreenRoute: 
this.fullScreenRoute,
@@ -670,12 +691,20 @@
 * @chainable
 */
remove: function () {
+   var parent = this.parentMap || this.parentLink;
+
if ( this.fullScreenMap ) {
L.Map.prototype.remove.call( this.fullScreenMap 
);
this.fullScreenMap = null;
}
-   if ( this.parentMap ) {
-   this.parentMap.fullScreenMap = null;
+   if ( parent ) {
+   parent.fullScreenMap = null;
+   mw.track( 'mediawiki.kartographer', {
+   action: 'close',
+   isFullScreen: true,
+   feature: parent
+   } );
+   parent.clicked = false;
}
 
return L.Map.prototype.remove.call( this );
diff --git a/modules/box/openfullscreen_control.js 
b/modules/box/openfullscreen_control.js
index d712b4f..50d5536 100644
--- a/modules/box/openfullscreen_control.js
+++ b/modules/box/openfullscreen_control.js
@@ -30,6 +30,7 @@
if ( this._map.useRouter ) {
this.updateHash();
this._map.on( 'moveend', this.onMapMove, this );
+   L.DomEvent.addListener( this.link, 'click', 
this.logOpenEvent, this );
} else {
// the router will handle it otherwise

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Stop mangling .gitreview

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Stop mangling .gitreview
..


Stop mangling .gitreview

Avoids a pointless commit on extensions/skins/vendor branches.

Ideally we can rewrite this to use the Gerrit REST api to create
branches, but this is a good first step

Bug: T146293
Change-Id: I3ba2bb8ff3534c12dcb7c8d611693f34fa13c036
---
M make-wmf-branch/MakeWmfBranch.php
1 file changed, 0 insertions(+), 38 deletions(-)

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



diff --git a/make-wmf-branch/MakeWmfBranch.php 
b/make-wmf-branch/MakeWmfBranch.php
index 1565391..2fe5118 100644
--- a/make-wmf-branch/MakeWmfBranch.php
+++ b/make-wmf-branch/MakeWmfBranch.php
@@ -161,8 +161,6 @@
function createBranch( $branchName, $doPush=true ) {
$this->runCmd( 'git', 'checkout', '-q', '-b', $branchName );
 
-   $this->fixGitReview();
-   $this->runWriteCmd( 'git', 'commit', '-a', '-q', '-m', 
"Creating new {$branchName} branch" );
if ( $doPush == true ) {
$this->runWriteCmd( 'git', 'push', 'origin', 
$branchName );
}
@@ -251,9 +249,6 @@
# Fix $wgVersion
$this->fixVersion( "includes/DefaultSettings.php" );
 
-   # Point gitreview defaultbranch at wmf/version
-   $this->fixGitReview();
-
# Do intermediate commit
$this->runCmd( 'git', 'commit', '-a', '-q', '-m', "Creating new 
WMF {$this->newVersion} branch" );
 
@@ -274,38 +269,5 @@
$s = preg_replace( '/^( \$wgVersion \s+ = \s+ )  [^;]*  ( ; \s* 
) $/xm',
"\\1'{$this->newVersion}'\\2", $s );
file_put_contents( $fileName, $s );
-   }
-
-   function fixGitReview() {
-   $lines = file( '.gitreview', FILE_IGNORE_NEW_LINES );
-   $outputFile = array();
-   $changed = false;
-
-   foreach ( $lines as $line ) {
-   $arr = explode( '=', $line );
-
-   if ( count( $arr ) < 2 ) {
-   $outputFile[] = $line;
-   continue;
-   }
-
-   list( $k, $v ) = $arr;
-
-   if ( trim( $k ) === 'defaultbranch' ) {
-   $v = "{$this->branchPrefix}{$this->newVersion}";
-   $changed = true;
-   }
-
-   $outputFile[] = implode( '=', array( $k, $v ) );
-   }
-
-   $final = implode( "\n", $outputFile );
-   $final .= "\n";
-
-   if ( !$changed ) {
-   $final .= '# Updated ' . date( 'c' ) . "\n";
-}
-
-   file_put_contents( '.gitreview', $final );
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ba2bb8ff3534c12dcb7c8d611693f34fa13c036
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Replace 404 gitblit URL by Diffusion URL

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Replace 404 gitblit URL by Diffusion URL
..


Replace 404 gitblit URL by Diffusion URL

Change-Id: I0d3035684992c8cc396293bd2ec31346b2ba4ac6
---
M data/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/data/i18n/en.json b/data/i18n/en.json
index 22324cf..e6a795c 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -168,7 +168,7 @@
"contact-page": "Email: mailto:wikimania-scholarsh...@wikimedia.org\;>wikimania-scholarsh...@wikimedia.org",
 
"credits": "Credits & licensing",
-   "credits-page": "The Wikimania scholarships software is open source and 
available
 under the https://www.gnu.org/copyleft/gpl.html\;>GNU General Public 
License 3.0.\n\nThe code is based on the Wikimania scholarships 
system used for Wikimania 2009, 2010, 2011, 2012 and 2013.",
+   "credits-page": "The Wikimania scholarships software is open source and 
available under the 
https://www.gnu.org/copyleft/gpl.html\;>GNU General Public License 
3.0.\n\nThe code is based on the Wikimania scholarships system used 
for Wikimania 2009, 2010, 2011, 2012 and 2013.",
 
"help-translate": "Help translate",
"translate-page": "We would like the scholarship application system 
translated into as many languages as possible.\n\nPlease request 
translator rights at translatewiki.net and 
after that you can start
 translating.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d3035684992c8cc396293bd2ec31346b2ba4ac6
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Aklapper 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add decile field to prospect.

2016-10-25 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Add decile field to prospect.
..

Add decile field to prospect.

Rosie has altered the options associated with this field and logged a ticket 
for us
to update our scripts. It turns out the field was not already in the script for
dev environments. I have added it & taken a baby-step towards a tidier way of
managing these custom fields

Bug: T147965

Change-Id: Iec797f7ed2c451c0d6953cdde22d0355da87b1f3
---
A sites/all/modules/wmf_civicrm/update_custom_fields.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
2 files changed, 130 insertions(+), 79 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/94/317994/1

diff --git a/sites/all/modules/wmf_civicrm/update_custom_fields.php 
b/sites/all/modules/wmf_civicrm/update_custom_fields.php
new file mode 100644
index 000..c9b2547
--- /dev/null
+++ b/sites/all/modules/wmf_civicrm/update_custom_fields.php
@@ -0,0 +1,113 @@
+ 
'Prospect'));
+  if (!$customGroup['count']) {
+$customGroup = civicrm_api3('CustomGroup', 'create', array(
+  'name' => 'Prospect',
+  'title' => 'Prospect',
+  'extends' => 'Contact',
+  'style' => 'tab',
+  'is_active' => 1,
+  ));
+   }
+// We mostly are trying to ensure a unique weight since weighting can be 
re-orded in the UI but it gets messy
+// if they are all set to 1.
+$weight = CRM_Core_DAO::singleValueQuery('SELECT max(weight) FROM 
civicrm_custom_field WHERE custom_group_id = %1',
+array(1 => array($customGroup['id'], 'Integer'))
+);
+
+foreach (_wmf_civicrm_get_prospect_fields() as $field) {
+  if (!civicrm_api3('CustomField', 'getcount', array(
+'custom_group_id' => $customGroup['id'],
+'name' => $field['name'],
+))){
+$weight++;
+civicrm_api3('CustomField', 'create', array_merge(
+  $field,
+  array(
+'custom_group_id' => $customGroup['id'],
+'weight' => $weight,
+  )
+));
+  }
+}
+}
+
+function _wmf_civicrm_get_prospect_fields() {
+  return array(
+  'ask_amount' => array(
+  'name' => 'ask_amount',
+  'label' => 'Ask Amount',
+  'data_type' => 'Money',
+  'html_type' => 'Text',
+  'is_searchable' => 1,
+  'is_search_range' => 1,
+  ),
+  'expected_amount' => array(
+  'name' => 'expected_amount',
+  'label' => 'Expected Amount',
+  'data_type' => 'Money',
+  'html_type' => 'Text',
+  'is_searchable' => 1,
+  'is_search_range' => 1,
+  ),
+  'likelihood' => array(
+  'name' => 'likelihood',
+  'label' => 'Likelihood (%)',
+  'data_type' => 'Integer',
+  'html_type' => 'Text',
+  'is_searchable' => 1,
+  'is_search_range' => 1,
+  ),
+  'expected_close_date' => array(
+  'name' => 'expected_close_date',
+  'label' => 'Expected Close Date',
+  'data_type' => 'Date',
+  'html_type' => 'Select Date',
+  'is_searchable' => 1,
+  'is_search_range' => 1,
+  ),
+  'close_date' => array(
+  'name' => 'close_date',
+  'label' => 'Close Date',
+  'data_type' => 'Date',
+  'html_type' => 'Select Date',
+  'is_searchable' => 1,
+  'is_search_range' => 1,
+  ),
+  'next_step' => array(
+  'name' => 'next_step',
+  'label' => 'Next Step',
+  'data_type' => 'Memo',
+  'html_type' => 'RichTextEditor',
+  'note_columns' => 60,
+  'note_rows' => 4,
+  ),
+  'Disc_Income_Decile' => array(
+  'name' => 'Disc_Income_Decile',
+  'label' => 'Disc Income Decile',
+  'data_type' => 'String',
+  'html_type' => 'Select',
+  'is_searchable' => 1,
+  'text_length' => 255,
+  'note_columns' => 60,
+  'note_rows' => 4,
+  'option_values' => array(
+  'A' => 'A',
+  'B' => 'B',
+  'C' => 'C',
+  'D' => 'D',
+  'E' => 'E',
+  'F' => 'F',
+  'G' => 'G',
+  'H' => 'H',
+  'I' => 'I',
+  )
+  ),
+  );
+}
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 137ef9f..ead87ac 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -56,11 +56,11 @@
 wmf_civicrm_update_7200();
 wmf_civicrm_update_7205();
 wmf_civicrm_update_7210();
-wmf_civicrm_update_7220();
 wmf_civicrm_update_7230();
 wmf_civicrm_update_7235();
 wmf_civicrm_update_7280();
 wmf_civicrm_update_7290();
+

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Translationview rewrite based on OOJS, OOJS-UI

2016-10-25 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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

Change subject: Translationview rewrite based on OOJS, OOJS-UI
..

Translationview rewrite based on OOJS, OOJS-UI

The three column layout and the initialization code for
the components were rewritten using OOJS-UI. Rest of the modules
left untouched. So no functionality change expected.

The UI code is now organized under the ui folder with mw prefixed
files and modules, dropping 'ext' prefix so that the classes are
easily greppable with its names.

This is a beginning of changes that leads to further modeling of our
classes for VE integration.

Change-Id: I07cde72f9b4a7daa45415b4af16f086f6c172046
---
M .jshintrc
M extension.json
M modules/base/ext.cx.model.js
M modules/publish/ext.cx.publish.js
M modules/translation/ext.cx.translation.js
D modules/translationview/ext.cx.translationview.js
A modules/ui/mw.cx.ui.Columns.js
A modules/ui/mw.cx.ui.Header.js
A modules/ui/mw.cx.ui.Infobar.js
A modules/ui/mw.cx.ui.SourceColumn.js
A modules/ui/mw.cx.ui.ToolsColumn.js
A modules/ui/mw.cx.ui.TranslationColumn.js
A modules/ui/mw.cx.ui.TranslationView.js
A modules/ui/mw.cx.ui.js
A modules/ui/styles/mw.cx.ui.Columns.less
A modules/ui/styles/mw.cx.ui.Header.less
A modules/ui/styles/mw.cx.ui.Infobar.less
R modules/ui/styles/mw.cx.ui.TranslationView.less
M modules/widgets/common/ext.cx.column.less
M specials/SpecialContentTranslation.php
20 files changed, 827 insertions(+), 136 deletions(-)


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

diff --git a/.jshintrc b/.jshintrc
index da351bf..dc06253 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -16,6 +16,7 @@
"mediaWiki",
"jQuery",
"QUnit",
-   "moment"
+   "moment",
+   "OO"
]
 }
diff --git a/extension.json b/extension.json
index 66b839a..4a1b5bd 100644
--- a/extension.json
+++ b/extension.json
@@ -225,6 +225,9 @@
"scripts": [
"base/ext.cx.model.js"
],
+   "dependencies": [
+   "oojs"
+   ],
"targets": [
"desktop",
"mobile"
@@ -242,20 +245,6 @@
],
"messages": [
"cx-feedback-link"
-   ]
-   },
-   "ext.cx.translationview": {
-   "scripts": [
-   "translationview/ext.cx.translationview.js"
-   ],
-   "styles": [
-   
"translationview/styles/ext.cx.translationview.less"
-   ],
-   "dependencies": [
-   "ext.cx.header",
-   "ext.cx.model",
-   "ext.cx.sitemapper",
-   "ext.cx.source"
]
},
"ext.cx.dashboard": {
@@ -954,6 +943,9 @@
"ext.cx.recommendtool.client": {
"scripts": [
"dashboard/ext.cx.recommendtool.client.js"
+   ],
+   "dependencies": [
+   "ext.cx.model"
]
},
"ext.cx.translation.conflict": {
@@ -1129,6 +1121,9 @@
"styles": [
"widgets/spinner/ext.cx.spinner.less"
],
+   "dependencies": [
+   "ext.cx.model"
+   ],
"targets": [
"desktop",
"mobile"
@@ -1153,7 +1148,7 @@
"styles": [
"widgets/translator/ext.cx.translator.less"
],
-   "messages":[
+   "messages": [
"cx-translator-month-stats-label",
"cx-translator-total-translations-label"
],
@@ -1161,6 +1156,83 @@
"chart.js",
"mediawiki.api"
]
+   },
+   "mw.cx.ui.TranslationView": {
+   "scripts": [
+   "ui/mw.cx.ui.TranslationView.js"
+   ],
+   "styles": [
+   "ui/styles/mw.cx.ui.TranslationView.less"
+   ],
+   "messages":[
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Rename some hacked horizon files

2016-10-25 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Rename some hacked horizon files
..

Rename some hacked horizon files

forms.py and wmtotp.py are dropped directly into the openstack_auth
directory, so give the raw puppet files clearer names.

Change-Id: I7ca2efb6405ef2a9a707725f1a8b3f7d74ff16b7
---
R modules/openstack/files/liberty/horizon/openstack_auth_backend_forms.py
R modules/openstack/files/liberty/horizon/openstack_auth_wmtotp.py
R modules/openstack/files/mitaka/horizon/openstack_auth_backend_forms.py
R modules/openstack/files/mitaka/horizon/openstack_auth_wmtotp.py
M modules/openstack/manifests/horizon/service.pp
5 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/openstack/files/liberty/horizon/forms.py 
b/modules/openstack/files/liberty/horizon/openstack_auth_backend_forms.py
similarity index 100%
rename from modules/openstack/files/liberty/horizon/forms.py
rename to 
modules/openstack/files/liberty/horizon/openstack_auth_backend_forms.py
diff --git a/modules/openstack/files/liberty/horizon/wmtotp.py 
b/modules/openstack/files/liberty/horizon/openstack_auth_wmtotp.py
similarity index 100%
rename from modules/openstack/files/liberty/horizon/wmtotp.py
rename to modules/openstack/files/liberty/horizon/openstack_auth_wmtotp.py
diff --git a/modules/openstack/files/mitaka/horizon/forms.py 
b/modules/openstack/files/mitaka/horizon/openstack_auth_backend_forms.py
similarity index 100%
rename from modules/openstack/files/mitaka/horizon/forms.py
rename to modules/openstack/files/mitaka/horizon/openstack_auth_backend_forms.py
diff --git a/modules/openstack/files/mitaka/horizon/wmtotp.py 
b/modules/openstack/files/mitaka/horizon/openstack_auth_wmtotp.py
similarity index 100%
rename from modules/openstack/files/mitaka/horizon/wmtotp.py
rename to modules/openstack/files/mitaka/horizon/openstack_auth_wmtotp.py
diff --git a/modules/openstack/manifests/horizon/service.pp 
b/modules/openstack/manifests/horizon/service.pp
index 4750a31..830164c 100644
--- a/modules/openstack/manifests/horizon/service.pp
+++ b/modules/openstack/manifests/horizon/service.pp
@@ -124,7 +124,7 @@
 
 # Homemade totp plugin for openstack_auth
 file { '/usr/lib/python2.7/dist-packages/openstack_auth/plugin/wmtotp.py':
-source  => 
"puppet:///modules/openstack/${openstack_version}/horizon/wmtotp.py",
+source  => 
"puppet:///modules/openstack/${openstack_version}/horizon/openstack_auth_wmtotp.py",
 owner   => 'root',
 group   => 'root',
 require => Package['python-openstack-auth'],
@@ -133,7 +133,7 @@
 
 # Replace the standard horizon login form to support 2fa
 file { '/usr/lib/python2.7/dist-packages/openstack_auth/forms.py':
-source  => 
"puppet:///modules/openstack/${openstack_version}/horizon/forms.py",
+source  => 
"puppet:///modules/openstack/${openstack_version}/horizon/openstack_auth_forms.py",
 owner   => 'root',
 group   => 'root',
 require => Package['python-openstack-auth'],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ca2efb6405ef2a9a707725f1a8b3f7d74ff16b7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add 'remember me' checkbox to Horizon auth.

2016-10-25 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Add 'remember me' checkbox to Horizon auth.
..

Add 'remember me' checkbox to Horizon auth.

The SESSION_TIMEOUT setting in Horizon is used in multiple places as a
maximum timeout.  This patch cranks that up to 7 days, but then
adds a new setting SESSION_SHORT_TIMEOUT which is used for transient
sessions (when the user doesn't tick 'remember me'.)

Will this introduce the wikitech bug where the horizon session
outlast the keystone token and we're dropped into a contentless-yet-
still-logged-in limbo?  Maybe.

Bug: T149036
Change-Id: Ica5b962cc807df45f537801d8080f84f488ec235
---
M modules/openstack/files/liberty/horizon/openstack_auth_backend_forms.py
A modules/openstack/files/liberty/horizon/openstack_auth_backened.py
M modules/openstack/manifests/horizon/service.pp
M modules/openstack/templates/liberty/horizon/local_settings.py.erb
M modules/openstack/templates/mitaka/horizon/local_settings.py.erb
5 files changed, 354 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/92/317992/1

diff --git 
a/modules/openstack/files/liberty/horizon/openstack_auth_backend_forms.py 
b/modules/openstack/files/liberty/horizon/openstack_auth_backend_forms.py
index 5383ff2..07a8011 100644
--- a/modules/openstack/files/liberty/horizon/openstack_auth_backend_forms.py
+++ b/modules/openstack/files/liberty/horizon/openstack_auth_backend_forms.py
@@ -62,10 +62,14 @@
   "authentication.  To enable it, "
   "visit Preferences->User "
   "Profile in your Wikitech account")
+rememberme = forms.BooleanField(label=_("Remember me"),
+help_text="Stay logged in on this computer 
"
+  "for 30 days.",
+required=False)
 
 def __init__(self, *args, **kwargs):
 super(Login, self).__init__(*args, **kwargs)
-fields_ordering = ['username', 'password', 'totptoken', 'region']
+fields_ordering = ['username', 'password', 'totptoken', 'rememberme', 
'region']
 if getattr(settings,
'OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT',
False):
@@ -75,7 +79,7 @@
 widget=forms.TextInput(attrs={"autofocus": "autofocus"}))
 self.fields['username'].widget = forms.widgets.TextInput()
 fields_ordering = ['domain', 'username', 'password',
-   'totptoken', 'region']
+   'totptoken', 'rememberme', 'region']
 self.fields['region'].choices = self.get_region_choices()
 if len(self.fields['region'].choices) == 1:
 self.fields['region'].initial = self.fields['region'].choices[0][0]
@@ -125,6 +129,7 @@
 username = self.cleaned_data.get('username')
 password = self.cleaned_data.get('password')
 token = self.cleaned_data.get('totptoken')
+remember = self.cleaned_data.get('rememberme')
 region = self.cleaned_data.get('region')
 domain = self.cleaned_data.get('domain', default_domain)
 
@@ -137,6 +142,7 @@
username=username,
password=password,
totp=token,
+   extended_session=remember,
user_domain_name=domain,
auth_url=region)
 msg = 'Login successful for user "%(username)s".' % \
diff --git a/modules/openstack/files/liberty/horizon/openstack_auth_backened.py 
b/modules/openstack/files/liberty/horizon/openstack_auth_backened.py
new file mode 100644
index 000..e672845
--- /dev/null
+++ b/modules/openstack/files/liberty/horizon/openstack_auth_backened.py
@@ -0,0 +1,315 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+""" Module defining the Django auth backend class for the Keystone API. """
+
+import datetime
+import logging
+import pytz
+
+from django.conf import settings
+from django.utils.module_loading import import_string  # noqa
+from django.utils.translation import ugettext_lazy as _
+from

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add documentation for wfClientAcceptsGzip()

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Add documentation for wfClientAcceptsGzip()
..


Add documentation for wfClientAcceptsGzip()

Change-Id: I18b9311d71278ca4c843908a11f77270f03cf534
---
M includes/GlobalFunctions.php
1 file changed, 6 insertions(+), 4 deletions(-)

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



diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index e30b371..c4db7e9 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1983,11 +1983,13 @@
 }
 
 /**
- * @todo document
- * @todo FIXME: We may want to blacklist some broken browsers
+ * Whether the client accept gzip encoding
  *
- * @param bool $force
- * @return bool Whereas client accept gzip compression
+ * Uses the Accept-Encoding header to check if the client supports gzip 
encoding.
+ * Use this when considering to send a gzip-encoded response to the client.
+ *
+ * @param bool $force Forces another check even if we already have a cached 
result.
+ * @return bool
  */
 function wfClientAcceptsGzip( $force = false ) {
static $result = null;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18b9311d71278ca4c843908a11f77270f03cf534
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nicoco007 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Nicoco007 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: PleaseStand 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Graph[wmf/1.28.0-wmf.23]: Fix fatal

2016-10-25 Thread MaxSem (Code Review)

MaxSem has submitted this change and it was merged.

Change subject: Fix fatal
..


Fix fatal

Change-Id: Ia6dfad7c21a3eb72e1a7c53a8a5b03feb496a8eb
(cherry picked from commit 61e8951daefde22d521e609c2f7622d6fc96c360)
---
M includes/Content.php
M includes/ParserTag.php
M includes/Sandbox.php
3 files changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/includes/Content.php b/includes/Content.php
index 4a4d2f6..c343961 100644
--- a/includes/Content.php
+++ b/includes/Content.php
@@ -42,8 +42,12 @@
$parser = $wgParser->getFreshParser();
$text = $parser->preprocess( $text, $title, $options, $revId );
 
-   $html = !$generateHtml ? '' : Singleton::buildHtml( $text, 
$title, $revId, $output,
-   $options->getIsPreview() );
+   if ( $generateHtml ) {
+   $tag = new ParserTag( $parser, $options, $output );
+   $html = $tag->buildHtml( $text, $title, 
$parser->getRevisionId() );
+   } else {
+   $html = '';
+   }
$output->setText( $html );
 
// Since we invoke parser manually, the ParserAfterParse never 
gets called, do it manually
diff --git a/includes/ParserTag.php b/includes/ParserTag.php
index a681a08..0a00209 100644
--- a/includes/ParserTag.php
+++ b/includes/ParserTag.php
@@ -101,7 +101,7 @@
 * @param string $hash
 * @return array
 */
-   private function buildDivAttributes( $mode = '', $data = false, $hash = 
'' ) {
+   public static function buildDivAttributes( $mode = '', $data = false, 
$hash = '' ) {
$attribs = [ 'class' => 'mw-graph' ];
 
if ( is_object( $data ) ) {
diff --git a/includes/Sandbox.php b/includes/Sandbox.php
index 665dfba..f606406 100644
--- a/includes/Sandbox.php
+++ b/includes/Sandbox.php
@@ -32,7 +32,7 @@
// Tell CodeEditor that this page is JSON (T143165)
$out->addJsConfigVars( 'wgCodeEditorCurrentLanguage', 'json' );
 
-   $attr = Singleton::buildDivAttributes( 'always' );
+   $attr = ParserTag::buildDivAttributes( 'always' );
$attr['id'] = 'mw-graph-image';
$graphHtml = Html::rawElement( 'div', $attr, '' );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6dfad7c21a3eb72e1a7c53a8a5b03feb496a8eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: wmf/1.28.0-wmf.23
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: phabricator: include project creations with policies other t...

2016-10-25 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: phabricator: include project creations with policies other than 
public+all-users
..

phabricator: include project creations with policies other than public+all-users

Change-Id: I974c8cb86dfbd1aece8462b709e49be18c955619
---
M modules/phabricator/templates/project_changes.sh.erb
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/317990/1

diff --git a/modules/phabricator/templates/project_changes.sh.erb 
b/modules/phabricator/templates/project_changes.sh.erb
index 9877662..5d89520 100644
--- a/modules/phabricator/templates/project_changes.sh.erb
+++ b/modules/phabricator/templates/project_changes.sh.erb
@@ -58,7 +58,8 @@
 OR project_transaction.transactionType = "core:view-policy"
 OR project_transaction.transactionType = "project:locked"
 OR project_transaction.transactionType = "project:status")
-AND project_transaction.oldValue != "null"
+AND (project_transaction.oldValue != "null"
+OR project_transaction.newValue NOT IN ("public", "users"))
 AND project_transaction.objectPHID = project.phid
 AND project_transaction.dateModified > UNIX_TIMESTAMP(DATE_SUB(NOW(), 
INTERVAL 1 WEEK));
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I974c8cb86dfbd1aece8462b709e49be18c955619
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: drop contint::packages

2016-10-25 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: contint: drop contint::packages
..

contint: drop contint::packages

The class was meant to share packages definition between production
and labs slaves.  Nowadays almost everything runs on labs and
contint::packages has been slowly deprecated in favor of
contint::packages::labs.

The last remnant is contint::packages::base which just installs
curl/colordiff.

Directly include contint::packages::base instead of contint::packages
Remove the include from contint::browsertests, it is always included on
slaves that already include contint::packages::base.

Delete the now useless manifest.

Change-Id: I9b39096c565741b51059acc24a027457f0358d91
---
M modules/contint/manifests/browsertests.pp
D modules/contint/manifests/packages.pp
M modules/contint/manifests/packages/labs.pp
M modules/role/manifests/ci/slave.pp
4 files changed, 2 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/317988/1

diff --git a/modules/contint/manifests/browsertests.pp 
b/modules/contint/manifests/browsertests.pp
index 79f30ea..51eae39 100644
--- a/modules/contint/manifests/browsertests.pp
+++ b/modules/contint/manifests/browsertests.pp
@@ -2,8 +2,6 @@
 #
 class contint::browsertests {
 
-# Ship several packages such as php5-sqlite or ruby1.9.3
-include contint::packages
 include contint::packages::ruby
 
 # Provides phantomjs, firefox and xvfb
diff --git a/modules/contint/manifests/packages.pp 
b/modules/contint/manifests/packages.pp
deleted file mode 100644
index f69c8fc..000
--- a/modules/contint/manifests/packages.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Holds all the packages needed for continuous integration.
-#
-# FIXME: split this!
-#
-class contint::packages {
-
-# Basic utilites needed for all Jenkins slaves
-include ::contint::packages::base
-
-}
diff --git a/modules/contint/manifests/packages/labs.pp 
b/modules/contint/manifests/packages/labs.pp
index e146f1c..080ffb0 100644
--- a/modules/contint/manifests/packages/labs.pp
+++ b/modules/contint/manifests/packages/labs.pp
@@ -7,7 +7,7 @@
 
 require contint::packages::apt
 
-include contint::packages
+include contint::packages::base
 
 include ::mediawiki::packages
 include ::mediawiki::packages::multimedia  # T76661
diff --git a/modules/role/manifests/ci/slave.pp 
b/modules/role/manifests/ci/slave.pp
index a04403c..9cd1134 100644
--- a/modules/role/manifests/ci/slave.pp
+++ b/modules/role/manifests/ci/slave.pp
@@ -10,7 +10,7 @@
 
 system::role { 'role::ci::slave': description => 'CI slave runner' }
 
-include contint::packages
+include contint::packages::base
 require contint::master_dir
 
 class { '::zuul': }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b39096c565741b51059acc24a027457f0358d91
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: move doxygen/graphviz to labs instances

2016-10-25 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: contint: move doxygen/graphviz to labs instances
..

contint: move doxygen/graphviz to labs instances

doxygen is the utility to generate online documentation. It used to be
run directly on the Jenkins master (contint::packages) which is no more
the case nowadays.

doxygen depends on Graphviz to generate methods/function call graphs and
class dependencies.

We had a use for Graphviz on the production/Jenkins master which was for
the "job dependency graph". As indicated on 3906dbe72, the plugin is no
more used and thus we no more need Graphviz on the Jenkins master.

Move 'doxygen' and 'graphviz' from contint::packages (for prod) to a new
standalone class contint::packages::doxygen.

Include the new class solely on the labs Jenkins slaves
(contint::packages::labs).

Change-Id: I8fa65a35047b0d0734a6b0a6e021e7dd053e0e58
---
M modules/contint/manifests/packages.pp
A modules/contint/manifests/packages/doxygen.pp
M modules/contint/manifests/packages/labs.pp
3 files changed, 13 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/317985/1

diff --git a/modules/contint/manifests/packages.pp 
b/modules/contint/manifests/packages.pp
index 2a6d32e..e3d297d 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -16,9 +16,4 @@
 
 require_package('openjdk-7-jdk')
 
-# MediaWiki doc is built directly on contint1001
-require_package('doxygen')
-
-# For Doxygen based documentations
-require_package('graphviz')
 }
diff --git a/modules/contint/manifests/packages/doxygen.pp 
b/modules/contint/manifests/packages/doxygen.pp
new file mode 100644
index 000..0ae3985
--- /dev/null
+++ b/modules/contint/manifests/packages/doxygen.pp
@@ -0,0 +1,12 @@
+# == Class contint::packages::doxygen
+#
+# Dependencies to run Doxygen. Used by MediaWiki, some extensions and random
+# other projects.
+#
+# Graphviz is used to generate call graphs.
+class contint::packages::doxygen {
+
+require_package('doxygen')
+require_package('graphviz')
+
+}
diff --git a/modules/contint/manifests/packages/labs.pp 
b/modules/contint/manifests/packages/labs.pp
index 164a84c..18f1dad 100644
--- a/modules/contint/manifests/packages/labs.pp
+++ b/modules/contint/manifests/packages/labs.pp
@@ -22,6 +22,7 @@
 }
 
 include ::contint::packages::analytics
+include ::contint::packages::doxygen
 include ::contint::packages::java
 include ::contint::packages::javascript
 include ::contint::packages::php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fa65a35047b0d0734a6b0a6e021e7dd053e0e58
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki...Graph[wmf/1.28.0-wmf.23]: Fix fatal

2016-10-25 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Fix fatal
..

Fix fatal

Change-Id: Ia6dfad7c21a3eb72e1a7c53a8a5b03feb496a8eb
(cherry picked from commit 61e8951daefde22d521e609c2f7622d6fc96c360)
---
M includes/Content.php
M includes/ParserTag.php
M includes/Sandbox.php
3 files changed, 8 insertions(+), 4 deletions(-)


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

diff --git a/includes/Content.php b/includes/Content.php
index 4a4d2f6..c343961 100644
--- a/includes/Content.php
+++ b/includes/Content.php
@@ -42,8 +42,12 @@
$parser = $wgParser->getFreshParser();
$text = $parser->preprocess( $text, $title, $options, $revId );
 
-   $html = !$generateHtml ? '' : Singleton::buildHtml( $text, 
$title, $revId, $output,
-   $options->getIsPreview() );
+   if ( $generateHtml ) {
+   $tag = new ParserTag( $parser, $options, $output );
+   $html = $tag->buildHtml( $text, $title, 
$parser->getRevisionId() );
+   } else {
+   $html = '';
+   }
$output->setText( $html );
 
// Since we invoke parser manually, the ParserAfterParse never 
gets called, do it manually
diff --git a/includes/ParserTag.php b/includes/ParserTag.php
index a681a08..0a00209 100644
--- a/includes/ParserTag.php
+++ b/includes/ParserTag.php
@@ -101,7 +101,7 @@
 * @param string $hash
 * @return array
 */
-   private function buildDivAttributes( $mode = '', $data = false, $hash = 
'' ) {
+   public static function buildDivAttributes( $mode = '', $data = false, 
$hash = '' ) {
$attribs = [ 'class' => 'mw-graph' ];
 
if ( is_object( $data ) ) {
diff --git a/includes/Sandbox.php b/includes/Sandbox.php
index 665dfba..f606406 100644
--- a/includes/Sandbox.php
+++ b/includes/Sandbox.php
@@ -32,7 +32,7 @@
// Tell CodeEditor that this page is JSON (T143165)
$out->addJsConfigVars( 'wgCodeEditorCurrentLanguage', 'json' );
 
-   $attr = Singleton::buildDivAttributes( 'always' );
+   $attr = ParserTag::buildDivAttributes( 'always' );
$attr['id'] = 'mw-graph-image';
$graphHtml = Html::rawElement( 'div', $attr, '' );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6dfad7c21a3eb72e1a7c53a8a5b03feb496a8eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: wmf/1.28.0-wmf.23
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: drop useless require_package

2016-10-25 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: contint: drop useless require_package
..

contint: drop useless require_package

contint::packages is meant to be shared between production and labs
slaves. It installs openjdk-7-jdk which is redundant with:

 jenkins::slave which installs the openjdk-7-jdk-headless for the
jenkins agent that runs on the instances.

 contint::packages::java installed on all slaved and meant to represent
the requirement to run a java/maven project.

Drop openjdk-7-jdk from contint::packages.

Change-Id: I1659311d10eaeed62816f38652cbdeeb341a8d1e
---
M modules/contint/manifests/packages.pp
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/317986/1

diff --git a/modules/contint/manifests/packages.pp 
b/modules/contint/manifests/packages.pp
index e3d297d..6f3edc1 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -14,6 +14,4 @@
 include ::mediawiki::packages::php5
 }
 
-require_package('openjdk-7-jdk')
-
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1659311d10eaeed62816f38652cbdeeb341a8d1e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: move php5 install on jessie to nearest user

2016-10-25 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: contint: move php5 install on jessie to nearest user
..

contint: move php5 install on jessie to nearest user

On Debian Jessie, mediawiki::packages no more install the Zend PHP. That
has to be done explicitly via mediawiki::packages:php5.

contint::packages was/is meant to be shared between production and labs
slaves, however everything now runs on labs.

Move the definition to contint::packages::labs next to the include of
mediawiki::packages.

Change-Id: Ide58718c9da3cf1ada60e304c082704b63aa66d4
---
M modules/contint/manifests/packages.pp
M modules/contint/manifests/packages/labs.pp
2 files changed, 5 insertions(+), 6 deletions(-)


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

diff --git a/modules/contint/manifests/packages.pp 
b/modules/contint/manifests/packages.pp
index 6f3edc1..f69c8fc 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -8,10 +8,4 @@
 # Basic utilites needed for all Jenkins slaves
 include ::contint::packages::base
 
-# We're no longer installing PHP on app servers starting with
-# jessie, but we still need it for CI
-if os_version('debian == jessie') {
-include ::mediawiki::packages::php5
-}
-
 }
diff --git a/modules/contint/manifests/packages/labs.pp 
b/modules/contint/manifests/packages/labs.pp
index 18f1dad..e146f1c 100644
--- a/modules/contint/manifests/packages/labs.pp
+++ b/modules/contint/manifests/packages/labs.pp
@@ -11,6 +11,11 @@
 
 include ::mediawiki::packages
 include ::mediawiki::packages::multimedia  # T76661
+# We're no longer installing PHP on app servers starting with
+# jessie, but we still need it for CI
+if os_version('debian == jessie') {
+include ::mediawiki::packages::php5
+}
 
 if os_version('ubuntu >= trusty || Debian >= jessie') {
 # Fonts needed for browser tests screenshots (T71535)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide58718c9da3cf1ada60e304c082704b63aa66d4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki...Graph[master]: Fix fatal

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Fix fatal
..


Fix fatal

Change-Id: Ia6dfad7c21a3eb72e1a7c53a8a5b03feb496a8eb
---
M includes/Content.php
M includes/ParserTag.php
M includes/Sandbox.php
3 files changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/includes/Content.php b/includes/Content.php
index 4a4d2f6..c343961 100644
--- a/includes/Content.php
+++ b/includes/Content.php
@@ -42,8 +42,12 @@
$parser = $wgParser->getFreshParser();
$text = $parser->preprocess( $text, $title, $options, $revId );
 
-   $html = !$generateHtml ? '' : Singleton::buildHtml( $text, 
$title, $revId, $output,
-   $options->getIsPreview() );
+   if ( $generateHtml ) {
+   $tag = new ParserTag( $parser, $options, $output );
+   $html = $tag->buildHtml( $text, $title, 
$parser->getRevisionId() );
+   } else {
+   $html = '';
+   }
$output->setText( $html );
 
// Since we invoke parser manually, the ParserAfterParse never 
gets called, do it manually
diff --git a/includes/ParserTag.php b/includes/ParserTag.php
index a681a08..0a00209 100644
--- a/includes/ParserTag.php
+++ b/includes/ParserTag.php
@@ -101,7 +101,7 @@
 * @param string $hash
 * @return array
 */
-   private function buildDivAttributes( $mode = '', $data = false, $hash = 
'' ) {
+   public static function buildDivAttributes( $mode = '', $data = false, 
$hash = '' ) {
$attribs = [ 'class' => 'mw-graph' ];
 
if ( is_object( $data ) ) {
diff --git a/includes/Sandbox.php b/includes/Sandbox.php
index 665dfba..f606406 100644
--- a/includes/Sandbox.php
+++ b/includes/Sandbox.php
@@ -32,7 +32,7 @@
// Tell CodeEditor that this page is JSON (T143165)
$out->addJsConfigVars( 'wgCodeEditorCurrentLanguage', 'json' );
 
-   $attr = Singleton::buildDivAttributes( 'always' );
+   $attr = ParserTag::buildDivAttributes( 'always' );
$attr['id'] = 'mw-graph-image';
$graphHtml = Html::rawElement( 'div', $attr, '' );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6dfad7c21a3eb72e1a7c53a8a5b03feb496a8eb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Vertically-align icons and text in Notifications popup

2016-10-25 Thread VolkerE (Code Review)

VolkerE has uploaded a new change for review.

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

Change subject: Vertically-align icons and text in Notifications popup
..

Vertically-align icons and text in Notifications popup

Ensure that icons and text are vertically aligned and also
introduce `transition` on item's background.

Bug: T147221
Change-Id: Idcf752276c25d2c4ab6e35721d2e070ead9a8c81
---
M modules/styles/mw.echo.ui.MenuItemWidget.less
M modules/styles/mw.echo.ui.NotificationBadgeWidget.less
M modules/styles/mw.echo.ui.NotificationItemWidget.less
M modules/styles/mw.echo.ui.ToggleReadCircleButtonWidget.less
4 files changed, 25 insertions(+), 17 deletions(-)


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

diff --git a/modules/styles/mw.echo.ui.MenuItemWidget.less 
b/modules/styles/mw.echo.ui.MenuItemWidget.less
index 8a0701d..68f6cd9 100644
--- a/modules/styles/mw.echo.ui.MenuItemWidget.less
+++ b/modules/styles/mw.echo.ui.MenuItemWidget.less
@@ -3,21 +3,20 @@
 
 .mw-echo-ui-menuItemWidget {
&-icon {
-   display: inline-block;
-   // We have to override oojs-ui's width/height, which uses
-   // a very specific selector
-   width: 1.5em !important;
-   height: 1.5em !important;
-   min-width: 1.5em !important;
-   min-height: 1.5em !important;
-
+   display: block;
position: absolute;
top: 0;
+   // We have to override oojs-ui's width/height, which uses
+   // a very specific selector
+   width: 1.143em !important; // equals `16px` at `font-size: 14px`
+   height: 1.143em !important;
+   min-width: 16px !important;
+   min-height: 16px !important;
}
 
&-content {
display: inline-block;
-   margin-left: 1.5em + 0.5em; // Icon width + 0.5em spacing
+   margin-left: 1.143em + 0.5em; // Icon width + 0.5em spacing
 
// We have to override oojs-ui's color, which uses
// a very specific selector
@@ -26,6 +25,10 @@
// Set max-width so buttons are truncated
max-width: 15em;
 
+   .oo-ui-labelElement-label {
+   font-size: 0.9em;
+   }
+
&-description {
color: #666 !important;
}
diff --git a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less 
b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
index b82f335..3b7ce2c 100644
--- a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
@@ -14,14 +14,18 @@
/* @noflip */
left: 0.8em;
 
-   > .oo-ui-popupWidget-popup {
+   //> .oo-ui-popupWidget-popup {
> .oo-ui-popupWidget-head {
height: 3.5em;
border-bottom: 1px solid #ddd;
 
> .oo-ui-iconWidget {
+   min-width: 30px;
+   min-height: 30px;
+   width: 30px;
+   height: 30px;
/* ( 3.5 - 1.875 ) / 2 = 0.8125 */
-   margin: 0.8125em 0 0.8125em 1em;
+   margin: 0.6em 0 0.8em 0.8em;
float: left;
opacity: @opacity-mid;
}
@@ -49,6 +53,7 @@
// item widget styles so that the edge 
borders of the items are not duplicated
border-left: 0;
border-right: 0;
+
&:last-child {
border-bottom: 0;
}
@@ -95,6 +100,6 @@
}
}
}
-   }
+   //}
}
 }
diff --git a/modules/styles/mw.echo.ui.NotificationItemWidget.less 
b/modules/styles/mw.echo.ui.NotificationItemWidget.less
index e9615d3..48d6f11 100644
--- a/modules/styles/mw.echo.ui.NotificationItemWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationItemWidget.less
@@ -6,7 +6,7 @@
background-color: #f1f1f1;
position: relative;
white-space: normal;
-   padding: 0.8em 1em 0.5em 1em;
+   padding: 0.8em 0.8em 0.5em 0.8em;
.box-sizing( border-box );
 
border: 1px solid #ddd;
@@ -94,11 +94,11 @@
display: table;

[MediaWiki-commits] [Gerrit] integration/config[master]: Android: fix screenshot and test result dirs

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Android: fix screenshot and test result dirs
..


Android: fix screenshot and test result dirs

• Screenshots are not stored under build/. Update the artifact string to
  use app/ instead. Also store the originals for easy comparison.

• Fix the JUnit result directories to function properly whether Spoon
  results exist or not.

Change-Id: Ibf1204e7621fbd2cc745d834df740afde6d44203
---
M jjb/mobile.yaml
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/jjb/mobile.yaml b/jjb/mobile.yaml
index ffc7d07..bf56273 100644
--- a/jjb/mobile.yaml
+++ b/jjb/mobile.yaml
@@ -95,10 +95,10 @@
  scripts/diff-screenshots
 publishers:
  - archive:
- # Capture generated .apk, ProGuard mappings, Spoon results, and 
screenshot difference results
- artifacts: 
'**/build/outputs/**,**/build/spoon/**,**/build/screenshots/**,**/build/screenshots-diff/**'
+ # Capture generated .apk, ProGuard mappings, Spoon results, and 
screenshots
+ artifacts: '**/build/outputs/**,**/build/spoon/**,**/screenshots*/**'
  - junit:
- results: '**/build/spoon/**/*.xml'
+ results: 
'**/test-results/**/*.xml,**/androidTest-results/**/*.xml,**/build/spoon/**/*.xml'
  - irc-android-ci
 
 - job-template:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf1204e7621fbd2cc745d834df740afde6d44203
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Graph[master]: Fix fatal

2016-10-25 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Fix fatal
..

Fix fatal

Change-Id: Ia6dfad7c21a3eb72e1a7c53a8a5b03feb496a8eb
---
M includes/Content.php
M includes/ParserTag.php
M includes/Sandbox.php
3 files changed, 8 insertions(+), 4 deletions(-)


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

diff --git a/includes/Content.php b/includes/Content.php
index 4a4d2f6..44f1f19 100644
--- a/includes/Content.php
+++ b/includes/Content.php
@@ -42,8 +42,12 @@
$parser = $wgParser->getFreshParser();
$text = $parser->preprocess( $text, $title, $options, $revId );
 
-   $html = !$generateHtml ? '' : Singleton::buildHtml( $text, 
$title, $revId, $output,
-   $options->getIsPreview() );
+   $tag = new ParserTag( $parser, $options, $output );
+   if ( $generateHtml ) {
+   $html = $tag->buildHtml( $text, $title, 
$parser->getRevisionId() );
+   } else {
+   $html = '';
+   }
$output->setText( $html );
 
// Since we invoke parser manually, the ParserAfterParse never 
gets called, do it manually
diff --git a/includes/ParserTag.php b/includes/ParserTag.php
index a681a08..0a00209 100644
--- a/includes/ParserTag.php
+++ b/includes/ParserTag.php
@@ -101,7 +101,7 @@
 * @param string $hash
 * @return array
 */
-   private function buildDivAttributes( $mode = '', $data = false, $hash = 
'' ) {
+   public static function buildDivAttributes( $mode = '', $data = false, 
$hash = '' ) {
$attribs = [ 'class' => 'mw-graph' ];
 
if ( is_object( $data ) ) {
diff --git a/includes/Sandbox.php b/includes/Sandbox.php
index 665dfba..f606406 100644
--- a/includes/Sandbox.php
+++ b/includes/Sandbox.php
@@ -32,7 +32,7 @@
// Tell CodeEditor that this page is JSON (T143165)
$out->addJsConfigVars( 'wgCodeEditorCurrentLanguage', 'json' );
 
-   $attr = Singleton::buildDivAttributes( 'always' );
+   $attr = ParserTag::buildDivAttributes( 'always' );
$attr['id'] = 'mw-graph-image';
$graphHtml = Html::rawElement( 'div', $attr, '' );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6dfad7c21a3eb72e1a7c53a8a5b03feb496a8eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: [WIP] evenstreams puppetization

2016-10-25 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: [WIP] evenstreams puppetization
..

[WIP] evenstreams puppetization

Bug: T148779
Change-Id: I2667830eb995bdc7ddc87359157d28c5f03f285c
---
A modules/eventstreams/manifests/init.pp
A modules/eventstreams/templates/config.yaml.erb
2 files changed, 84 insertions(+), 0 deletions(-)


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

diff --git a/modules/eventstreams/manifests/init.pp 
b/modules/eventstreams/manifests/init.pp
new file mode 100644
index 000..ae17d75
--- /dev/null
+++ b/modules/eventstreams/manifests/init.pp
@@ -0,0 +1,40 @@
+# == Class: eventstreams
+#
+# === Parameters
+#
+# [*broker_list*]
+#   Comma-separated list of Kafka broker URIs
+#
+class eventstreams(
+$broker_list,
+$allowed_topics = undef,
+) {
+
+include ::service::configuration
+
+service::packages { 'eventstreams':
+pkgs => ['librdkafka++1', 'librdkafka1'],
+dev_pkgs => ['librdkafka-dev'],
+}
+
+service::node { 'eventstreams':
+enable=> true,
+port  => 6947,
+healthcheck_url   => '',
+has_spec  => false, # I should make one!
+deployment=> 'scap3',
+deployment_config => true,
+deployment_vars   => {
+log_level  => 'info',
+broker_list=> $broker_list,
+allowed_topics => $allowed_topics
+site   => $::site,
+},
+auto_refresh  => false,
+init_restart  => false,
+environment   => {
+'UV_THREADPOOL_SIZE' => 128
+},
+}
+
+}
diff --git a/modules/eventstreams/templates/config.yaml.erb 
b/modules/eventstreams/templates/config.yaml.erb
new file mode 100644
index 000..0e14be5
--- /dev/null
+++ b/modules/eventstreams/templates/config.yaml.erb
@@ -0,0 +1,44 @@
+# Number of worker processes to spawn.
+# Set to 0 to run everything in a single process without clustering.
+# Use 'ncpu' to run as many workers as there are CPU units
+num_workers: 0
+
+# Log error messages and gracefully restart a worker if v8 reports that it
+# uses more heap (note: not RSS) than this many mb.
+worker_heap_limit_mb: 250
+
+# Logger info
+logging:
+  level: info
+  streams:
+- type: debug
+#  streams:
+#  # Use gelf-stream -> logstash
+#  - type: gelf
+#host: logstash1003.eqiad.wmnet
+#port: 12201
+
+# Statsd metrics reporter
+metrics:
+  #type: log
+  #host: localhost
+  #port: 8125
+
+services:
+  - name: eventstream
+# a relative path or the name of an npm package, if different from name
+module: ./app.js
+# optionally, a version constraint of the npm package
+# version: ^0.4.0
+# per-service config
+conf:
+  port: 6947
+  # interface: localhost # uncomment to only listen on localhost
+  # more per-service config settings
+  # the location of the spec, defaults to spec.yaml if not specified
+  spec: ./spec.template.yaml
+  # allow cross-domain requests to the API (default '*')
+  cors: '*'
+  # kafka configs go here.
+  kafka:
+metadata.broker.list: 'localhost:9092'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2667830eb995bdc7ddc87359157d28c5f03f285c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Make ArticleTargetLoader dependent on user.options

2016-10-25 Thread jenkins-bot (Code Review)

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

Change subject: Make ArticleTargetLoader dependent on user.options
..


Make ArticleTargetLoader dependent on user.options

Bug: T148311
Change-Id: I60407173bf5b4a2d083c9560dd763337cbd5dd18
---
M extension.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index c32e16a..cfb6943 100644
--- a/extension.json
+++ b/extension.json
@@ -334,7 +334,8 @@
"ext.visualEditor.track",
"jquery.textSelection",
"mediawiki.api",
-   "mediawiki.Uri"
+   "mediawiki.Uri",
+   "user.options"
],
"messages": [
"visualeditor-loaderror-message",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I60407173bf5b4a2d083c9560dd763337cbd5dd18
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Android: fix screenshot and test result dirs

2016-10-25 Thread Niedzielski (Code Review)

Niedzielski has uploaded a new change for review.

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

Change subject: Android: fix screenshot and test result dirs
..

Android: fix screenshot and test result dirs

• Screenshots are not stored under build/. Update the artifact string to
  use app/ instead. Also store the originals for easy comparison.

• Fix the JUnit result directories to function properly whether Spoon
  results exist or not.

Change-Id: Ibf1204e7621fbd2cc745d834df740afde6d44203
---
M jjb/mobile.yaml
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/48/317948/1

diff --git a/jjb/mobile.yaml b/jjb/mobile.yaml
index ffc7d07..bf56273 100644
--- a/jjb/mobile.yaml
+++ b/jjb/mobile.yaml
@@ -95,10 +95,10 @@
  scripts/diff-screenshots
 publishers:
  - archive:
- # Capture generated .apk, ProGuard mappings, Spoon results, and 
screenshot difference results
- artifacts: 
'**/build/outputs/**,**/build/spoon/**,**/build/screenshots/**,**/build/screenshots-diff/**'
+ # Capture generated .apk, ProGuard mappings, Spoon results, and 
screenshots
+ artifacts: '**/build/outputs/**,**/build/spoon/**,**/screenshots*/**'
  - junit:
- results: '**/build/spoon/**/*.xml'
+ results: 
'**/test-results/**/*.xml,**/androidTest-results/**/*.xml,**/build/spoon/**/*.xml'
  - irc-android-ci
 
 - job-template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf1204e7621fbd2cc745d834df740afde6d44203
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: remove python-requests

2016-10-25 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: contint: remove python-requests
..

contint: remove python-requests

We have python-requests installed on gallium which was to fulfill a
dependency to auto sync the VisualEditor repository in Gerrit. That was
to workaround a bug in Gerrit which no more apply nowaday. The sync
script has been removed and the dependency is no more needed.

Bug: T51846
Change-Id: I0b7a42c34cf9671c515b843dd3fe9849356005f8
---
M modules/contint/manifests/packages.pp
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/317923/1

diff --git a/modules/contint/manifests/packages.pp 
b/modules/contint/manifests/packages.pp
index aab7b8d..2a6d32e 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -21,8 +21,4 @@
 
 # For Doxygen based documentations
 require_package('graphviz')
-
-# VisualEditor syncing
-require_package('python-requests')
-
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b7a42c34cf9671c515b843dd3fe9849356005f8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 

___
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 401 matches

Mail list logo