[MediaWiki-commits] [Gerrit] added hook for navigation manipulation - change (mediawiki...BlueSpiceFoundation)
Tweichart has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178148
Change subject: added hook for navigation manipulation
..
added hook for navigation manipulation
Change-Id: I7bc28f6ef1a333edb1826a2e5cb285fd6b673caa
---
M includes/BsBaseTemplate.php
1 file changed, 8 insertions(+), 6 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/48/178148/1
diff --git a/includes/BsBaseTemplate.php b/includes/BsBaseTemplate.php
index f706a95..2827163 100644
--- a/includes/BsBaseTemplate.php
+++ b/includes/BsBaseTemplate.php
@@ -499,14 +499,16 @@
}
$aOut = array();
- foreach ($aPortlets as $sKey = $vPortlet) {
- if ($vPortlet instanceof ViewBaseElement) {
- $aOut[] = $vPortlet-execute();
- } else {
- $aOut[] = $vPortlet; //Check for string?
+ if ( wfRunHooks( BSBaseTemplateGetNavigationSidebar, array(
$this, $aPortlets, $aOut ) ) ) {
+ foreach ( $aPortlets as $sKey = $vPortlet ) {
+ if ( $vPortlet instanceof ViewBaseElement ) {
+ $aOut[] = $vPortlet-execute();
+ } else {
+ $aOut[] = $vPortlet; //Check for string?
+ }
}
}
- return implode(\n, $aOut);
+ return implode( \n, $aOut );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/178148
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bc28f6ef1a333edb1826a2e5cb285fd6b673caa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] added hook for navigation manipulation - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: added hook for navigation manipulation
..
added hook for navigation manipulation
Change-Id: I7bc28f6ef1a333edb1826a2e5cb285fd6b673caa
---
M includes/BsBaseTemplate.php
1 file changed, 8 insertions(+), 6 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/includes/BsBaseTemplate.php b/includes/BsBaseTemplate.php
index f706a95..2827163 100644
--- a/includes/BsBaseTemplate.php
+++ b/includes/BsBaseTemplate.php
@@ -499,14 +499,16 @@
}
$aOut = array();
- foreach ($aPortlets as $sKey = $vPortlet) {
- if ($vPortlet instanceof ViewBaseElement) {
- $aOut[] = $vPortlet-execute();
- } else {
- $aOut[] = $vPortlet; //Check for string?
+ if ( wfRunHooks( BSBaseTemplateGetNavigationSidebar, array(
$this, $aPortlets, $aOut ) ) ) {
+ foreach ( $aPortlets as $sKey = $vPortlet ) {
+ if ( $vPortlet instanceof ViewBaseElement ) {
+ $aOut[] = $vPortlet-execute();
+ } else {
+ $aOut[] = $vPortlet; //Check for string?
+ }
}
}
- return implode(\n, $aOut);
+ return implode( \n, $aOut );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/178148
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7bc28f6ef1a333edb1826a2e5cb285fd6b673caa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] moved view.widget to BlueSpiceFoundation - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: moved view.widget to BlueSpiceFoundation
..
moved view.widget to BlueSpiceFoundation
Change-Id: I7405870da18e44cef8619828b7e20efe35718f1f
---
M includes/AutoLoader.php
A includes/outputhandler/views/view.Widget.php
M includes/utility/WidgetListHelper.class.php
3 files changed, 93 insertions(+), 4 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index c1df7c5..fc00905 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -102,6 +102,7 @@
$GLOBALS['wgAutoloadClasses']['ViewTagErrorList'] = __DIR__ .
'/outputhandler/views/view.TagErrorList.php';
$GLOBALS['wgAutoloadClasses']['ViewUserBarElement'] = __DIR__ .
'/outputhandler/views/view.UserBarElement.php';
$GLOBALS['wgAutoloadClasses']['ViewUserMiniProfile'] = __DIR__ .
'/outputhandler/views/view.UserMiniProfile.php';
+$GLOBALS['wgAutoloadClasses']['ViewWidget'] = __DIR__ .
'/outputhandler/views/view.Widget.php';
//Overrides
// Replace Mediawikis ApiFormatJson class with our own to prevent some errors
with the application/json header.
diff --git a/includes/outputhandler/views/view.Widget.php
b/includes/outputhandler/views/view.Widget.php
new file mode 100644
index 000..812bb54
--- /dev/null
+++ b/includes/outputhandler/views/view.Widget.php
@@ -0,0 +1,92 @@
+?php
+class ViewWidget extends ViewBaseElement {
+
+ protected $_mDefaultViewstate = ''; // Possible values
'expanded'|'collapsed'
+ protected $_mTitle= '';
+ protected $_mBody = '';
+ protected $_mTooltip = '';
+ protected $_mAdditionalTitleClasses = array();
+ protected $_mAdditionalBodyClasses = array();
+
+ public function execute( $params = false ) {
+ $this-checkProperties();
+
+ $sAdditionalTitleClasses = implode(' ',
$this-_mAdditionalTitleClasses );
+ $sAdditionalBodyClasses = implode(' ',
$this-_mAdditionalBodyClasses );
+ if (is_array($params) isset($params['format'])
$params['format'] == 'json'){
+ $oReturn = new stdClass();
+ $oReturn-defaultViewstate = $this-_mDefaultViewstate;
+ $oReturn-title = $this-_mTitle;
+ $oReturn-body = $this-_mBody;
+ $oReturn-tooltip = $this-_mTooltip;
+ $oReturn-additionalTitleClasses =
$this-_mAdditionalTitleClasses;
+ $oReturn-additionalBodyClasses =
$this-_mAdditionalBodyClasses;
+ return $oReturn;
+ }
+ $aOut = array();
+ $aOut[] = 'div class=bs-widget'.$this-_mDefaultViewstate.'
id=bs-widget-'.$this-_mId.' title='.$this-_mTooltip.'';
+ $aOut[] = ' div class=bs-widget-head';
+ $aOut[] = 'h5 class=bs-widget-title
'.$sAdditionalTitleClasses.''.$this-_mTitle.'/h5';
+ $aOut[] = ' /div';
+ $aOut[] = ' div class=bs-widget-body
'.$sAdditionalBodyClasses.'';
+ $aOut[] = $this-_mBody;
+ $aOut[] = ' /div';
+ $aOut[] = '/div';
+
+ return implode( \n, $aOut );
+ }
+
+ private function checkProperties() {
+ if( empty($this-_mId) ) throw new BsException ('No id set.');
// TODO RBV (21.10.10 09:08): Check for html id validity. See MW
Sanitizer::escapeId() for inspiration.
+ if( empty($this-_mTitle) ) $this-_mTitle = $this-mId;
+ if( empty($this-_mTooltip) ) $this-_mTooltip = $this-_mTitle;
+ if( empty($this-_mBody) ) {
+ if( $this-hasItems() ) {
+ foreach ($this-_mItems as $oViewItem ){
+ $this-_mBody .= $oViewItem-execute();
+ }
+ }else {
+ $this-_mBody = 'ulliem' . wfMessage(
'bs-no-information-available' )-plain() . '/em/li/ul';
+ }
+ }
+ }
+
+ public function setTitle( $sTitle ) {
+ $this-_mTitle = $sTitle;
+ return $this;
+ }
+
+ public function setBody( $sBody ) {
+ $this-_mBody = $sBody;
+ return $this;
+ }
+
+ public function setTooltip( $sTooltip ) {
+ $this-_mTooltip = $sTooltip;
+ return $this;
+ }
+
+ public function setAdditionalTitleClasses( $aAdditionalTitleClasses ) {
+ $this-_mAdditionalTitleClasses = $aAdditionalTitleClasses;
+ return $this;
+ }
+
+ public function setAdditionalBodyClasses( $aAdditionalBodyClasses ) {
+ $this-_mAdditionalBodyClasses =
[MediaWiki-commits] [Gerrit] fixed bug, wiki crashed when extension widgetbar was deactiv... - change (mediawiki...BlueSpiceExtensions)
jenkins-bot has submitted this change and it was merged.
Change subject: fixed bug, wiki crashed when extension widgetbar was deactivated
..
fixed bug, wiki crashed when extension widgetbar was deactivated
* moved view.widget to BluespiceFoundation
Change-Id: Ibc4debc7f6c97073408a3d6814406b265a763718
---
M WidgetBar/WidgetBar.setup.php
D WidgetBar/views/view.Widget.php
2 files changed, 0 insertions(+), 93 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/WidgetBar/WidgetBar.setup.php b/WidgetBar/WidgetBar.setup.php
index b7317cc..fd6edcb 100644
--- a/WidgetBar/WidgetBar.setup.php
+++ b/WidgetBar/WidgetBar.setup.php
@@ -24,7 +24,6 @@
unset( $aResourceModuleTemplate );
-$wgAutoloadClasses['ViewWidget'] = __DIR__ . '/views/view.Widget.php';
$wgAutoloadClasses['ViewWidgetError'] = __DIR__ .
'/views/view.WidgetError.php';
$wgAutoloadClasses['ViewWidgetErrorList'] = __DIR__ .
'/views/view.WidgetErrorList.php';
$wgAutoloadClasses['ViewWidgetList'] = __DIR__ . '/views/view.WidgetList.php';
diff --git a/WidgetBar/views/view.Widget.php b/WidgetBar/views/view.Widget.php
deleted file mode 100644
index 812bb54..000
--- a/WidgetBar/views/view.Widget.php
+++ /dev/null
@@ -1,92 +0,0 @@
-?php
-class ViewWidget extends ViewBaseElement {
-
- protected $_mDefaultViewstate = ''; // Possible values
'expanded'|'collapsed'
- protected $_mTitle= '';
- protected $_mBody = '';
- protected $_mTooltip = '';
- protected $_mAdditionalTitleClasses = array();
- protected $_mAdditionalBodyClasses = array();
-
- public function execute( $params = false ) {
- $this-checkProperties();
-
- $sAdditionalTitleClasses = implode(' ',
$this-_mAdditionalTitleClasses );
- $sAdditionalBodyClasses = implode(' ',
$this-_mAdditionalBodyClasses );
- if (is_array($params) isset($params['format'])
$params['format'] == 'json'){
- $oReturn = new stdClass();
- $oReturn-defaultViewstate = $this-_mDefaultViewstate;
- $oReturn-title = $this-_mTitle;
- $oReturn-body = $this-_mBody;
- $oReturn-tooltip = $this-_mTooltip;
- $oReturn-additionalTitleClasses =
$this-_mAdditionalTitleClasses;
- $oReturn-additionalBodyClasses =
$this-_mAdditionalBodyClasses;
- return $oReturn;
- }
- $aOut = array();
- $aOut[] = 'div class=bs-widget'.$this-_mDefaultViewstate.'
id=bs-widget-'.$this-_mId.' title='.$this-_mTooltip.'';
- $aOut[] = ' div class=bs-widget-head';
- $aOut[] = 'h5 class=bs-widget-title
'.$sAdditionalTitleClasses.''.$this-_mTitle.'/h5';
- $aOut[] = ' /div';
- $aOut[] = ' div class=bs-widget-body
'.$sAdditionalBodyClasses.'';
- $aOut[] = $this-_mBody;
- $aOut[] = ' /div';
- $aOut[] = '/div';
-
- return implode( \n, $aOut );
- }
-
- private function checkProperties() {
- if( empty($this-_mId) ) throw new BsException ('No id set.');
// TODO RBV (21.10.10 09:08): Check for html id validity. See MW
Sanitizer::escapeId() for inspiration.
- if( empty($this-_mTitle) ) $this-_mTitle = $this-mId;
- if( empty($this-_mTooltip) ) $this-_mTooltip = $this-_mTitle;
- if( empty($this-_mBody) ) {
- if( $this-hasItems() ) {
- foreach ($this-_mItems as $oViewItem ){
- $this-_mBody .= $oViewItem-execute();
- }
- }else {
- $this-_mBody = 'ulliem' . wfMessage(
'bs-no-information-available' )-plain() . '/em/li/ul';
- }
- }
- }
-
- public function setTitle( $sTitle ) {
- $this-_mTitle = $sTitle;
- return $this;
- }
-
- public function setBody( $sBody ) {
- $this-_mBody = $sBody;
- return $this;
- }
-
- public function setTooltip( $sTooltip ) {
- $this-_mTooltip = $sTooltip;
- return $this;
- }
-
- public function setAdditionalTitleClasses( $aAdditionalTitleClasses ) {
- $this-_mAdditionalTitleClasses = $aAdditionalTitleClasses;
- return $this;
- }
-
- public function setAdditionalBodyClasses( $aAdditionalBodyClasses ) {
- $this-_mAdditionalBodyClasses = $aAdditionalBodyClasses;
- return $this;
- }
-
- public function setDefaultViewstate( $sDefaultViewstate ) {
- if ( $sDefaultViewstate != 'expanded' ||
[MediaWiki-commits] [Gerrit] WikiAdmin: Fix for shop link - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178149
Change subject: WikiAdmin: Fix for shop link
..
WikiAdmin: Fix for shop link
The shop link was not placed in an list item element which caused
malformed html
Change-Id: Idfe18c02715390bbfd628049c0b1366a40f4cacc
---
M WikiAdmin/WikiAdmin.class.php
1 file changed, 4 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/49/178149/1
diff --git a/WikiAdmin/WikiAdmin.class.php b/WikiAdmin/WikiAdmin.class.php
index c464e0c..7676e4f 100644
--- a/WikiAdmin/WikiAdmin.class.php
+++ b/WikiAdmin/WikiAdmin.class.php
@@ -216,7 +216,7 @@
$aOutSortable[$sModulLabel] = 'li'.$sLink.'/li';
}
- $aOutSortable['Shop'] = self::getShopLink();
+ $aOutSortable['Shop'] = self::getShopListItem();
ksort( $aOutSortable );
$aOut[] = implode( \n, $aOutSortable ).'/ul';
@@ -236,10 +236,10 @@
}
/**
-* Returns a link to the BlueSpice shop
+* Returns a list item with a link to the BlueSpice shop
* @return string Link to the shop
*/
- private static function getShopLink() {
+ private static function getShopListItem() {
$sLink = Html::element(
'a',
array(
@@ -249,6 +249,6 @@
),
wfMessage( 'bs-wikiadmin-shop' )-escaped()
);
- return $sLink;
+ return 'li'.$sLink.'/li';
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/178149
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfe18c02715390bbfd628049c0b1366a40f4cacc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix required-true to requireX() everywhere - change (wikimedia/wikimania-scholarships)
Niharika29 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178150
Change subject: Fix required-true to requireX() everywhere
..
Fix required-true to requireX() everywhere
Change-Id: I6da0a01a21e799cb2d3d5a92a0f17e300904c39a
---
M src/Wikimania/Scholarship/Controllers/Admin/Settings.php
M src/Wikimania/Scholarship/Controllers/Admin/User.php
M src/Wikimania/Scholarship/Controllers/User/ChangePassword.php
M src/Wikimania/Scholarship/Dao/Settings.php
4 files changed, 13 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships
refs/changes/50/178150/1
diff --git a/src/Wikimania/Scholarship/Controllers/Admin/Settings.php
b/src/Wikimania/Scholarship/Controllers/Admin/Settings.php
index 78b686d..55e8f8c 100644
--- a/src/Wikimania/Scholarship/Controllers/Admin/Settings.php
+++ b/src/Wikimania/Scholarship/Controllers/Admin/Settings.php
@@ -41,15 +41,11 @@
protected function handlePost() {
- $this-form-expectInt( 'phase1pass', array( 'required' = true
) );
- $this-form-expectInt( 'phase2pass', array( 'required' = true
) );
- $this-form-expectFloat( 'weightonwiki', array( 'required' =
true ) );
- $this-form-expectFloat( 'weightoffwiki', array(
- 'required' = true,
- ) );
- $this-form-expectFloat( 'weightinterest', array(
- 'required' = true,
- ) );
+ $this-form-requireInt( 'phase1pass' );
+ $this-form-requireInt( 'phase2pass' );
+ $this-form-requireFloat( 'weightonwiki' );
+ $this-form-requireFloat( 'weightoffwiki' );
+ $this-form-requireFloat( 'weightinterest' );
if ( $this-form-validate() ) {
$settings = array(
diff --git a/src/Wikimania/Scholarship/Controllers/Admin/User.php
b/src/Wikimania/Scholarship/Controllers/Admin/User.php
index 5fc94f3..d44ff9d 100644
--- a/src/Wikimania/Scholarship/Controllers/Admin/User.php
+++ b/src/Wikimania/Scholarship/Controllers/Admin/User.php
@@ -58,11 +58,11 @@
protected function handlePost() {
$id = $this-request-post( 'id' );
- $this-form-expectString( 'username', array( 'required' =
true ) );
+ $this-form-requireString( 'username' );
$this-form-expectString( 'password',
array( 'required' = ( $id == 'new' ) )
);
- $this-form-expectEmail( 'email', array( 'required' = true )
);
+ $this-form-requireEmail( 'email' );
$this-form-expectBool( 'reviewer' );
$this-form-expectBool( 'isvalid' );
$this-form-expectBool( 'isadmin' );
diff --git a/src/Wikimania/Scholarship/Controllers/User/ChangePassword.php
b/src/Wikimania/Scholarship/Controllers/User/ChangePassword.php
index 9fb1f7e..ba55dc0 100644
--- a/src/Wikimania/Scholarship/Controllers/User/ChangePassword.php
+++ b/src/Wikimania/Scholarship/Controllers/User/ChangePassword.php
@@ -39,9 +39,9 @@
protected function handlePost() {
- $this-form-expectString( 'oldpw', array( 'required' = true )
);
- $this-form-expectString( 'newpw1', array( 'required' = true
) );
- $this-form-expectString( 'newpw2', array( 'required' = true
) );
+ $this-form-requireString( 'oldpw' );
+ $this-form-requireString( 'newpw1' );
+ $this-form-requireString( 'newpw2' );
if ( $this-form-validate() ) {
$oldPass = $this-form-get( 'oldpw' );
diff --git a/src/Wikimania/Scholarship/Dao/Settings.php
b/src/Wikimania/Scholarship/Dao/Settings.php
index 811a902..5300c90 100644
--- a/src/Wikimania/Scholarship/Dao/Settings.php
+++ b/src/Wikimania/Scholarship/Dao/Settings.php
@@ -51,8 +51,9 @@
public function updateSettings( array $settings ) {
// TODO: change schema to track user changing settings
$stmt = $this-dbh-prepare( self::concat(
- 'REPLACE INTO settings (setting_name, value)',
- 'VALUES (:name, :value)'
+ 'UPDATE settings
+ SET value = :value
+ WHERE setting_name = :name'
) );
try {
$this-dbh-beginTransaction();
--
To view, visit https://gerrit.wikimedia.org/r/178150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6da0a01a21e799cb2d3d5a92a0f17e300904c39a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Niharika29 niharikakohl...@gmail.com
___
MediaWiki-commits mailing
[MediaWiki-commits] [Gerrit] [PagesList] Register extension - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [PagesList] Register extension .. [PagesList] Register extension Change-Id: Ib46a050976667de02e1e9f5abfacdfc72f71b330 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 03beb3e..0b43950 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1575,6 +1575,9 @@ Paged Tiff Handler descmsg = tiff-desc +Pages List +aliasfile = PagesList/PagesList.i18n.alias.php + Pan Scroll Parser Fun -- To view, visit https://gerrit.wikimedia.org/r/178151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib46a050976667de02e1e9f5abfacdfc72f71b330 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [PagesList] Register extension - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/178151 Change subject: [PagesList] Register extension .. [PagesList] Register extension Change-Id: Ib46a050976667de02e1e9f5abfacdfc72f71b330 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/51/178151/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 03beb3e..0b43950 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1575,6 +1575,9 @@ Paged Tiff Handler descmsg = tiff-desc +Pages List +aliasfile = PagesList/PagesList.i18n.alias.php + Pan Scroll Parser Fun -- To view, visit https://gerrit.wikimedia.org/r/178151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib46a050976667de02e1e9f5abfacdfc72f71b330 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] added hook - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: added hook
..
added hook
* hook added for filename updated
Change-Id: I9b7179559835697ff2206ba942180a9bc4b7
---
M InsertFile/resources/BS.InsertFile/BaseDialog.js
M InsertFile/resources/BS.InsertFile/FileDialog.js
M InsertFile/resources/BS.InsertFile/ImageDialog.js
3 files changed, 10 insertions(+), 5 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/InsertFile/resources/BS.InsertFile/BaseDialog.js
b/InsertFile/resources/BS.InsertFile/BaseDialog.js
index 779273e..9e29d6e 100644
--- a/InsertFile/resources/BS.InsertFile/BaseDialog.js
+++ b/InsertFile/resources/BS.InsertFile/BaseDialog.js
@@ -158,9 +158,10 @@
this.configPanel.items.unshift(this.tfLinkText);
this.configPanel.items.unshift(this.tfFileName);
+ this.tfFileName.on('change', this.onTfFileNameChange, this);
this.pnlConfig = Ext.create('Ext.form.Panel', this.configPanel
);
- this.pnlConfig.on('expand', this.onPnlExpand, this);
+ this.pnlConfig.on('expand', this.onPnlConfigExpand, this);
this.items = [
this.gdImages,
@@ -177,8 +178,12 @@
}
},
- onPnlExpand: function(panel, eOpts){
- $(document).trigger(onBsInsertFilePanelExpand, [this, panel,
eOpts]);
+ onTfFileNameChange: function( textfield, newValue, oldValue, eOpts ){
+ $(document).trigger(BSInsertFileConfigPanelFileNameChange,
[this, textfield, newValue, oldValue, eOpts]);
+ },
+
+ onPnlConfigExpand: function(panel, eOpts){
+ $(document).trigger(BSInsertFileConfigPanelExpand, [this,
panel, eOpts]);
},
btnUploadClick: function( sender, event ) {
diff --git a/InsertFile/resources/BS.InsertFile/FileDialog.js
b/InsertFile/resources/BS.InsertFile/FileDialog.js
index 56059f5..741472e 100644
--- a/InsertFile/resources/BS.InsertFile/FileDialog.js
+++ b/InsertFile/resources/BS.InsertFile/FileDialog.js
@@ -14,7 +14,7 @@
this.configPanel.items = [];
this.callParent(arguments);
},
- onPnlExpand: function(panel, eOpts){
+ onPnlConfigExpand: function(panel, eOpts){
this.callParent(arguments);
},
});
\ No newline at end of file
diff --git a/InsertFile/resources/BS.InsertFile/ImageDialog.js
b/InsertFile/resources/BS.InsertFile/ImageDialog.js
index 66eac37..f2a81a9 100644
--- a/InsertFile/resources/BS.InsertFile/ImageDialog.js
+++ b/InsertFile/resources/BS.InsertFile/ImageDialog.js
@@ -177,7 +177,7 @@
}
this.callParent(arguments);
},
- onPnlExpand: function(panel, eOpts){
+ onPnlConfigExpand: function(panel, eOpts){
this.callParent(arguments);
},
onNbHeightChange: function( element, event ) {
--
To view, visit https://gerrit.wikimedia.org/r/153774
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b7179559835697ff2206ba942180a9bc4b7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [MultimediaPlayer] Register extension - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/178152 Change subject: [MultimediaPlayer] Register extension .. [MultimediaPlayer] Register extension Change-Id: Id217b1fe72afbbc9e0d97330810fa0921628b4b3 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/52/178152/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 0b43950..dd83d54 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1327,6 +1327,8 @@ # Multi Upload // Missing qqq +Multimedia Player + Multimedia Viewer optional = multimediaviewer-credit optional = multimediaviewer-license-cc-by-1.0, multimediaviewer-license-cc-sa-1.0, multimediaviewer-license-cc-by-sa-1.0 -- To view, visit https://gerrit.wikimedia.org/r/178152 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id217b1fe72afbbc9e0d97330810fa0921628b4b3 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [MultimediaPlayer] Register extension - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [MultimediaPlayer] Register extension .. [MultimediaPlayer] Register extension Change-Id: Id217b1fe72afbbc9e0d97330810fa0921628b4b3 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 0b43950..dd83d54 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1327,6 +1327,8 @@ # Multi Upload // Missing qqq +Multimedia Player + Multimedia Viewer optional = multimediaviewer-credit optional = multimediaviewer-license-cc-by-1.0, multimediaviewer-license-cc-sa-1.0, multimediaviewer-license-cc-by-sa-1.0 -- To view, visit https://gerrit.wikimedia.org/r/178152 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id217b1fe72afbbc9e0d97330810fa0921628b4b3 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Kill unused files/misc/update-repository - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178153
Change subject: Kill unused files/misc/update-repository
..
Kill unused files/misc/update-repository
Change-Id: I1237c9fafe0e5c8eed97ad12c05668eba559c2f4
---
D files/misc/update-repository
1 file changed, 0 insertions(+), 63 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/178153/1
diff --git a/files/misc/update-repository b/files/misc/update-repository
deleted file mode 100755
index 618785a..000
--- a/files/misc/update-repository
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/misc/update-repository
-#
-
-#
-# APT repository update script
-# Written by Mark Bergsma m...@nedworks.org
-
-set -e
-
-REPOSITORY_ROOT=/srv/wikimedia
-DISTRIBUTIONS=hardy-wikimedia karmic-wikimedia lucid-wikimedia
-COMPONENTS=main restricted universe multiverse
-ARCHITECTURES=amd64
-CODENAME=hardy
-VERSION=8.04
-
-GPGKEY=Wikimedia Archive Automatic Signing Key r...@wikimedia.org
-
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-
-cd $REPOSITORY_ROOT
-
-for distribution in $DISTRIBUTIONS
-do
- for component in $COMPONENTS
- do
- # Generate the overrides file
- find pool -name '*.deb' -exec dpkg-deb --show
--showformat='${Package}\t${Priority}\t${Section}\n' {} \; \
-indices/override.$distribution.$component
-
- # Generate the Packages files
- for architecture in $ARCHITECTURES
- do
- dpkg-scanpackages -m -a $architecture pool/$component
indices/override.$distribution.$component \
-
dists/$distribution/$component/binary-$architecture/Packages
- gzip -c
dists/$distribution/$component/binary-$architecture/Packages \
-
dists/$distribution/$component/binary-$architecture/Packages.gz
- bzip2 -c
dists/$distribution/$component/binary-$architecture/Packages \
-
dists/$distribution/$component/binary-$architecture/Packages.bz2
-
- # Redundant? why twice?
-#dpkg-scanpackages -m -a $architecture pool/$component
indices/override.$distribution.$component \
-#| bzip2 -c
dists/$distribution/$component/binary-$architecture/Packages.bz2
- done
-
- # Generate the Sources files
- dpkg-scansources pool/$component /dev/null \
-dists/$distribution/$component/source/Sources
- gzip -c dists/$distribution/$component/source/Sources \
-
dists/$distribution/$component/source/Sources.gz
- bzip2 -c dists/$distribution/$component/source/Sources \
-
dists/$distribution/$component/source/Sources.bz2
- done
-
- # Generate the Release file
- apt-ftparchive -o 'APT::FTPArchive::Release::Origin=Wikimedia' -o
'APT::FTPArchive::Release::Label=Wikimedia' -o
APT::FTPArchive::Release::Suite=$distribution -o
APT::FTPArchive::Release::Version=$VERSION -o
APT::FTPArchive::Release::Codename=$CODENAME -o
APT::FTPArchive::Release::Architectures=$ARCHITECTURES -o
APT::FTPArchive::Release::Components=$COMPONENTS release dists/$distribution
dists/$distribution/Release
-
- # Sign the Release file
- gpg --batch --yes -a -b -u $GPGKEY -o dists/$distribution/Release.gpg
dists/$distribution/Release
-done
--
To view, visit https://gerrit.wikimedia.org/r/178153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1237c9fafe0e5c8eed97ad12c05668eba559c2f4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: add missing subnets to preseed.cfg - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/178154 Change subject: autoinstall: add missing subnets to preseed.cfg .. autoinstall: add missing subnets to preseed.cfg Subnets: - labs-support1-b-codfw - labs-hosts1-c-eqiad - labs-hosts1-d-eqiad ...had a subnets/ cfg file but no preseed.cfg config to point there. Change-Id: Ib0e0f232de73a7dbb9565efed97516266d4ede72 --- M modules/install-server/files/autoinstall/netboot.cfg 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/54/178154/1 diff --git a/modules/install-server/files/autoinstall/netboot.cfg b/modules/install-server/files/autoinstall/netboot.cfg index 76ee00a..935a206 100755 --- a/modules/install-server/files/autoinstall/netboot.cfg +++ b/modules/install-server/files/autoinstall/netboot.cfg @@ -25,7 +25,9 @@ 10.64.19.255) echo subnets/private1-b-eqiad.cfg ;; \ 10.64.20.255) echo subnets/labs-hosts1-b-eqiad.cfg ;; \ 10.64.35.255) echo subnets/private1-c-eqiad.cfg ;; \ + 10.64.36.255) echo subnets/labs-hosts1-c-eqiad.cfg ;; \ 10.64.51.255) echo subnets/private1-d-eqiad.cfg ;; \ + 10.64.52.255) echo subnets/labs-hosts1-d-eqiad.cfg ;; \ 10.64.5.255) echo subnets/analytics1-a-eqiad.cfg ;; \ 10.64.21.255) echo subnets/analytics1-b-eqiad.cfg ;; \ 10.64.36.255) echo subnets/analytics1-c-eqiad.cfg ;; \ @@ -34,6 +36,7 @@ 10.128.0.255) echo subnets/private1-ulsfo.cfg ;; \ 10.192.3.255) echo subnets/private1-a-codfw.cfg ;; \ 10.192.19.255) echo subnets/private1-b-codfw.cfg ;; \ + 10.192.21.255) echo subnets/labs-support1-b-codfw.cfg ;; \ 10.192.35.255) echo subnets/private1-c-codfw.cfg ;; \ 10.192.51.255) echo subnets/private1-d-codfw.cfg ;; \ 91.198.174.127) echo subnets/esams.cfg ;; \ -- To view, visit https://gerrit.wikimedia.org/r/178154 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0e0f232de73a7dbb9565efed97516266d4ede72 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: kill i386/i686 variants - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/178155 Change subject: autoinstall: kill i386/i686 variants .. autoinstall: kill i386/i686 variants These are unused for a long time now. Keep the architecture detection for now, even though x86_64.cfg is the only one actually being used. Change-Id: I139c34ebd67333d8d9f4a1439dea172a73513dd9 --- D modules/install-server/files/autoinstall/i386.cfg D modules/install-server/files/autoinstall/i686.cfg 2 files changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/55/178155/1 diff --git a/modules/install-server/files/autoinstall/i386.cfg b/modules/install-server/files/autoinstall/i386.cfg deleted file mode 100644 index 98f6c16..000 --- a/modules/install-server/files/autoinstall/i386.cfg +++ /dev/null @@ -1,2 +0,0 @@ -# Use a server kernel -d-i base-installer/kernel/override-imagestring linux-server diff --git a/modules/install-server/files/autoinstall/i686.cfg b/modules/install-server/files/autoinstall/i686.cfg deleted file mode 12 index 8ac1893..000 --- a/modules/install-server/files/autoinstall/i686.cfg +++ /dev/null @@ -1 +0,0 @@ -i386.cfg \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/178155 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I139c34ebd67333d8d9f4a1439dea172a73513dd9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: s/--/---/ for jessie's kernel cmdline - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/178159 Change subject: autoinstall: s/--/---/ for jessie's kernel cmdline .. autoinstall: s/--/---/ for jessie's kernel cmdline Linux = 3.15 added a feature where every kernel command-line option after a -- is ignored. This broke d-i, which had a documented behavior of using kernel command-line options that were passed after a -- to both the installer and the target. Jessie beta2+ comes with 3.16, so this resulted in console output coming into the VGA instead of the serial port (the only option we passed after --). Replace this with --- which is what is currently proposed at https://bugs.debian.org/764675. Note that this isn't fixed yet as of beta2, so the option is currently *not* copied to the target. It does fix the installer output, though, and looks like something that might get merged before the release of jessie. Change-Id: If2366cc9cac1ed3e37a0b7de7446e9dbb907da45 --- M modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 M modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 M modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 M modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-115200 M modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-57600 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/59/178159/1 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 index 99bca38..b8f9100 100644 --- a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 @@ -9,4 +9,4 @@ LABEL server kernel debian-installer/amd64/linux - append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,115200n8 + append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 --- console=ttyS0,115200n8 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 index c1dbd3c..11cf075 100644 --- a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 @@ -9,4 +9,4 @@ LABEL server kernel debian-installer/amd64/linux - append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,57600n8 + append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 --- console=ttyS0,57600n8 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 index f516486..3b6bc36 100644 --- a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 @@ -9,4 +9,4 @@ LABEL server kernel debian-installer/amd64/linux - append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,9600n8 + append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 --- console=ttyS0,9600n8 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-115200 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-115200 index 654fd20..1075a77 100644 --- a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-115200 +++
[MediaWiki-commits] [Gerrit] autoinstall: switch to autoinstall/enable=true - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/178156 Change subject: autoinstall: switch to autoinstall/enable=true .. autoinstall: switch to autoinstall/enable=true Right now, we have a bunch of locale/keyboard configuration options on the kernel command-line instead of common.cfg, as these happen before network configuration. However, d-i has a mode for telling it to do this after the netcfg step, precisely for preseeding: autoinstall/enable=true, also know as auto. Pass this to the kernel command-line instead and move the two configuration directives to common.cfg. While at it, drop a bunch of deprecated and/or unneeded such options as we only need two right now: locale keyboard layout. This has been tested with both precise trusty. Change-Id: I0a23d80b94d8ed3e0ae5b64903439c8d56b6bf6e --- M modules/install-server/files/autoinstall/common.cfg M modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-115200 M modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-57600 M modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-9600 M modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS1-115200 M modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS1-57600 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-115200 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-57600 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-9600 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS1-115200 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS1-57600 11 files changed, 16 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/56/178156/1 diff --git a/modules/install-server/files/autoinstall/common.cfg b/modules/install-server/files/autoinstall/common.cfg index d8cf8ad..77c96f2 100644 --- a/modules/install-server/files/autoinstall/common.cfg +++ b/modules/install-server/files/autoinstall/common.cfg @@ -1,4 +1,10 @@ # some basic configs, may be overridden by other files + +# these need autoinstall/enable=true (aka auto) on the command-line so they +# can take place after network configuration +d-idebian-installer/locale string en_US +d-ikeyboard-configuration/layoutcode string us + base-configtzconfig/gmtboolean true d-iclock-setup/utc boolean true d-itime/zone string UTC diff --git a/modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-115200 b/modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-115200 index 3122a5d..e142845 100644 --- a/modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-115200 +++ b/modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-115200 @@ -9,4 +9,4 @@ LABEL server kernel ubuntu-installer/amd64/linux - append debian-installer/locale=en_US console-setup/ask_detect=false console-setup/layoutcode=us keyboard-configuration/layout=English (US) keyboard-configuration/variant=English (US) vga=normal initrd=ubuntu-installer/amd64/initrd.gz preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,115200n8 + append initrd=ubuntu-installer/amd64/initrd.gz vga=normal autoinstall/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,115200n8 diff --git a/modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-57600 b/modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-57600 index 635a989..71bc7c6 100644 --- a/modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-57600 +++ b/modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-57600 @@ -9,4 +9,4 @@ LABEL server kernel ubuntu-installer/amd64/linux - append debian-installer/locale=en_US console-setup/ask_detect=false console-setup/layoutcode=us keyboard-configuration/layout=English (US) keyboard-configuration/variant=English (US) vga=normal initrd=ubuntu-installer/amd64/initrd.gz preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,57600n8 + append initrd=ubuntu-installer/amd64/initrd.gz vga=normal autoinstall/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 --
[MediaWiki-commits] [Gerrit] reprepro: add jessie-wikimedia to reprepro - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/178165 Change subject: reprepro: add jessie-wikimedia to reprepro .. reprepro: add jessie-wikimedia to reprepro With components main, non-free and backports (the latter replacing universe, which was a misnomer even in our Ubuntu repositories). We'll eventually need a third-party as well but this needs to happen across the board anyway, as it requires global changes to the updates file. Change-Id: Ia5409ddca0adf98615962372397f1f405b3a7d6e --- M modules/install-server/files/reprepro/distributions M modules/install-server/files/reprepro/incoming 2 files changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/65/178165/1 diff --git a/modules/install-server/files/reprepro/distributions b/modules/install-server/files/reprepro/distributions index be38854..bbdd865 100644 --- a/modules/install-server/files/reprepro/distributions +++ b/modules/install-server/files/reprepro/distributions @@ -71,3 +71,18 @@ DebOverride: deb-override Log: log + +Origin: Wikimedia +Label: Wikimedia +Suite: jessie-wikimedia +Codename: jessie-wikimedia +Version: 8 +Architectures: source amd64 i386 +Components: main backports non-free +UDebComponents: main +Update: hwraid +Description: Wikimedia packages for Debian Jessie +SignWith: default +DebOverride: deb-override +Log: + log diff --git a/modules/install-server/files/reprepro/incoming b/modules/install-server/files/reprepro/incoming index c544479..5292fd7 100644 --- a/modules/install-server/files/reprepro/incoming +++ b/modules/install-server/files/reprepro/incoming @@ -1,4 +1,4 @@ Name: default IncomingDir: incoming TempDir: /tmp -Allow: hardy-wikimedia lucid-wikimedia lucid-wikimedia-mysql precise-wikimedia trusty-wikimedia hardyhardy-wikimedia lucidlucid-wikimedia preciseprecise-wikimedia trustytrusty-wikimedia +Allow: precise-wikimedia trusty-wikimedia jessie-wikimedia preciseprecise-wikimedia trustytrusty-wikimedia jessie-jessie-wikimedia -- To view, visit https://gerrit.wikimedia.org/r/178165 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5409ddca0adf98615962372397f1f405b3a7d6e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: add jessie-installer - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/178157 Change subject: autoinstall: add jessie-installer .. autoinstall: add jessie-installer This adds a profile for Debian 8, codenamed Jessie. This is identical with precise/trusty, with the following differences: - s/ubuntu-installer/debian-installer - no biosdevname=0, since that's biosdevname is Ubuntu-only functionality (and = trusty as well). Note that this won't make jessie installs working by themselves. More changes are needed and will follow this commit. Change-Id: I4bfec1ea14400208d300af96e0bc223ccb1872ec --- A modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/boot.txt A modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 A modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 A modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 A modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-115200 A modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-57600 6 files changed, 64 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/57/178157/1 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/boot.txt b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/boot.txt new file mode 100644 index 000..6eb8d73 --- /dev/null +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/boot.txt @@ -0,0 +1,4 @@ + + +Debian 8 (jessie) amd64 (Wikimedia edition) + diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 new file mode 100644 index 000..99bca38 --- /dev/null +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 @@ -0,0 +1,12 @@ +SERIAL 0x3F8 115200 +CONSOLE 0 + +DISPLAY pxelinux.cfg/boot.txt + +default server +prompt 1 +timeout 100 + +LABEL server + kernel debian-installer/amd64/linux + append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,115200n8 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 new file mode 100644 index 000..c1dbd3c --- /dev/null +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 @@ -0,0 +1,12 @@ +SERIAL 0x3F8 57600 +CONSOLE 0 + +DISPLAY pxelinux.cfg/boot.txt + +default server +prompt 1 +timeout 100 + +LABEL server + kernel debian-installer/amd64/linux + append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,57600n8 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 new file mode 100644 index 000..f516486 --- /dev/null +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 @@ -0,0 +1,12 @@ +SERIAL 0x3F8 9600 +CONSOLE 0 + +DISPLAY pxelinux.cfg/boot.txt + +default server +prompt 1 +timeout 100 + +LABEL server + kernel debian-installer/amd64/linux + append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,9600n8 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-115200 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-115200 new file mode 100644 index 000..654fd20 --- /dev/null +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-115200 @@ -0,0 +1,12 @@ +SERIAL 0x2F8 115200 +CONSOLE 0 + +DISPLAY pxelinux.cfg/boot.txt + +default server +prompt 1 +timeout 100 + +LABEL server + kernel debian-installer/amd64/linux + append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS1,115200n8 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-57600
[MediaWiki-commits] [Gerrit] autoinstall: tell d-i to not install Recommends - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/178164 Change subject: autoinstall: tell d-i to not install Recommends .. autoinstall: tell d-i to not install Recommends Change-Id: I0d486c18e4edf2188a91e6df3a51092bc98450a3 --- M modules/install-server/files/autoinstall/common.cfg 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/64/178164/1 diff --git a/modules/install-server/files/autoinstall/common.cfg b/modules/install-server/files/autoinstall/common.cfg index af46846..8396584 100644 --- a/modules/install-server/files/autoinstall/common.cfg +++ b/modules/install-server/files/autoinstall/common.cfg @@ -41,6 +41,9 @@ # no popcon d-ipopularity-contest/participate boolean false +# do not install Recommends +d-ibase-installer/install-recommends boolean false + # Tasksel - do not install anything d-itasksel/first multiselect -- To view, visit https://gerrit.wikimedia.org/r/178164 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d486c18e4edf2188a91e6df3a51092bc98450a3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: preseed popularity-contest - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/178163 Change subject: autoinstall: preseed popularity-contest .. autoinstall: preseed popularity-contest Change-Id: I6f0cff79238984df1406d73f3cbe1965a034bb0b --- M modules/install-server/files/autoinstall/common.cfg 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/63/178163/1 diff --git a/modules/install-server/files/autoinstall/common.cfg b/modules/install-server/files/autoinstall/common.cfg index 5c5ae6a..af46846 100644 --- a/modules/install-server/files/autoinstall/common.cfg +++ b/modules/install-server/files/autoinstall/common.cfg @@ -38,6 +38,9 @@ # Don't configure Postfix postfixpostfix/main_mailer_typeselect No configuration +# no popcon +d-ipopularity-contest/participate boolean false + # Tasksel - do not install anything d-itasksel/first multiselect -- To view, visit https://gerrit.wikimedia.org/r/178163 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6f0cff79238984df1406d73f3cbe1965a034bb0b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: preseed xkb-keymap for jessie - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/178158 Change subject: autoinstall: preseed xkb-keymap for jessie .. autoinstall: preseed xkb-keymap for jessie console-setup 1.59 introduced keyboard-configuration/xkb-keymap (and 1.89 allowed it to be preseeded). This supersedes (replaces enhances) keyboard-configuration/layoutcode that we already use. Jessie currently comes with 1.114 and prompts for more keyboard layout options without this option. Trusty comes with 1.70ubuntu8, but 1.70ubuntu2 forked from Debian and dropped support for xkb-keymap. Preseed this with a value of us and keep our layoutcode setting for current/future Ubuntu installs. Change-Id: Ic8bb1685c5d5b71f60549206cad0a908ba877727 --- M modules/install-server/files/autoinstall/common.cfg 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/58/178158/1 diff --git a/modules/install-server/files/autoinstall/common.cfg b/modules/install-server/files/autoinstall/common.cfg index 77c96f2..fdadc8b 100644 --- a/modules/install-server/files/autoinstall/common.cfg +++ b/modules/install-server/files/autoinstall/common.cfg @@ -4,6 +4,7 @@ # can take place after network configuration d-idebian-installer/locale string en_US d-ikeyboard-configuration/layoutcode string us +d-ikeyboard-configuration/xkb-keymap string us base-configtzconfig/gmtboolean true d-iclock-setup/utc boolean true -- To view, visit https://gerrit.wikimedia.org/r/178158 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8bb1685c5d5b71f60549206cad0a908ba877727 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: switch subnet detection to default gw - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/178161 Change subject: autoinstall: switch subnet detection to default gw .. autoinstall: switch subnet detection to default gw Our preseeding configuration currently checks the subnet's broadcast address and performs a switch on that, to include the respective subnets/*.cfg config. Unfortunately, this now impossible with the Debian d-i. Ubuntu ships with both udhcpc and isc-dhcp-client in the netboot initrd and netcfg is (hard)coded to prefer dhclient over udhcpc, so Ubuntu ends up using dhclient for the DHCP configuration. In contrast, Debian doesn't ship dhclient, so it just uses udhcpc for the config. udhcpc's default-script does not pass brd to ip address and thus does not set the broadcast address on the interface, so our ip address show call returns garbage. Moreover, d-i doesn't ship with ifconfig at all nowadays (neither trusty's nor jessie's installers ship with it) but rely exclusively on iproute2 instead, and iproute2 doesn't have an option to show the broadcast address of an interface at all. The d-i environment is severly limited (no awk, perl, or anything fancier than that e.g. ipcalc) and calculating the broadcast address based on the IP/CIDR mask in a one-liner using busybox's /bin/sh while (probably) possible, is a bit... extreme. Instead, switch our simple switch/esac to use ip route list | grep default and those subnets' default gateways, which is guranteed to work across all of our systems. Change-Id: I1624d7cd5d68c1a31ac49a1a452dcd2adc960ed7 --- M modules/install-server/files/autoinstall/netboot.cfg 1 file changed, 32 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/61/178161/1 diff --git a/modules/install-server/files/autoinstall/netboot.cfg b/modules/install-server/files/autoinstall/netboot.cfg index 935a206..30bd8c2 100755 --- a/modules/install-server/files/autoinstall/netboot.cfg +++ b/modules/install-server/files/autoinstall/netboot.cfg @@ -10,38 +10,38 @@ d-ipreseed/include string common.cfg passwd.cfg override.cfg d-ipreseed/include_command string \ - case $(ip address show dev eth0 | egrep '^[[:space:]]+inet ' | cut -d ' ' -f 8) in \ - 208.80.153.31) echo subnets/public1-a-codfw.cfg ;; \ - 208.80.153.63) echo subnets/public1-b-codfw.cfg ;; \ - 208.80.153.95) echo subnets/public1-c-codfw.cfg ;; \ - 208.80.153.127) echo subnets/public1-d-codfw.cfg ;; \ - 208.80.154.63) echo subnets/public1-a-eqiad.cfg ;; \ - 208.80.154.191) echo subnets/public1-b-eqiad.cfg ;; \ - 208.80.154.127) echo subnets/public1-c-eqiad.cfg ;; \ - 208.80.155.127) echo subnets/public1-d-eqiad.cfg ;; \ - 208.80.155.79) echo subnets/sandbox1-b-eqiad.cfg ;; \ - 10.64.3.255) echo subnets/private1-a-eqiad.cfg ;; \ - 10.64.4.255) echo subnets/labs-hosts1-a-eqiad.cfg ;; \ - 10.64.19.255) echo subnets/private1-b-eqiad.cfg ;; \ - 10.64.20.255) echo subnets/labs-hosts1-b-eqiad.cfg ;; \ - 10.64.35.255) echo subnets/private1-c-eqiad.cfg ;; \ - 10.64.36.255) echo subnets/labs-hosts1-c-eqiad.cfg ;; \ - 10.64.51.255) echo subnets/private1-d-eqiad.cfg ;; \ - 10.64.52.255) echo subnets/labs-hosts1-d-eqiad.cfg ;; \ - 10.64.5.255) echo subnets/analytics1-a-eqiad.cfg ;; \ - 10.64.21.255) echo subnets/analytics1-b-eqiad.cfg ;; \ - 10.64.36.255) echo subnets/analytics1-c-eqiad.cfg ;; \ - 10.64.53.255) echo subnets/analytics1-d-eqiad.cfg ;; \ - 10.64.37.255) echo subnets/labs-support1-c-eqiad.cfg ;; \ - 10.128.0.255) echo subnets/private1-ulsfo.cfg ;; \ - 10.192.3.255) echo subnets/private1-a-codfw.cfg ;; \ - 10.192.19.255) echo subnets/private1-b-codfw.cfg ;; \ - 10.192.21.255) echo subnets/labs-support1-b-codfw.cfg ;; \ - 10.192.35.255) echo subnets/private1-c-codfw.cfg ;; \ - 10.192.51.255) echo subnets/private1-d-codfw.cfg ;; \ - 91.198.174.127) echo subnets/esams.cfg ;; \ - 198.35.26.15) echo subnets/public1-ulsfo.cfg ;; \ - 10.20.0.255) echo subnets/private1-esams.cfg ;; \ + case $(ip route show | grep default | cut -d' ' -f 3) in \ + 208.80.153.1) echo subnets/public1-a-codfw.cfg ;; \ + 208.80.153.33) echo subnets/public1-b-codfw.cfg ;; \ + 208.80.153.65) echo subnets/public1-c-codfw.cfg ;; \ + 208.80.153.97) echo subnets/public1-d-codfw.cfg ;; \ + 208.80.154.1) echo subnets/public1-a-eqiad.cfg ;; \ + 208.80.154.129) echo subnets/public1-b-eqiad.cfg ;; \ +
[MediaWiki-commits] [Gerrit] autoinstall: set get_domain=unassigned on jessie - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/178160 Change subject: autoinstall: set get_domain=unassigned on jessie .. autoinstall: set get_domain=unassigned on jessie d-i's netcfg has a bug where the DHCP domain name option gets ignored for preseeding purposes and manual input is required. I debugged this extensively and filled it as https://bugs.debian.org/772523. As we run the installer with priority=high (the default), meaning that we get prompted for = high questions, this breaks automated installs in Debian. The bug exists in Ubuntu as well, but Ubuntu has a custom patch on top of netcfg that downgrades that question to priority=medium. The reason for that is unknown, as in a typical Ubuntu fashion, the custom patch is undocumented in the Ubuntu source and was never forwarded to Debian along with a reational. It's possible it's a wrong fix for the bug above (as the domain is prefilled). Besides pushing for a fix in time for jessie, we have the following options for a workaround: 1) Set d-i to priority=critical. This may be a good idea anyway but as this touches far more that netcfg, it's not a great workaround. 2) Remove option domain-name from our DHCP config; d-i would resort to the hostname found in the FQDN and the bug would not manifest. This is not a very elegant solution. 3) Bundle the isc-dhcp-client udeb into a gzipped cpio and append it to jessie's initrd. I approached this solution but it got messy real quick (multiple library udeb dependencies, glibc incompatibilities etc.) 4) Trick d-i by setting netcfg/get_domain to unassigned (or any other value) in the kernel command-prompt, similar to how we set netcfg/get_hostname to unassigned too. This affects only the bootstrap phase of the installer anyway, as immediately after netcfg comes preseeding and we preseed domain-name anyway, under our subnets/ configuration. This implements solution (4). As the bug doesn't manifest in Ubuntu (as explained above), this touches only the jessie config. Change-Id: Ibd8cb5d4dab0b8480e09178d06d4fc468577 --- M modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 M modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 M modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 M modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-115200 M modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-57600 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/60/178160/1 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 index b8f9100..5ff9303 100644 --- a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 @@ -9,4 +9,4 @@ LABEL server kernel debian-installer/amd64/linux - append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 --- console=ttyS0,115200n8 + append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/get_domain=unassigned netcfg/dhcp_timeout=60 --- console=ttyS0,115200n8 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 index 11cf075..e44460f 100644 --- a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 @@ -9,4 +9,4 @@ LABEL server kernel debian-installer/amd64/linux - append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 --- console=ttyS0,57600n8 + append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/get_domain=unassigned netcfg/dhcp_timeout=60 --- console=ttyS0,57600n8 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600
[MediaWiki-commits] [Gerrit] autoinstall: switch based on distroname too - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/178162 Change subject: autoinstall: switch based on distroname too .. autoinstall: switch based on distroname too Add an include file under common.cfg to include different files depending on /etc/default-release, i.e. the Debian/Ubuntu version. Populate trusty with our Ubuntu-specific preseeding commands and symlink precise to it, as they are (and probably will stay) identical. Add a jessie.cfg that populates Debian-specific settings: so far, just apt-setup/non-free and the mirror. Use http.debian.net for the mirror, until we get a mirror of our own, which still needs a bit more work. Finally, drop our old per-architecture detection, as a) we are amd64 exclusively nowadays, b) the only directive that x86_64.cfg had (kernel) was not architecture-specific but distribution-specific and got moved to trusty.cfg instead. Change-Id: If9b4dda82b1a1b18990caa640d4dc886642e95aa --- M modules/install-server/files/autoinstall/common.cfg A modules/install-server/files/autoinstall/jessie.cfg A modules/install-server/files/autoinstall/precise.cfg A modules/install-server/files/autoinstall/trusty.cfg D modules/install-server/files/autoinstall/x86_64.cfg 5 files changed, 23 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/62/178162/1 diff --git a/modules/install-server/files/autoinstall/common.cfg b/modules/install-server/files/autoinstall/common.cfg index fdadc8b..5c5ae6a 100644 --- a/modules/install-server/files/autoinstall/common.cfg +++ b/modules/install-server/files/autoinstall/common.cfg @@ -41,16 +41,7 @@ # Tasksel - do not install anything d-itasksel/first multiselect -# Use software from the universe component? -d-iapt-setup/universe boolean true - -# Default mirror, can be overridden per subnet -d-imirror/country string manual -d-imirror/http/hostnamestring ubuntu.wikimedia.org -d-imirror/http/directory string /ubuntu/ -d-imirror/http/proxy string - -# disable multiarch, enabled by default in amd64 since saucy +# disable multiarch, enabled by default in Ubuntu amd64 since saucy d-iapt-setup/multiarch string # Wikimedia's APT repository @@ -58,8 +49,8 @@ d-iapt-setup/local0/source boolean true d-iapt-setup/local0/keystring http://apt.wikimedia.org/autoinstall/keyring/wikimedia-archive-keyring.gpg -# Architecture specific settings (kernels etc) -d-ipreseed/include_command string echo $(uname -m).cfg +# Distribution-specific settings +d-ipreseed/include_command string echo $(cat /etc/default-release).cfg # Early command d-ipreseed/early_command string wget -O /tmp/early_command http://apt.wikimedia.org/autoinstall/scripts/early_command sh /tmp/early_command diff --git a/modules/install-server/files/autoinstall/jessie.cfg b/modules/install-server/files/autoinstall/jessie.cfg new file mode 100644 index 000..1e6714a --- /dev/null +++ b/modules/install-server/files/autoinstall/jessie.cfg @@ -0,0 +1,8 @@ +# Use software from the non-free component? +d-iapt-setup/non-free boolean true + +# Default mirror, can be overridden per subnet +d-imirror/country string manual +d-imirror/http/hostnamestring http.debian.net +d-imirror/http/directory string /debian/ +d-imirror/http/proxy string http://webproxy.eqiad.wmnet:8080/ diff --git a/modules/install-server/files/autoinstall/precise.cfg b/modules/install-server/files/autoinstall/precise.cfg new file mode 12 index 000..93467be --- /dev/null +++ b/modules/install-server/files/autoinstall/precise.cfg @@ -0,0 +1 @@ +trusty.cfg \ No newline at end of file diff --git a/modules/install-server/files/autoinstall/trusty.cfg b/modules/install-server/files/autoinstall/trusty.cfg new file mode 100644 index 000..f16cdcd --- /dev/null +++ b/modules/install-server/files/autoinstall/trusty.cfg @@ -0,0 +1,11 @@ +# Use software from the universe component? +d-iapt-setup/universe boolean true + +# Default mirror, can be overridden per subnet +d-imirror/country string manual +d-imirror/http/hostnamestring ubuntu.wikimedia.org +d-imirror/http/directory string /ubuntu/ +d-imirror/http/proxy string + +# Use a server kernel +d-i base-installer/kernel/override-imagestring linux-server diff --git a/modules/install-server/files/autoinstall/x86_64.cfg b/modules/install-server/files/autoinstall/x86_64.cfg deleted file mode 100644 index 98f6c16..000 --- a/modules/install-server/files/autoinstall/x86_64.cfg +++ /dev/null @@ -1,2 +0,0 @@ -# Use a server kernel -d-i base-installer/kernel/override-imagestring linux-server -- To view, visit https://gerrit.wikimedia.org/r/178162 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
[MediaWiki-commits] [Gerrit] apt: switch components based on $lsbdistid - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178166
Change subject: apt: switch components based on $lsbdistid
..
apt: switch components based on $lsbdistid
We decided to name our Debian backports component just backports
instead of universe, so we need to do this conditionally.
Change-Id: Id24732dd5435b06253d329eb4a1627d6c4ae9862
---
M modules/apt/manifests/init.pp
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/66/178166/1
diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index 79e4eff..76f9ac3 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -26,10 +26,16 @@
require = Package['python-apt'],
}
+$components = $::lsbdistid ?
+'Debian' = 'main backports non-free',
+'Ubuntu' = 'main universe non-free',
+default = fail('Unrecognized operating system'),
+}
+
apt::repository { 'wikimedia':
uri = 'http://apt.wikimedia.org/wikimedia',
dist= ${::lsbdistcodename}-wikimedia,
-components = 'main universe non-free',
+components = $components,
comment_old = true,
}
--
To view, visit https://gerrit.wikimedia.org/r/178166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id24732dd5435b06253d329eb4a1627d6c4ae9862
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: apt components based on Debian/Ubuntu - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/178167 Change subject: autoinstall: apt components based on Debian/Ubuntu .. autoinstall: apt components based on Debian/Ubuntu Use different apt components in the installer depending on Debian/Ubuntu. Change-Id: Ibfa8833f22caac3ba7a1ce21860826d1065557eb --- M modules/install-server/files/autoinstall/scripts/early_command 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/67/178167/1 diff --git a/modules/install-server/files/autoinstall/scripts/early_command b/modules/install-server/files/autoinstall/scripts/early_command index 6b080d2..92fcf1b 100644 --- a/modules/install-server/files/autoinstall/scripts/early_command +++ b/modules/install-server/files/autoinstall/scripts/early_command @@ -1,7 +1,6 @@ #!/bin/sh set -e -set -x ## redo network configuration statically # at least trusty has ip under /sbin @@ -26,8 +25,14 @@ killall.sh || kill-all-dhcp; netcfg ## preseed the correct wikimedia repository location -SUITE=$(debconf-get mirror/suite) -echo d-i apt-setup/local0/repository string http://apt.wikimedia.org/wikimedia $SUITE-wikimedia main universe non-free /tmp/apt_repository.cfg +if [ -f /usr/share/keyrings/ubuntu-archive-keyring.gpg ]; then + SUITE=$(debconf-get mirror/suite) + echo d-i apt-setup/local0/repository string http://apt.wikimedia.org/wikimedia $SUITE-wikimedia main universe non-free /tmp/apt_repository.cfg +else + #SUITE=$(debconf-get mirror/codename) # is set later in the process + SUITE=$(cat /etc/default-release) + echo d-i apt-setup/local0/repository string http://apt.wikimedia.org/wikimedia $SUITE-wikimedia main backports non-free /tmp/apt_repository.cfg +fi debconf-set-selections /tmp/apt_repository.cfg # apt-setup doesn't allow us to set up pinning and hence everything we install -- To view, visit https://gerrit.wikimedia.org/r/178167 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibfa8833f22caac3ba7a1ce21860826d1065557eb Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: move rootdelay=90 to Ubuntu-specific - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/178168 Change subject: autoinstall: move rootdelay=90 to Ubuntu-specific .. autoinstall: move rootdelay=90 to Ubuntu-specific systemd manages to do a reasonable job at booting with the dependencies right, so there's no reason to wait 1½ minutes to boot. Probably :) Let's try it for new installs. Change-Id: I7d5b666727018995a61dd971be06aec50be35219 --- M modules/install-server/files/autoinstall/common.cfg M modules/install-server/files/autoinstall/trusty.cfg 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/68/178168/1 diff --git a/modules/install-server/files/autoinstall/common.cfg b/modules/install-server/files/autoinstall/common.cfg index 8396584..30fc2e2 100644 --- a/modules/install-server/files/autoinstall/common.cfg +++ b/modules/install-server/files/autoinstall/common.cfg @@ -19,9 +19,8 @@ d-igrub-installer/only_debian boolean true d-igrub-installer/with_other_osboolean true -#d-i grub-installer/grub2_instead_of_grub_legacy boolean false d-igrub-installer/bootdev string /dev/sda -d-idebian-installer/add-kernel-optsstring elevator=deadline rootdelay=90 +d-idebian-installer/add-kernel-optsstring elevator=deadline d-igrub-pc grub-pc/hidden_timeout boolean false # Avoid that last message about the install being complete. diff --git a/modules/install-server/files/autoinstall/trusty.cfg b/modules/install-server/files/autoinstall/trusty.cfg index f16cdcd..4c3f255 100644 --- a/modules/install-server/files/autoinstall/trusty.cfg +++ b/modules/install-server/files/autoinstall/trusty.cfg @@ -9,3 +9,5 @@ # Use a server kernel d-i base-installer/kernel/override-imagestring linux-server + +d-idebian-installer/add-kernel-optsstring elevator=deadline rootdelay=90 -- To view, visit https://gerrit.wikimedia.org/r/178168 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d5b666727018995a61dd971be06aec50be35219 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: add missing subnets to preseed.cfg - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: autoinstall: add missing subnets to preseed.cfg .. autoinstall: add missing subnets to preseed.cfg Subnets: - labs-support1-b-codfw - labs-hosts1-c-eqiad - labs-hosts1-d-eqiad ...had a subnets/ cfg file but no preseed.cfg config to point there. Change-Id: Ib0e0f232de73a7dbb9565efed97516266d4ede72 --- M modules/install-server/files/autoinstall/netboot.cfg 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/install-server/files/autoinstall/netboot.cfg b/modules/install-server/files/autoinstall/netboot.cfg index 76ee00a..935a206 100755 --- a/modules/install-server/files/autoinstall/netboot.cfg +++ b/modules/install-server/files/autoinstall/netboot.cfg @@ -25,7 +25,9 @@ 10.64.19.255) echo subnets/private1-b-eqiad.cfg ;; \ 10.64.20.255) echo subnets/labs-hosts1-b-eqiad.cfg ;; \ 10.64.35.255) echo subnets/private1-c-eqiad.cfg ;; \ + 10.64.36.255) echo subnets/labs-hosts1-c-eqiad.cfg ;; \ 10.64.51.255) echo subnets/private1-d-eqiad.cfg ;; \ + 10.64.52.255) echo subnets/labs-hosts1-d-eqiad.cfg ;; \ 10.64.5.255) echo subnets/analytics1-a-eqiad.cfg ;; \ 10.64.21.255) echo subnets/analytics1-b-eqiad.cfg ;; \ 10.64.36.255) echo subnets/analytics1-c-eqiad.cfg ;; \ @@ -34,6 +36,7 @@ 10.128.0.255) echo subnets/private1-ulsfo.cfg ;; \ 10.192.3.255) echo subnets/private1-a-codfw.cfg ;; \ 10.192.19.255) echo subnets/private1-b-codfw.cfg ;; \ + 10.192.21.255) echo subnets/labs-support1-b-codfw.cfg ;; \ 10.192.35.255) echo subnets/private1-c-codfw.cfg ;; \ 10.192.51.255) echo subnets/private1-d-codfw.cfg ;; \ 91.198.174.127) echo subnets/esams.cfg ;; \ -- To view, visit https://gerrit.wikimedia.org/r/178154 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib0e0f232de73a7dbb9565efed97516266d4ede72 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: kill i386/i686 variants - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: autoinstall: kill i386/i686 variants .. autoinstall: kill i386/i686 variants These are unused for a long time now. Keep the architecture detection for now, even though x86_64.cfg is the only one actually being used. Change-Id: I139c34ebd67333d8d9f4a1439dea172a73513dd9 --- D modules/install-server/files/autoinstall/i386.cfg D modules/install-server/files/autoinstall/i686.cfg 2 files changed, 0 insertions(+), 3 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/install-server/files/autoinstall/i386.cfg b/modules/install-server/files/autoinstall/i386.cfg deleted file mode 100644 index 98f6c16..000 --- a/modules/install-server/files/autoinstall/i386.cfg +++ /dev/null @@ -1,2 +0,0 @@ -# Use a server kernel -d-i base-installer/kernel/override-imagestring linux-server diff --git a/modules/install-server/files/autoinstall/i686.cfg b/modules/install-server/files/autoinstall/i686.cfg deleted file mode 12 index 8ac1893..000 --- a/modules/install-server/files/autoinstall/i686.cfg +++ /dev/null @@ -1 +0,0 @@ -i386.cfg \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/178155 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I139c34ebd67333d8d9f4a1439dea172a73513dd9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Kill unused files/misc/update-repository - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Kill unused files/misc/update-repository
..
Kill unused files/misc/update-repository
Change-Id: I1237c9fafe0e5c8eed97ad12c05668eba559c2f4
---
D files/misc/update-repository
1 file changed, 0 insertions(+), 63 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/misc/update-repository b/files/misc/update-repository
deleted file mode 100755
index 618785a..000
--- a/files/misc/update-repository
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/misc/update-repository
-#
-
-#
-# APT repository update script
-# Written by Mark Bergsma m...@nedworks.org
-
-set -e
-
-REPOSITORY_ROOT=/srv/wikimedia
-DISTRIBUTIONS=hardy-wikimedia karmic-wikimedia lucid-wikimedia
-COMPONENTS=main restricted universe multiverse
-ARCHITECTURES=amd64
-CODENAME=hardy
-VERSION=8.04
-
-GPGKEY=Wikimedia Archive Automatic Signing Key r...@wikimedia.org
-
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-
-cd $REPOSITORY_ROOT
-
-for distribution in $DISTRIBUTIONS
-do
- for component in $COMPONENTS
- do
- # Generate the overrides file
- find pool -name '*.deb' -exec dpkg-deb --show
--showformat='${Package}\t${Priority}\t${Section}\n' {} \; \
-indices/override.$distribution.$component
-
- # Generate the Packages files
- for architecture in $ARCHITECTURES
- do
- dpkg-scanpackages -m -a $architecture pool/$component
indices/override.$distribution.$component \
-
dists/$distribution/$component/binary-$architecture/Packages
- gzip -c
dists/$distribution/$component/binary-$architecture/Packages \
-
dists/$distribution/$component/binary-$architecture/Packages.gz
- bzip2 -c
dists/$distribution/$component/binary-$architecture/Packages \
-
dists/$distribution/$component/binary-$architecture/Packages.bz2
-
- # Redundant? why twice?
-#dpkg-scanpackages -m -a $architecture pool/$component
indices/override.$distribution.$component \
-#| bzip2 -c
dists/$distribution/$component/binary-$architecture/Packages.bz2
- done
-
- # Generate the Sources files
- dpkg-scansources pool/$component /dev/null \
-dists/$distribution/$component/source/Sources
- gzip -c dists/$distribution/$component/source/Sources \
-
dists/$distribution/$component/source/Sources.gz
- bzip2 -c dists/$distribution/$component/source/Sources \
-
dists/$distribution/$component/source/Sources.bz2
- done
-
- # Generate the Release file
- apt-ftparchive -o 'APT::FTPArchive::Release::Origin=Wikimedia' -o
'APT::FTPArchive::Release::Label=Wikimedia' -o
APT::FTPArchive::Release::Suite=$distribution -o
APT::FTPArchive::Release::Version=$VERSION -o
APT::FTPArchive::Release::Codename=$CODENAME -o
APT::FTPArchive::Release::Architectures=$ARCHITECTURES -o
APT::FTPArchive::Release::Components=$COMPONENTS release dists/$distribution
dists/$distribution/Release
-
- # Sign the Release file
- gpg --batch --yes -a -b -u $GPGKEY -o dists/$distribution/Release.gpg
dists/$distribution/Release
-done
--
To view, visit https://gerrit.wikimedia.org/r/178153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1237c9fafe0e5c8eed97ad12c05668eba559c2f4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WikiAdmin: Fix for shop link - change (mediawiki...BlueSpiceExtensions)
Smuggli has submitted this change and it was merged.
Change subject: WikiAdmin: Fix for shop link
..
WikiAdmin: Fix for shop link
The shop link was not placed in an list item element which caused
malformed html
Change-Id: Idfe18c02715390bbfd628049c0b1366a40f4cacc
---
M WikiAdmin/WikiAdmin.class.php
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/WikiAdmin/WikiAdmin.class.php b/WikiAdmin/WikiAdmin.class.php
index c464e0c..7676e4f 100644
--- a/WikiAdmin/WikiAdmin.class.php
+++ b/WikiAdmin/WikiAdmin.class.php
@@ -216,7 +216,7 @@
$aOutSortable[$sModulLabel] = 'li'.$sLink.'/li';
}
- $aOutSortable['Shop'] = self::getShopLink();
+ $aOutSortable['Shop'] = self::getShopListItem();
ksort( $aOutSortable );
$aOut[] = implode( \n, $aOutSortable ).'/ul';
@@ -236,10 +236,10 @@
}
/**
-* Returns a link to the BlueSpice shop
+* Returns a list item with a link to the BlueSpice shop
* @return string Link to the shop
*/
- private static function getShopLink() {
+ private static function getShopListItem() {
$sLink = Html::element(
'a',
array(
@@ -249,6 +249,6 @@
),
wfMessage( 'bs-wikiadmin-shop' )-escaped()
);
- return $sLink;
+ return 'li'.$sLink.'/li';
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/178149
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idfe18c02715390bbfd628049c0b1366a40f4cacc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: switch to autoinstall/enable=true - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: autoinstall: switch to autoinstall/enable=true .. autoinstall: switch to autoinstall/enable=true Right now, we have a bunch of locale/keyboard configuration options on the kernel command-line instead of common.cfg, as these happen before network configuration. However, d-i has a mode for telling it to do this after the netcfg step, precisely for preseeding: autoinstall/enable=true, also know as auto. Pass this to the kernel command-line instead and move the two configuration directives to common.cfg. While at it, drop a bunch of deprecated and/or unneeded such options as we only need two right now: locale keyboard layout. This has been tested with both precise trusty. Change-Id: I0a23d80b94d8ed3e0ae5b64903439c8d56b6bf6e --- M modules/install-server/files/autoinstall/common.cfg M modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-115200 M modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-57600 M modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-9600 M modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS1-115200 M modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS1-57600 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-115200 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-57600 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-9600 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS1-115200 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS1-57600 11 files changed, 16 insertions(+), 10 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/install-server/files/autoinstall/common.cfg b/modules/install-server/files/autoinstall/common.cfg index d8cf8ad..77c96f2 100644 --- a/modules/install-server/files/autoinstall/common.cfg +++ b/modules/install-server/files/autoinstall/common.cfg @@ -1,4 +1,10 @@ # some basic configs, may be overridden by other files + +# these need autoinstall/enable=true (aka auto) on the command-line so they +# can take place after network configuration +d-idebian-installer/locale string en_US +d-ikeyboard-configuration/layoutcode string us + base-configtzconfig/gmtboolean true d-iclock-setup/utc boolean true d-itime/zone string UTC diff --git a/modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-115200 b/modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-115200 index 3122a5d..e142845 100644 --- a/modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-115200 +++ b/modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-115200 @@ -9,4 +9,4 @@ LABEL server kernel ubuntu-installer/amd64/linux - append debian-installer/locale=en_US console-setup/ask_detect=false console-setup/layoutcode=us keyboard-configuration/layout=English (US) keyboard-configuration/variant=English (US) vga=normal initrd=ubuntu-installer/amd64/initrd.gz preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,115200n8 + append initrd=ubuntu-installer/amd64/initrd.gz vga=normal autoinstall/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,115200n8 diff --git a/modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-57600 b/modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-57600 index 635a989..71bc7c6 100644 --- a/modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-57600 +++ b/modules/install-server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-57600 @@ -9,4 +9,4 @@ LABEL server kernel ubuntu-installer/amd64/linux - append debian-installer/locale=en_US console-setup/ask_detect=false console-setup/layoutcode=us keyboard-configuration/layout=English (US) keyboard-configuration/variant=English (US) vga=normal initrd=ubuntu-installer/amd64/initrd.gz preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,57600n8 + append initrd=ubuntu-installer/amd64/initrd.gz vga=normal autoinstall/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,57600n8 diff --git
[MediaWiki-commits] [Gerrit] autoinstall: add jessie-installer - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: autoinstall: add jessie-installer .. autoinstall: add jessie-installer This adds a profile for Debian 8, codenamed Jessie. This is identical with precise/trusty, with the following differences: - s/ubuntu-installer/debian-installer - no biosdevname=0, since that's biosdevname is Ubuntu-only functionality (and = trusty as well). Note that this won't make jessie installs working by themselves. More changes are needed and will follow this commit. Change-Id: I4bfec1ea14400208d300af96e0bc223ccb1872ec --- A modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/boot.txt A modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 A modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 A modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 A modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-115200 A modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-57600 6 files changed, 64 insertions(+), 0 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/boot.txt b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/boot.txt new file mode 100644 index 000..6eb8d73 --- /dev/null +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/boot.txt @@ -0,0 +1,4 @@ + + +Debian 8 (jessie) amd64 (Wikimedia edition) + diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 new file mode 100644 index 000..99bca38 --- /dev/null +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 @@ -0,0 +1,12 @@ +SERIAL 0x3F8 115200 +CONSOLE 0 + +DISPLAY pxelinux.cfg/boot.txt + +default server +prompt 1 +timeout 100 + +LABEL server + kernel debian-installer/amd64/linux + append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,115200n8 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 new file mode 100644 index 000..c1dbd3c --- /dev/null +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 @@ -0,0 +1,12 @@ +SERIAL 0x3F8 57600 +CONSOLE 0 + +DISPLAY pxelinux.cfg/boot.txt + +default server +prompt 1 +timeout 100 + +LABEL server + kernel debian-installer/amd64/linux + append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,57600n8 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 new file mode 100644 index 000..f516486 --- /dev/null +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 @@ -0,0 +1,12 @@ +SERIAL 0x3F8 9600 +CONSOLE 0 + +DISPLAY pxelinux.cfg/boot.txt + +default server +prompt 1 +timeout 100 + +LABEL server + kernel debian-installer/amd64/linux + append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,9600n8 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-115200 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-115200 new file mode 100644 index 000..654fd20 --- /dev/null +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-115200 @@ -0,0 +1,12 @@ +SERIAL 0x2F8 115200 +CONSOLE 0 + +DISPLAY pxelinux.cfg/boot.txt + +default server +prompt 1 +timeout 100 + +LABEL server + kernel debian-installer/amd64/linux + append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS1,115200n8 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-57600 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-57600 new
[MediaWiki-commits] [Gerrit] autoinstall: preseed xkb-keymap for jessie - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: autoinstall: preseed xkb-keymap for jessie .. autoinstall: preseed xkb-keymap for jessie console-setup 1.59 introduced keyboard-configuration/xkb-keymap (and 1.89 allowed it to be preseeded). This supersedes (replaces enhances) keyboard-configuration/layoutcode that we already use. Jessie currently comes with 1.114 and prompts for more keyboard layout options without this option. Trusty comes with 1.70ubuntu8, but 1.70ubuntu2 forked from Debian and dropped support for xkb-keymap. Preseed this with a value of us and keep our layoutcode setting for current/future Ubuntu installs. Change-Id: Ic8bb1685c5d5b71f60549206cad0a908ba877727 --- M modules/install-server/files/autoinstall/common.cfg 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/install-server/files/autoinstall/common.cfg b/modules/install-server/files/autoinstall/common.cfg index 77c96f2..fdadc8b 100644 --- a/modules/install-server/files/autoinstall/common.cfg +++ b/modules/install-server/files/autoinstall/common.cfg @@ -4,6 +4,7 @@ # can take place after network configuration d-idebian-installer/locale string en_US d-ikeyboard-configuration/layoutcode string us +d-ikeyboard-configuration/xkb-keymap string us base-configtzconfig/gmtboolean true d-iclock-setup/utc boolean true -- To view, visit https://gerrit.wikimedia.org/r/178158 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic8bb1685c5d5b71f60549206cad0a908ba877727 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: s/--/---/ for jessie's kernel cmdline - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: autoinstall: s/--/---/ for jessie's kernel cmdline .. autoinstall: s/--/---/ for jessie's kernel cmdline Linux = 3.15 added a feature where every kernel command-line option after a -- is ignored. This broke d-i, which had a documented behavior of using kernel command-line options that were passed after a -- to both the installer and the target. Jessie beta2+ comes with 3.16, so this resulted in console output coming into the VGA instead of the serial port (the only option we passed after --). Replace this with --- which is what is currently proposed at https://bugs.debian.org/764675. Note that this isn't fixed yet as of beta2, so the option is currently *not* copied to the target. It does fix the installer output, though, and looks like something that might get merged before the release of jessie. Change-Id: If2366cc9cac1ed3e37a0b7de7446e9dbb907da45 --- M modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 M modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 M modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 M modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-115200 M modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-57600 5 files changed, 5 insertions(+), 5 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 index 99bca38..b8f9100 100644 --- a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-115200 @@ -9,4 +9,4 @@ LABEL server kernel debian-installer/amd64/linux - append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,115200n8 + append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 --- console=ttyS0,115200n8 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 index c1dbd3c..11cf075 100644 --- a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-57600 @@ -9,4 +9,4 @@ LABEL server kernel debian-installer/amd64/linux - append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,57600n8 + append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 --- console=ttyS0,57600n8 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 index f516486..3b6bc36 100644 --- a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 +++ b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS0-9600 @@ -9,4 +9,4 @@ LABEL server kernel debian-installer/amd64/linux - append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,9600n8 + append initrd=debian-installer/amd64/initrd.gz vga=normal auto-install/enable=true preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 --- console=ttyS0,9600n8 diff --git a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-115200 b/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-115200 index 654fd20..1075a77 100644 --- a/modules/install-server/files/tftpboot/jessie-installer/pxelinux.cfg/ttyS1-115200 +++
[MediaWiki-commits] [Gerrit] Add i18n file in JSON format - change (mediawiki...XMLContentExtension)
Raimond Spekking has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178169
Change subject: Add i18n file in JSON format
..
Add i18n file in JSON format
* Remove trailing ?
* Fix indention
Change-Id: Ifc23557fe1b369d70a917bf472be7374709a06b9
---
D XMLContentExtension.i18n.php
M XMLContentExtension.php
A i18n/en.json
A i18n/qqq.json
4 files changed, 36 insertions(+), 19 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/XMLContentExtension
refs/changes/69/178169/1
diff --git a/XMLContentExtension.i18n.php b/XMLContentExtension.i18n.php
deleted file mode 100644
index e69de29..000
--- a/XMLContentExtension.i18n.php
+++ /dev/null
diff --git a/XMLContentExtension.php b/XMLContentExtension.php
index 6d82d3e..2568ec0 100644
--- a/XMLContentExtension.php
+++ b/XMLContentExtension.php
@@ -1,27 +1,28 @@
?php
- $wgExtensionCredits['other'][] = array(
-'path' = __FILE__,
-'name' = 'XMLContent',
-'version' = 0.1,
-'author' = 'Johannes Nanninga (mailto:johannes.nanni...@stud.uni-due.de)',
-'url' = '',
-'description' = 'Adds a new Namespace and Content type that can contain,
display, edit, and validate XML.',
- );
+$wgExtensionCredits['other'][] = array(
+ 'path' = __FILE__,
+ 'name' = 'XMLContentExtension',
+ 'version' = 0.1,
+ 'author' = 'Johannes Nanninga
(mailto:johannes.nanni...@stud.uni-due.de)',
+ 'url' = 'https://www.mediawiki.org/wiki/Extension:XMLContentExtension',
+ 'descriptiondesc' = 'xmlcontentextension-desc',
+);
+/**
+ * Load i18n file
+ */
+$wgMessagesDirs['XMLContentExtension'] = __DIR__ . '/i18n';
- require_once(__DIR__ . '/include/NSFunctions.php');
+require_once(__DIR__ . '/include/NSFunctions.php');
- require_once(__DIR__ . '/XMLContentExtension.body.php');
- require_once(__DIR__ . '/XMLContentExtension.i18n.php');
+require_once(__DIR__ . '/XMLContentExtension.body.php');
- require_once(__DIR__ . '/include/XmlContent.class.php');
- require_once(__DIR__ . '/include/XmlContentHandler.class.php');
- require_once(__DIR__ . '/include/XMLDocument.class.php');
+require_once(__DIR__ . '/include/XmlContent.class.php');
+require_once(__DIR__ . '/include/XmlContentHandler.class.php');
+require_once(__DIR__ . '/include/XMLDocument.class.php');
- require_once(__DIR__ . '/XMLContentExtension.resources.php');
+require_once(__DIR__ . '/XMLContentExtension.resources.php');
- require_once(__DIR__ . '/XMLContentExtension.hooks.php');
- require_once(__DIR__ . '/XMLContentExtension.routes.php');
-
-?
+require_once(__DIR__ . '/XMLContentExtension.hooks.php');
+require_once(__DIR__ . '/XMLContentExtension.routes.php');
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..a62568d
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,8 @@
+{
+ @metadata: {
+ authors: [
+ Raimond Spekking
+ ]
+ },
+ xmlcontentextension-desc:
{{desc|name=XMLContentExtension|url=https://www.mediawiki.org/wiki/Extension:XMLContentExtension}};
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..6041ff3
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,8 @@
+{
+ @metadata: {
+ authors: [
+ Johannes Nanninga
+ ]
+ },
+ xmlcontentextension-desc: Adds a new namespace and content type that
can contain, display, edit, and validate XML
+}
--
To view, visit https://gerrit.wikimedia.org/r/178169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc23557fe1b369d70a917bf472be7374709a06b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/XMLContentExtension
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update cached article count monthly to avoid social unrest - change (operations/puppet)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178170
Change subject: Update cached article count monthly to avoid social unrest
..
Update cached article count monthly to avoid social unrest
The link-based article count is now fast to update, as it doesn't
require page parsing as it used to until some years ago. However,
it's not instant, so it sometimes gets very out of sync. Then wrong
counts are corrected and users freak out as if Orson Welles had
announced an alien invasion at the radio.
We are sick of
* users making Reedy waste precious time to run the script manually,
* clueless discussions where we're asked to prove that no, there is
no teapot in orbit around the sun.
Wikibooks is excluded because some subdomains use comma count which
has unknown performance. Multilingual projects are excluded because
nobody there cares about article count and some are huge.
Bug: T68867
Change-Id: I13f866b565f665a00ec6ce61bb5073cf380bd0ff
---
A files/misc/scripts/update-article-count
M manifests/misc/maintenance.pp
2 files changed, 31 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/178170/1
diff --git a/files/misc/scripts/update-article-count
b/files/misc/scripts/update-article-count
new file mode 100644
index 000..5998fd8
--- /dev/null
+++ b/files/misc/scripts/update-article-count
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+. /etc/profile.d/mediawiki.sh
+
+cd $MEDIAWIKI_DEPLOYMENT_DIR/multiversion
+# All language subdomains of content projects, unless they use comma count
+for set in wikinews wikipedia wikiquote wikisource wikiversity wikivoyage
wiktionary; do
+ echo $set
+ /usr/local/bin/mwscriptwikiset updateArticleCount.php $set.dblist
--update
+ echo
+ echo
+done
diff --git a/manifests/misc/maintenance.pp b/manifests/misc/maintenance.pp
index 70b90a0..a3ed43c 100644
--- a/manifests/misc/maintenance.pp
+++ b/manifests/misc/maintenance.pp
@@ -168,6 +168,25 @@
}
}
+class misc::maintenance::update_article_count( $ensure = present ) {
+cron { 'update_article_count':
+ensure = $ensure,
+command = 'flock -n /var/lock/update-article-count
/usr/local/bin/update-article-count /var/log/mediawiki/updateArticleCount.log
21',
+user = 'apache',
+monthday = 29,
+hour = 5,
+minute = 0,
+}
+
+file { '/usr/local/bin/update-article-count':
+ensure = $ensure,
+source = 'puppet:///files/misc/scripts/update-article-count',
+owner = 'apache',
+group = 'wikidev',
+mode = '0755',
+}
+}
+
class misc::maintenance::wikidata( $ensure = present ) {
cron { 'wikibase-repo-prune2':
ensure = $ensure,
--
To view, visit https://gerrit.wikimedia.org/r/178170
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I13f866b565f665a00ec6ce61bb5073cf380bd0ff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Nemo bis federicol...@tiscali.it
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Stab in the dark: Try booting virt1011 from port2 - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178172
Change subject: Stab in the dark: Try booting virt1011 from port2
..
Stab in the dark: Try booting virt1011 from port2
Change-Id: I1d00265708515cc8944246fc6f0faffe4a20acbd
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/178172/1
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 206bcbb..bb1ae83 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3985,7 +3985,7 @@
}
host virt1011 {
-hardware ethernet f0:92:1c:05:4a:98;
+hardware ethernet f0:92:1c:05:4a:9c;
fixed-address virt1011.eqiad.wmnet;
}
--
To view, visit https://gerrit.wikimedia.org/r/178172
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d00265708515cc8944246fc6f0faffe4a20acbd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix fatal under MediaWiki 1.24 - change (mediawiki...WhosOnline)
Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178173
Change subject: Fix fatal under MediaWiki 1.24
..
Fix fatal under MediaWiki 1.24
Change-Id: I309be10353614a32bada9138f99f517b6a7a7c63
---
M WhosOnlineSpecialPage.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WhosOnline
refs/changes/73/178173/1
diff --git a/WhosOnlineSpecialPage.php b/WhosOnlineSpecialPage.php
index 1983fdc..36a398c 100644
--- a/WhosOnlineSpecialPage.php
+++ b/WhosOnlineSpecialPage.php
@@ -75,10 +75,10 @@
function getNavigationBar() {
global $wgContLang;
- return wfViewPrevNext(
+ return $this-getLanguage()-viewPrevNext(
+ $wgContLang-specialpage( 'WhosOnline' ),
$this-mOffset,
$this-mLimit,
- $wgContLang-specialpage( 'WhosOnline' ),
'',
$this-countUsersOnline() ( $this-mLimit +
$this-mOffset ) // show next link
);
--
To view, visit https://gerrit.wikimedia.org/r/178173
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I309be10353614a32bada9138f99f517b6a7a7c63
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WhosOnline
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix fatal under MediaWiki 1.24 - change (mediawiki...Editcount)
Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178174
Change subject: Fix fatal under MediaWiki 1.24
..
Fix fatal under MediaWiki 1.24
Change-Id: I6c989eb90878376c42f06d5da59b3473075dc3e5
---
M Editcount_body.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Editcount
refs/changes/74/178174/1
diff --git a/Editcount_body.php b/Editcount_body.php
index d388801..1064807 100644
--- a/Editcount_body.php
+++ b/Editcount_body.php
@@ -23,7 +23,7 @@
$user = User::newFromName( $username );
$username = is_object( $user ) ? $user-getName() : '';
- $uid = $user-getId();
+ $uid = ( $user instanceof User ? $user-getId() : 0 );
if ( $this-including() ) {
if ( $namespace === null ) {
--
To view, visit https://gerrit.wikimedia.org/r/178174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c989eb90878376c42f06d5da59b3473075dc3e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Editcount
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jQuery's .live was deprecated in jQuery version 1.7 and remo... - change (mediawiki...AJAXPoll)
Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178175
Change subject: jQuery's .live was deprecated in jQuery version 1.7 and removed
in 1.9, so don't use it here, it'll just generate TypeErrors under MW 1.24
..
jQuery's .live was deprecated in jQuery version 1.7 and removed in 1.9, so
don't use it here, it'll just generate TypeErrors under MW 1.24
Change-Id: I703ea427e00fdea957788c8d29892ebb6fe3fffa
---
M resources/ajaxpoll.js
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AJAXPoll
refs/changes/75/178175/1
diff --git a/resources/ajaxpoll.js b/resources/ajaxpoll.js
index 2dc4c86..4857b54 100644
--- a/resources/ajaxpoll.js
+++ b/resources/ajaxpoll.js
@@ -1,6 +1,6 @@
var ajaxpollTmp;
-$(.ajaxpoll-answer-vote).live(mouseover,
+$(.ajaxpoll-answer-vote).on(mouseover,
function(){
var sp=$(this).find(span);
ajaxpollTmp=sp.html();
@@ -9,7 +9,7 @@
}
);
-$(.ajaxpoll-answer-vote).live(mouseout,
+$(.ajaxpoll-answer-vote).on(mouseout,
function(){
var sp=$(this).find(span);
sp.attr(title,sp.text());
@@ -19,7 +19,7 @@
/* attach click handler */
$(.ajaxpoll-answer-name label)
- .live(click,
+ .on(click,
function(event){
event.preventDefault();
event.stopPropagation();
@@ -44,23 +44,23 @@
}
)
-$(.ajaxpoll-answer-name:not(.ajaxpoll-answer-name-revoke)
label).live(mouseover,
+$(.ajaxpoll-answer-name:not(.ajaxpoll-answer-name-revoke)
label).on(mouseover,
function(){
$(this).addClass(ajaxpoll-hover-vote);
}
);
-$(.ajaxpoll-answer-name:not(.ajaxpoll-answer-name-revoke)
label).live(mouseout,
+$(.ajaxpoll-answer-name:not(.ajaxpoll-answer-name-revoke)
label).on(mouseout,
function(){
$(this).removeClass(ajaxpoll-hover-vote);
}
);
-$(.ajaxpoll-answer-name-revoke label).live(mouseover,
+$(.ajaxpoll-answer-name-revoke label).on(mouseover,
function(){
$(this).addClass(ajaxpoll-hover-revoke);
}
);
-$(.ajaxpoll-answer-name-revoke label).live(mouseout,
+$(.ajaxpoll-answer-name-revoke label).on(mouseout,
function(){
$(this).removeClass(ajaxpoll-hover-revoke);
}
--
To view, visit https://gerrit.wikimedia.org/r/178175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I703ea427e00fdea957788c8d29892ebb6fe3fffa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AJAXPoll
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix path to font files - change (mediawiki...Gamepress)
Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178176
Change subject: Fix path to font files
..
Fix path to font files
Change-Id: Icc9ad00bddf5fffc0aa5c9461d729e9204271acd
---
M resources/css/style.css
1 file changed, 25 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Gamepress
refs/changes/76/178176/1
diff --git a/resources/css/style.css b/resources/css/style.css
index 8eb4834..71f81b3 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -1705,51 +1705,51 @@
@font-face {
font-family: 'OpenSansRegular';
- src: url('fonts/opensans-regular.eot');
- src: url('fonts/opensans-regular.eot?#iefix')
format('embedded-opentype'),
-url('fonts/opensans-regular.woff') format('woff'),
-url('fonts/opensans-regular.ttf') format('truetype'),
-url('fonts/opensans-regular.svg#OpenSansRegular')
format('svg');
+ src: url('../fonts/opensans-regular.eot');
+ src: url('../fonts/opensans-regular.eot?#iefix')
format('embedded-opentype'),
+url('../fonts/opensans-regular.woff') format('woff'),
+url('../fonts/opensans-regular.ttf') format('truetype'),
+url('../fonts/opensans-regular.svg#OpenSansRegular')
format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'OpenSansSemiboldRegular';
- src: url('fonts/opensans-semibold.eot');
- src: url('fonts/opensans-semibold.eot?#iefix')
format('embedded-opentype'),
-url('fonts/opensans-semibold.woff') format('woff'),
-url('fonts/opensans-semibold.ttf') format('truetype'),
-url('fonts/opensans-semibold.svg#OpenSansSemiboldRegular')
format('svg');
+ src: url('../fonts/opensans-semibold.eot');
+ src: url('../fonts/opensans-semibold.eot?#iefix')
format('embedded-opentype'),
+url('../fonts/opensans-semibold.woff') format('woff'),
+url('../fonts/opensans-semibold.ttf') format('truetype'),
+url('../fonts/opensans-semibold.svg#OpenSansSemiboldRegular')
format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'OpenSansBold';
- src: url('fonts/opensans-bold.eot');
- src: url('fonts/opensans-bold.eot?#iefix') format('embedded-opentype'),
-url('fonts/opensans-bold.woff') format('woff'),
-url('fonts/opensans-bold.ttf') format('truetype'),
-url('fonts/opensans-bold.svg#OpenSansBold') format('svg');
+ src: url('../fonts/opensans-bold.eot');
+ src: url('../fonts/opensans-bold.eot?#iefix')
format('embedded-opentype'),
+url('../fonts/opensans-bold.woff') format('woff'),
+url('../fonts/opensans-bold.ttf') format('truetype'),
+url('../fonts/opensans-bold.svg#OpenSansBold') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'OpenSansItalic';
- src: url('fonts/opensans-italic.eot');
- src: url('fonts/opensans-italic.eot?#iefix')
format('embedded-opentype'),
-url('fonts/opensans-italic.woff') format('woff'),
-url('fonts/opensans-italic.ttf') format('truetype'),
-url('fonts/opensans-italic.svg#OpenSansItalic') format('svg');
+ src: url('../fonts/opensans-italic.eot');
+ src: url('../fonts/opensans-italic.eot?#iefix')
format('embedded-opentype'),
+url('../fonts/opensans-italic.woff') format('woff'),
+url('../fonts/opensans-italic.ttf') format('truetype'),
+url('../fonts/opensans-italic.svg#OpenSansItalic')
format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'FrancoisOneRegular';
- src: url('fonts/francoisone.eot');
- src: url('fonts/francoisone.eot?#iefix') format('embedded-opentype'),
-url('fonts/francoisone.woff') format('woff'),
-url('fonts/francoisone.ttf') format('truetype'),
-url('fonts/francoisone.svg#FrancoisOneRegular') format('svg');
+ src: url('../fonts/francoisone.eot');
+ src: url('../fonts/francoisone.eot?#iefix') format('embedded-opentype'),
+url('../fonts/francoisone.woff') format('woff'),
+url('../fonts/francoisone.ttf') format('truetype'),
+url('../fonts/francoisone.svg#FrancoisOneRegular')
format('svg');
font-weight: normal;
font-style: normal;
}
--
To view, visit https://gerrit.wikimedia.org/r/178176
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc9ad00bddf5fffc0aa5c9461d729e9204271acd
Gerrit-PatchSet: 1
[MediaWiki-commits] [Gerrit] update L10N for fr-wiki from core - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged.
Change subject: update L10N for fr-wiki from core
..
update L10N for fr-wiki from core
Change-Id: Ib9679a2c502a48acfbbfc58a7227c6ad08853844
---
M solve_disambiguation.py
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/solve_disambiguation.py b/solve_disambiguation.py
index 0e8c204..678302e 100644
--- a/solve_disambiguation.py
+++ b/solve_disambiguation.py
@@ -76,7 +76,6 @@
python solve_disambiguation.py -just -pos:New_Name Old_Name
-
#
# (C) Rob W.W. Hooft, 2003
# (C) Daniel Herding, 2004
@@ -96,8 +95,7 @@
import wikipedia as pywikibot
import editarticle
import pagegenerators
-from pywikibot import config
-from pywikibot import i18n
+from pywikibot import config, i18n
# Summary message when working on disambiguation pages
msg = 'solve_disambiguation-links-resolved'
@@ -113,6 +111,7 @@
# Disambiguation Needed template
dn_template = {
'en': u'{{dn}}',
+'fr': u'{{Lien vers un homonyme}}',
}
# Summary message when adding Disambiguation Needed template
--
To view, visit https://gerrit.wikimedia.org/r/178064
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9679a2c502a48acfbbfc58a7227c6ad08853844
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix fatals under MW 1.24 + bump time and memory limits - change (mediawiki...RefreshSpecial)
Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178177
Change subject: Fix fatals under MW 1.24 + bump time and memory limits
..
Fix fatals under MW 1.24 + bump time and memory limits
Change-Id: If467f508c2aec208686bcc271df9fb8d8010d80f
---
M RefreshSpecial.body.php
1 file changed, 35 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RefreshSpecial
refs/changes/77/178177/1
diff --git a/RefreshSpecial.body.php b/RefreshSpecial.body.php
index 75ba53a..37e65e1 100644
--- a/RefreshSpecial.body.php
+++ b/RefreshSpecial.body.php
@@ -38,6 +38,11 @@
return;
}
+ // Bump up PHP's memory and time limits a bit, the defaults
aren't good
+ // enough; this extension's pretty intensive
+ ini_set( 'memory_limit', '512M' );
+ set_time_limit( 240 );
+
$out-setPageTitle( $this-msg( 'refreshspecial-title'
)-plain() );
$cSF = new RefreshSpecialForm();
@@ -104,21 +109,29 @@
* that brings up an interesting question - do we need that
limit or not?
*/
foreach ( QueryPage::getPages() as $page ) {
- @list( $class, $special, $limit ) = $page;
+ list( $class, $special ) = $page;
+ $limit = isset( $page[2] ) ? $page[2] : null;
$specialObj = SpecialPageFactory::getPage( $special );
if ( !$specialObj ) {
$out-addWikiText( $this-msg(
'refreshspecial-no-page' )-plain() . $special\n );
exit;
}
- $file = $specialObj-getFile();
- if ( $file ) {
- // @todo FIXME: I have *no* clue why this fugly
hack is needed,
- // but without it MW constructs an invalid
include path and due
- // to the very nature of require_once(), we get
lovely fatals.
- $file = str_replace( 'specialpage/', '', $file
);
- require_once( $file );
+
+ if ( $specialObj instanceof QueryPage ) {
+ $queryPage = $specialObj;
+ } else {
+ if ( !class_exists( $class ) ) {
+ $file = $specialObj-getFile();
+ // @todo FIXME: I have *no* clue why
this fugly hack is needed,
+ // but without it MW constructs an
invalid include path and due
+ // to the very nature of
require_once(), we get lovely fatals.
+ $file = str_replace( 'specialpage/',
'', $file );
+ require_once $file;
+ }
+ $queryPage = new $class;
}
+
$queryPage = new $class;
$checked = '';
if ( $queryPage-isExpensive() ) {
@@ -196,7 +209,8 @@
);
foreach ( QueryPage::getPages() as $page ) {
- @list( $class, $special, $limit ) = $page;
+ list( $class, $special ) = $page;
+ $limit = isset( $page[2] ) ? $page[2] : null;
if ( !in_array( $special, $to_refresh ) ) {
continue;
}
@@ -206,13 +220,18 @@
$out-addWikiText( $this-msg(
'refreshspecial-no-page' )-plain() . : $special\n );
exit;
}
- $file = $specialObj-getFile();
- if ( $file ) {
- // @todo FIXME: I have *no* clue why this fugly
hack is needed,
- // but without it MW constructs an invalid
include path and due
- // to the very nature of require_once(), we get
lovely fatals.
- $file = str_replace( 'specialpage/', '', $file
);
- require_once( $file );
+ if ( $specialObj instanceof QueryPage ) {
+ $queryPage = $specialObj;
+ } else {
+ if ( !class_exists( $class ) ) {
+ $file = $specialObj-getFile();
+ // @todo FIXME: I have *no* clue why
this fugly hack is needed,
+ // but without it MW
[MediaWiki-commits] [Gerrit] mediawiki.feedback: improve error handling - change (mediawiki/core)
TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178178
Change subject: mediawiki.feedback: improve error handling
..
mediawiki.feedback: improve error handling
Some loose ends with the rewrite to promises, add some logging in case
of errors, so it's a bit easier to figure out why something was failing
Bug: T51636
Change-Id: I081c58378566baef273b76c1a25c3b2d8ba0e19e
---
M resources/src/mediawiki/mediawiki.feedback.js
1 file changed, 13 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/78/178178/1
diff --git a/resources/src/mediawiki/mediawiki.feedback.js
b/resources/src/mediawiki/mediawiki.feedback.js
index 6bcb87f..587f5b9 100644
--- a/resources/src/mediawiki/mediawiki.feedback.js
+++ b/resources/src/mediawiki/mediawiki.feedback.js
@@ -260,21 +260,22 @@
{ redirect: true }
)
.done( function ( result ) {
- if ( result.edit !== undefined ) {
- if ( result.edit.result === 'Success' )
{
- fb.displayThanks();
- } else {
- // unknown API result
- fb.displayError(
'feedback-error1' );
- }
+ if ( result.edit.result === 'Success' ) {
+ fb.displayThanks();
} else {
- // edit failed
- fb.displayError( 'feedback-error2' );
+ // unknown API result
+ fb.displayError( 'feedback-error1' );
}
} )
- .fail( function () {
- // ajax request failed
- fb.displayError( 'feedback-error3' );
+ .fail( function ( code, result ) {
+ if ( code === 'http' ) {
+ // ajax request failed
+ fb.displayError( 'feedback-error3' );
+ mw.log.warn( 'Feedback report failed
with HTTP error: ' + result.textStatus );
+ } else {
+ fb.displayError( 'feedback-error2' );
+ mw.log.warn( 'Feedback report failed
with API error: ' + code );
+ }
} );
},
--
To view, visit https://gerrit.wikimedia.org/r/178178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I081c58378566baef273b76c1a25c3b2d8ba0e19e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ hartman.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] modify buildApplicationCrumbs for conditional sprint or non-... - change (phabricator...Sprint)
Christopher Johnson (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178179
Change subject: modify buildApplicationCrumbs for conditional sprint or
non-sprint project profile display
..
modify buildApplicationCrumbs for conditional sprint or non-sprint project
profile display
Change-Id: I8c3f49301a43a26bdf934a81975d6c84ac49a17b
---
M src/application/SprintApplication.php
M src/controller/SprintController.php
M src/controller/SprintListController.php
M src/controller/SprintProjectProfileController.php
M src/controller/SprintReportController.php
5 files changed, 56 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint
refs/changes/79/178179/1
diff --git a/src/application/SprintApplication.php
b/src/application/SprintApplication.php
index 085a3a4..ded7747 100644
--- a/src/application/SprintApplication.php
+++ b/src/application/SprintApplication.php
@@ -10,8 +10,16 @@
return pht('Sprint');
}
- public function getBaseURI() {
-return '/sprint/';
+ public function getContext() {
+ $controller = new SprintProjectProfileController;
+ $request = $controller-processRequest();
+ return $request;
+ }
+
+ public function getBaseURI()
+ {
+// $path = $this-getContext();
+ return '/sprint/';
}
public function getIconName() {
diff --git a/src/controller/SprintController.php
b/src/controller/SprintController.php
index 1629a91..a7041b4 100644
--- a/src/controller/SprintController.php
+++ b/src/controller/SprintController.php
@@ -67,15 +67,52 @@
}
protected function buildApplicationCrumbs() {
-$crumbs = parent::buildApplicationCrumbs();
+$crumbs = $this-buildCrumbs('projects', '/project/');
+
+$can_create = $this-hasApplicationCapability(
+ProjectCreateProjectsCapability::CAPABILITY);
+
+$crumbs-addAction(
+id(new PHUIListItemView())
+-setName(pht('Create Project'))
+-setHref($this-getProjectsURI().'create/')
+-setIcon('fa-plus-square')
+-setDisabled(!$can_create)
+-setAppIcon('projects'));
+
+return $crumbs;
+ }
+ protected function buildSprintApplicationCrumbs() {
+$crumbs = $this-buildCrumbs('slowvote', '/sprint/');
+
+ $can_create = $this-hasApplicationCapability(
+ProjectCreateProjectsCapability::CAPABILITY);
$crumbs-addAction(
id(new PHUIListItemView())
-setName(pht('Create Sprint'))
-setHref($this-getProjectsURI().'create/')
--setIcon('fa-calendar'));
+-setIcon('fa-calendar')
+-setDisabled(!$can_create));
return $crumbs;
}
+ protected function buildCrumbs($sprite, $uri) {
+$crumbs = array();
+
+
+ $crumbs[] = id(new PhabricatorCrumbView())
+ -setHref($uri)
+ -setAural($sprite)
+ -setIcon($sprite);
+
+
+$view = new PhabricatorCrumbsView();
+foreach ($crumbs as $crumb) {
+ $view-addCrumb($crumb);
+}
+
+return $view;
+ }
}
diff --git a/src/controller/SprintListController.php
b/src/controller/SprintListController.php
index eb3cff8..cff190c 100644
--- a/src/controller/SprintListController.php
+++ b/src/controller/SprintListController.php
@@ -117,7 +117,7 @@
));
-$crumbs = $this-buildApplicationCrumbs();
+$crumbs = $this-buildSprintApplicationCrumbs();
$crumbs-addTextCrumb(pht('Burndown List'));
diff --git a/src/controller/SprintProjectProfileController.php
b/src/controller/SprintProjectProfileController.php
index 24b98d5..ddcbca8 100644
--- a/src/controller/SprintProjectProfileController.php
+++ b/src/controller/SprintProjectProfileController.php
@@ -120,7 +120,11 @@
$actions = $this-buildActionListView($project);
$properties = $this-buildPropertyListView($project, $actions);
-$crumbs = $this-buildApplicationCrumbs();
+if (!$this-shouldShowSprintFields($project)) {
+ $crumbs = $this-buildApplicationCrumbs();
+} else {
+ $crumbs = $this-buildSprintApplicationCrumbs();
+}
$crumbs-addTextCrumb($project-getName())
-setActionList($actions);
diff --git a/src/controller/SprintReportController.php
b/src/controller/SprintReportController.php
index 972d2b9..31eecec 100644
--- a/src/controller/SprintReportController.php
+++ b/src/controller/SprintReportController.php
@@ -49,7 +49,7 @@
$nav-appendChild($core);
$nav-setCrumbs(
-$this-buildApplicationCrumbs()
+$this-buildSprintApplicationCrumbs()
-addTextCrumb(pht('Reports')));
return $this-buildApplicationPage(
--
To view, visit https://gerrit.wikimedia.org/r/178179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c3f49301a43a26bdf934a81975d6c84ac49a17b
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
[MediaWiki-commits] [Gerrit] Toolbar help: Make magic word from help string a param - change (mediawiki...WikiEditor)
TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178180
Change subject: Toolbar help: Make magic word from help string a param
..
Toolbar help: Make magic word from help string a param
Instead of having this magic word in the translation message, make it a
parameter of the translation message and retrieve it from
wgWikiEditorMagicWords.
Bug: T40831
Change-Id: Id3155221aa61bc86da2d9dedab36cbe9dd96
---
M i18n/en.json
M i18n/qqq.json
M modules/jquery.wikiEditor.toolbar.config.js
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor
refs/changes/80/178180/1
diff --git a/i18n/en.json b/i18n/en.json
index 221bde5..56cf9ed 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -206,7 +206,7 @@
wikieditor-toolbar-help-content-olist-syntax: # List itembr /# List
item,
wikieditor-toolbar-help-content-olist-result: olliList
item/liliList item/li/ol,
wikieditor-toolbar-help-content-file-description: Embedded file,
-wikieditor-toolbar-help-content-file-syntax:
[[$1:Example.png|thumb|Caption text]],
+wikieditor-toolbar-help-content-file-syntax:
[[$1:Example.png|$2|Caption text]],
wikieditor-toolbar-help-content-file-result: div style='width:104px;'
class='thumbinner'a title='Caption text' class='image' href='#'img
height='50' width='100' border='0' class='thumbimage'
src='$2/WikiEditor/modules/images/toolbar/example-image.png' alt=''//adiv
class='thumbcaption'div class='magnify'a title='Enlarge' class='internal'
href='#'img height='11' width='15' alt=''
src='$1/common/images/magnify-clip.png'//a/divCaption text/div/div,
wikieditor-toolbar-help-content-reference-description: Reference,
wikieditor-toolbar-help-content-reference-syntax: Page text.lt;ref
name=\test\gt;[http://www.example.org Link text], additional
text.lt;/refgt;,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index bb4beec..e9cd8e2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -174,7 +174,7 @@
wikieditor-toolbar-help-content-ulist-description:
{{Identical|Bulleted list}},
wikieditor-toolbar-help-content-olist-description:
{{Identical|Numbered list}},
wikieditor-toolbar-help-content-file-description:
{{Identical|Embedded file}},
- wikieditor-toolbar-help-content-file-syntax:
{{doc-important|''thumb'' is a magic word. Leave it
untranslated!}}\nParameters:\n* $1 - \File\ namespace name,
+ wikieditor-toolbar-help-content-file-syntax: Parameters:\n* $1 -
\File\ namespace name\n $2 - the image syntax parameter for a thumbnail,
wikieditor-toolbar-help-content-file-result: {{doc-important|Do not
translate anything except \Caption text\ (twice) and \Enlarge\ (to
\{{int:thumbnail-more}}\).}}\nParameters:\n* $1 - style path. e.g.
\/w/skins\\n* $2 - extension assets path. e.g. \/w/extensions\,
wikieditor-toolbar-help-content-reference-description:
{{Identical|Reference}},
wikieditor-toolbar-help-content-reference-syntax: I suggest leaving
the codename=\test\/code string in English\n\nwww.example.org is not a
real website, but it has been reserved to use in software documentation. If you
translate the word example and try to go to that web address then you might get
a message that it doesn't exist. But somebody may have created a commercial web
page for that address, such as www.Beispiel.org, using the German word for
example. It is therefore recommended that you do not translate
http://www.example.org at all. If you do wish to translate it you should first
check where the translated link takes you.,
diff --git a/modules/jquery.wikiEditor.toolbar.config.js
b/modules/jquery.wikiEditor.toolbar.config.js
index 17a219a..ba3a75a 100644
--- a/modules/jquery.wikiEditor.toolbar.config.js
+++ b/modules/jquery.wikiEditor.toolbar.config.js
@@ -1369,7 +1369,7 @@
'rows': [
{
'description': {
'htmlMsg': 'wikieditor-toolbar-help-content-file-description' },
- 'syntax': { 'htmlMsg':
[ 'wikieditor-toolbar-help-content-file-syntax', fileNamespace ] },
+ 'syntax': { 'htmlMsg':
[ 'wikieditor-toolbar-help-content-file-syntax', fileNamespace, mw.config.get(
'wgWikiEditorMagicWords' ).img_thumbnail ] },
'result': { 'htmlMsg':
[ 'wikieditor-toolbar-help-content-file-result', mw.config.get( 'stylepath' ),
mw.config.get( 'wgExtensionAssetsPath' ) ] }
}
]
--
To view, visit https://gerrit.wikimedia.org/r/178180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
[MediaWiki-commits] [Gerrit] modify buildApplicationCrumbs for conditional sprint or non-... - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: modify buildApplicationCrumbs for conditional sprint or
non-sprint project profile display
..
modify buildApplicationCrumbs for conditional sprint or non-sprint project
profile display
Change-Id: I8c3f49301a43a26bdf934a81975d6c84ac49a17b
---
M src/application/SprintApplication.php
M src/controller/SprintController.php
M src/controller/SprintListController.php
M src/controller/SprintProjectProfileController.php
M src/controller/SprintReportController.php
5 files changed, 49 insertions(+), 7 deletions(-)
Approvals:
Christopher Johnson (WMDE): Verified; Looks good to me, approved
diff --git a/src/application/SprintApplication.php
b/src/application/SprintApplication.php
index 085a3a4..f7a0d5a 100644
--- a/src/application/SprintApplication.php
+++ b/src/application/SprintApplication.php
@@ -10,8 +10,9 @@
return pht('Sprint');
}
- public function getBaseURI() {
-return '/sprint/';
+ public function getBaseURI()
+ {
+ return '/sprint/';
}
public function getIconName() {
diff --git a/src/controller/SprintController.php
b/src/controller/SprintController.php
index 1629a91..a7041b4 100644
--- a/src/controller/SprintController.php
+++ b/src/controller/SprintController.php
@@ -67,15 +67,52 @@
}
protected function buildApplicationCrumbs() {
-$crumbs = parent::buildApplicationCrumbs();
+$crumbs = $this-buildCrumbs('projects', '/project/');
+
+$can_create = $this-hasApplicationCapability(
+ProjectCreateProjectsCapability::CAPABILITY);
+
+$crumbs-addAction(
+id(new PHUIListItemView())
+-setName(pht('Create Project'))
+-setHref($this-getProjectsURI().'create/')
+-setIcon('fa-plus-square')
+-setDisabled(!$can_create)
+-setAppIcon('projects'));
+
+return $crumbs;
+ }
+ protected function buildSprintApplicationCrumbs() {
+$crumbs = $this-buildCrumbs('slowvote', '/sprint/');
+
+ $can_create = $this-hasApplicationCapability(
+ProjectCreateProjectsCapability::CAPABILITY);
$crumbs-addAction(
id(new PHUIListItemView())
-setName(pht('Create Sprint'))
-setHref($this-getProjectsURI().'create/')
--setIcon('fa-calendar'));
+-setIcon('fa-calendar')
+-setDisabled(!$can_create));
return $crumbs;
}
+ protected function buildCrumbs($sprite, $uri) {
+$crumbs = array();
+
+
+ $crumbs[] = id(new PhabricatorCrumbView())
+ -setHref($uri)
+ -setAural($sprite)
+ -setIcon($sprite);
+
+
+$view = new PhabricatorCrumbsView();
+foreach ($crumbs as $crumb) {
+ $view-addCrumb($crumb);
+}
+
+return $view;
+ }
}
diff --git a/src/controller/SprintListController.php
b/src/controller/SprintListController.php
index eb3cff8..cff190c 100644
--- a/src/controller/SprintListController.php
+++ b/src/controller/SprintListController.php
@@ -117,7 +117,7 @@
));
-$crumbs = $this-buildApplicationCrumbs();
+$crumbs = $this-buildSprintApplicationCrumbs();
$crumbs-addTextCrumb(pht('Burndown List'));
diff --git a/src/controller/SprintProjectProfileController.php
b/src/controller/SprintProjectProfileController.php
index 24b98d5..ddcbca8 100644
--- a/src/controller/SprintProjectProfileController.php
+++ b/src/controller/SprintProjectProfileController.php
@@ -120,7 +120,11 @@
$actions = $this-buildActionListView($project);
$properties = $this-buildPropertyListView($project, $actions);
-$crumbs = $this-buildApplicationCrumbs();
+if (!$this-shouldShowSprintFields($project)) {
+ $crumbs = $this-buildApplicationCrumbs();
+} else {
+ $crumbs = $this-buildSprintApplicationCrumbs();
+}
$crumbs-addTextCrumb($project-getName())
-setActionList($actions);
diff --git a/src/controller/SprintReportController.php
b/src/controller/SprintReportController.php
index 972d2b9..31eecec 100644
--- a/src/controller/SprintReportController.php
+++ b/src/controller/SprintReportController.php
@@ -49,7 +49,7 @@
$nav-appendChild($core);
$nav-setCrumbs(
-$this-buildApplicationCrumbs()
+$this-buildSprintApplicationCrumbs()
-addTextCrumb(pht('Reports')));
return $this-buildApplicationPage(
--
To view, visit https://gerrit.wikimedia.org/r/178179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8c3f49301a43a26bdf934a81975d6c84ac49a17b
Gerrit-PatchSet: 2
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de
Gerrit-Reviewer: Christopher Johnson (WMDE) christopher.john...@wikimedia.de
___
MediaWiki-commits mailing list
[MediaWiki-commits] [Gerrit] Convert API help to use i18n pt.2 - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Convert API help to use i18n pt.2 .. Convert API help to use i18n pt.2 - API help modified to use i18n messages - i18n messages edited to add said messages Bug: T74704 Change-Id: I5aa62a9ac0cb801dc2387c1e939d0e26b7053eac --- M repo/i18n/en.json M repo/i18n/qqq.json M repo/includes/api/GetClaims.php M repo/includes/api/GetEntities.php M repo/includes/api/LinkTitles.php M repo/includes/api/MergeItems.php M repo/includes/api/ParseValue.php 7 files changed, 180 insertions(+), 228 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/i18n/en.json b/repo/i18n/en.json index 1f10bb7..f246361 100644 --- a/repo/i18n/en.json +++ b/repo/i18n/en.json @@ -462,5 +462,63 @@ apihelp-wbformatvalue-param-datavalue: The data to format. This has to be the JSON serialization of a DataValue object., apihelp-wbformatvalue-param-options: The options the formatter should use. Provided as a JSON object., apihelp-wbformatvalue-example-1: Format a simple string value., - apihelp-wbformatvalue-example-2: Format a string value as a URL in HTML. + apihelp-wbformatvalue-example-2: Format a string value as a URL in HTML., + apihelp-wbgetclaims-description: Gets Wikibase claims., + apihelp-wbgetclaims-param-entity: ID of the entity from which to obtain claims. Required unless claim GUID is provided., + apihelp-wbgetclaims-param-property: Optional filter to only return claims with a main snak that has the specified property., + apihelp-wbgetclaims-param-claim: A GUID identifying the claim. Required unless entity is provided. The GUID is the globally unique identifier for a claim, e.g. \q42$D8404CDA-25E4-4334-AF13-A3290BCD9C0F\., + apihelp-wbgetclaims-param-rank: Optional filter to return only the claims that have the specified rank, + apihelp-wbgetclaims-param-props: Some parts of the claim are returned optionally. This parameter controls which ones are returned., + apihelp-wbgetclaims-param-ungroupedlist: Do not group snaks by property ID, + apihelp-wbgetclaims-example-1: Get claims for item with ID Q42, + apihelp-wbgetclaims-example-2: Get claims for item with ID Q42 and property with ID P2, + apihelp-wbgetclaims-example-3: Get claims for item with ID Q42 that are ranked as normal, + apihelp-wbgetclaims-example-4: Get claim with GUID of Q42$D8404CDA-25E4-4334-AF13-A3290BCD9C0F, + apihelp-wbgetentities-description: Gets the data for multiple Wikibase entities., + apihelp-wbgetentities-param-ids: The IDs of the entities to get the data from, + apihelp-wbgetentities-param-sites: Identifier for the site on which the corresponding page resides\nUse together with 'title', but only give one site for several titles or several sites for one title., + apihelp-wbgetentities-param-titles: The title of the corresponding page\nUse together with 'sites', but only give one site for several titles or several sites for one title., + apihelp-wbgetentities-param-redirects: Whether redirects shall be resolved.\nIf set to \no\, redirects will be treated like deleted entities., + apihelp-wbgetentities-param-props: The names of the properties to get back from each entity.\nWill be further filtered by any languages given., + apihelp-wbgetentities-param-languages: By default the internationalized values are returned in all available languages.\nThis parameter allows filtering these down to one or more languages by providing one or more language codes., + apihelp-wbgetentities-param-languagefallback: Apply language fallback for languages defined in the \languages\ parameter,\nwith the current context of API call., + apihelp-wbgetentities-param-normalize: Try to normalize the page title against the client site.\nThis only works if exactly one site and one page have been given., + apihelp-wbgetentities-param-ungroupedlist: Do not group snaks by property ID., + apihelp-wbgetentities-param-sitefilter: Filter sitelinks in entities to those with these siteids., + apihelp-wbgetentities-example-1: Get entities with ID Q42 with all available attributes in all available languages, + apihelp-wbgetentities-example-2: Get entities with ID P17 with all available attributes in all available languages, + apihelp-wbgetentities-example-3: Get entities with IDs Q42 and P17 with all available attributes in all available languages, + apihelp-wbgetentities-example-4: Get entities with ID Q42 with all available attributes in English language, + apihelp-wbgetentities-example-5: Get entities with ID Q42 with all available attributes in any possible fallback language for the ii language, + apihelp-wbgetentities-example-6: Get entities with ID Q42 showing all
[MediaWiki-commits] [Gerrit] On labs, raise the timeout for apt. - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178181
Change subject: On labs, raise the timeout for apt.
..
On labs, raise the timeout for apt.
This is an attempt to reduce some transient failures we've
been seeing.
Unfortunately, the apt docs don't say what the efault
is for this setting. So maybe I'm lowering it instead
of raising it...
Change-Id: Ia0e09f620d06d086c8619bb036ec22f7de23ab10
---
M manifests/role/labs.pp
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/81/178181/1
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 1ff90ee..b0e1442 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -163,4 +163,10 @@
# It needs to know project/hostname for nova access.
notify{instanceproject: ${::instanceproject}:}
notify{hostname: ${::instancename}:}
+
+apt::conf { 'labs-timeout':
+priority = '98',
+key = 'Acquire::http::Timeout',
+value= '300',
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/178181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0e09f620d06d086c8619bb036ec22f7de23ab10
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] On labs, raise the timeout for apt. - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: On labs, raise the timeout for apt.
..
On labs, raise the timeout for apt.
This is an attempt to reduce some transient failures we've
been seeing.
Unfortunately, the apt docs don't say what the efault
is for this setting. So maybe I'm lowering it instead
of raising it...
Change-Id: Ia0e09f620d06d086c8619bb036ec22f7de23ab10
---
M manifests/role/labs.pp
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 1ff90ee..b0e1442 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -163,4 +163,10 @@
# It needs to know project/hostname for nova access.
notify{instanceproject: ${::instanceproject}:}
notify{hostname: ${::instancename}:}
+
+apt::conf { 'labs-timeout':
+priority = '98',
+key = 'Acquire::http::Timeout',
+value= '300',
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/178181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0e09f620d06d086c8619bb036ec22f7de23ab10
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add quarry to analytics, research and labs - change (labs...wikibugs2)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/178182 Change subject: Add quarry to analytics, research and labs .. Add quarry to analytics, research and labs Change-Id: I4e6ac26555a33fbc2ced68aca4c3a277e7955669 --- M channels.yaml 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 refs/changes/82/178182/1 diff --git a/channels.yaml b/channels.yaml index 459652a..624c6ab 100644 --- a/channels.yaml +++ b/channels.yaml @@ -40,6 +40,7 @@ # x.get(X-Bugzilla-Product, None) == MediaWiki extensions) and \ # x.get(X-Bugzilla-Component, None) in [OpenStackManager]) - MediaWiki-extensions-OpenStackManager +- Quarry #wikimedia-mobile: # x.get(X-Bugzilla-Product, None) in [Wikimedia Mobile, Commons App, Wikipedia App, MobileFrontend], @@ -103,6 +104,10 @@ #wikimedia-analytics: # x.get(X-Bugzilla-Product, None) == Analytics, - Analytics(-.*)? +- Quarry + +'#wikimedia-research': +- Quarry #wikimedia-devtools: # teams -- To view, visit https://gerrit.wikimedia.org/r/178182 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e6ac26555a33fbc2ced68aca4c3a277e7955669 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: Yuvipanda yuvipa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implement AJAX warnings for CreateMassMessageList - change (mediawiki...MassMessage)
Unicodesnowman has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178183
Change subject: Implement AJAX warnings for CreateMassMessageList
..
Implement AJAX warnings for CreateMassMessageList
In Special:CreateMassMessageList, the title is checked to see if it
already exists using AJAX, and a warning is given if so.
The source is also checked using AJAX to make sure it is a valid
delivery list, and has targets; this is implemented using a new API
call.
Finally, implements progressive disclosure for the Source textbox
in a way that does not break if Javascript is disabled.
This is my first time implementing a new API call, so I probably
have made mistakes. Please provide feedback :)
Bug: T72523
Bug: T72471
Bug: T72520
Change-Id: I3f4bcd39eb937f2c5f51662267e60d2b5f4c48a1
---
M MassMessage.php
M i18n/en.json
A includes/ApiQueryMMTargets.php
M modules/ext.MassMessage.create.js
4 files changed, 120 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage
refs/changes/83/178183/1
diff --git a/MassMessage.php b/MassMessage.php
index c22bdb7..35dc467 100644
--- a/MassMessage.php
+++ b/MassMessage.php
@@ -68,6 +68,7 @@
$wgAutoloadClasses['ApiMassMessage'] = __DIR__ .
'/includes/ApiMassMessage.php';
$wgAutoloadClasses['ApiEditMassMessageList'] = __DIR__ .
'/includes/ApiEditMassMessageList.php';
$wgAutoloadClasses['ApiQueryMMSites'] = __DIR__ .
'/includes/ApiQueryMMSites.php';
+$wgAutoloadClasses['ApiQueryMMTargets'] = __DIR__ .
'/includes/ApiQueryMMTargets.php';
$wgAutoloadClasses['MassMessage'] = __DIR__ . '/includes/MassMessage.php';
$wgAutoloadClasses['MassMessageTargets'] = __DIR__ .
'/includes/MassMessageTargets.php';
$wgAutoloadClasses['SpecialMassMessage'] = __DIR__ .
'/includes/SpecialMassMessage.php';
@@ -92,6 +93,7 @@
$wgAPIModules['massmessage'] = 'ApiMassMessage';
$wgAPIModules['editmassmessagelist'] = 'ApiEditMassMessageList';
$wgAPIListModules['mmsites'] = 'ApiQueryMMSites';
+$wgAPIPropModules['mmtargets'] = 'ApiQueryMMTargets';
// Job classes
$wgJobClasses['MassMessageJob'] = 'MassMessageJob';
@@ -188,7 +190,14 @@
);
$wgResourceModules['ext.MassMessage.create'] = array(
'scripts' = 'ext.MassMessage.create.js',
- 'dependencies' = 'ext.MassMessage.autocomplete',
+ 'messages' = array(
+ 'massmessage-create-exists',
+ 'massmessage-create-invalidsource',
+ ),
+ 'dependencies' = array(
+ 'mediawiki.jqueryMsg',
+ 'ext.MassMessage.autocomplete',
+ ),
'localBasePath' = __DIR__ . '/modules',
'remoteExtPath' = 'MassMessage/modules',
);
diff --git a/i18n/en.json b/i18n/en.json
index 5dadc0a..2731316 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -117,5 +117,8 @@
apihelp-massmessage-example-1: Send a message to the list at
[[Signpost Spamlist]] with the subject \New Signpost\, and message body of
\Please read it\,
apihelp-query+mmsites-description: Serve autocomplete requests for
the site field in MassMessage.,
apihelp-query+mmsites-param-term: The prefix to search for.,
- apihelp-query+mmsites-example-1: Autocomplete \en\
+ apihelp-query+mmsites-example-1: Autocomplete \en\,
+ apihelp-query+mmtargets-description: Check if a delivery list has
targets. Used in create list validation.,
+ apihelp-query+mmtargets-param-source: The source list or category,
+ apihelp-query+mmtargets-example-1: Checks if it has targets
}
diff --git a/includes/ApiQueryMMTargets.php b/includes/ApiQueryMMTargets.php
new file mode 100644
index 000..a178141
--- /dev/null
+++ b/includes/ApiQueryMMTargets.php
@@ -0,0 +1,49 @@
+?php
+/**
+ * API module to check if a delivery list has targets
+ *
+ * @ingroup API
+ */
+class ApiQueryMMTargets extends ApiQueryBase {
+
+ public function execute() {
+ $params = $this-extractRequestParams();
+ $source = Title::newFromText( $params['source'] );
+
+ $targets = MassMessageTargets::getTargets( $source );
+ $hasTargets = true;
+ if ( is_null ( $targets ) || count( $targets ) === 0 ) {
+ $hasTargets = false;
+ }
+
+ $result = $this-getResult();
+ $result-addValue( 'query', $this-getModuleName(), $hasTargets
);
+ }
+
+ public function getCacheMode( $params ) {
+ return 'public';
+ }
+
+ public function getAllowedParams() {
+ return array(
+ 'source' = array(
+ ApiBase::PARAM_TYPE = 'string',
+ ApiBase::PARAM_REQUIRED = true
+ )
+ );
+ }
+
+ public function isInternal() {
+ return true;
+ }
+
+ /**
+* @see
[MediaWiki-commits] [Gerrit] Add quarry to analytics, research and labs - change (labs...wikibugs2)
Merlijn van Deen has submitted this change and it was merged. Change subject: Add quarry to analytics, research and labs .. Add quarry to analytics, research and labs Change-Id: I4e6ac26555a33fbc2ced68aca4c3a277e7955669 --- M channels.yaml 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Merlijn van Deen: Verified; Looks good to me, approved diff --git a/channels.yaml b/channels.yaml index 459652a..624c6ab 100644 --- a/channels.yaml +++ b/channels.yaml @@ -40,6 +40,7 @@ # x.get(X-Bugzilla-Product, None) == MediaWiki extensions) and \ # x.get(X-Bugzilla-Component, None) in [OpenStackManager]) - MediaWiki-extensions-OpenStackManager +- Quarry #wikimedia-mobile: # x.get(X-Bugzilla-Product, None) in [Wikimedia Mobile, Commons App, Wikipedia App, MobileFrontend], @@ -103,6 +104,10 @@ #wikimedia-analytics: # x.get(X-Bugzilla-Product, None) == Analytics, - Analytics(-.*)? +- Quarry + +'#wikimedia-research': +- Quarry #wikimedia-devtools: # teams -- To view, visit https://gerrit.wikimedia.org/r/178182 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4e6ac26555a33fbc2ced68aca4c3a277e7955669 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update config file for new toollabs / labs-team project names - change (labs...wikibugs2)
Merlijn van Deen has submitted this change and it was merged. Change subject: Update config file for new toollabs / labs-team project names .. Update config file for new toollabs / labs-team project names Change-Id: I0d7108a694fb605350d0cddbf0b6425b6c0cc0b3 --- M channels.yaml 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Merlijn van Deen: Verified; Looks good to me, approved diff --git a/channels.yaml b/channels.yaml index 24d793c..459652a 100644 --- a/channels.yaml +++ b/channels.yaml @@ -34,7 +34,8 @@ #wikimedia-labs: # x.get(X-Bugzilla-Product, None) in [Tool Labs tools, Wikimedia Labs] -- Tool-Labs-tools(-.*)? +- Tool-Labs(.*)? +- Labs-Team - Wikimedia-Labs(-.*)? # x.get(X-Bugzilla-Product, None) == MediaWiki extensions) and \ # x.get(X-Bugzilla-Component, None) in [OpenStackManager]) -- To view, visit https://gerrit.wikimedia.org/r/178136 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d7108a694fb605350d0cddbf0b6425b6c0cc0b3 Gerrit-PatchSet: 2 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clone cached tables before returning them to users in mw.wik... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Clone cached tables before returning them to users in
mw.wikibase
..
Clone cached tables before returning them to users in mw.wikibase
So that any changes they perform will not persist between several
invokes.
Bug: T76946
Change-Id: I6a085bec4190cbf158ef72125885b9d51e1c51a5
---
M client/includes/scribunto/mw.wikibase.lua
M client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
2 files changed, 16 insertions(+), 5 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/scribunto/mw.wikibase.lua
b/client/includes/scribunto/mw.wikibase.lua
index a91b989..1ac0ff2 100644
--- a/client/includes/scribunto/mw.wikibase.lua
+++ b/client/includes/scribunto/mw.wikibase.lua
@@ -15,7 +15,7 @@
local php = mw_interface
mw_interface = nil
- -- Caching variable for the wikibase.entity objects
+ -- Caching variable for the entity tables as obtained from PHP
local entities = {}
-- Caching variable for the entity id string belonging to the current
page (nil if page is not linked to an entity)
local pageEntityId = false
@@ -30,11 +30,13 @@
return nil
end
- entities[ id ] = wikibase.entity.create( entity )
+ entities[ id ] = entity
end
if type( entities[ id ] ) == 'table' then
- return entities[ id ]
+ return wikibase.entity.create(
+ mw.clone( entities[ id ] ) -- Use a clone here,
so that people can't modify the entity
+ )
else
return nil
end
diff --git
a/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
b/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
index 5452d64..aafba0b 100644
--- a/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
+++ b/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
@@ -21,6 +21,13 @@
return type( mw.wikibase.getEntityObject() )
end
+local function testGetEntityObjectIsCloned()
+ mw.wikibase.getEntityObject( 'Q199024' ).id = 'a'
+
+ -- We should get a freshly cloned table here, so the changes above wont
persist
+ return mw.wikibase.getEntityObject( 'Q199024' ).id
+end
+
local function testGetEntityObjectSchemaVersion()
return mw.wikibase.getEntityObject().schemaVersion
end
@@ -40,6 +47,9 @@
},
{ name = 'mw.wikibase.getEntityObject (type)', func =
testGetEntityObjectType, type='ToString',
expect = { 'table' }
+ },
+ { name = 'mw.wikibase.getEntityObject (is cloned)', func =
testGetEntityObjectIsCloned, type='ToString',
+ expect = { 'Q199024' }
},
{ name = 'mw.wikibase.getEntityObject (schema version)', func =
testGetEntityObjectSchemaVersion,
expect = { 2 }
@@ -67,8 +77,7 @@
args = { 'Q32487' },
expect = { 'WikibaseClientLuaTest' }
},
- {
- name = 'mw.wikibase.sitelink', func = mw.wikibase.sitelink,
type='ToString',
+ { name = 'mw.wikibase.sitelink', func = mw.wikibase.sitelink,
type='ToString',
args = { 'Q32488' },
expect = { nil }
}
--
To view, visit https://gerrit.wikimedia.org/r/177991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a085bec4190cbf158ef72125885b9d51e1c51a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] shinken: Add fixed up init script - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178184
Change subject: shinken: Add fixed up init script
..
shinken: Add fixed up init script
See line 76 of init file for why
Change-Id: I1666f548e2aa835928d7026cc1848fc129ded95f
---
A modules/shinken/files/init
M modules/shinken/manifests/init.pp
2 files changed, 559 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/178184/1
diff --git a/modules/shinken/files/init b/modules/shinken/files/init
new file mode 100755
index 000..f8effea
--- /dev/null
+++ b/modules/shinken/files/init
@@ -0,0 +1,550 @@
+#!/bin/sh
+# THIS FILE IS MANAGED BY PUPPET
+# Copyright (C) 2009-2011:
+#Gabes Jean, napar...@gmail.com
+#Gerhard Lausser, gerhard.laus...@consol.de
+#Gregory Starck, g.sta...@gmail.com
+#Hartmut Goebel, h.goe...@goebel-consult.de
+#
+# This file is part of Shinken.
+#
+# Shinken is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Shinken is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Shinken. If not, see http://www.gnu.org/licenses/.
+
+### BEGIN INIT INFO
+# Provides: shinken
+# Required-Start:$local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
+# Default-Start:
+# Default-Stop: 0 1 6
+# Short-Description: Shinken monitoring daemon
+# Description: Shinken is a monitoring tool composed of many separated
modules:
+# - arbiter : the main one : control everything else.
+# - scheduler : receives checks/actions from arbiter. Schedules
forwards them to pollers.
+# - poller : receives the checks from a scheduler. Launch them and
returns results
+# - broker : manage results by looking at scheduler. Like export to
flat file or db.
+# - reactionner : manage the failed checks by looking at scheduler.
+# - receiver: manage all passive data
+### END INIT INFO
+
+# Deadlink :(
+#
http://refspecs.freestandards.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
+
+. /lib/lsb/init-functions
+
+NAME=shinken
+
+
+## This permits to overhidde the default default shinken cfg file:
+[ -z $SHINKEN_DEFAULT_FILE ] SHINKEN_DEFAULT_FILE=/etc/default/$NAME
+## so you can now do:
+## bash -c SHINKEN_DEFAULT_FILE=$your_own_default_file $init_path/shinken
$action $args
+## to easily use your own config
+
+#echo Using $SHINKEN_DEFAULT_FILE ..
+
+# Reads configuration variable file if it is present
+[ -r $SHINKEN_DEFAULT_FILE ] . $SHINKEN_DEFAULT_FILE
+
+
+## SHINKEN_MODULE_FILE is set by shinken-* if it's one of these that's calling
us.
+if [ -z $SHINKEN_MODULE_FILE ]; then
+SCRIPTNAME=$0
+_usage_mods_=[ $AVAIL_MODULES ]
+else
+SCRIPTNAME=$SHINKEN_MODULE_FILE
+fi
+
+curpath=$(cd $(dirname $0) pwd)
+#echo curpath is $curpath filename is $(basename $0)
+
+## Default paths:
+test $BIN || BIN=$(cd $curpath/.. pwd)
+test $VAR || VAR=$(cd $curpath/../../var pwd)
+test $ETC || ETC=$(cd $curpath/../../etc pwd)
+
+# This line is missing in package's init, causing init to not work
+BIN=/usr/lib/python2.7/dist-packages/shinken/bin
+
+export PATH=${PATH:+$PATH:}/usr/sbin:/bin:/sbin
+export LANG=en_US.UTF8
+export PYTHONIOENCODING=utf8
+
+# We try to find the LAST possible Python VERSION
+pythonver() {
+versions=2.4 2.5 2.6 2.7
+LASTFOUND=
+# Is there any python here?
+for v in $versions
+do
+which python$v /dev/null 21
+if [ $? -eq 0 ]
+then
+LASTFOUND=python$v
+fi
+done
+if [ -z $LASTFOUND ]
+then
+# Finaly try to find a default python
+which python /dev/null 21
+if [ $? -ne 0 ]
+then
+echo No python interpreter found!
+exit 2
+else
+echo python found
+LASTFOUND=$(which python)
+fi
+fi
+PYTHON=$LASTFOUND
+}
+
+# Ok, go search this Python version
+pythonver
+
+# Uncomment the line below if you got the **lib** shinken installed
+# on a non standard place (not in /usr/lib/python*)
+#export PYTHONPATH=${PATH:+$PATH:}/opt/shinken
+# Or uncommentif you want to force the Python version
+#export PYTHON=python2.7
+
+# default
+DEBUG=false
+CMD=
+SUBMODULES=
+
+usage() {
+cat END
+Usage: $SCRIPTNAME [ -d ] {start|stop|restart|status|check} $_usage_mods_
+
+ -d start requested module(s) in debug mode, only useful with start|restart
+
+END
+}
+
+if [ $1 = -d
[MediaWiki-commits] [Gerrit] 2.6.1 release - change (mediawiki...UserFunctions)
jenkins-bot has submitted this change and it was merged. Change subject: 2.6.1 release .. 2.6.1 release * Provide license information in extension credits * Provide COPYING * Consistenly use __DIR__ * Remove vanity Change-Id: I6425140cdfbeed56aef4d4e548915221050f7cbd --- A COPYING M UserFunctions.php 2 files changed, 114 insertions(+), 6 deletions(-) Approvals: Toniher: Checked; Looks good to me, approved jenkins-bot: Verified diff --git a/COPYING b/COPYING new file mode 100644 index 000..81ec8af --- /dev/null +++ b/COPYING @@ -0,0 +1,103 @@ +'''[http://www.mediawiki.org/wiki/Extension:UserFunctions UserFunctions]''' is a free, open-source extension to MediaWiki that provides a set of dynamic parser functions that trigger on the current user. + +Copyright (C) 2006 + + +The license text below applies to all files within this distribution, other than those that are in a directory which contains files named LICENSE or COPYING, or a subdirectory thereof. For those files, the license text contained in said file overrides any license information contained in directories of smaller depth. Alternative licenses are typically used for software that is provided by external parties, and merely packaged with this extension for convenience. + + + +== GNU GENERAL PUBLIC LICENSE == +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc.,br / +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Everyone is permitted to copy and distribute verbatim copiesbr / +of this license document, but changing it is not allowed. + +=== Preamble === +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software - to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original +authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. + +=== TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION === + +'''0.''' This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The Program, below, refers to any such program or work, and a work based on the Program means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term modification.) Each licensee is addressed as you. + +Activities other than copying, distribution and modification are
[MediaWiki-commits] [Gerrit] Use APISite.login instead of deprecated forceLogin - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178185
Change subject: Use APISite.login instead of deprecated forceLogin
..
Use APISite.login instead of deprecated forceLogin
Change-Id: I7eda163b63151ea5fc90bbf7ba1e4adf4b7181c5
---
M scripts/watchlist.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/85/178185/1
diff --git a/scripts/watchlist.py b/scripts/watchlist.py
index ffa7803..31d1dcf 100755
--- a/scripts/watchlist.py
+++ b/scripts/watchlist.py
@@ -56,7 +56,7 @@
def refresh(site, sysop=False):
Fetch the watchlist.
if not site.logged_in(sysop=sysop):
-site.forceLogin(sysop=sysop)
+site.login(sysop=sysop)
params = {
'action': 'query',
--
To view, visit https://gerrit.wikimedia.org/r/178185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7eda163b63151ea5fc90bbf7ba1e4adf4b7181c5
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] shinken: Add fixed up init script - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: shinken: Add fixed up init script
..
shinken: Add fixed up init script
See line 76 of init file for why
Change-Id: I1666f548e2aa835928d7026cc1848fc129ded95f
---
A modules/shinken/files/init
M modules/shinken/manifests/init.pp
2 files changed, 559 insertions(+), 1 deletion(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/shinken/files/init b/modules/shinken/files/init
new file mode 100755
index 000..f8effea
--- /dev/null
+++ b/modules/shinken/files/init
@@ -0,0 +1,550 @@
+#!/bin/sh
+# THIS FILE IS MANAGED BY PUPPET
+# Copyright (C) 2009-2011:
+#Gabes Jean, napar...@gmail.com
+#Gerhard Lausser, gerhard.laus...@consol.de
+#Gregory Starck, g.sta...@gmail.com
+#Hartmut Goebel, h.goe...@goebel-consult.de
+#
+# This file is part of Shinken.
+#
+# Shinken is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Shinken is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Shinken. If not, see http://www.gnu.org/licenses/.
+
+### BEGIN INIT INFO
+# Provides: shinken
+# Required-Start:$local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
+# Default-Start:
+# Default-Stop: 0 1 6
+# Short-Description: Shinken monitoring daemon
+# Description: Shinken is a monitoring tool composed of many separated
modules:
+# - arbiter : the main one : control everything else.
+# - scheduler : receives checks/actions from arbiter. Schedules
forwards them to pollers.
+# - poller : receives the checks from a scheduler. Launch them and
returns results
+# - broker : manage results by looking at scheduler. Like export to
flat file or db.
+# - reactionner : manage the failed checks by looking at scheduler.
+# - receiver: manage all passive data
+### END INIT INFO
+
+# Deadlink :(
+#
http://refspecs.freestandards.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
+
+. /lib/lsb/init-functions
+
+NAME=shinken
+
+
+## This permits to overhidde the default default shinken cfg file:
+[ -z $SHINKEN_DEFAULT_FILE ] SHINKEN_DEFAULT_FILE=/etc/default/$NAME
+## so you can now do:
+## bash -c SHINKEN_DEFAULT_FILE=$your_own_default_file $init_path/shinken
$action $args
+## to easily use your own config
+
+#echo Using $SHINKEN_DEFAULT_FILE ..
+
+# Reads configuration variable file if it is present
+[ -r $SHINKEN_DEFAULT_FILE ] . $SHINKEN_DEFAULT_FILE
+
+
+## SHINKEN_MODULE_FILE is set by shinken-* if it's one of these that's calling
us.
+if [ -z $SHINKEN_MODULE_FILE ]; then
+SCRIPTNAME=$0
+_usage_mods_=[ $AVAIL_MODULES ]
+else
+SCRIPTNAME=$SHINKEN_MODULE_FILE
+fi
+
+curpath=$(cd $(dirname $0) pwd)
+#echo curpath is $curpath filename is $(basename $0)
+
+## Default paths:
+test $BIN || BIN=$(cd $curpath/.. pwd)
+test $VAR || VAR=$(cd $curpath/../../var pwd)
+test $ETC || ETC=$(cd $curpath/../../etc pwd)
+
+# This line is missing in package's init, causing init to not work
+BIN=/usr/lib/python2.7/dist-packages/shinken/bin
+
+export PATH=${PATH:+$PATH:}/usr/sbin:/bin:/sbin
+export LANG=en_US.UTF8
+export PYTHONIOENCODING=utf8
+
+# We try to find the LAST possible Python VERSION
+pythonver() {
+versions=2.4 2.5 2.6 2.7
+LASTFOUND=
+# Is there any python here?
+for v in $versions
+do
+which python$v /dev/null 21
+if [ $? -eq 0 ]
+then
+LASTFOUND=python$v
+fi
+done
+if [ -z $LASTFOUND ]
+then
+# Finaly try to find a default python
+which python /dev/null 21
+if [ $? -ne 0 ]
+then
+echo No python interpreter found!
+exit 2
+else
+echo python found
+LASTFOUND=$(which python)
+fi
+fi
+PYTHON=$LASTFOUND
+}
+
+# Ok, go search this Python version
+pythonver
+
+# Uncomment the line below if you got the **lib** shinken installed
+# on a non standard place (not in /usr/lib/python*)
+#export PYTHONPATH=${PATH:+$PATH:}/opt/shinken
+# Or uncommentif you want to force the Python version
+#export PYTHON=python2.7
+
+# default
+DEBUG=false
+CMD=
+SUBMODULES=
+
+usage() {
+cat END
+Usage: $SCRIPTNAME [ -d ] {start|stop|restart|status|check} $_usage_mods_
+
+ -d start requested module(s) in debug mode, only useful with start|restart
+
+END
+}
+
+if [ $1 = -d ]; then
+DEBUG=1
+shift
+fi
+
+if [
[MediaWiki-commits] [Gerrit] Attempt to fix double-encoding in old-bugzilla HTTPS redirects - change (operations/puppet)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178186
Change subject: Attempt to fix double-encoding in old-bugzilla HTTPS redirects
..
Attempt to fix double-encoding in old-bugzilla HTTPS redirects
This is said to cause problems with urlencoding in the path part
(see http://stackoverflow.com/q/6520484/323407 ) but I don't think
Bugzilla uses such URLs.
Bug: T75848
Change-Id: I0ffa077a2b664a40bdf957090b0d31c5dfbad86f
---
M modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/178186/1
diff --git a/modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
b/modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
index e3ada12..513265c 100644
--- a/modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
+++ b/modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
@@ -14,7 +14,7 @@
Redirect permanent / https://%= @svc_name %/
RewriteEngine On
RewriteCond %{HTTP:X-Forwarded-Proto} !https
-RewriteRule (.*) https://%= @svc_name %%{REQUEST_URI}
+RewriteRule (.*) https://%= @svc_name %%{REQUEST_URI} [NE]
/VirtualHost
VirtualHost *:80
@@ -107,7 +107,7 @@
RewriteRule /page\.cgi$ https://www.mediawiki.org/wiki/Bugzilla/Fields? [R=303]
RewriteCond %{HTTP:X-Forwarded-Proto} !https
-RewriteRule (.*) https://old-bugzilla.wikimedia.org%{REQUEST_URI}
+RewriteRule (.*) https://old-bugzilla.wikimedia.org%{REQUEST_URI} [NE]
/VirtualHost
--
To view, visit https://gerrit.wikimedia.org/r/178186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ffa077a2b664a40bdf957090b0d31c5dfbad86f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adds default task sort by priority desc - change (phabricator...Sprint)
Christopher Johnson (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178187
Change subject: adds default task sort by priority desc
..
adds default task sort by priority desc
adds epoch sort key for create and update dates
Change-Id: I846333e5958144d7998ac61a70cc6ed01e2283e7
---
M src/view/TasksTableView.php
1 file changed, 37 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint
refs/changes/87/178187/1
diff --git a/src/view/TasksTableView.php b/src/view/TasksTableView.php
index b91f4fd..573615f 100644
--- a/src/view/TasksTableView.php
+++ b/src/view/TasksTableView.php
@@ -43,9 +43,12 @@
-setHeaders(
array(
pht('Task'),
+pht('Epoch Created'),
pht('Date Created'),
+pht('Epoch Updated'),
pht('Last Update'),
pht('Assigned to'),
+pht('NumPriority'),
pht('Priority'),
pht('Points'),
pht('Status'),
@@ -57,14 +60,30 @@
$reverse,
array(
'Task',
+'Epoch Created',
'Date Created',
+'Epoch Updated',
'Last Update',
'Assigned to',
+'NumPriority',
'Priority',
'Points',
'Status'
)
);
+$table-setColumnVisibility(
+array(
+true,
+false,
+true,
+false,
+true,
+true,
+false,
+true,
+true,
+true,
+));
$box = id(new PHUIObjectBoxView())
-setHeaderText(pht('Tasks in this Sprint'))
@@ -111,8 +130,8 @@
}
$row = $this-addTaskToTree($output, $task, $tasks, $map, $handles);
- list ($task, $created, $last_update, $assigned_to, $priority,$points,
$status) = $row[0];
- $row['sort'] = $this-setSortOrder($row, $order, $task, $created,
$last_update, $assigned_to, $priority,$points, $status);
+ list ($task, $cdate, $date_created, $udate, $last_update, $owner_link,
$numpriority, $priority, $points, $status) = $row[0];
+ $row['sort'] = $this-setSortOrder($row, $order, $task, $cdate, $udate,
$owner_link, $numpriority, $points, $status);
$rows[] = $row;
}
$rows = isort($rows, 'sort');
@@ -128,34 +147,31 @@
return $rows;
}
- /**
- * @param string $priority
- * @param string $points
- */
- private function setSortOrder ($row, $order, $task, $created, $last_update,
$assigned_to, $priority,
+ private function setSortOrder ($row, $order, $task, $cdate, $udate,
$owner_link, $numpriority,
$points, $status) {
switch ($order) {
case 'Task':
$row['sort'] = $task;
break;
case 'Date Created':
-$row['sort'] = $created;
+$row['sort'] = $cdate;
break;
- case 'Date Modified':
-$row['sort'] = $last_update;
+ case 'Last Update':
+$row['sort'] = $udate;
break;
case 'Assigned to':
-$row['sort'] = $assigned_to;
+$row['sort'] = $owner_link;
break;
case 'Priority':
-$row['sort'] = $priority;
+$row['sort'] = $numpriority;
break;
case 'Points':
$row['sort'] = $points;
break;
case 'Status':
- default:
$row['sort'] = $status;
+ default:
+$row['sort'] = -$numpriority;
break;
}
return $row['sort'];
@@ -223,6 +239,10 @@
return $priority_name-getTaskPriorityName($task-getPriority());
}
+ private function getPriority($task) {
+return $task-getPriority();
+ }
+
private function addTaskToTree($output, $task, $tasks, $map, $handles,
$depth = 0) {
static $included = array();
@@ -242,6 +262,7 @@
}
$owner_link = $this-setOwnerLink($handles, $task);
+$priority = $this-getPriority($task);
$priority_name = $this-getPriorityName($task);
// Build the row
@@ -257,9 +278,12 @@
$task-getMonogram() . ': ' . $task-getTitle()
) . ($repeat ? 'nbsp;nbsp;em title=This task is a child of
more than one task in this list. Children are only shown on ' .
'the first occurance[Repeat]/em' : '')),
+$cdate,
$date_created,
+$udate,
$last_updated,
$owner_link,
+$priority,
$priority_name,
$points,
$status,
--
To view, visit https://gerrit.wikimedia.org/r/178187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I846333e5958144d7998ac61a70cc6ed01e2283e7
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson
[MediaWiki-commits] [Gerrit] Disable Flow EventLogging by default - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/178188 Change subject: Disable Flow EventLogging by default .. Disable Flow EventLogging by default I think opt-in makes more sense than opt-out Change-Id: I520b3098fff4aa238e894965abe453e5c8b90cf3 --- M Flow.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/88/178188/1 diff --git a/Flow.php b/Flow.php index 8c68f64..83f979b 100644 --- a/Flow.php +++ b/Flow.php @@ -289,4 +289,4 @@ $wgFlowParsoidForwardCookies = false; // Enable/disable event logging -$wgFlowEventLogging = true; +$wgFlowEventLogging = false; -- To view, visit https://gerrit.wikimedia.org/r/178188 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I520b3098fff4aa238e894965abe453e5c8b90cf3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adds default task sort by priority desc - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: adds default task sort by priority desc
..
adds default task sort by priority desc
adds epoch sort key for create and update dates
Change-Id: I846333e5958144d7998ac61a70cc6ed01e2283e7
---
M src/view/TasksTableView.php
1 file changed, 37 insertions(+), 13 deletions(-)
Approvals:
Christopher Johnson (WMDE): Verified; Looks good to me, approved
diff --git a/src/view/TasksTableView.php b/src/view/TasksTableView.php
index b91f4fd..573615f 100644
--- a/src/view/TasksTableView.php
+++ b/src/view/TasksTableView.php
@@ -43,9 +43,12 @@
-setHeaders(
array(
pht('Task'),
+pht('Epoch Created'),
pht('Date Created'),
+pht('Epoch Updated'),
pht('Last Update'),
pht('Assigned to'),
+pht('NumPriority'),
pht('Priority'),
pht('Points'),
pht('Status'),
@@ -57,14 +60,30 @@
$reverse,
array(
'Task',
+'Epoch Created',
'Date Created',
+'Epoch Updated',
'Last Update',
'Assigned to',
+'NumPriority',
'Priority',
'Points',
'Status'
)
);
+$table-setColumnVisibility(
+array(
+true,
+false,
+true,
+false,
+true,
+true,
+false,
+true,
+true,
+true,
+));
$box = id(new PHUIObjectBoxView())
-setHeaderText(pht('Tasks in this Sprint'))
@@ -111,8 +130,8 @@
}
$row = $this-addTaskToTree($output, $task, $tasks, $map, $handles);
- list ($task, $created, $last_update, $assigned_to, $priority,$points,
$status) = $row[0];
- $row['sort'] = $this-setSortOrder($row, $order, $task, $created,
$last_update, $assigned_to, $priority,$points, $status);
+ list ($task, $cdate, $date_created, $udate, $last_update, $owner_link,
$numpriority, $priority, $points, $status) = $row[0];
+ $row['sort'] = $this-setSortOrder($row, $order, $task, $cdate, $udate,
$owner_link, $numpriority, $points, $status);
$rows[] = $row;
}
$rows = isort($rows, 'sort');
@@ -128,34 +147,31 @@
return $rows;
}
- /**
- * @param string $priority
- * @param string $points
- */
- private function setSortOrder ($row, $order, $task, $created, $last_update,
$assigned_to, $priority,
+ private function setSortOrder ($row, $order, $task, $cdate, $udate,
$owner_link, $numpriority,
$points, $status) {
switch ($order) {
case 'Task':
$row['sort'] = $task;
break;
case 'Date Created':
-$row['sort'] = $created;
+$row['sort'] = $cdate;
break;
- case 'Date Modified':
-$row['sort'] = $last_update;
+ case 'Last Update':
+$row['sort'] = $udate;
break;
case 'Assigned to':
-$row['sort'] = $assigned_to;
+$row['sort'] = $owner_link;
break;
case 'Priority':
-$row['sort'] = $priority;
+$row['sort'] = $numpriority;
break;
case 'Points':
$row['sort'] = $points;
break;
case 'Status':
- default:
$row['sort'] = $status;
+ default:
+$row['sort'] = -$numpriority;
break;
}
return $row['sort'];
@@ -223,6 +239,10 @@
return $priority_name-getTaskPriorityName($task-getPriority());
}
+ private function getPriority($task) {
+return $task-getPriority();
+ }
+
private function addTaskToTree($output, $task, $tasks, $map, $handles,
$depth = 0) {
static $included = array();
@@ -242,6 +262,7 @@
}
$owner_link = $this-setOwnerLink($handles, $task);
+$priority = $this-getPriority($task);
$priority_name = $this-getPriorityName($task);
// Build the row
@@ -257,9 +278,12 @@
$task-getMonogram() . ': ' . $task-getTitle()
) . ($repeat ? 'nbsp;nbsp;em title=This task is a child of
more than one task in this list. Children are only shown on ' .
'the first occurance[Repeat]/em' : '')),
+$cdate,
$date_created,
+$udate,
$last_updated,
$owner_link,
+$priority,
$priority_name,
$points,
$status,
--
To view, visit https://gerrit.wikimedia.org/r/178187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I846333e5958144d7998ac61a70cc6ed01e2283e7
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de
Gerrit-Reviewer:
[MediaWiki-commits] [Gerrit] WIP Simple statistics script - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178189
Change subject: WIP Simple statistics script
..
WIP Simple statistics script
This is a prototype for early testing.
In the future it will either be discarded or converted
to something more compatible and robust.
Change-Id: Icd58f22b9e35eeed07840388570aa73430871581
---
A util/betastats/.perlcriticrc
A util/betastats/build.sh
A util/betastats/cx.csv
A util/betastats/cxbetastat.pl
A util/betastats/published.txt
5 files changed, 1,010 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/89/178189/1
diff --git a/util/betastats/.perlcriticrc b/util/betastats/.perlcriticrc
new file mode 100644
index 000..55593cb
--- /dev/null
+++ b/util/betastats/.perlcriticrc
@@ -0,0 +1,15 @@
+severity = 1
+verbose = 8
+exclude = Modules::RequireVersionVar
+
+[InputOutput::RequireCheckedSyscalls]
+exclude_functions = say
+
+[TestingAndDebugging::ProhibitNoWarnings]
+allow_with_category_restriction = 1
+
+[-Modules::ProhibitExcessMainComplexity]
+
+[-Documentation::RequirePodSections]
+[-Documentation::RequirePodAtEnd]
+
diff --git a/util/betastats/build.sh b/util/betastats/build.sh
new file mode 100755
index 000..c4b1394
--- /dev/null
+++ b/util/betastats/build.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+perltidy -b -bext='/' cxbetastat.pl
+perlcritic cxbetastat.pl
diff --git a/util/betastats/cx.csv b/util/betastats/cx.csv
new file mode 100644
index 000..acdf675
--- /dev/null
+++ b/util/betastats/cx.csv
@@ -0,0 +1,404 @@
+26228 2 KartikMistry/Mert_and_Marcus110589 {from:en,to:gu}
KartikMistry20140703070222
+31550 2 읏/Liubov_Popova 122865 {from:es,to:ca} 읏
20140822145908
+31587 2 읏/Pad_thai 122951 {from:es,to:ca} 읏
20140822195114
+31588 2 읏/Te_gelat_tailandès122952 {from:es,to:ca} 읏
20140822201552
+33816 2 Arrbee/Camera_Work 127253 {from:en,to:bn} Arrbee
20140908112126
+35582 2 Arrbee/Cédric_Villani 130054 {from:es,to:ca} Arrbee
20140917133048
+37012 2 CennoxX/Popcorn_Time132167 {from:en,to:de} CennoxX
20140922213049
+37796 2 Lijealso/Randia_capitata133371 {from:es,to:pt}
Lijealso20140925153008
+37799 2 Dianakc/Teodorico_de_Chartres 133404 {from:en,to:pt}
Dianakc 20140925170758
+37814 2 Lijealso/Salvia_madrensis 133422 {from:es,to:pt}
Lijealso20140925173903
+38451 2 Arrbee/Cafe 134281 {from:es,to:pt} Arrbee
20140927033054
+43883 2 PMG/USS_Ammonoosuc_(1864) 142118 {from:en,to:pl}
PMG 20141015132648
+44103 2 Victorrey/Fuego 142445 {from:es,to:ca} Victorrey
20141015221047
+44909 2 Davidpar/Control_mental 143652 {from:es,to:ca}
Davidpar20141018165855
+48020 2 Arrbee/Barcelona148366 {from:es,to:pt} Arrbee
20141029155306
+49166 2 Davidpar/Torcuato_Luca_de_Tena 149942 {from:es,to:ca}
Davidpar20141101180928
+50569 2 Ninovolador/Jardim_Elétrico 151792 {from:pt,to:es}
Ninovolador 20141105004606
+50572 2 Rauletemunoz/Calle_de_Aiguafreda151799
{from:ca,to:es} Rauletemunoz20141105104528
+50782 2 Helder.wiki/Anel_primo 152140 {from:es,to:pt}
Helder.wiki 20141106001854
+50821 2 Ixocactus/Jerry_Coyne 152188 {from:es,to:pt}
Ixocactus 20141106035217
+50975 2 Marcos_dias_de_oliveira/HD_31093152369
{from:ca,to:pt} Marcos dias de oliveira 20141106055958
+51010 2 DanielGSouza/Hápax 152452 {from:es,to:pt}
DanielGSouza20141106103717
+51011 2 DanielGSouza/Porta-luvas152453 {from:es,to:pt}
DanielGSouza20141106105245
+51012 2 Jcornelius/Corredores_Ferroviarios_S.A. 152454
{from:es,to:pt} Jcornelius 20141106105448
+51216 2 Arrbee/Cafetería152735 {from:es,to:pt} Arrbee
20141107041156
+51220 2 Arrbee/Barcelona_Sporting_Club 152739 {from:es,to:pt}
Arrbee 20141107041632
+51224 2 KartikMistry/Ahmedabad 152743 {from:pt,to:es}
KartikMistry20141107042007
+51220 2 Arrbee/Barcelona_Sporting_Club 152744 {from:es,to:pt}
Arrbee 20141107042132
+51228 2 Arrbee/Gobernador_general_de_Canada 152748
{from:es,to:pt} Arrbee 20141107042459
+51230 2 Arrbee/Nueva_Franciá152750 {from:es,to:pt} Arrbee
20141107042600
+51231 2 Arrbee/Idioma_francés 152751 {from:es,to:pt} Arrbee
20141107042700
+51235 2 Arrbee/Santos_Colón 152755 {from:es,to:pt} Arrbee
20141107043020
+51235 2 Arrbee/Santos_Colón 152757 {from:es,to:pt} Arrbee
20141107043051
+51237 2 KartikMistry/Santos_Colón 152758 {from:es,to:pt}
KartikMistry20141107043159
+51361 2 Nikerabbit/Santos_Colón 152931 {from:es,to:pt}
Nikerabbit
[MediaWiki-commits] [Gerrit] Fix sending of SuggestedPagesFunnel shown event - change (apps...wikipedia)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178190
Change subject: Fix sending of SuggestedPagesFunnel shown event
..
Fix sending of SuggestedPagesFunnel shown event
I thought I removed that line, but it somehow came back (maybe during a
rebase).
Bug: T76933
Change-Id: I9498a366cc4eb7f5e1cb69c2361265d411e77447
---
M
wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
1 file changed, 0 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/90/178190/1
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index 0a34360..41675e3 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -248,8 +248,6 @@
// Descriptions are expendable
}
});
-
-funnel.logSuggestionsShown(pageTitle, results.getPageTitles());
}
private final class ReadMoreAdapter extends BaseAdapter {
--
To view, visit https://gerrit.wikimedia.org/r/178190
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9498a366cc4eb7f5e1cb69c2361265d411e77447
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add buildSprintApplicationCrumbs to SprintDataView - change (phabricator...Sprint)
Christopher Johnson (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/178191 Change subject: add buildSprintApplicationCrumbs to SprintDataView .. add buildSprintApplicationCrumbs to SprintDataView Change-Id: I36e21a2bbe5c3e11e85de3c109d5a9b4b764312a --- M src/controller/SprintDataViewController.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint refs/changes/91/178191/1 diff --git a/src/controller/SprintDataViewController.php b/src/controller/SprintDataViewController.php index 23bda41..107e441 100644 --- a/src/controller/SprintDataViewController.php +++ b/src/controller/SprintDataViewController.php @@ -37,7 +37,7 @@ -setErrors(array($e-getMessage())); } -$crumbs = $this-buildApplicationCrumbs(); +$crumbs = $this-buildSprintApplicationCrumbs(); $crumbs-addTextCrumb( $project-getName(), '/project/view/'.$project-getID()); -- To view, visit https://gerrit.wikimedia.org/r/178191 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I36e21a2bbe5c3e11e85de3c109d5a9b4b764312a Gerrit-PatchSet: 1 Gerrit-Project: phabricator/extensions/Sprint Gerrit-Branch: master Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add buildSprintApplicationCrumbs to SprintDataView - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged. Change subject: add buildSprintApplicationCrumbs to SprintDataView .. add buildSprintApplicationCrumbs to SprintDataView Change-Id: I36e21a2bbe5c3e11e85de3c109d5a9b4b764312a --- M src/controller/SprintDataViewController.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Christopher Johnson (WMDE): Verified; Looks good to me, approved diff --git a/src/controller/SprintDataViewController.php b/src/controller/SprintDataViewController.php index 23bda41..107e441 100644 --- a/src/controller/SprintDataViewController.php +++ b/src/controller/SprintDataViewController.php @@ -37,7 +37,7 @@ -setErrors(array($e-getMessage())); } -$crumbs = $this-buildApplicationCrumbs(); +$crumbs = $this-buildSprintApplicationCrumbs(); $crumbs-addTextCrumb( $project-getName(), '/project/view/'.$project-getID()); -- To view, visit https://gerrit.wikimedia.org/r/178191 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I36e21a2bbe5c3e11e85de3c109d5a9b4b764312a Gerrit-PatchSet: 1 Gerrit-Project: phabricator/extensions/Sprint Gerrit-Branch: master Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de Gerrit-Reviewer: Christopher Johnson (WMDE) christopher.john...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix bottom padding of Read More component after refreshing p... - change (apps...wikipedia)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178192
Change subject: Fix bottom padding of Read More component after refreshing page.
..
Fix bottom padding of Read More component after refreshing page.
- When a page is refreshed, the bottom component sent an incorrect padding
height to the WebView.
- Also added some left/right padding to the license and last-modified
text.
Change-Id: I2e7e2e626b632216497247e86aaddcc6336d2497
---
M wikipedia/res/layout/fragment_page.xml
M
wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
2 files changed, 11 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/92/178192/1
diff --git a/wikipedia/res/layout/fragment_page.xml
b/wikipedia/res/layout/fragment_page.xml
index 362e285..3889c74 100644
--- a/wikipedia/res/layout/fragment_page.xml
+++ b/wikipedia/res/layout/fragment_page.xml
@@ -119,6 +119,8 @@
android:layout_width=match_parent
android:layout_height=wrap_content
android:paddingTop=16dp
+android:paddingLeft=@dimen/activity_horizontal_margin
+
android:paddingRight=@dimen/activity_horizontal_margin
style=?android:textAppearanceSmall
android:textColorLink=?attr/link_color
android:gravity=center/
@@ -126,6 +128,8 @@
android:id=@+id/page_license_text
android:layout_width=match_parent
android:layout_height=wrap_content
+android:paddingLeft=@dimen/activity_horizontal_margin
+
android:paddingRight=@dimen/activity_horizontal_margin
style=?android:textAppearanceSmall
android:textColorLink=?attr/link_color
android:gravity=center/
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index 41675e3..3f05955 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -127,7 +127,7 @@
/**
* Hide the bottom content entirely.
- * It can only be shown again by calling layoutContent()
+ * It can only be shown again by calling beginLayout()
*/
public void hide() {
bottomContentContainer.setVisibility(View.GONE);
@@ -162,18 +162,19 @@
// calculate the height of the listview, based on the number of items
inside it.
ListAdapter adapter = readMoreList.getAdapter();
-int listHeight = 0;
if (adapter != null adapter.getCount() 0) {
ViewGroup.LayoutParams params = readMoreList.getLayoutParams();
final int itemHeight =
(int)parentFragment.getResources().getDimension(R.dimen.defaultListItemSize);
-listHeight = adapter.getCount() * itemHeight
-+ (readMoreList.getDividerHeight() * (adapter.getCount() -
1));
-params.height = listHeight;
+params.height = adapter.getCount() * itemHeight
++ (readMoreList.getDividerHeight() *
(adapter.getCount() - 1));
readMoreList.setLayoutParams(params);
}
+readMoreList.measure(View.MeasureSpec.UNSPECIFIED,
View.MeasureSpec.UNSPECIFIED);
+bottomContentContainer.measure(View.MeasureSpec.UNSPECIFIED,
View.MeasureSpec.UNSPECIFIED);
+
// pad the bottom of the webview, to make room for ourselves
-int totalHeight = bottomContentContainer.getHeight() + listHeight;
+int totalHeight = bottomContentContainer.getMeasuredHeight();
JSONObject payload = new JSONObject();
try {
payload.put(paddingBottom, (int)(totalHeight / displayDensity));
--
To view, visit https://gerrit.wikimedia.org/r/178192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e7e2e626b632216497247e86aaddcc6336d2497
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Defer toStorageRow until we need it for update - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178193
Change subject: Defer toStorageRow until we need it for update
..
Defer toStorageRow until we need it for update
Change-Id: Ib94df903f937f769c9ac7c2b2f557e52f14146f7
---
M includes/Data/Mapper/CachingObjectMapper.php
M includes/Data/ObjectManager.php
2 files changed, 20 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/93/178193/1
diff --git a/includes/Data/Mapper/CachingObjectMapper.php
b/includes/Data/Mapper/CachingObjectMapper.php
index 7abac0c..e0661e6 100644
--- a/includes/Data/Mapper/CachingObjectMapper.php
+++ b/includes/Data/Mapper/CachingObjectMapper.php
@@ -72,6 +72,8 @@
// first time this id has been seen
$this-loaded[$pk] = $object;
} elseif ( $this-loaded[$pk] !== $object ) {
+ // @todo: duplicates may be ok...
+
// loaded object of this id is not same object
$class = get_class( $object );
$id = json_encode( $pk );
@@ -91,6 +93,8 @@
// provide previously loaded object
return $this-loaded[$pk];
} elseif ( $object !== $this-loaded[$pk] ) {
+ // @todo: duplicates may be ok...
+
// loaded object of this id is not same object
$class = get_class( $object );
$id = json_encode( $pk );
diff --git a/includes/Data/ObjectManager.php b/includes/Data/ObjectManager.php
index 15b0af2..7655b9e 100644
--- a/includes/Data/ObjectManager.php
+++ b/includes/Data/ObjectManager.php
@@ -109,7 +109,7 @@
*/
public function merge( $object ) {
if ( !isset( $this-loaded[$object] ) ) {
- $this-loaded[$object] = $this-mapper-toStorageRow(
$object );
+ $this-loaded[$object] = $object;
}
}
@@ -122,7 +122,7 @@
if ( !isset( $this-loaded[$object] ) ) {
throw new FlowException( 'Object was not loaded through
this object manager, use ObjectManager::merge if necessary' );
}
- $row = $this-loaded[$object];
+ $row = $this-mapper-toStorageRow( $this-loaded[$object] );
foreach ( $this-indexes as $index ) {
$index-cachePurge( $object, $row );
}
@@ -179,7 +179,7 @@
if ( !isset( $this-loaded[$object] ) ) {
throw new FlowException( 'Object was not loaded through
this object manager, use ObjectManager::merge if necessary' );
}
- $old = $this-loaded[$object];
+ $old = $this-mapper-toStorageRow( $this-loaded[$object] );
$this-storage-remove( $old );
foreach ( $this-lifecycleHandlers as $handler ) {
$handler-onAfterRemove( $object, $old, $metadata );
@@ -209,7 +209,7 @@
*/
public function serializeOffset( $object, array $sortFields ) {
$offsetFields = array();
- // @todo $row = $this-loaded[$object] ?
+ // @todo $row = $this-mapper-toStorageRow(
$this-loaded[$object] ) ?
$row = $this-mapper-toStorageRow( $object );
// @todo Why not self::splitFromRow?
foreach( $sortFields as $field ) {
@@ -258,7 +258,7 @@
$handler-onAfterInsert( $object, $stored,
$metadata );
}
- $this-loaded[$object] = $stored;
+ $this-loaded[$object] = clone $object;
}
}
@@ -282,7 +282,7 @@
* @param array $metadata
*/
protected function updateSingle( $object, array $metadata ) {
- $old = $this-loaded[$object];
+ $old = $this-mapper-toStorageRow( $this-loaded[$object] );
$new = $this-mapper-toStorageRow( $object );
if ( self::arrayEquals( $old, $new ) ) {
return;
@@ -291,7 +291,7 @@
foreach ( $this-lifecycleHandlers as $handler ) {
$handler-onAfterUpdate( $object, $old, $new, $metadata
);
}
- $this-loaded[$object] = $new;
+ $this-loaded[$object] = clone $object;
}
/**
@@ -301,14 +301,16 @@
$object = parent::load( $row );
/*
-* We already have $row, but in $this-loaded, we'll want a
copy that
-* has been through ObjectMapper. This value will be used when
updating
-* data, and differences will be calculated. We want to make
sure
[MediaWiki-commits] [Gerrit] Close panel on canvas click + fullscreen mouseleave - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Close panel on canvas click + fullscreen mouseleave
..
Close panel on canvas click + fullscreen mouseleave
Also remove the unused mmv-image-click event and fix a bug
where links got right-aligned when the panel was opened in
fullscreen mode.
Change-Id: If538ac420da4aae3908ac96978491f89c5b53493
Bug: T76029
---
M resources/mmv/mmv.lightboxinterface.js
M resources/mmv/ui/mmv.ui.canvas.js
M resources/mmv/ui/mmv.ui.canvas.less
M resources/mmv/ui/mmv.ui.metadataPanel.js
M resources/mmv/ui/mmv.ui.metadataPanel.less
M resources/mmv/ui/mmv.ui.metadataPanelScroller.js
M resources/mmv/ui/mmv.ui.metadataPanelScroller.less
7 files changed, 61 insertions(+), 14 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mmv/mmv.lightboxinterface.js
b/resources/mmv/mmv.lightboxinterface.js
index 92aa5cc..0adc144 100644
--- a/resources/mmv/mmv.lightboxinterface.js
+++ b/resources/mmv/mmv.lightboxinterface.js
@@ -202,6 +202,16 @@
this.canvas.attach();
+ // cross-communication between panel and canvas, sort of
+ this.$postDiv.on( 'mmv-metadata-open.lip', function () {
+ ui.$main.addClass( 'metadata-panel-is-open' );
+ } ).on( 'mmv-metadata-close.lip', function () {
+ ui.$main.removeClass( 'metadata-panel-is-open' );
+ } );
+ this.$wrapper.on( 'mmv-panel-close-area-click.lip', function ()
{
+ ui.panel.scroller.toggle( 'down' );
+ } );
+
// Buttons fading might not had been reset properly after a
hard fullscreen exit
// This needs to happen after the parent attach() because the
buttons need to be attached
// to the DOM for $.fn.stop() to work
@@ -235,6 +245,9 @@
this.buttons.unattach();
+ this.$postDiv.off( '.lip' );
+ this.$wrapper.off( 'mmv-panel-close-area-click.lip' );
+
this.fileReuse.unattach();
this.fileReuse.closeDialog();
diff --git a/resources/mmv/ui/mmv.ui.canvas.js
b/resources/mmv/ui/mmv.ui.canvas.js
index 75e4f2d..1a45ee1 100644
--- a/resources/mmv/ui/mmv.ui.canvas.js
+++ b/resources/mmv/ui/mmv.ui.canvas.js
@@ -200,7 +200,13 @@
this.handleEvent( 'mmv-options-closed', $.proxy(
this.handleDialogEvent, this ) );
this.$image.on( 'click.mmv-canvas', function ( e ) {
- if ( !canvas.dialogOpen ) {
+ // ignore clicks if the metadata panel or one of the
dialogs is open - assume the intent is to
+ // close it in this case; that will be handled elsewhere
+ if (
+ !canvas.dialogOpen
+ // FIXME a UI component should not know about
its parents
+canvas.$container.closest(
'.metadata-panel-is-open').length === 0
+ ) {
e.stopPropagation(); // don't let $imageWrapper
handle this
mw.mmv.actionLogger.log( 'view-original-file'
).always( function() {
$( document ).trigger( 'mmv-viewfile' );
@@ -219,8 +225,10 @@
canvas.$mainWrapper.trigger( $.Event( 'mmv-resize-end'
) );
} ) );
- this.$imageDiv.on( 'click.mmv-canvas', 'img', function () {
- canvas.$mainWrapper.trigger( $.Event( 'mmv-image-click'
) );
+ this.$imageWrapper.on( 'click.mmv-canvas', function () {
+ if ( canvas.$container.closest(
'.metadata-panel-is-open').length 0 ) {
+ canvas.$mainWrapper.trigger(
'mmv-panel-close-area-click' );
+ }
} );
};
@@ -232,7 +240,7 @@
$( window ).off( 'resize.mmv-canvas' );
- this.$imageDiv.off( 'click.mmv-canvas' );
+ this.$imageWrapper.off( 'click.mmv-canvas' );
};
/**
diff --git a/resources/mmv/ui/mmv.ui.canvas.less
b/resources/mmv/ui/mmv.ui.canvas.less
index ac20bc0..af17765 100644
--- a/resources/mmv/ui/mmv.ui.canvas.less
+++ b/resources/mmv/ui/mmv.ui.canvas.less
@@ -52,4 +52,11 @@
.mw-mmv-dialog-is-open {
cursor: default;
}
+ .metadata-panel-is-open {
+ cursor: pointer;
+ }
}
+
+.metadata-panel-is-open .mw-mmv-image-wrapper {
+ cursor: pointer;
+}
\ No newline at end of file
diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.js
b/resources/mmv/ui/mmv.ui.metadataPanel.js
index be6b403..a9e9cc2 100644
--- a/resources/mmv/ui/mmv.ui.metadataPanel.js
+++
[MediaWiki-commits] [Gerrit] adds Sprint extension to role::phabricator::main - change (operations/puppet)
Christopher Johnson (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178194
Change subject: adds Sprint extension to role::phabricator::main
..
adds Sprint extension to role::phabricator::main
also bumps role::phabricator::labs to 0.6.0.9
note: see https://phabricator.wikimedia.org/T1322 for requirements
Change-Id: Ie2249beeacbd03e00965d1291d02ed342a18dfc4
---
M manifests/role/phabricator.pp
1 file changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/94/178194/1
diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index afe4c7c..f2f0230 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -63,6 +63,10 @@
mysql_admin_user = $::mysql_adminuser,
mysql_admin_pass = $::mysql_adminpass,
auth_type= 'dual',
+libext_tag = '0.6.0.9',
+libraries= {
+'sprint' = '/srv/phab/libext/Sprint/src',
+},
extension_tag= 'HEAD',
extensions = [ 'MediaWikiUserpageCustomField.php',
'SecurityPolicyEnforcerAction.php'],
@@ -158,9 +162,9 @@
git_tag = $current_tag,
lock_file= '/var/run/phab_repo_lock',
auth_type= 'local',
-libext_tag = '0.5.2',
+libext_tag = '0.6.0.9',
libraries= {
-'burndown' = '/srv/phab/libext/Sprint',
+ 'sprint' = '/srv/phab/libext/Sprint/src',
},
extension_tag= 'HEAD',
extensions = ['SecurityPolicyEnforcerAction.php'],
--
To view, visit https://gerrit.wikimedia.org/r/178194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2249beeacbd03e00965d1291d02ed342a18dfc4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] diamond: require python-statsd - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178195
Change subject: diamond: require python-statsd
..
diamond: require python-statsd
use require_package due to python-statsd being included multiple times (e.g.
swift)
Change-Id: I0cc7328c7d8271fe2cc86a88de937d4961c22aa4
---
M modules/diamond/manifests/init.pp
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/178195/1
diff --git a/modules/diamond/manifests/init.pp
b/modules/diamond/manifests/init.pp
index 9641a6b..9014959 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -63,9 +63,12 @@
},
) {
package { [ 'python-diamond', 'python-configobj' ]:
-ensure = present,
+ensure = present,
+require = Class['packages::python_statsd'],
}
+require_package('python-statsd')
+
file { [ '/etc/diamond/collectors', '/etc/diamond/handlers' ]:
ensure = directory,
owner = 'root',
--
To view, visit https://gerrit.wikimedia.org/r/178195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cc7328c7d8271fe2cc86a88de937d4961c22aa4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed schema update hook registration - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review. https://gerrit.wikimedia.org/r/178196 Change subject: Fixed schema update hook registration .. Fixed schema update hook registration We need to use $GLOBALS otherwise callback is not correct registered and update from web will fail Change-Id: I75b13c38eda953cd44036843fc099493da456273 --- M SmartList/SmartList.setup.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/96/178196/1 diff --git a/SmartList/SmartList.setup.php b/SmartList/SmartList.setup.php index 5f9b3d9..f3941ef 100644 --- a/SmartList/SmartList.setup.php +++ b/SmartList/SmartList.setup.php @@ -8,7 +8,7 @@ $GLOBALS['wgAutoloadClasses']['SmartList'] = __DIR__ . '/SmartList.class.php'; -$wgHooks['LoadExtensionSchemaUpdates'][] = 'SmartList::getSchemaUpdates'; +$GLOBALS['wgHooks']['LoadExtensionSchemaUpdates'][] = 'SmartList::getSchemaUpdates'; $wgAjaxExportList[] = 'SmartList::getMostVisitedPages'; $wgAjaxExportList[] = 'SmartList::getMostEditedPages'; -- To view, visit https://gerrit.wikimedia.org/r/178196 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I75b13c38eda953cd44036843fc099493da456273 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Smuggli mug...@hallowelt.biz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix task table status sort - change (phabricator...Sprint)
Christopher Johnson (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/178197 Change subject: fix task table status sort .. fix task table status sort Change-Id: Iddf9cffe1cc83dfdc551f9ff149589fcc2ecdc94 --- M src/view/TasksTableView.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint refs/changes/97/178197/1 diff --git a/src/view/TasksTableView.php b/src/view/TasksTableView.php index 573615f..f328439 100644 --- a/src/view/TasksTableView.php +++ b/src/view/TasksTableView.php @@ -170,6 +170,7 @@ break; case 'Status': $row['sort'] = $status; +break; default: $row['sort'] = -$numpriority; break; -- To view, visit https://gerrit.wikimedia.org/r/178197 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iddf9cffe1cc83dfdc551f9ff149589fcc2ecdc94 Gerrit-PatchSet: 1 Gerrit-Project: phabricator/extensions/Sprint Gerrit-Branch: master Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix task table status sort - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged. Change subject: fix task table status sort .. fix task table status sort Change-Id: Iddf9cffe1cc83dfdc551f9ff149589fcc2ecdc94 --- M src/view/TasksTableView.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Christopher Johnson (WMDE): Verified; Looks good to me, approved diff --git a/src/view/TasksTableView.php b/src/view/TasksTableView.php index 573615f..f328439 100644 --- a/src/view/TasksTableView.php +++ b/src/view/TasksTableView.php @@ -170,6 +170,7 @@ break; case 'Status': $row['sort'] = $status; +break; default: $row['sort'] = -$numpriority; break; -- To view, visit https://gerrit.wikimedia.org/r/178197 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iddf9cffe1cc83dfdc551f9ff149589fcc2ecdc94 Gerrit-PatchSet: 1 Gerrit-Project: phabricator/extensions/Sprint Gerrit-Branch: master Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de Gerrit-Reviewer: Christopher Johnson (WMDE) christopher.john...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.feedback: Improve error handling - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.feedback: Improve error handling
..
mediawiki.feedback: Improve error handling
Some loose ends with the rewrite to promises, add some logging in case
of errors, so it's a bit easier to figure out why something was failing
Bug: T51636
Change-Id: I081c58378566baef273b76c1a25c3b2d8ba0e19e
---
M resources/src/mediawiki/mediawiki.feedback.js
1 file changed, 13 insertions(+), 12 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.feedback.js
b/resources/src/mediawiki/mediawiki.feedback.js
index 6bcb87f..587f5b9 100644
--- a/resources/src/mediawiki/mediawiki.feedback.js
+++ b/resources/src/mediawiki/mediawiki.feedback.js
@@ -260,21 +260,22 @@
{ redirect: true }
)
.done( function ( result ) {
- if ( result.edit !== undefined ) {
- if ( result.edit.result === 'Success' )
{
- fb.displayThanks();
- } else {
- // unknown API result
- fb.displayError(
'feedback-error1' );
- }
+ if ( result.edit.result === 'Success' ) {
+ fb.displayThanks();
} else {
- // edit failed
- fb.displayError( 'feedback-error2' );
+ // unknown API result
+ fb.displayError( 'feedback-error1' );
}
} )
- .fail( function () {
- // ajax request failed
- fb.displayError( 'feedback-error3' );
+ .fail( function ( code, result ) {
+ if ( code === 'http' ) {
+ // ajax request failed
+ fb.displayError( 'feedback-error3' );
+ mw.log.warn( 'Feedback report failed
with HTTP error: ' + result.textStatus );
+ } else {
+ fb.displayError( 'feedback-error2' );
+ mw.log.warn( 'Feedback report failed
with API error: ' + code );
+ }
} );
},
--
To view, visit https://gerrit.wikimedia.org/r/178178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I081c58378566baef273b76c1a25c3b2d8ba0e19e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ hartman.w...@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bug: User sorting options not taken into account via API - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Bug: User sorting options not taken into account via API
..
Bug: User sorting options not taken into account via API
recheck
Change-Id: I166059834c870f20e324a29bf66c498a65715faf
---
M includes/Block/TopicList.php
M includes/api/ApiFlowViewTopicList.php
A tests/phpunit/Block/TopicListTest.php
M tests/phpunit/api/ApiFlowViewTopicListTest.php
4 files changed, 99 insertions(+), 32 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Block/TopicList.php b/includes/Block/TopicList.php
index a2eb43e..0bf8805 100644
--- a/includes/Block/TopicList.php
+++ b/includes/Block/TopicList.php
@@ -180,22 +180,22 @@
$serializer = Container::get( 'formatter.topiclist' );
}
- if ( $this-workflow-isNew() ) {
- return $response + $serializer-buildEmptyResult(
$this-workflow );
- }
-
// @todo remove the 'api' = true, its always api
$findOptions = $this-getFindOptions( $options + array( 'api'
= true ) );
- $page = $this-getPage( $findOptions );
// sortby option
if ( isset( $findOptions['sortby'] ) ) {
$response['sortby'] = $findOptions['sortby'];
// default is newest
} else {
- $response['sortby'] = '';
+ $response['sortby'] = 'newest';
}
+ if ( $this-workflow-isNew() ) {
+ return $response + $serializer-buildEmptyResult(
$this-workflow );
+ }
+
+ $page = $this-getPage( $findOptions );
$workflowIds = array();
/** @var TopicListEntry $topicListEntry */
foreach ( $page-getResults() as $topicListEntry ) {
@@ -248,42 +248,50 @@
// Compute offset/limit
$limit = $this-getLimit( $requestOptions );
- if ( isset( $requestOptions['offset-id'] )
$requestOptions['offset-id'] ) {
+ // @todo Once we migrate View.php to use the API directly
+ // all defaults will be handled by API and not here.
+ $requestOptions += array(
+ 'offset-id' = false,
+ 'offset-dir' = 'fwd',
+ 'offset' = false,
+ 'api' = true,
+ 'sortby' = 'user',
+ );
+ if ( strlen( $requestOptions['sortby'] ) === 0 ) {
+ $requestOptions['sortby'] = 'user';
+ }
+
+ if ( $requestOptions['offset-id'] ) {
$findOptions['pager-offset'] = UUID::create(
$requestOptions['offset-id'] );
- } elseif ( isset( $requestOptions['offset'] )
$requestOptions['offset'] ) {
+ } elseif ( $requestOptions['offset'] ) {
$findOptions['pager-offset'] = intval(
$requestOptions['offset'] );
}
- if ( isset( $requestOptions['offset-dir'] )
$requestOptions['offset-dir'] ) {
+ if ( $requestOptions['offset-dir'] ) {
$findOptions['pager-dir'] =
$requestOptions['offset-dir'];
}
- if ( isset( $requestOptions['api'] ) $requestOptions['api']
) {
+ if ( $requestOptions['api'] ) {
$findOptions['offset-elastic'] = false;
}
$findOptions['pager-limit'] = $limit;
- // Only support sortby = updated now, fall back to creation
time by default otherwise.
- // To clear the sortby user preference, pass sortby with an
empty value
$sortByOption = '';
$user = $this-context-getUser();
- if ( isset( $requestOptions['sortby'] ) ) {
- if ( $requestOptions['sortby'] === 'updated' ) {
- $sortByOption = 'updated';
- }
- if (
- isset( $requestOptions['savesortby'] )
-!$user-isAnon()
-$user-getOption( 'flow-topiclist-sortby' )
!= $sortByOption
- ) {
- $user-setOption( 'flow-topiclist-sortby',
$sortByOption );
- $user-saveSettings();
- }
- } else {
- if ( !$user-isAnon() $user-getOption(
'flow-topiclist-sortby' ) === 'updated' ) {
-$sortByOption = 'updated';
- }
+ if ( $requestOptions['sortby'] === 'user' !$user-isAnon() )
{
+
[MediaWiki-commits] [Gerrit] Add simple safer actions - change (search/extra)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178198
Change subject: Add simple safer actions
..
Add simple safer actions
Actually 3 things:
1. Simple safer query actions allow for easily rejecting or degrading
queries based on type rather than any complex rules. Thus, simple. The
only query types supported thus far are term_range and numeric_range.
2. Documentation on how to integrate other plugins with this plugin. Fancy.
3. Add term_range and numeric_range queries to the list of known queries
to noop. This should allow them to be wrapped in ```safer``` without forcing
the users to specify ```error_on_unknown: false```.
Change-Id: I6d952db228212734a8bb20715219fc0d3663f019
---
M docs/safer.md
M src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
M
src/main/java/org/wikimedia/search/extra/safer/DefaultNoopSafeifierActions.java
M src/main/java/org/wikimedia/search/extra/safer/SaferQueryBuilder.java
A
src/main/java/org/wikimedia/search/extra/safer/simple/QueryNotAllowedException.java
A src/main/java/org/wikimedia/search/extra/safer/simple/SimpleActionModule.java
A
src/main/java/org/wikimedia/search/extra/safer/simple/SimpleActionModuleParser.java
M src/test/java/org/wikimedia/search/extra/safer/SafeifierNoopQueriesTest.java
M src/test/java/org/wikimedia/search/extra/safer/SaferQueryStringTest.java
A
src/test/java/org/wikimedia/search/extra/safer/simple/SimpleActionModuleTest.java
10 files changed, 471 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/search/extra
refs/changes/98/178198/1
diff --git a/docs/safer.md b/docs/safer.md
index ba0785c..14c8ba1 100644
--- a/docs/safer.md
+++ b/docs/safer.md
@@ -15,6 +15,7 @@
containing a ```query``` filter containing a phrase query would be silently
ignored.
+
Options
---
@@ -22,6 +23,17 @@
* ```query``` The query to wrap. Required.
* ```error_on_unknown``` Should an error be thrown back to the user if the we
encounter a query that we don't understand? Defaults to true.
+* ```simple``` Configuration for simple rules for handling queries. The
+configuration consists of fields who's names are query types and who's
+values are what actions to take on that query type.
+* Possible field nanes:
+* ```term_range```
+* ```numeric_range```
+* Possible field values:
+* ```none```, the default, means do nothing when encountering these
+queries.
+* ```error``` these queries cause errors to be thrown back to the user.
+* ```degrade``` these queries are degraded into term queries.
* ```phrase``` Configuration for handling phrase queries with too many clauses.
It can contain:
* ```max_terms_per_query``` The maximum number of terms a phrase query
@@ -48,7 +60,8 @@
phrase that pushed the count over the limit. The other phrases are not
modified.
-Example
+
+Examples
---
```bash
curl -XPOST localhost:9200/wiki/_search -d'{
@@ -56,8 +69,25 @@
safer: {
query: {
query_string: {
-query: \I am a long long long long long long long long
long phrase query\,
-default_field: text
+query: Z
+}
+},
+simple: {
+term_range: error
+}
+}
+}
+}'
+```
+
+
+```bash
+curl -XPOST localhost:9200/wiki/_search -d'{
+query: {
+safer: {
+query: {
+query_string: {
+query: \I am a long long long long long long long long
long phrase query\
}
},
phrase: {
@@ -68,16 +98,44 @@
}'
```
+
Default-ness
Elasticsearch doesn't allow plugins to create wrap all queries so it wouldn't
be possible to wrap ```safer``` around all queries by default. It also
probably would be the wrong thing to do from a feature standpoint as well
because:
-# It'd add extra overhead for simple queries that are known safe like term
+* It'd add extra overhead for simple queries that are known safe like term
and match queries.
-# You'd just get the default configuration. While the default configuration is
+* You'd just get the default configuration. While the default configuration is
pretty good, its probably worth thinking about.
-# It'd be a breaking change to Elasticsearch. Stuff that worked before
+* It'd be a breaking change to Elasticsearch. Stuff that worked before
installing the plugin could fail afterwords. That's just too surprising for a
plugin.
+
+
+Integrating
+---
+This query was designed to allow other plugins to hook into it. Doing so looks
+like this:
+```java
+public class MyPlugin extends AbstractPlugin {
+@Override
+public CollectionClass? extends Module modules() {
+return ImmutableList.Class? extends
[MediaWiki-commits] [Gerrit] Reduce the width rather than adding a 200px padding-right - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Reduce the width rather than adding a 200px padding-right
..
Reduce the width rather than adding a 200px padding-right
This padding of 200px is retained even when the browser is less
than our desired width, until the browser gets small enough to
receive the mobile styling. I don't see any good reason for
it, so this patch removes the padding and adjusts the width to keep
the same final width as before.
We should still look into relaxing the width restriction.
Change-Id: Ied9724ac96d77e9de134a95010f64ff7bf600a7a
---
M modules/styles/board/navigation.less
M modules/styles/common.less
2 files changed, 5 insertions(+), 6 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/styles/board/navigation.less
b/modules/styles/board/navigation.less
index 9a27057..26e2481 100644
--- a/modules/styles/board/navigation.less
+++ b/modules/styles/board/navigation.less
@@ -6,13 +6,11 @@
// Top board navigation bar
.flow-board-navigation {
left: 0;
- font-size: 1em;
position: static;
padding: 0;
white-space: nowrap;
min-width: 14em;
clear: both;
- max-width: 915px;
a:link, a:visited {
padding: 0.2em 0.3em;
@@ -77,6 +75,5 @@
font-size: 1.15em;
position: relative;
padding-top: .5em;
- padding-right: 200px;
}
}
diff --git a/modules/styles/common.less b/modules/styles/common.less
index 9d15db8..a88b447 100644
--- a/modules/styles/common.less
+++ b/modules/styles/common.less
@@ -25,12 +25,13 @@
// Top board header
.flow-board-header,
+// board navigation
+.flow-board-navigation,
// The whole board content wrapper
.flow-board {
- max-width: 100%;
font-size: .875em;
width: 100%;
- max-width: 915px;
+ max-width: 700px;
}
// Individual topic containers
@@ -83,9 +84,10 @@
// Top board header
.flow-board-header,
+ // board navigation
+ .flow-board-navigation,
// The whole board content wrapper
.flow-board {
- padding-right: 200px;
// Set a fixed font-size from which everything else can use a
relative amount
font-size: 1em;
line-height: 1.4em;
--
To view, visit https://gerrit.wikimedia.org/r/177437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied9724ac96d77e9de134a95010f64ff7bf600a7a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [maven-release-plugin] prepare release experimental-1.4.0 - change (search/highlighter)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/178199 Change subject: [maven-release-plugin] prepare release experimental-1.4.0 .. [maven-release-plugin] prepare release experimental-1.4.0 Change-Id: Ia4cf6d4ebcd09683294d56bd8d66d9ad026e0bcb --- M experimental-highlighter-core/pom.xml M experimental-highlighter-elasticsearch-plugin/pom.xml M experimental-highlighter-lucene/pom.xml M pom.xml 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/search/highlighter refs/changes/99/178199/1 diff --git a/experimental-highlighter-core/pom.xml b/experimental-highlighter-core/pom.xml index 7d00b37..d446f9c 100644 --- a/experimental-highlighter-core/pom.xml +++ b/experimental-highlighter-core/pom.xml @@ -3,7 +3,7 @@ parent groupIdorg.wikimedia.search.highlighter/groupId artifactIdexperimental/artifactId -version1.4.0-SNAPSHOT/version +version1.4.0/version /parent artifactIdexperimental-highlighter-core/artifactId packagingjar/packaging diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml b/experimental-highlighter-elasticsearch-plugin/pom.xml index dbf9101..8e19339 100644 --- a/experimental-highlighter-elasticsearch-plugin/pom.xml +++ b/experimental-highlighter-elasticsearch-plugin/pom.xml @@ -3,7 +3,7 @@ parent groupIdorg.wikimedia.search.highlighter/groupId artifactIdexperimental/artifactId -version1.4.0-SNAPSHOT/version +version1.4.0/version /parent artifactIdexperimental-highlighter-elasticsearch-plugin/artifactId packagingjar/packaging diff --git a/experimental-highlighter-lucene/pom.xml b/experimental-highlighter-lucene/pom.xml index eb04fad..d1c7cc8 100644 --- a/experimental-highlighter-lucene/pom.xml +++ b/experimental-highlighter-lucene/pom.xml @@ -3,7 +3,7 @@ parent groupIdorg.wikimedia.search.highlighter/groupId artifactIdexperimental/artifactId -version1.4.0-SNAPSHOT/version +version1.4.0/version /parent artifactIdexperimental-highlighter-lucene/artifactId packagingjar/packaging diff --git a/pom.xml b/pom.xml index 8d383f5..cdde50a 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ groupIdorg.wikimedia.search.highlighter/groupId artifactIdexperimental/artifactId - version1.4.0-SNAPSHOT/version + version1.4.0/version packagingpom/packaging modules -- To view, visit https://gerrit.wikimedia.org/r/178199 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia4cf6d4ebcd09683294d56bd8d66d9ad026e0bcb Gerrit-PatchSet: 1 Gerrit-Project: search/highlighter Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [maven-release-plugin] prepare for next development iteration - change (search/highlighter)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/178200 Change subject: [maven-release-plugin] prepare for next development iteration .. [maven-release-plugin] prepare for next development iteration Change-Id: I84a571c5462faa274f8d3578af687d261a1596fb --- M experimental-highlighter-core/pom.xml M experimental-highlighter-elasticsearch-plugin/pom.xml M experimental-highlighter-lucene/pom.xml M pom.xml 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/search/highlighter refs/changes/00/178200/1 diff --git a/experimental-highlighter-core/pom.xml b/experimental-highlighter-core/pom.xml index d446f9c..a2829e0 100644 --- a/experimental-highlighter-core/pom.xml +++ b/experimental-highlighter-core/pom.xml @@ -3,7 +3,7 @@ parent groupIdorg.wikimedia.search.highlighter/groupId artifactIdexperimental/artifactId -version1.4.0/version +version1.4.1-SNAPSHOT/version /parent artifactIdexperimental-highlighter-core/artifactId packagingjar/packaging diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml b/experimental-highlighter-elasticsearch-plugin/pom.xml index 8e19339..f596db0 100644 --- a/experimental-highlighter-elasticsearch-plugin/pom.xml +++ b/experimental-highlighter-elasticsearch-plugin/pom.xml @@ -3,7 +3,7 @@ parent groupIdorg.wikimedia.search.highlighter/groupId artifactIdexperimental/artifactId -version1.4.0/version +version1.4.1-SNAPSHOT/version /parent artifactIdexperimental-highlighter-elasticsearch-plugin/artifactId packagingjar/packaging diff --git a/experimental-highlighter-lucene/pom.xml b/experimental-highlighter-lucene/pom.xml index d1c7cc8..eb02f94 100644 --- a/experimental-highlighter-lucene/pom.xml +++ b/experimental-highlighter-lucene/pom.xml @@ -3,7 +3,7 @@ parent groupIdorg.wikimedia.search.highlighter/groupId artifactIdexperimental/artifactId -version1.4.0/version +version1.4.1-SNAPSHOT/version /parent artifactIdexperimental-highlighter-lucene/artifactId packagingjar/packaging diff --git a/pom.xml b/pom.xml index cdde50a..c320817 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ groupIdorg.wikimedia.search.highlighter/groupId artifactIdexperimental/artifactId - version1.4.0/version + version1.4.1-SNAPSHOT/version packagingpom/packaging modules -- To view, visit https://gerrit.wikimedia.org/r/178200 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84a571c5462faa274f8d3578af687d261a1596fb Gerrit-PatchSet: 1 Gerrit-Project: search/highlighter Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [maven-release-plugin] prepare release experimental-1.4.0 - change (search/highlighter)
Manybubbles has submitted this change and it was merged. Change subject: [maven-release-plugin] prepare release experimental-1.4.0 .. [maven-release-plugin] prepare release experimental-1.4.0 Change-Id: Ia4cf6d4ebcd09683294d56bd8d66d9ad026e0bcb --- M experimental-highlighter-core/pom.xml M experimental-highlighter-elasticsearch-plugin/pom.xml M experimental-highlighter-lucene/pom.xml M pom.xml 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: Manybubbles: Verified; Looks good to me, approved diff --git a/experimental-highlighter-core/pom.xml b/experimental-highlighter-core/pom.xml index 7d00b37..d446f9c 100644 --- a/experimental-highlighter-core/pom.xml +++ b/experimental-highlighter-core/pom.xml @@ -3,7 +3,7 @@ parent groupIdorg.wikimedia.search.highlighter/groupId artifactIdexperimental/artifactId -version1.4.0-SNAPSHOT/version +version1.4.0/version /parent artifactIdexperimental-highlighter-core/artifactId packagingjar/packaging diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml b/experimental-highlighter-elasticsearch-plugin/pom.xml index dbf9101..8e19339 100644 --- a/experimental-highlighter-elasticsearch-plugin/pom.xml +++ b/experimental-highlighter-elasticsearch-plugin/pom.xml @@ -3,7 +3,7 @@ parent groupIdorg.wikimedia.search.highlighter/groupId artifactIdexperimental/artifactId -version1.4.0-SNAPSHOT/version +version1.4.0/version /parent artifactIdexperimental-highlighter-elasticsearch-plugin/artifactId packagingjar/packaging diff --git a/experimental-highlighter-lucene/pom.xml b/experimental-highlighter-lucene/pom.xml index eb04fad..d1c7cc8 100644 --- a/experimental-highlighter-lucene/pom.xml +++ b/experimental-highlighter-lucene/pom.xml @@ -3,7 +3,7 @@ parent groupIdorg.wikimedia.search.highlighter/groupId artifactIdexperimental/artifactId -version1.4.0-SNAPSHOT/version +version1.4.0/version /parent artifactIdexperimental-highlighter-lucene/artifactId packagingjar/packaging diff --git a/pom.xml b/pom.xml index 8d383f5..cdde50a 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ groupIdorg.wikimedia.search.highlighter/groupId artifactIdexperimental/artifactId - version1.4.0-SNAPSHOT/version + version1.4.0/version packagingpom/packaging modules -- To view, visit https://gerrit.wikimedia.org/r/178199 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia4cf6d4ebcd09683294d56bd8d66d9ad026e0bcb Gerrit-PatchSet: 1 Gerrit-Project: search/highlighter Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [maven-release-plugin] prepare for next development iteration - change (search/highlighter)
Manybubbles has submitted this change and it was merged. Change subject: [maven-release-plugin] prepare for next development iteration .. [maven-release-plugin] prepare for next development iteration Change-Id: I84a571c5462faa274f8d3578af687d261a1596fb --- M experimental-highlighter-core/pom.xml M experimental-highlighter-elasticsearch-plugin/pom.xml M experimental-highlighter-lucene/pom.xml M pom.xml 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: Manybubbles: Verified; Looks good to me, approved diff --git a/experimental-highlighter-core/pom.xml b/experimental-highlighter-core/pom.xml index d446f9c..a2829e0 100644 --- a/experimental-highlighter-core/pom.xml +++ b/experimental-highlighter-core/pom.xml @@ -3,7 +3,7 @@ parent groupIdorg.wikimedia.search.highlighter/groupId artifactIdexperimental/artifactId -version1.4.0/version +version1.4.1-SNAPSHOT/version /parent artifactIdexperimental-highlighter-core/artifactId packagingjar/packaging diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml b/experimental-highlighter-elasticsearch-plugin/pom.xml index 8e19339..f596db0 100644 --- a/experimental-highlighter-elasticsearch-plugin/pom.xml +++ b/experimental-highlighter-elasticsearch-plugin/pom.xml @@ -3,7 +3,7 @@ parent groupIdorg.wikimedia.search.highlighter/groupId artifactIdexperimental/artifactId -version1.4.0/version +version1.4.1-SNAPSHOT/version /parent artifactIdexperimental-highlighter-elasticsearch-plugin/artifactId packagingjar/packaging diff --git a/experimental-highlighter-lucene/pom.xml b/experimental-highlighter-lucene/pom.xml index d1c7cc8..eb02f94 100644 --- a/experimental-highlighter-lucene/pom.xml +++ b/experimental-highlighter-lucene/pom.xml @@ -3,7 +3,7 @@ parent groupIdorg.wikimedia.search.highlighter/groupId artifactIdexperimental/artifactId -version1.4.0/version +version1.4.1-SNAPSHOT/version /parent artifactIdexperimental-highlighter-lucene/artifactId packagingjar/packaging diff --git a/pom.xml b/pom.xml index cdde50a..c320817 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ groupIdorg.wikimedia.search.highlighter/groupId artifactIdexperimental/artifactId - version1.4.0/version + version1.4.1-SNAPSHOT/version packagingpom/packaging modules -- To view, visit https://gerrit.wikimedia.org/r/178200 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84a571c5462faa274f8d3578af687d261a1596fb Gerrit-PatchSet: 1 Gerrit-Project: search/highlighter Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update installation instructions after release - change (search/highlighter)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/178201 Change subject: Update installation instructions after release .. Update installation instructions after release Change-Id: Id69ec70b4495209587af41fea54d111b36d7e42c --- M README.md 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/search/highlighter refs/changes/01/178201/1 diff --git a/README.md b/README.md index 0cbbaca..df7fe7c 100644 --- a/README.md +++ b/README.md @@ -34,12 +34,17 @@ | Experimental Highlighter Plugin | ElasticSearch | |-|-| -| master | 1.4.1 | +| 1.4.0, master branch| 1.4.1 | | 0.0.11 - 0.0.13, 1.3 branch| 1.3.0 - 1.3.6 | | 0.0.10 | 1.2.0 | | 0.0.1 - 0.0.9 | 1.1.0 | -Install it like so for Elasticsearch 1.3.x: +Install it like so for Elasticsearch 1.4.x: +```bash +./bin/plugin --install org.wikimedia.search.highlighter/experimental-highlighter-elasticsearch-plugin/1.4.0 +``` + +and for Elasticsearch 1.3.x: ```bash ./bin/plugin --install org.wikimedia.search.highlighter/experimental-highlighter-elasticsearch-plugin/0.0.13 ``` -- To view, visit https://gerrit.wikimedia.org/r/178201 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id69ec70b4495209587af41fea54d111b36d7e42c Gerrit-PatchSet: 1 Gerrit-Project: search/highlighter Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Increase navigator font size - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178202
Change subject: Increase navigator font size
..
Increase navigator font size
In patch Ied9724ac96d77e9de134a95010f64ff7bf600a7a, I accidentally decreased the
height of the navigator. I didn't notice before merging.
This one will no longer specify the same height override as the other 2 elements
but override it itself, using a more specific selector.
Change-Id: I944b5bdd1654284804176b3f39c8e196f3a1086e
---
M modules/styles/board/navigation.less
M modules/styles/common.less
2 files changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/02/178202/1
diff --git a/modules/styles/board/navigation.less
b/modules/styles/board/navigation.less
index 26e2481..dccd1c6 100644
--- a/modules/styles/board/navigation.less
+++ b/modules/styles/board/navigation.less
@@ -70,7 +70,7 @@
// MEDIA QUERIES
@media all and (min-width: @wgFlowDeviceWidthTablet) {
- .flow-board-navigation {
+ html .flow-board-navigation {
left: 0;
font-size: 1.15em;
position: relative;
diff --git a/modules/styles/common.less b/modules/styles/common.less
index a88b447..6d84313 100644
--- a/modules/styles/common.less
+++ b/modules/styles/common.less
@@ -84,8 +84,6 @@
// Top board header
.flow-board-header,
- // board navigation
- .flow-board-navigation,
// The whole board content wrapper
.flow-board {
// Set a fixed font-size from which everything else can use a
relative amount
--
To view, visit https://gerrit.wikimedia.org/r/178202
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I944b5bdd1654284804176b3f39c8e196f3a1086e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Dont takeover redirected wikitext pages - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Dont takeover redirected wikitext pages
..
Dont takeover redirected wikitext pages
Change-Id: Icaf1feb7c6f08d11dad844e7ad1ce408bec169bd
---
M includes/TalkpageManager.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/TalkpageManager.php b/includes/TalkpageManager.php
index e16d997..767af75 100644
--- a/includes/TalkpageManager.php
+++ b/includes/TalkpageManager.php
@@ -70,6 +70,10 @@
return false;
}
+ if ( $title-isRedirect() ) {
+ return false;
+ }
+
if ( in_array( $title-getPrefixedText(), $this-occupiedPages
) ) {
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/177424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icaf1feb7c6f08d11dad844e7ad1ce408bec169bd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix bad spacing in topic title on monobook - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix bad spacing in topic title on monobook
..
Fix bad spacing in topic title on monobook
Best practices[1] encourage using unitless line height, specifying
line-height with em's inherits differently causing rendering errors
such as the topic title in monobook. I reviewed all the places these
are used in with both monobook and vector. There are some tiny changes
in line height removing the em's but it generally looks the same.
Note that some of these locations aren't actually used.
navagiation.less is unreferenced from the templates. forms.less has
a few line-height definitions, but only the first for
.mw-ui-input-large is used(for the nojs new topic link). The others are
referenced from form_element.handlebars but that template is never
called either.
[1]
https://developer.mozilla.org/en-US/docs/Web/CSS/line-height#Prefer_unitless_numbers_for_line-height_values
Bug: T76602
Change-Id: I7404dea26ec1cf2a42c45dec93ce126cb4a9
---
M modules/styles/board/replycount.less
M modules/styles/board/terms-of-use.less
M modules/styles/board/timestamps.less
M modules/styles/board/topic/navigation.less
M modules/styles/board/topic/post.less
M modules/styles/mediawiki.ui/forms.less
M modules/styles/mediawiki.ui/modal.less
7 files changed, 9 insertions(+), 11 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/styles/board/replycount.less
b/modules/styles/board/replycount.less
index fe18ca6..8b53853 100644
--- a/modules/styles/board/replycount.less
+++ b/modules/styles/board/replycount.less
@@ -23,7 +23,7 @@
width: 100%;
color: @colorTextLight;
font-size: .5em;
- line-height: 2.25em;
+ line-height: 2.25;
font-weight: bold;
text-align: center;
}
diff --git a/modules/styles/board/terms-of-use.less
b/modules/styles/board/terms-of-use.less
index 3d29220..e7ecd5f 100644
--- a/modules/styles/board/terms-of-use.less
+++ b/modules/styles/board/terms-of-use.less
@@ -10,6 +10,6 @@
height: 3.6em;
vertical-align: middle;
color: @colorTextLight;
- font-size: .75em;
- line-height: 1.5em;
+ font-size: .75em;
+ line-height: 1.4;
}
diff --git a/modules/styles/board/timestamps.less
b/modules/styles/board/timestamps.less
index 67e19ba..9356cba 100644
--- a/modules/styles/board/timestamps.less
+++ b/modules/styles/board/timestamps.less
@@ -18,12 +18,10 @@
.flow-timestamp-user-formatted {
display: block;
position: relative;
- line-height: 1em;
}
.flow-timestamp-ago {
margin-top: -1em;
- line-height: 1em;
}
.client-js {
diff --git a/modules/styles/board/topic/navigation.less
b/modules/styles/board/topic/navigation.less
index f864467..25d4414 100644
--- a/modules/styles/board/topic/navigation.less
+++ b/modules/styles/board/topic/navigation.less
@@ -14,7 +14,7 @@
float: right;
border-radius: 3px;
font-size: .875em;
- line-height: 1.1em;
+ line-height: 1.1;
h5 {
color: @colorText;
diff --git a/modules/styles/board/topic/post.less
b/modules/styles/board/topic/post.less
index 1a478b4..90b0332 100644
--- a/modules/styles/board/topic/post.less
+++ b/modules/styles/board/topic/post.less
@@ -105,7 +105,7 @@
// Author link in post
.flow-author {
font-size: .875em;
- line-height: 1.2em;
+ line-height: 1.2;
display: inline-block;
color: @colorText;
word-wrap: break-word;
diff --git a/modules/styles/mediawiki.ui/forms.less
b/modules/styles/mediawiki.ui/forms.less
index 181696f..cb371b8 100644
--- a/modules/styles/mediawiki.ui/forms.less
+++ b/modules/styles/mediawiki.ui/forms.less
@@ -16,7 +16,7 @@
margin: 0;
font-size: 1.75em;
font-style: italic;
- line-height: 1.25em;
+ line-height: 1.25;
color: @colorTextLight;
}
}
@@ -89,7 +89,7 @@
width: 2em;
color: @colorGrayLight;
font-size: 1em;
- line-height: 1em;
+ line-height: 1;
text-align: center;
pointer-events: none;
//.glyphicon
diff --git a/modules/styles/mediawiki.ui/modal.less
b/modules/styles/mediawiki.ui/modal.less
index c27e0e0..463010c 100644
--- a/modules/styles/mediawiki.ui/modal.less
+++ b/modules/styles/mediawiki.ui/modal.less
@@ -55,7 +55,7 @@
padding: 0 .3em;
font-weight: bold;
color: @colorText;
- line-height: 2.2em;
+ line-height: 2.2;
border-bottom: 1px solid @colorGrayLight;
[MediaWiki-commits] [Gerrit] Update installation instructions after release - change (search/highlighter)
jenkins-bot has submitted this change and it was merged. Change subject: Update installation instructions after release .. Update installation instructions after release Change-Id: Id69ec70b4495209587af41fea54d111b36d7e42c --- M README.md 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/README.md b/README.md index 0cbbaca..df7fe7c 100644 --- a/README.md +++ b/README.md @@ -34,12 +34,17 @@ | Experimental Highlighter Plugin | ElasticSearch | |-|-| -| master | 1.4.1 | +| 1.4.0, master branch| 1.4.1 | | 0.0.11 - 0.0.13, 1.3 branch| 1.3.0 - 1.3.6 | | 0.0.10 | 1.2.0 | | 0.0.1 - 0.0.9 | 1.1.0 | -Install it like so for Elasticsearch 1.3.x: +Install it like so for Elasticsearch 1.4.x: +```bash +./bin/plugin --install org.wikimedia.search.highlighter/experimental-highlighter-elasticsearch-plugin/1.4.0 +``` + +and for Elasticsearch 1.3.x: ```bash ./bin/plugin --install org.wikimedia.search.highlighter/experimental-highlighter-elasticsearch-plugin/0.0.13 ``` -- To view, visit https://gerrit.wikimedia.org/r/178201 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id69ec70b4495209587af41fea54d111b36d7e42c Gerrit-PatchSet: 1 Gerrit-Project: search/highlighter Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove resize handle in compressed textareas - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178203
Change subject: Remove resize handle in compressed textareas
..
Remove resize handle in compressed textareas
This removes the small bottom-right resize handle
Change-Id: I5edeffddc0c41556bca17a79a8c355f864236702
---
M modules/styles/board/form-actions.less
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/03/178203/1
diff --git a/modules/styles/board/form-actions.less
b/modules/styles/board/form-actions.less
index 05863fe..318ba85 100644
--- a/modules/styles/board/form-actions.less
+++ b/modules/styles/board/form-actions.less
@@ -18,6 +18,8 @@
// The !important overrides the element-specific (min-)height set by
autoexpand widget
height: 2.25em !important;
min-height: 2.25em !important;
+
+ resize: none;
}
.flow-anon-warning {
--
To view, visit https://gerrit.wikimedia.org/r/178203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5edeffddc0c41556bca17a79a8c355f864236702
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Determine update actions based on usage aspects. - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Determine update actions based on usage aspects.
..
Determine update actions based on usage aspects.
This greatly simplifies test cases for ChangeHandler.
Bug: 71352
Change-Id: I4ef7a9315b110caf29ae43c30c582fe6623e2581
---
M client/includes/Changes/AffectedPagesFinder.php
M client/includes/Changes/ChangeHandler.php
M client/includes/Changes/PageUpdater.php
M client/includes/Changes/WikiPageUpdater.php
M client/includes/Usage/EntityUsage.php
M client/includes/WikibaseClient.php
M client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
M client/tests/phpunit/includes/Changes/MockPageUpdater.php
8 files changed, 328 insertions(+), 415 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/Changes/AffectedPagesFinder.php
b/client/includes/Changes/AffectedPagesFinder.php
index 8355d35..1967d82 100644
--- a/client/includes/Changes/AffectedPagesFinder.php
+++ b/client/includes/Changes/AffectedPagesFinder.php
@@ -105,7 +105,7 @@
/**
* @since 0.5
*
-* @param Change $change
+* @param EntityChange $change
*
* @return IteratorPageEntityUsages
*/
diff --git a/client/includes/Changes/ChangeHandler.php
b/client/includes/Changes/ChangeHandler.php
index 57e3082..c3b57cb 100644
--- a/client/includes/Changes/ChangeHandler.php
+++ b/client/includes/Changes/ChangeHandler.php
@@ -2,17 +2,17 @@
namespace Wikibase\Client\Changes;
+use Exception;
use InvalidArgumentException;
use MWException;
use Title;
use Wikibase\Change;
use Wikibase\Client\Store\TitleFactory;
-use Wikibase\DataModel\Entity\Diff\EntityDiff;
-use Wikibase\DataModel\Entity\Diff\ItemDiff;
+use Wikibase\Client\Usage\EntityUsage;
+use Wikibase\Client\Usage\PageEntityUsages;
use Wikibase\EntityChange;
use Wikibase\ItemChange;
use Wikibase\SiteLinkCommentCreator;
-use Wikibase\Lib\Store\StorageException;
/**
* Interface for change handling. Whenever a change is detected,
@@ -29,28 +29,28 @@
/**
* The change requites any rendered version of the page to be purged
from the parser cache.
*/
- const PARSER_PURGE_ACTION = 1;
+ const PARSER_PURGE_ACTION = 'parser';
/**
* The change requites a LinksUpdate job to be scheduled to update any
links
* associated with the page.
*/
- const LINKS_UPDATE_ACTION = 2;
+ const LINKS_UPDATE_ACTION = 'links';
/**
* The change requites any HTML output generated from the page to be
purged from web cached.
*/
- const WEB_PURGE_ACTION = 4;
+ const WEB_PURGE_ACTION = 'web';
/**
* The change requites an entry to be injected into the recentchanges
table.
*/
- const RC_ENTRY_ACTION = 8;
+ const RC_ENTRY_ACTION = 'rc';
/**
* The change requites an entry to be injected into the revision table.
*/
- const HISTORY_ENTRY_ACTION = 16;
+ const HISTORY_ENTRY_ACTION = 'history';
/**
* @var AffectedPagesFinder
@@ -83,8 +83,7 @@
PageUpdater $updater,
ChangeListTransformer $changeListTransformer,
$localSiteId,
- $injectRC,
- $allowDataTransclusion
+ $injectRC
) {
$this-changeListTransformer = $changeListTransformer;
$this-affectedPagesFinder = $affectedPagesFinder;
@@ -99,13 +98,8 @@
throw new InvalidArgumentException( '$injectRC must be
a bool' );
}
- if ( !is_bool( $allowDataTransclusion ) ) {
- throw new InvalidArgumentException(
'$allowDataTransclusion must be a bool' );
- }
-
$this-localSiteId = $localSiteId;
$this-injectRC = (bool)$injectRC;
- $this-dataTransclusionAllowed = $allowDataTransclusion;
}
/**
@@ -139,13 +133,14 @@
/**
* Main entry point for handling changes
*
-* @see https://www.mediawiki.org/wiki/Manual:Hooks/WikibasePollHandle
+* @todo: process multiple changes at once!
*
* @since 0.1
*
* @param Change $change
*
* @throws MWException
+*
* @return bool
*/
public function handleChange( Change $change ) {
@@ -155,115 +150,153 @@
wfDebugLog( __CLASS__, __FUNCTION__ . : handling change #$chid
. ( . $change-getType() . ) );
- //TODO: Actions may be per-title, depending on how the change
applies to that page.
- // We'll need on list of titles per action.
- $actions = $this-getActions( $change );
+
[MediaWiki-commits] [Gerrit] Use revision timestamp instead of wfTimestampNow() - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Use revision timestamp instead of wfTimestampNow()
..
Use revision timestamp instead of wfTimestampNow()
In some circumstances the revision id can be constructed during one
second and the moderation timestamp set during the next second. This
causes a mismatch between the timestamp embedded in the revision and
the reported moderation time.
This patch changes the revisions to source their moderation timestamp
directly from the revision id.
Change-Id: Ib05da5063c45853d2325b1e14193bfb025c7ad60
---
M includes/Model/AbstractRevision.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Model/AbstractRevision.php
b/includes/Model/AbstractRevision.php
index 4620f8e..3a14936 100644
--- a/includes/Model/AbstractRevision.php
+++ b/includes/Model/AbstractRevision.php
@@ -265,7 +265,7 @@
$obj-moderationTimestamp = null;
} else {
$obj-moderatedBy = UserTuple::newFromUser( $user );
- $obj-moderationTimestamp = wfTimestampNow();
+ $obj-moderationTimestamp = $obj-revId-getTimestamp();
}
return $obj;
--
To view, visit https://gerrit.wikimedia.org/r/175665
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib05da5063c45853d2325b1e14193bfb025c7ad60
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor: Added support for NSFileRepo images - change (mediawiki...BlueSpiceExtensions)
jenkins-bot has submitted this change and it was merged.
Change subject: VisualEditor: Added support for NSFileRepo images
..
VisualEditor: Added support for NSFileRepo images
NSFileRepo allows Images with a colon in the file name. VisualEditor did
not handle those filenames correctly
Change-Id: I5b3accc3420f9bbcc1e330c3ea80f0637364e0ec
---
M VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
Mglaser: Looks good to me, approved
Smuggli: Checked; Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
index 7f307ba..04dc148 100644
--- a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
+++ b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
@@ -137,7 +137,8 @@
var htmlImageObject = $('img /').attr(
me.makeDefaultImageAttributesObject() ),
wikiImageObject = me.makeWikiImageDataObject(),
parts = link.split(|), part = '',
- unsuffixedValue, dimensions, kvpair, key, value, src,
imgParts;
+ unsuffixedValue, dimensions, kvpair, key, value, src,
imgParts,
+ imgName;
wikiImageObject.imagename = parts[0];
@@ -319,11 +320,13 @@
//We set a dummy url which contains the original filename as
//querystring parameter
imgParts = parts[0].split(':');
- src = _imageDummyUrl + '?' + imgParts[1];
+ imgParts.shift(); //Throw away leading namespace prefix
+ imgName = imgParts.join(':'); //Reassemble image name
+ src = _imageDummyUrl + '?' + imgName;
//We have to save the name and url of the image to allow post
process
//replacement of dummyUrls
- _images.push({ imageName: imgParts[1], dummySrc: src });
+ _images.push({ imageName: imgName, dummySrc: src });
// image, resulting in a 404 error.
htmlImageObject.attr('src', src);
--
To view, visit https://gerrit.wikimedia.org/r/177789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5b3accc3420f9bbcc1e330c3ea80f0637364e0ec
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed schema update hook registration - change (mediawiki...BlueSpiceExtensions)
jenkins-bot has submitted this change and it was merged. Change subject: Fixed schema update hook registration .. Fixed schema update hook registration We need to use $GLOBALS otherwise callback is not correct registered and update from web will fail Change-Id: I75b13c38eda953cd44036843fc099493da456273 --- M SmartList/SmartList.setup.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mglaser: Looks good to me, approved jenkins-bot: Verified diff --git a/SmartList/SmartList.setup.php b/SmartList/SmartList.setup.php index 5f9b3d9..f3941ef 100644 --- a/SmartList/SmartList.setup.php +++ b/SmartList/SmartList.setup.php @@ -8,7 +8,7 @@ $GLOBALS['wgAutoloadClasses']['SmartList'] = __DIR__ . '/SmartList.class.php'; -$wgHooks['LoadExtensionSchemaUpdates'][] = 'SmartList::getSchemaUpdates'; +$GLOBALS['wgHooks']['LoadExtensionSchemaUpdates'][] = 'SmartList::getSchemaUpdates'; $wgAjaxExportList[] = 'SmartList::getMostVisitedPages'; $wgAjaxExportList[] = 'SmartList::getMostEditedPages'; -- To view, visit https://gerrit.wikimedia.org/r/178196 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I75b13c38eda953cd44036843fc099493da456273 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Smuggli mug...@hallowelt.biz Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Reach through MWTimestamp for the DateTime object - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Reach through MWTimestamp for the DateTime object
..
Hygiene: Reach through MWTimestamp for the DateTime object
Rather than newing up an appropriate DateTime object, reach through
the MWTimestamp for its DateTime which keeps timezone handling
centralized.
Change-Id: I33643b1f29756e920a36e6b60c527ace6f817387
---
M includes/Import/LiquidThreadsApi/ConversionStrategy.php
M includes/Import/LiquidThreadsApi/Objects.php
M includes/Import/Wikitext/ImportSource.php
3 files changed, 6 insertions(+), 12 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Import/LiquidThreadsApi/ConversionStrategy.php
b/includes/Import/LiquidThreadsApi/ConversionStrategy.php
index fce7da0..51782aa 100644
--- a/includes/Import/LiquidThreadsApi/ConversionStrategy.php
+++ b/includes/Import/LiquidThreadsApi/ConversionStrategy.php
@@ -3,14 +3,13 @@
namespace Flow\Import\LiquidThreadsApi;
use DatabaseBase;
-use DateTime;
-use DateTimeZone;
use Flow\Import\Converter;
use Flow\Import\IConversionStrategy;
use Flow\Import\ImportSourceStore;
use Flow\Import\Postprocessor\LqtRedirector;
use Flow\UrlGenerator;
use LqtDispatch;
+use MWTimestamp;
use Title;
use User;
use WikitextContent;
@@ -111,10 +110,9 @@
* @return WikitextContent
*/
public function createArchiveCleanupRevisionContent( WikitextContent
$content, Title $title ) {
- $now = new DateTime( now, new DateTimeZone( 'GMT' ) );
$arguments = implode( '|', array(
'from=' . $title-getPrefixedText(),
- 'date=' . $now-format( 'Y-m-d' ),
+ 'date=' .
MWTimestamp::getInstance()-timestamp-format( 'Y-m-d' ),
) );
$newWikitext = preg_replace(
diff --git a/includes/Import/LiquidThreadsApi/Objects.php
b/includes/Import/LiquidThreadsApi/Objects.php
index de4c8c0..cef3426 100644
--- a/includes/Import/LiquidThreadsApi/Objects.php
+++ b/includes/Import/LiquidThreadsApi/Objects.php
@@ -3,8 +3,6 @@
namespace Flow\Import\LiquidThreadsApi;
use ArrayIterator;
-use DateTime;
-use DateTimeZone;
use Flow\Import\IImportHeader;
use Flow\Import\IImportObject;
use Flow\Import\IImportPost;
@@ -14,6 +12,7 @@
use Flow\Import\IObjectRevision;
use Flow\Import\IRevisionableObject;
use Iterator;
+use MWTimestamp;
use Title;
use User;
@@ -349,10 +348,9 @@
$wikitextForLastRevision
);
$templateName = wfMessage(
'flow-importer-lqt-converted-template' )-inContentLanguage()-plain();
- $now = new DateTime( 'now', new DateTimeZone( 'UTC' ) );
$arguments = implode( '|', array(
'archive=' . $archiveTitle-getPrefixedText(),
- 'date=' . $now-format( 'Y-m-d' ),
+ 'date=' .
MWTimestamp::getInstance()-timestamp-format( 'Y-m-d' ),
) );
$newWikitext .= \n\n{{{$templateName}|$arguments}};
diff --git a/includes/Import/Wikitext/ImportSource.php
b/includes/Import/Wikitext/ImportSource.php
index 013a748..d737c51 100644
--- a/includes/Import/Wikitext/ImportSource.php
+++ b/includes/Import/Wikitext/ImportSource.php
@@ -3,13 +3,12 @@
namespace Flow\Import\Wikitext;
use ArrayIterator;
-use DateTime;
-use DateTimeZone;
use FlowHooks;
use Flow\Exception\FlowException;
use Flow\Import\Plain\ImportHeader;
use Flow\Import\Plain\ObjectRevision;
use Flow\Import\IImportSource;
+use MWTimestamp;
use Parser;
use ParserOptions;
use Revision;
@@ -62,10 +61,9 @@
}
$template = wfMessage( 'flow-importer-wt-converted-template'
)-inContentLanguage()-plain();
- $now = new DateTime( now, new DateTimeZone( GMT ) );
$arguments = implode( '|', array(
'from=' . $this-title-getPrefixedText(),
- 'date=' . $now-format( 'Y-m-d' ),
+ 'date=' .
MWTimestamp::getInstance()-timestamp-format( 'Y-m-d' ),
) );
$content .= \n\n{{{$template}|$arguments}};
--
To view, visit https://gerrit.wikimedia.org/r/177105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I33643b1f29756e920a36e6b60c527ace6f817387
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Gracefully restart after user interaction - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Gracefully restart after user interaction
..
Gracefully restart after user interaction
In the first attempt to deploy to office wiki something went wrong and
we manually reverted the moves to seven pages. On restarting the converter
it saw the first move and assumed everything was complete, when it
needed to perform the page move again.
This patch adjusts to only look at the most recent move, rather than any
move by the specified user.
Change-Id: If4287e128448bf9d3a0aa40d18815964371cacd8
---
M includes/Import/Converter.php
1 file changed, 15 insertions(+), 6 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Import/Converter.php b/includes/Import/Converter.php
index 43b21bf..378b40b 100644
--- a/includes/Import/Converter.php
+++ b/includes/Import/Converter.php
@@ -162,10 +162,14 @@
}
/**
-* Looks in the logging table to see if the provided title was moved
+* Looks in the logging table to see if the provided title was last
moved
* there by the user provided in the constructor. The provided user
should
* be a system user for this task, as this assumes that user has never
* moved these pages outside the conversion process.
+*
+* This only considers the most recent move and not prior moves. This
allows
+* for edge cases such as starting an import, canceling it, and manually
+* reverting the move by a normal user.
*
* @param Title $title
* @return Title|null
@@ -173,12 +177,11 @@
protected function getPageMovedFrom( Title $title ) {
$row = $this-dbr-selectRow(
array( 'logging', 'page' ),
- array( 'log_namespace', 'log_title' ),
+ array( 'log_namespace', 'log_title', 'log_user' ),
array(
'page_namespace' = $title-getNamespace(),
'page_title' = $title-getDBkey(),
'log_page = page_id',
- 'log_user' = $this-user-getId(),
'log_type' = 'move',
),
__METHOD__,
@@ -188,11 +191,17 @@
)
);
- if ( $row ) {
- return Title::makeTitle( $row-log_namespace,
$row-log_title );
- } else {
+ // The page has never been moved
+ if ( !$row ) {
return null;
}
+
+ // The most recent move was not by our user
+ if ( $row-log_user != $this-user-getId() ) {
+ return null;
+ }
+
+ return Title::makeTitle( $row-log_namespace, $row-log_title );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/177100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If4287e128448bf9d3a0aa40d18815964371cacd8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Remove !important from .flow-revision-content - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Remove !important from .flow-revision-content
..
Hygiene: Remove !important from .flow-revision-content
This class is only used when viewing single revisions of a header
(timestamp link in history page) or a post(not linked afaik). This
!important selector does not appear to be necessary anymore. Looking
through the git history it was added in the first commit I928373
without explanation.
Bug: T76598
Change-Id: Ie3e90aa4ae4b6f112e03d473344edaba20aaad04
---
M modules/styles/common.less
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/styles/common.less b/modules/styles/common.less
index 9d15db8..df955b9 100644
--- a/modules/styles/common.less
+++ b/modules/styles/common.less
@@ -41,7 +41,7 @@
// Revision view
.flow-revision-content {
background: none repeat scroll 0 0 #EDEDED;
- color: #77 !important;
+ color: #77;
margin-top: 20px;
padding: 10px;
}
--
To view, visit https://gerrit.wikimedia.org/r/177473
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3e90aa4ae4b6f112e03d473344edaba20aaad04
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix sending of SuggestedPagesFunnel shown event - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix sending of SuggestedPagesFunnel shown event
..
Fix sending of SuggestedPagesFunnel shown event
I thought I removed that line, but it somehow came back (maybe during a
rebase).
Bug: T76933
Change-Id: I9498a366cc4eb7f5e1cb69c2361265d411e77447
---
M
wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
1 file changed, 0 insertions(+), 2 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index 0a34360..41675e3 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -248,8 +248,6 @@
// Descriptions are expendable
}
});
-
-funnel.logSuggestionsShown(pageTitle, results.getPageTitles());
}
private final class ReadMoreAdapter extends BaseAdapter {
--
To view, visit https://gerrit.wikimedia.org/r/178190
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9498a366cc4eb7f5e1cb69c2361265d411e77447
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VisualEditor for cherry-pick - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update VisualEditor for cherry-pick .. Update VisualEditor for cherry-pick New changes: a195e07 Update VE core for cherry-pick 7a680b9 Ensure clipboard key is removed from paste target Change-Id: Ifff2606a78500d37ea65dbbb953a55b9f8d6ecc9 --- M extensions/VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Chad: Looks good to me, approved Manybubbles: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/extensions/VisualEditor b/extensions/VisualEditor index 3765160..a195e07 16 --- a/extensions/VisualEditor +++ b/extensions/VisualEditor -Subproject commit 37651605d4fb8668e3acafd840917ea8ba46e288 +Subproject commit a195e07a372fe445b50b963ce60c2966e88edf1f -- To view, visit https://gerrit.wikimedia.org/r/178009 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifff2606a78500d37ea65dbbb953a55b9f8d6ecc9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf11 Gerrit-Owner: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Increase specificity of api interaction selectors a... - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Increase specificity of api interaction selectors and
remove !important
..
Hygiene: Increase specificity of api interaction selectors and remove !important
I looked around and the two prefixed id's appear to be enough to win,
but I'm not sure i found every possible place they are used. I also
grepped through most of the flow specific css after less processing
to verify that we hardly use id selectors unless its to increase
specificity, and everywhere except this just one id.
Bug: T76598
Change-Id: Ia16671cf9cdbcc3e545103790b55e1b9007d9556
---
M modules/styles/js.less
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/styles/js.less b/modules/styles/js.less
index 029afe0..8766113 100644
--- a/modules/styles/js.less
+++ b/modules/styles/js.less
@@ -22,9 +22,9 @@
}
// API interaction indicator
- .flow-api-inprogress {
+ div#content div#bodyContent .flow-api-inprogress {
opacity: 0.5;
- cursor: wait !important;
+ cursor: wait;
}
// A preview version of a given block
@@ -34,8 +34,8 @@
color: @colorRegressive;
}
- .flow-preview-target-hidden {
- display: none !important;
+ div#content div#bodyContent .flow-preview-target-hidden {
+ display: none;
}
// With JS, hide .flow-nojs display .flow-js elements
--
To view, visit https://gerrit.wikimedia.org/r/177472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia16671cf9cdbcc3e545103790b55e1b9007d9556
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
