[MediaWiki-commits] [Gerrit] Add composer global bin to path - change (mediawiki/vagrant)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193659
Change subject: Add composer global bin to path
..
Add composer global bin to path
Makes sure applications installed via the "composer global" command
are in the path.
Change-Id: Id785d0911af1d41737ef5c7ab9b772916f27eeb1
---
M puppet/modules/php/manifests/composer.pp
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/59/193659/1
diff --git a/puppet/modules/php/manifests/composer.pp
b/puppet/modules/php/manifests/composer.pp
index adbf9e8..79ba819 100644
--- a/puppet/modules/php/manifests/composer.pp
+++ b/puppet/modules/php/manifests/composer.pp
@@ -48,4 +48,8 @@
env::var { 'COMPOSER_CACHE_DIR':
value => $cache_dir,
}
+
+env::profile_script { 'add composer global bin to path':
+content => "export PATH=\$PATH:~/.composer/vendor/bin",
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/193659
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id785d0911af1d41737ef5c7ab9b772916f27eeb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sniff to detect text before first opening php tag - change (mediawiki...codesniffer)
jenkins-bot has submitted this change and it was merged.
Change subject: Sniff to detect text before first opening php tag
..
Sniff to detect text before first opening php tag
Detects additional characters before first php open tag. Ignores subsequent php
open tags which can be preceeded by characters as in templates.
Bug: T46875
Change-Id: Ie9b60139a3cb9e3e585b382e16f0305b683affcc
---
A MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
A
MediaWiki/Tests/files/ExtraCharacters/extra_characters_before_phpopen_tag_fail.php
A
MediaWiki/Tests/files/ExtraCharacters/extra_characters_before_phpopen_tag_pass.php
3 files changed, 41 insertions(+), 0 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
b/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
new file mode 100644
index 000..4d436a2
--- /dev/null
+++ b/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
@@ -0,0 +1,27 @@
+getTokens();
+ $isNotFirstOpenTag = $phpcsFile->findPrevious(
+ array( T_OPEN_TAG ),
+ ( $stackPtr - 1 ),
+ null,
+ false
+ );
+ // some other character beginning file
+ if ( $isNotFirstOpenTag === false ) {
+ $error = 'Extra character found before first addError( $error, $stackPtr, 'Found' );
+ }
+ }
+}
diff --git
a/MediaWiki/Tests/files/ExtraCharacters/extra_characters_before_phpopen_tag_fail.php
b/MediaWiki/Tests/files/ExtraCharacters/extra_characters_before_phpopen_tag_fail.php
new file mode 100644
index 000..c3f3f18
--- /dev/null
+++
b/MediaWiki/Tests/files/ExtraCharacters/extra_characters_before_phpopen_tag_fail.php
@@ -0,0 +1,7 @@
+someText
+
+ https://gerrit.wikimedia.org/r/192201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9b60139a3cb9e3e585b382e16f0305b683affcc
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Sumit
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Sumit
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sniff to detect unused global variables - change (mediawiki...codesniffer)
jenkins-bot has submitted this change and it was merged.
Change subject: Sniff to detect unused global variables
..
Sniff to detect unused global variables
Bug: T53279
Change-Id: I856564e2de73c113aa9863efdd69ba65b1d40cb6
---
A MediaWiki/Sniffs/VariableAnalysis/UnusedGlobalVariablesSniff.php
A MediaWiki/Tests/files/VariableAnalysis/unused_global_variables_fail.php
A MediaWiki/Tests/files/VariableAnalysis/used_global_variables_pass.php
A
MediaWiki/Tests/files/VariableAnalysis/used_global_variables_quote_string_pass.php
4 files changed, 71 insertions(+), 0 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MediaWiki/Sniffs/VariableAnalysis/UnusedGlobalVariablesSniff.php
b/MediaWiki/Sniffs/VariableAnalysis/UnusedGlobalVariablesSniff.php
new file mode 100644
index 000..f7409dd
--- /dev/null
+++ b/MediaWiki/Sniffs/VariableAnalysis/UnusedGlobalVariablesSniff.php
@@ -0,0 +1,53 @@
+getTokens();
+
+ $scopeOpener = ++$tokens[$stackPtr]['scope_opener'];
+ $scopeCloser = $tokens[$stackPtr]['scope_closer'];
+
+ $globalLine = 0;
+ $globalVariables = array();
+ $otherVariables = array();
+ $matches = array();
+ $strVariables = array();
+
+ for ( $i = $scopeOpener; $i < $scopeCloser; $i++ ) {
+ if ( in_array( $tokens[$i]['type'],
PHP_CodeSniffer_Tokens::$emptyTokens ) ) {
+ continue;
+ }
+ if ( $tokens[$i]['type'] === 'T_GLOBAL' ) {
+ $globalLine = $tokens[$i]['line'];
+ }
+ if ( $tokens[$i]['type'] === 'T_VARIABLE' &&
$tokens[$i]['line'] == $globalLine ) {
+ $globalVariables[] = $tokens[$i]['content']
.'#'. $i;
+ }
+ if ( $tokens[$i]['type'] === 'T_VARIABLE' &&
$tokens[$i]['line'] != $globalLine ) {
+ $otherVariables[] = $tokens[$i]['content'];
+ }
+ if ( $tokens[$i]['type'] === 'T_DOUBLE_QUOTED_STRING' )
{
+ preg_match_all( '/[$]\w+/',
$tokens[$i]['content'], $matches );
+ $strVariables = array_merge_recursive(
$strVariables, $matches );
+ }
+ }
+ $strVariables = iterator_to_array(
+ new RecursiveIteratorIterator( new
RecursiveArrayIterator( $strVariables ) ),
+ false
+ );
+ foreach ( $globalVariables as $global ) {
+ $global = explode( '#', $global );
+ if ( !in_array( $global[0], $otherVariables ) &&
!in_array( $global[0], $strVariables ) ) {
+ $phpcsFile->addWarning( 'Global ' . $global[0]
.' is never used.', $global[1] );
+ }
+ }
+ }
+}
diff --git
a/MediaWiki/Tests/files/VariableAnalysis/unused_global_variables_fail.php
b/MediaWiki/Tests/files/VariableAnalysis/unused_global_variables_fail.php
new file mode 100644
index 000..e500e0a
--- /dev/null
+++ b/MediaWiki/Tests/files/VariableAnalysis/unused_global_variables_fail.php
@@ -0,0 +1,6 @@
+https://gerrit.wikimedia.org/r/192248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I856564e2de73c113aa9863efdd69ba65b1d40cb6
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Phoenix303
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add 'login' user right - change (mediawiki/core)
Zhaofeng Li has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193658
Change subject: Add 'login' user right
..
Add 'login' user right
This commit adds the 'login' user right and
assigns it to registered users by default. It is
required for an account to be able to log in.
This user right may be useful for approve-based
wikis where new accounts need to be manually
verified before they can log in.
Bug: T48057
Change-Id: I68c6f52e7738591bbc2d7c8e40f16abf9ff39290
---
M includes/DefaultSettings.php
M includes/User.php
M includes/specials/SpecialUserlogin.php
M languages/i18n/en.json
M languages/i18n/qqq.json
5 files changed, 17 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/58/193658/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 6786f81..695cb20 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4551,6 +4551,7 @@
#$wgGroupPermissions['*']['patrolmarks'] = false; // let anons see what was
patrolled
// Implicit group for all logged-in accounts
+$wgGroupPermissions['user']['login'] = true;
$wgGroupPermissions['user']['move'] = true;
$wgGroupPermissions['user']['move-subpages'] = true;
$wgGroupPermissions['user']['move-rootuserpages'] = true; // can move root
userpages
diff --git a/includes/User.php b/includes/User.php
index 7025717..0766801 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -134,6 +134,7 @@
'import',
'importupload',
'ipblock-exempt',
+ 'login',
'managechangetags',
'markbotedits',
'mergehistory',
diff --git a/includes/specials/SpecialUserlogin.php
b/includes/specials/SpecialUserlogin.php
index f2f6b69..27b47c9 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -42,6 +42,7 @@
const NEED_TOKEN = 12;
const WRONG_TOKEN = 13;
const USER_MIGRATED = 14;
+ const NO_LOGIN_RIGHT = 15;
/**
* Valid error and warning messages
@@ -714,6 +715,12 @@
$u = User::newFromName( $this->mUsername );
+ // Check if the user has the 'login' right,
+ // and abort if the user doesn't.
+ if ( !in_array( "login", $u->getRights() ) ) {
+ return self::NO_LOGIN_RIGHT;
+ }
+
// Give extensions a way to indicate the username has been
updated,
// rather than telling the user the account doesn't exist.
if ( !Hooks::run( 'LoginUserMigrated', array( $u, &$msg ) ) ) {
@@ -1029,6 +1036,10 @@
}
$this->mainLoginForm( $this->msg( $error,
$params )->text() );
break;
+ case self::NO_LOGIN_RIGHT:
+ $error = $this->mAbortLoginErrorMsg ?:
'login-nologinright';
+ $this->mainLoginForm( $this->msg( $error,
$this->mUsername )->escaped() );
+ break;
default:
throw new MWException( 'Unhandled case value' );
}
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 31c766f..93fef04 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -487,6 +487,7 @@
"createaccount-text": "Someone created an account for your email
address on {{SITENAME}} ($4) named \"$2\", with password \"$3\".\nYou should
log in and change your password now.\n\nYou may ignore this message, if this
account was created in error.",
"login-throttled": "You have made too many recent login
attempts.\nPlease wait $1 before trying again.",
"login-abort-generic": "Your login was unsuccessful - Aborted",
+ "login-nologinright": "You don't have permission to log in.",
"login-migrated-generic": "Your account has been migrated, and your
username no longer exist on this wiki.",
"loginlanguagelabel": "Language: $1",
"loginlanguagelinks": "* {{#language:de}}|de\n* {{#language:en}}|en\n*
{{#language:eo}}|eo\n* {{#language:fr}}|fr\n* {{#language:es}}|es\n*
{{#language:it}}|it\n* {{#language:nl}}|nl",
@@ -1081,6 +1082,7 @@
"right-createpage": "Create pages (which are not discussion pages)",
"right-createtalk": "Create discussion pages",
"right-createaccount": "Create new user accounts",
+ "right-login": "Log in with the account",
"right-minoredit": "Mark edits as minor",
"right-move": "Move pages",
"right-move-subpages": "Move pages with their subpages",
@@ -1158,6 +1160,7 @@
"action-createtalk": "create discussion pages",
"action-createaccount": "create this user account",
"action-his
[MediaWiki-commits] [Gerrit] Fixed phpcs sniff verifies wg prefix against all global vari... - change (mediawiki...codesniffer)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixed phpcs sniff verifies wg prefix against all global
variables
..
Fixed phpcs sniff verifies wg prefix against all global variables
Bug: T90365
Change-Id: Icc95fcd41a3d39abbf457ae10e3c18b27ca6bd39
---
M MediaWiki/Sniffs/NamingConventions/ValidGlobalNameSniff.php
A MediaWiki/Tests/files/NamingConventions/wg_global_name2_fail.php
M MediaWiki/Tests/files/NamingConventions/wg_global_name_fail.php
3 files changed, 40 insertions(+), 29 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MediaWiki/Sniffs/NamingConventions/ValidGlobalNameSniff.php
b/MediaWiki/Sniffs/NamingConventions/ValidGlobalNameSniff.php
index c3ab05e..60f3a8a 100644
--- a/MediaWiki/Sniffs/NamingConventions/ValidGlobalNameSniff.php
+++ b/MediaWiki/Sniffs/NamingConventions/ValidGlobalNameSniff.php
@@ -39,39 +39,44 @@
$tokens = $phpcsFile->getTokens();
$nameIndex = $phpcsFile->findNext( T_VARIABLE, $stackPtr + 1 );
- $globalName = $tokens[$nameIndex]['content'];
+ $semicolonIndex = $phpcsFile->findNext( T_SEMICOLON, $stackPtr
+ 1 );
- if( in_array( $globalName, self::$mediaWikiValid ) ||
- in_array( $globalName, self::$PHPReserved )
- ) {
- return;
- }
+ while( $nameIndex < $semicolonIndex ) {
+ if( $tokens[ $nameIndex ][ 'code' ] !== T_WHITESPACE &&
$tokens[ $nameIndex ][ 'code' ] !== T_COMMA ) {
+ $globalName = $tokens[$nameIndex]['content'];
- // Skip '$' and forge a valid global variable name
- $expected = '$wg' . ucfirst(substr( $globalName, 1 ));
+ if( in_array( $globalName,
self::$mediaWikiValid ) ||
+ in_array( $globalName,
self::$PHPReserved )
+ ) {
+ return;
+ }
- // Verify global is prefixed with wg
- if( strpos($globalName, '$wg' ) !== 0 ) {
- $phpcsFile->addError(
- 'Global variable "%s" is lacking \'wg\' prefix.
Should be "%s".',
- $stackPtr,
- 'wgPrefix',
- array( $globalName, $expected )
- );
- } else {
- // Verify global is probably CamelCase
- $val = ord( substr( $globalName, 3, 1 ) );
- if( !($val >= 65 && $val <= 90) ) {
- $phpcsFile->addError(
- 'Global variable "%s" should use
CamelCase: "%s"',
- $stackPtr,
- 'CamelCase',
- array( $globalName, $expected )
- );
+ // Skip '$' and forge a valid global variable
name
+ $expected = '$wg' . ucfirst(substr(
$globalName, 1 ));
+
+ // Verify global is prefixed with wg
+ if( strpos($globalName, '$wg' ) !== 0 ) {
+ $phpcsFile->addError(
+ 'Global variable "%s" is
lacking \'wg\' prefix. Should be "%s".',
+ $stackPtr,
+ 'wgPrefix',
+ array( $globalName, $expected )
+ );
+ } else {
+ // Verify global is probably CamelCase
+ $val = ord( substr( $globalName, 3, 1 )
);
+ if( !($val >= 65 && $val <= 90) ) {
+ $phpcsFile->addError(
+ 'Global variable "%s"
should use CamelCase: "%s"',
+ $stackPtr,
+ 'CamelCase',
+ array( $globalName,
$expected )
+ );
+ }
+ }
}
+ $nameIndex++;
}
-
}
-
}
diff --git a/MediaWiki/Tests/files/NamingConventions/wg_global_name2_fail.php
b/MediaWiki/Tests/files/NamingConventions/wg_global_name2_fail.php
new file mode 100644
[MediaWiki-commits] [Gerrit] Hygiene: Align watchstars correctly in SearchOverlay - change (mediawiki...MobileFrontend)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193657
Change subject: Hygiene: Align watchstars correctly in SearchOverlay
..
Hygiene: Align watchstars correctly in SearchOverlay
Bug: T91178
Change-Id: Ic7c7ac459d0f92dbbf74673cf8dcf9cc19e6cf6f
---
M less/modules/watchstar.less
1 file changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/57/193657/1
diff --git a/less/modules/watchstar.less b/less/modules/watchstar.less
index b5e1e3c..1a7c55c 100644
--- a/less/modules/watchstar.less
+++ b/less/modules/watchstar.less
@@ -7,10 +7,21 @@
.page-list .watch-this-article {
position: absolute;
right: 0;
- top: 50%;
margin-top: -(@watchThisArticleSize / 2);
width: @watchThisArticleSize;
}
+.alpha,
+.beta {
+ .page-list .watch-this-article {
+ top: 75%;
+ }
+}
+
+.stable {
+ .page-list .watch-this-article {
+ top: 65%;
+ }
+}
.animations {
.mw-ui-icon.watch-this-article,
--
To view, visit https://gerrit.wikimedia.org/r/193657
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7c7ac459d0f92dbbf74673cf8dcf9cc19e6cf6f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Preview 3 of metrolook - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged.
Change subject: Preview 3 of metrolook
..
Preview 3 of metrolook
* Improvements to ipad desgn.
* Bug fixes.
* Improvement to mobile desgn
Please see changelog for more details and README.md.
Change-Id: I64b67359af448484bba862d8adc8e3974daf44fe
---
M CHANGELOG.md
M Metrolook.php
M MetrolookTemplate.php
M README.md
M components/collapsibleNav.less
M components/common.less
M components/mobile.less
M components/navigation.less
M components/search.less
M images/closed-ltr.svg
M images/closed-rtl.svg
M images/downarrow.svg
M images/open.svg
M images/uploadlogo.svg
M js/metrolook.js
M screen-hd.less
A skinStyles/mediawiki.sectionAnchor.less
M variables.less
18 files changed, 236 insertions(+), 145 deletions(-)
Approvals:
Paladox: Looks good to me, approved
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 954285f..0cb9f82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
Changelog
=
+
### 3.0 beta 16
Big release with new desgn for mobile and minor improvements to desktop desgn.
@@ -9,9 +10,7 @@
Bump required mediawiki version to mediawiki 1.25 wmf 18
-
Mainly new features and desgn are
-
* Mobile desgn (This is a preview of mobile desgn please report bug in issue
section and fix bugs if you know how to thanks. and please also suggest
improvements to the desktop and mobile desgn.)
@@ -69,6 +68,12 @@
* Fixes for desktop desgn.
+Revision 5
+
+Improvements to ipad desgn.
+
+* Bug fixes.
+
### 3.0 beta 15
diff --git a/Metrolook.php b/Metrolook.php
index f0d14d4..16c7368 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -156,6 +156,7 @@
'jquery.ui.tabs' => 'skinStyles/jquery.ui/jquery.ui.tabs.css',
'jquery.ui.tooltips' => 'skinStyles/jquery.ui/jquery.ui.tooltips.css',
'mediawiki.notification' => 'skinStyles/mediawiki.notification.less',
+ '+mediawiki.sectionAnchor' => 'skinStyles/mediawiki.sectionAnchor.less',
'mediawiki.special' => 'skinStyles/mediawiki.special.less',
'mediawiki.special.preferences' =>
'skinStyles/mediawiki.special.preferences.less',
'remoteSkinPath' => 'Metrolook',
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 629a881..0982aab 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -318,20 +318,20 @@
msg('uploadbtn')
?>renderNavigation(
array( 'NAMESPACES', 'VARIANTS', 'VIEWS', 'ACTIONS' ) ); ?>
-
+
-
+
renderNavigation( array( 'SEARCH'
) ); ?>
-
+
diff --git a/README.md b/README.md
index c9d0f71..feb3e63 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,12 @@
|`$wgMetrolookTileN`Where `N` is between 5 to 10. | | `$wgMetrolookTile5 =
true;`| `$wgMetrolookTile5 = false;` |
|`$wgMetrolookURLN`, `$wgMetrolookImageN`Where `N` is between 1 to 6. | |
`$wgMetrolookURL1 = link of website;``$wgMetrolookImage1 = image link;`| |
+## Mobile desgn
+
+To test out the new mobile desgn please visit
https://github.com/paladox/Metrolook/tree/test
+
+It is in preview meaning there will be bugs and problems. Please report any
bugs or suggestion for the desgn.
+
$wgBartile is now used to disable the default tiles or enable them so you can
have the default tiles or set your self one.
@@ -77,6 +83,9 @@
and all you need to do is edit background-colour and the top bar should change
colour but please remember there is also hover which is when you hover it goes
a different colour.
```css
+
+/* Add your custom theme overrides here */
+
/* Top Bar colour and hover colour start */
@import "mediawiki.mixins";
@@ -123,7 +132,7 @@
background-repeat: repeat-x;
/* This image is only a fallback (for IE 6-9), so we do not @embed it.
*/
background-image: url('images/page-fade.png');
- min-width: 67.800em;
+ min-width: 64.7em;
}
}
@@ -186,7 +195,7 @@
}
}
-/* Top Bar colour and hover colour end */
+/* Top Bar colour and hover colour */
```
## Known Issues
@@ -220,23 +229,4 @@
http://www.pidgi.net/new/public/images/pidgiwiki.png"/>
-```
-
-```html
-
-
-
-
-
-
-
-
```
diff --git a/components/collapsibleNav.less b/components/collapsibleNav.less
index 0cb663b..ea7dad6 100644
--- a/components/collapsibleNav.less
+++ b/components/collapsibleNav.less
@@ -9,9 +9,9 @@
[MediaWiki-commits] [Gerrit] Preview 3 of metrolook - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193656
Change subject: Preview 3 of metrolook
..
Preview 3 of metrolook
* Improvements to ipad desgn.
* Bug fixes.
* Improvement to mobile desgn
Please see changelog for more details and README.md.
Change-Id: I64b67359af448484bba862d8adc8e3974daf44fe
---
M CHANGELOG.md
M Metrolook.php
M MetrolookTemplate.php
M README.md
M components/collapsibleNav.less
M components/common.less
M components/mobile.less
M components/navigation.less
M components/search.less
M images/closed-ltr.svg
M images/closed-rtl.svg
M images/downarrow.svg
M images/open.svg
M images/uploadlogo.svg
M js/metrolook.js
M screen-hd.less
A skinStyles/mediawiki.sectionAnchor.less
M variables.less
18 files changed, 242 insertions(+), 145 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/56/193656/1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 954285f..0b77e31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
Changelog
=
+<<< HEAD
+<<< HEAD
+
+===
+>>> Testing new release
+===
### 3.0 beta 16
Big release with new desgn for mobile and minor improvements to desktop desgn.
@@ -9,9 +15,7 @@
Bump required mediawiki version to mediawiki 1.25 wmf 18
-
Mainly new features and desgn are
-
* Mobile desgn (This is a preview of mobile desgn please report bug in issue
section and fix bugs if you know how to thanks. and please also suggest
improvements to the desktop and mobile desgn.)
@@ -69,7 +73,14 @@
* Fixes for desktop desgn.
+Revision 5
+Improvements to ipad desgn.
+
+* Bug fixes.
+
+
+>>> Revison 3 of new release
### 3.0 beta 15
* Adding copying file for license.
diff --git a/Metrolook.php b/Metrolook.php
index f0d14d4..16c7368 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -156,6 +156,7 @@
'jquery.ui.tabs' => 'skinStyles/jquery.ui/jquery.ui.tabs.css',
'jquery.ui.tooltips' => 'skinStyles/jquery.ui/jquery.ui.tooltips.css',
'mediawiki.notification' => 'skinStyles/mediawiki.notification.less',
+ '+mediawiki.sectionAnchor' => 'skinStyles/mediawiki.sectionAnchor.less',
'mediawiki.special' => 'skinStyles/mediawiki.special.less',
'mediawiki.special.preferences' =>
'skinStyles/mediawiki.special.preferences.less',
'remoteSkinPath' => 'Metrolook',
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 629a881..0982aab 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -318,20 +318,20 @@
msg('uploadbtn')
?>renderNavigation(
array( 'NAMESPACES', 'VARIANTS', 'VIEWS', 'ACTIONS' ) ); ?>
-
+
-
+
renderNavigation( array( 'SEARCH'
) ); ?>
-
+
diff --git a/README.md b/README.md
index c9d0f71..feb3e63 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,12 @@
|`$wgMetrolookTileN`Where `N` is between 5 to 10. | | `$wgMetrolookTile5 =
true;`| `$wgMetrolookTile5 = false;` |
|`$wgMetrolookURLN`, `$wgMetrolookImageN`Where `N` is between 1 to 6. | |
`$wgMetrolookURL1 = link of website;``$wgMetrolookImage1 = image link;`| |
+## Mobile desgn
+
+To test out the new mobile desgn please visit
https://github.com/paladox/Metrolook/tree/test
+
+It is in preview meaning there will be bugs and problems. Please report any
bugs or suggestion for the desgn.
+
$wgBartile is now used to disable the default tiles or enable them so you can
have the default tiles or set your self one.
@@ -77,6 +83,9 @@
and all you need to do is edit background-colour and the top bar should change
colour but please remember there is also hover which is when you hover it goes
a different colour.
```css
+
+/* Add your custom theme overrides here */
+
/* Top Bar colour and hover colour start */
@import "mediawiki.mixins";
@@ -123,7 +132,7 @@
background-repeat: repeat-x;
/* This image is only a fallback (for IE 6-9), so we do not @embed it.
*/
background-image: url('images/page-fade.png');
- min-width: 67.800em;
+ min-width: 64.7em;
}
}
@@ -186,7 +195,7 @@
}
}
-/* Top Bar colour and hover colour end */
+/* Top Bar colour and hover colour */
```
## Known Issues
@@ -220,23 +229,4 @@
http://www.pidgi.net/new/public/images/pidgiwiki.png"/>
-```
-
-```html
-
-
-
-
-
-
[MediaWiki-commits] [Gerrit] dysprosium -> new jessie install test on real hw - change (operations/puppet)
BBlack has submitted this change and it was merged. Change subject: dysprosium -> new jessie install test on real hw .. dysprosium -> new jessie install test on real hw Change-Id: I32d967f8312c13c8add2cdf1ed1e08a0421fa9d8 --- M modules/install-server/files/autoinstall/netboot.cfg M modules/install-server/files/autoinstall/scripts/late_command 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/modules/install-server/files/autoinstall/netboot.cfg b/modules/install-server/files/autoinstall/netboot.cfg index cdd5650..028cd6e 100755 --- a/modules/install-server/files/autoinstall/netboot.cfg +++ b/modules/install-server/files/autoinstall/netboot.cfg @@ -59,8 +59,8 @@ calcium|helium|potassium|tmh1001|tmh1002) echo partman/raid1-1partition.cfg ;; \ acamar|achernar|baham|cobalt|lead|lithium|polonium) echo partman/raid1-lvm.cfg ;; \ cp1008) echo partman/varnish-oldssd.cfg ;; \ - cp1060|cp1064|cp1065|cp1070) echo partman/varnish.cfg ;; \ - cp102[1-9]|cp10[3-6][0-9]|cp1070|cp[34]0[0-9][0-9]|sq6[7-9]|sq70|dysprosium) echo partman/raid1-varnish.cfg ;; \ + cp1060|cp1064|cp1065|cp1070|dysprosium) echo partman/varnish.cfg ;; \ + cp102[1-9]|cp10[3-6][0-9]|cp1070|cp[34]0[0-9][0-9]|sq6[7-9]|sq70) echo partman/raid1-varnish.cfg ;; \ d-i-test) echo partman/flat.cfg ;; \ antimony|arsenic|caesium|erbium|gadolinium|heze|magnesium|neodymium|palladium|promethium|rubidium|strontium|terbium) echo partman/lvm.cfg ;; \ graphite[12]001) echo partman/graphite.cfg ;; \ diff --git a/modules/install-server/files/autoinstall/scripts/late_command b/modules/install-server/files/autoinstall/scripts/late_command index 03a5326..ac4def3 100644 --- a/modules/install-server/files/autoinstall/scripts/late_command +++ b/modules/install-server/files/autoinstall/scripts/late_command @@ -27,7 +27,7 @@ # kernel update + optimized mkfs for all cache nodes # (the upgrade is to grab our updated firmware packages first for initramfs...) case `hostname` in \ - amssq[0-9]*|cp[1234]*) + amssq[0-9]*|cp[1234]*|dysprosium) chroot /target apt-get -y upgrade apt-install linux-image-3.19 mke2fs -F -F -t ext4 -T huge -O sparse_super2 -m 0 -L sda3-varnish /dev/sda3 -- To view, visit https://gerrit.wikimedia.org/r/193655 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32d967f8312c13c8add2cdf1ed1e08a0421fa9d8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack Gerrit-Reviewer: BBlack ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dysprosium -> new jessie install test on real hw - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/193655 Change subject: dysprosium -> new jessie install test on real hw .. dysprosium -> new jessie install test on real hw Change-Id: I32d967f8312c13c8add2cdf1ed1e08a0421fa9d8 --- M modules/install-server/files/autoinstall/netboot.cfg M modules/install-server/files/autoinstall/scripts/late_command 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/55/193655/1 diff --git a/modules/install-server/files/autoinstall/netboot.cfg b/modules/install-server/files/autoinstall/netboot.cfg index cdd5650..028cd6e 100755 --- a/modules/install-server/files/autoinstall/netboot.cfg +++ b/modules/install-server/files/autoinstall/netboot.cfg @@ -59,8 +59,8 @@ calcium|helium|potassium|tmh1001|tmh1002) echo partman/raid1-1partition.cfg ;; \ acamar|achernar|baham|cobalt|lead|lithium|polonium) echo partman/raid1-lvm.cfg ;; \ cp1008) echo partman/varnish-oldssd.cfg ;; \ - cp1060|cp1064|cp1065|cp1070) echo partman/varnish.cfg ;; \ - cp102[1-9]|cp10[3-6][0-9]|cp1070|cp[34]0[0-9][0-9]|sq6[7-9]|sq70|dysprosium) echo partman/raid1-varnish.cfg ;; \ + cp1060|cp1064|cp1065|cp1070|dysprosium) echo partman/varnish.cfg ;; \ + cp102[1-9]|cp10[3-6][0-9]|cp1070|cp[34]0[0-9][0-9]|sq6[7-9]|sq70) echo partman/raid1-varnish.cfg ;; \ d-i-test) echo partman/flat.cfg ;; \ antimony|arsenic|caesium|erbium|gadolinium|heze|magnesium|neodymium|palladium|promethium|rubidium|strontium|terbium) echo partman/lvm.cfg ;; \ graphite[12]001) echo partman/graphite.cfg ;; \ diff --git a/modules/install-server/files/autoinstall/scripts/late_command b/modules/install-server/files/autoinstall/scripts/late_command index 03a5326..ac4def3 100644 --- a/modules/install-server/files/autoinstall/scripts/late_command +++ b/modules/install-server/files/autoinstall/scripts/late_command @@ -27,7 +27,7 @@ # kernel update + optimized mkfs for all cache nodes # (the upgrade is to grab our updated firmware packages first for initramfs...) case `hostname` in \ - amssq[0-9]*|cp[1234]*) + amssq[0-9]*|cp[1234]*|dysprosium) chroot /target apt-get -y upgrade apt-install linux-image-3.19 mke2fs -F -F -t ext4 -T huge -O sparse_super2 -m 0 -L sda3-varnish /dev/sda3 -- To view, visit https://gerrit.wikimedia.org/r/193655 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I32d967f8312c13c8add2cdf1ed1e08a0421fa9d8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Upgrade karma-qunit to ??? - change (oojs/ui)
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/193654 Change subject: Upgrade karma-qunit to ??? .. Upgrade karma-qunit to ??? https://github.com/karma-runner/karma-qunit/pull/22 Not quite sure if this is going to work... Change-Id: Ie70843fe8ffe4ef747620d2f0ca5a9e16a61f3ca --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/54/193654/1 diff --git a/package.json b/package.json index 01096c9..eaae96a 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "karma-chrome-launcher": "0.1.7", "karma-coverage": "0.2.7", "karma-firefox-launcher": "0.1.4", -"karma-qunit": "0.1.4", +"karma-qunit": "git://github.com/marcins/karma-qunit.git#feature-qunit-fixture", "q": "1.1.2", "qunitjs": "1.17.1" } -- To view, visit https://gerrit.wikimedia.org/r/193654 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie70843fe8ffe4ef747620d2f0ca5a9e16a61f3ca Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 6c5cb61..cc31f3e - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/193653 Change subject: Syncronize VisualEditor: 6c5cb61..cc31f3e .. Syncronize VisualEditor: 6c5cb61..cc31f3e Change-Id: I59f72058735a58e92bd56bc9c200f6062a8c99f9 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/53/193653/1 diff --git a/VisualEditor b/VisualEditor index 6c5cb61..cc31f3e 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 6c5cb6113909bfcc52c924ee53ae65bd181c541c +Subproject commit cc31f3e8da1d905c2069406f37cc3c763f90a1ac -- To view, visit https://gerrit.wikimedia.org/r/193653 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59f72058735a58e92bd56bc9c200f6062a8c99f9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 6c5cb61..cc31f3e - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 6c5cb61..cc31f3e .. Syncronize VisualEditor: 6c5cb61..cc31f3e Change-Id: I59f72058735a58e92bd56bc9c200f6062a8c99f9 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 6c5cb61..cc31f3e 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 6c5cb6113909bfcc52c924ee53ae65bd181c541c +Subproject commit cc31f3e8da1d905c2069406f37cc3c763f90a1ac -- To view, visit https://gerrit.wikimedia.org/r/193653 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59f72058735a58e92bd56bc9c200f6062a8c99f9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Missing support here for sqlite - change (mediawiki...ConfirmAccount)
jenkins-bot has submitted this change and it was merged. Change subject: Missing support here for sqlite .. Missing support here for sqlite * Some .sql were missing sqlite support. * Converts spaces to tabs in .sql file. Change-Id: I968b0b88233763e80ab9e1aa439518ceb253cc5d --- M backend/schema/mysql/ConfirmAccount.sql M backend/schema/mysql/patch-account_credentials.sql M backend/schema/mysql/patch-acr_agent.sql M backend/schema/mysql/patch-acr_areas.sql M backend/schema/mysql/patch-acr_filename.sql M backend/schema/mysql/patch-email-index.sql 6 files changed, 141 insertions(+), 142 deletions(-) Approvals: Aaron Schulz: Looks good to me, approved jenkins-bot: Verified diff --git a/backend/schema/mysql/ConfirmAccount.sql b/backend/schema/mysql/ConfirmAccount.sql index 792e740..486b65e 100644 --- a/backend/schema/mysql/ConfirmAccount.sql +++ b/backend/schema/mysql/ConfirmAccount.sql @@ -6,59 +6,59 @@ -- This stores all of our reviews, -- the corresponding tags are stored in the tag table CREATE TABLE IF NOT EXISTS /*_*/account_requests ( - acr_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT, - -- Usernames must be unique, must not be in the form of - -- an IP address. _Shouldn't_ allow slashes or case - -- conflicts. Spaces are allowed, and are _not_ converted - -- to underscores like titles. See the User::newFromName() for - -- the specific tests that usernames have to pass. - acr_name varchar(255) binary NOT NULL default '', - -- Optional 'real name' to be displayed in credit listings - acr_real_name varchar(255) binary NOT NULL default '', - -- Note: email should be restricted, not public info. - -- Same with passwords. - acr_email tinytext NOT NULL, - -- Initially NULL; when a user's e-mail address has been - -- validated by returning with a mailed token, this is - -- set to the current timestamp. - acr_email_authenticated varbinary(14) default NULL, - -- Randomly generated token created when the e-mail address - -- is set and a confirmation test mail sent. - acr_email_token binary(32), - -- Expiration date for the user_email_token - acr_email_token_expires varbinary(14), - -- A little about this user - acr_bio mediumblob NOT NULL, - -- Private info for reviewers to look at when considering request - acr_notes mediumblob NOT NULL, - -- Links to recognize/identify this user, CSV, may not be public - acr_urls mediumblob NOT NULL, - -- IP address - acr_ip VARCHAR(255) NULL default '', - acr_xff VARCHAR(255) NULL default '', - -- User-Agent header - acr_agent VARCHAR(255) NULL default '', - -- Name of attached file (.pdf,.doc,.txt etc...) - acr_filename VARCHAR(255) NULL, - acr_storage_key VARCHAR(64) NULL, - -- Prospective account access level - acr_type tinyint(255) unsigned NOT NULL default 0, - -- Areas of interest - acr_areas mediumblob NOT NULL, + acr_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT, + -- Usernames must be unique, must not be in the form of + -- an IP address. _Shouldn't_ allow slashes or case + -- conflicts. Spaces are allowed, and are _not_ converted + -- to underscores like titles. See the User::newFromName() for + -- the specific tests that usernames have to pass. + acr_name varchar(255) binary NOT NULL default '', + -- Optional 'real name' to be displayed in credit listings + acr_real_name varchar(255) binary NOT NULL default '', + -- Note: email should be restricted, not public info. + -- Same with passwords. + acr_email tinytext NOT NULL, + -- Initially NULL; when a user's e-mail address has been + -- validated by returning with a mailed token, this is + -- set to the current timestamp. + acr_email_authenticated varbinary(14) default NULL, + -- Randomly generated token created when the e-mail address + -- is set and a confirmation test mail sent. + acr_email_token binary(32), + -- Expiration date for the user_email_token + acr_email_token_expires varbinary(14), + -- A little about this user + acr_bio mediumblob NOT NULL, + -- Private info for reviewers to look at when considering request + acr_notes mediumblob NOT NULL, + -- Links to recognize/identify this user, CSV, may not be public + acr_urls mediumblob NOT NULL, + -- IP address + acr_ip VARCHAR(255) NULL default '', + acr_xff VARCHAR(255) NULL default '', + -- User-Agent header + acr_agent VARCHAR(255) NULL default '', + -- Name of attached file (.pdf,.doc,.txt etc...) + acr_filename VARCHAR(255) NULL, + acr_storage_key VARCHAR(64) NULL, + -- Prospective account access level + acr_type tinyint(255) unsigned NOT NULL default 0, + -- Areas of interest + acr_areas mediumblob NOT NULL, - -- Timestamp of account registration. - acr_registration varbinary(14) NOT NUL
[MediaWiki-commits] [Gerrit] Update to cassandra_driver_v2 branch for deploy testing - change (mediawiki...deploy)
GWicke has submitted this change and it was merged. Change subject: Update to cassandra_driver_v2 branch for deploy testing .. Update to cassandra_driver_v2 branch for deploy testing Change-Id: Ic5396e9d2f35770ae94d3a8cfb86273d0897732b --- M node_modules/istanbul/node_modules/async/package.json M node_modules/mocha-jshint/node_modules/jshint/README.md M node_modules/mocha-jshint/node_modules/jshint/dist/jshint-rhino.js M node_modules/mocha-jshint/node_modules/jshint/dist/jshint.js M node_modules/mocha-jshint/node_modules/jshint/package.json M node_modules/mocha-jshint/node_modules/jshint/src/cli.js M node_modules/mocha-jshint/node_modules/jshint/src/jshint.js M node_modules/mocha-jshint/node_modules/jshint/src/lex.js M node_modules/mocha-jshint/node_modules/jshint/src/messages.js M node_modules/mocha-jshint/node_modules/jshint/src/options.js M node_modules/mocha-jshint/node_modules/jshint/src/style.js M node_modules/mocha-jshint/node_modules/jshint/src/vars.js M node_modules/mocha-lcov-reporter/package.json M node_modules/mocha/node_modules/debug/package.json M node_modules/mocha/node_modules/glob/node_modules/inherits/package.json M node_modules/mocha/node_modules/glob/package.json M node_modules/mocha/node_modules/jade/package.json M node_modules/mocha/node_modules/mkdirp/package.json M node_modules/preq/node_modules/bluebird/README.md M node_modules/preq/node_modules/bluebird/changelog.md M node_modules/preq/node_modules/bluebird/js/browser/bluebird.js M node_modules/preq/node_modules/bluebird/js/browser/bluebird.min.js M node_modules/preq/node_modules/bluebird/js/main/map.js M node_modules/preq/node_modules/bluebird/js/main/reduce.js M node_modules/preq/node_modules/bluebird/package.json M node_modules/request/node_modules/hawk/node_modules/hoek/.travis.yml M node_modules/request/node_modules/hawk/node_modules/hoek/lib/index.js M node_modules/request/node_modules/hawk/node_modules/hoek/package.json M node_modules/request/node_modules/hawk/node_modules/hoek/test/index.js D node_modules/restbase-mod-table-cassandra/.npmignore M node_modules/restbase-mod-table-cassandra/lib/db.js M node_modules/restbase-mod-table-cassandra/lib/dbutils.js M node_modules/restbase-mod-table-cassandra/lib/index.js M node_modules/restbase-mod-table-cassandra/lib/secondaryIndexes.js D node_modules/restbase-mod-table-cassandra/node_modules/.bin/uuid M node_modules/restbase-mod-table-cassandra/node_modules/async/package.json D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/.jshintignore D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/.jshintrc D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/.travis.yml D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/LICENSE D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/README.md D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/contrib/TestVarint.java D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/index.js D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/.dntrc D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/.npmignore D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/.travis.yml D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/README.markdown D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/bignum.cc D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/binding.gyp D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/Makefile D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/Release/.deps/Release/bignum.node.d D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/Release/.deps/Release/obj.target/bignum.node.d D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/Release/.deps/Release/obj.target/bignum/bignum.o.d D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/Release/bignum.node D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/Release/linker.lock D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/Release/obj.target/bignum.node D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/Release/obj.target/bignum/bignum.o D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/bignum.target.mk D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_m
[MediaWiki-commits] [Gerrit] Update to cassandra_driver_v2 branch for deploy testing - change (mediawiki...deploy)
GWicke has uploaded a new change for review. https://gerrit.wikimedia.org/r/193586 Change subject: Update to cassandra_driver_v2 branch for deploy testing .. Update to cassandra_driver_v2 branch for deploy testing Change-Id: Ic5396e9d2f35770ae94d3a8cfb86273d0897732b --- M node_modules/istanbul/node_modules/async/package.json M node_modules/mocha-jshint/node_modules/jshint/README.md M node_modules/mocha-jshint/node_modules/jshint/dist/jshint-rhino.js M node_modules/mocha-jshint/node_modules/jshint/dist/jshint.js M node_modules/mocha-jshint/node_modules/jshint/package.json M node_modules/mocha-jshint/node_modules/jshint/src/cli.js M node_modules/mocha-jshint/node_modules/jshint/src/jshint.js M node_modules/mocha-jshint/node_modules/jshint/src/lex.js M node_modules/mocha-jshint/node_modules/jshint/src/messages.js M node_modules/mocha-jshint/node_modules/jshint/src/options.js M node_modules/mocha-jshint/node_modules/jshint/src/style.js M node_modules/mocha-jshint/node_modules/jshint/src/vars.js M node_modules/mocha-lcov-reporter/package.json M node_modules/mocha/node_modules/debug/package.json M node_modules/mocha/node_modules/glob/node_modules/inherits/package.json M node_modules/mocha/node_modules/glob/package.json M node_modules/mocha/node_modules/jade/package.json M node_modules/mocha/node_modules/mkdirp/package.json M node_modules/preq/node_modules/bluebird/README.md M node_modules/preq/node_modules/bluebird/changelog.md M node_modules/preq/node_modules/bluebird/js/browser/bluebird.js M node_modules/preq/node_modules/bluebird/js/browser/bluebird.min.js M node_modules/preq/node_modules/bluebird/js/main/map.js M node_modules/preq/node_modules/bluebird/js/main/reduce.js M node_modules/preq/node_modules/bluebird/package.json M node_modules/request/node_modules/hawk/node_modules/hoek/.travis.yml M node_modules/request/node_modules/hawk/node_modules/hoek/lib/index.js M node_modules/request/node_modules/hawk/node_modules/hoek/package.json M node_modules/request/node_modules/hawk/node_modules/hoek/test/index.js D node_modules/restbase-mod-table-cassandra/.npmignore M node_modules/restbase-mod-table-cassandra/lib/db.js M node_modules/restbase-mod-table-cassandra/lib/dbutils.js M node_modules/restbase-mod-table-cassandra/lib/index.js M node_modules/restbase-mod-table-cassandra/lib/secondaryIndexes.js D node_modules/restbase-mod-table-cassandra/node_modules/.bin/uuid M node_modules/restbase-mod-table-cassandra/node_modules/async/package.json D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/.jshintignore D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/.jshintrc D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/.travis.yml D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/LICENSE D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/README.md D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/contrib/TestVarint.java D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/index.js D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/.dntrc D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/.npmignore D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/.travis.yml D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/README.markdown D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/bignum.cc D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/binding.gyp D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/Makefile D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/Release/.deps/Release/bignum.node.d D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/Release/.deps/Release/obj.target/bignum.node.d D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/Release/.deps/Release/obj.target/bignum/bignum.o.d D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/Release/bignum.node D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/Release/linker.lock D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/Release/obj.target/bignum.node D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/Release/obj.target/bignum/bignum.o D node_modules/restbase-mod-table-cassandra/node_modules/cassandra-codec/node_modules/bignum/build/bignum.target.mk D node_modules/restbase-mod-table-cassandra/no
[MediaWiki-commits] [Gerrit] refreshLinks.php: Tweak exit condition in deleteLinksFromNon... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: refreshLinks.php: Tweak exit condition in
deleteLinksFromNonexistent()
..
refreshLinks.php: Tweak exit condition in deleteLinksFromNonexistent()
Instead of exiting the do...while loop only once a query returns zero
rows, exit whenever fewer rows than the batch size are returned. This
could save quite a bit of time when the highest nonexistent page_id
found is a relatively low one.
Follows-up 40e300b8273d.
Bug: T44180
Change-Id: I14d2d48c2405fcc0bd05a3181ba6293caef5298c
---
M maintenance/refreshLinks.php
1 file changed, 7 insertions(+), 6 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php
index 7c85a1c..b2f7497 100644
--- a/maintenance/refreshLinks.php
+++ b/maintenance/refreshLinks.php
@@ -284,7 +284,7 @@
$this->output( "0.." );
do {
- $list = $dbr->selectFieldValues(
+ $ids = $dbr->selectFieldValues(
$table,
$field,
array(
@@ -295,15 +295,16 @@
array( 'DISTINCT', 'ORDER BY' =>
$field, 'LIMIT' => $batchSize )
);
- if ( $list ) {
- $counter += count( $list );
+ $numIds = count( $ids );
+ if ( $numIds ) {
+ $counter += $numIds;
wfWaitForSlaves();
- $dbw->delete( $table, array( $field =>
$list ), __METHOD__ );
+ $dbw->delete( $table, array( $field =>
$ids ), __METHOD__ );
$this->output( $counter . ".." );
- $start = $list[count( $list ) - 1] + 1;
+ $start = $ids[$numIds - 1] + 1;
}
- } while ( $list );
+ } while ( $numIds >= $batchSize );
$this->output( "\n" );
wfWaitForSlaves();
--
To view, visit https://gerrit.wikimedia.org/r/193564
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14d2d48c2405fcc0bd05a3181ba6293caef5298c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Parent5446
Gerrit-Reviewer: Reedy
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 hard message tracking - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193585
Change subject: Remove hard message tracking
..
Remove hard message tracking
The data is not useful, takes resources.
Bug: T90419
Change-Id: Ifd1ba9aae44d40284c27ffa51112cd86a8846d85
---
M resources/js/ext.translate.editor.js
1 file changed, 1 insertion(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/85/193585/1
diff --git a/resources/js/ext.translate.editor.js
b/resources/js/ext.translate.editor.js
index 4bae5a1..77a2b60 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -266,15 +266,7 @@
* Record it to mark as hard.
*/
skip: function () {
- // Only record skips of fuzzy or untranslated as hards
- // @TODO devise better algorithm
- if ( this.$messageItem.is( '.fuzzy, .untranslated' ) ) {
- // We can just ignore the result even if it
fails
- (new mw.Api()).postWithToken( 'edit', {
- action: 'hardmessages',
- title: this.message.title
- } );
- }
+ // @TODO devise good algorithm for identifying hard to
translate messages
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/193585
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd1ba9aae44d40284c27ffa51112cd86a8846d85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix uncaught exception when moving documentation unit of tra... - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193584
Change subject: Fix uncaught exception when moving documentation unit of
translatable page
..
Fix uncaught exception when moving documentation unit of translatable page
Bug: T59541
Change-Id: Ie41396b55ce7a874ea3608227760db7cf6c0ac6c
---
M tag/PageTranslationHooks.php
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/84/193584/1
diff --git a/tag/PageTranslationHooks.php b/tag/PageTranslationHooks.php
index 636381c..b75ccb4 100644
--- a/tag/PageTranslationHooks.php
+++ b/tag/PageTranslationHooks.php
@@ -938,6 +938,11 @@
continue;
}
+ // Documentation pages are never translation pages
+ if ( $handle->isDoc() ) {
+ continue;
+ }
+
$group = $handle->getGroup();
if ( !$group instanceof WikiPageMessageGroup ) {
continue;
--
To view, visit https://gerrit.wikimedia.org/r/193584
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie41396b55ce7a874ea3608227760db7cf6c0ac6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] convert varnish to service_unit - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: convert varnish to service_unit
..
convert varnish to service_unit
Change-Id: I19386d471bdb2646dce01a68830da18bcc9d9464
---
M modules/varnish/manifests/instance.pp
R modules/varnish/templates/initscripts/varnish.systemd.erb
R modules/varnish/templates/initscripts/varnish.sysvinit.erb
3 files changed, 20 insertions(+), 45 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/varnish/manifests/instance.pp
b/modules/varnish/manifests/instance.pp
index 69673f4..59c5218 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -84,51 +84,26 @@
content => template("${module_name}/varnish-default.erb"),
}
-case $::initsystem {
-'upstart': {
-file { "/etc/init.d/varnish${instancesuffix}":
-owner => 'root',
-group => 'root',
-mode=> '0555',
-content => template("${module_name}/varnish.init.erb"),
-}
-service { "varnish${instancesuffix}":
-ensure=> running,
-require => [
-File["/etc/default/varnish${instancesuffix}"],
-File["/etc/init.d/varnish${instancesuffix}"],
-File["/etc/varnish/${vcl}.inc.vcl"],
-File["/etc/varnish/wikimedia_${vcl}.vcl"],
-Mount['/var/lib/varnish']
-],
-hasstatus => false,
-pattern => "/var/run/varnishd${instancesuffix}.pid",
-subscribe => Package['varnish'],
-tag => 'varnish_instance'
-}
-}
-'systemd': {
-file { "/etc/systemd/system/varnish${instancesuffix}.service":
-owner => 'root',
-group => 'root',
-mode=> '0444',
-content => template("${module_name}/varnish.service.erb"),
-}
-service { "varnish${instancesuffix}":
-provider => 'systemd',
-ensure=> running,
-require => [
-
File["/etc/systemd/system/varnish${instancesuffix}.service"],
-File["/etc/varnish/${vcl}.inc.vcl"],
-File["/etc/varnish/wikimedia_${vcl}.vcl"],
-Mount['/var/lib/varnish']
-],
-subscribe => Package['varnish'],
-tag => 'varnish_instance'
-}
-}
-default: {
-fail('varnish::instance does not like your init system!')
+base::service_unit { "varnish${instancesuffix}":
+template_name => 'varnish',
+systemd => true,
+sysvinit => true,
+refresh => false,
+service_params => {
+tag => 'varnish_instance',
+enable => true,
+require => [
+Package['varnish'],
+File["/etc/default/varnish${instancesuffix}"],
+File["/etc/varnish/${vcl}.inc.vcl"],
+File["/etc/varnish/wikimedia_${vcl}.vcl"],
+Mount['/var/lib/varnish'],
+],
+# The two below were for upstart only. They seem
+# nonsensical vs fixing the initscript, but I suspect they're
+# harmless on systemd and can be removed later.
+hasstatus => false,
+pattern => "/var/run/varnishd${instancesuffix}.pid",
}
}
diff --git a/modules/varnish/templates/varnish.service.erb
b/modules/varnish/templates/initscripts/varnish.systemd.erb
similarity index 100%
rename from modules/varnish/templates/varnish.service.erb
rename to modules/varnish/templates/initscripts/varnish.systemd.erb
diff --git a/modules/varnish/templates/varnish.init.erb
b/modules/varnish/templates/initscripts/varnish.sysvinit.erb
similarity index 100%
rename from modules/varnish/templates/varnish.init.erb
rename to modules/varnish/templates/initscripts/varnish.sysvinit.erb
--
To view, visit https://gerrit.wikimedia.org/r/193543
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I19386d471bdb2646dce01a68830da18bcc9d9464
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
Gerrit-Reviewer: BBlack
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 $template_name param to service_unit - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Add $template_name param to service_unit
..
Add $template_name param to service_unit
This is to support the pattern in e.g. varnish, where
varnish::instance defines multiple instances with distinct names
set by the (other-module) caller, but the init file template is
common to all instances and is defined and located within the
varnish module.
Change-Id: If9d589c0c0ba0b522e824b1d09dc2d5dacedca10
---
M modules/base/manifests/service_unit.pp
1 file changed, 9 insertions(+), 4 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/manifests/service_unit.pp
b/modules/base/manifests/service_unit.pp
index 14b7ad8..ff0f2e2 100644
--- a/modules/base/manifests/service_unit.pp
+++ b/modules/base/manifests/service_unit.pp
@@ -11,12 +11,16 @@
#[*ensure*]
# Is the usual metaparameter, defaults to present
#
+#[*template_name*]
+# String, default $name. Init file template pathnames are formed
+# using the pattern "$module/initscripts/$template_name.$initsystem.erb"
+#
#[*systemd*]
# Boolean - set it to true to make the resource include personalized
# init file. As this is used to You are expected to put them in a
# specific subdirectory of the current module, which is
-# $module/initscripts/$name.systemd.erb for systemd (and similarly for
-# other init systems)
+# $module/initscripts/$template_name.systemd.erb for systemd (and
+# similarly for other init systems)
#
#[*upstart*]
# As the preceding param, but for upstart scripts
@@ -58,6 +62,7 @@
$sysvinit = false,
$strict = true,
$refresh = true,
+$template_name= $name,
$service_params = {},
) {
@@ -68,10 +73,10 @@
# we assume init scripts are templated
if $initscript {
if $caller_module_name {
-$template =
"${caller_module_name}/initscripts/${name}.${initscript}.erb"
+$template =
"${caller_module_name}/initscripts/${template_name}.${initscript}.erb"
}
else {
-$template = "initscripts/${name}.${initscript}.erb"
+$template = "initscripts/${template_name}.${initscript}.erb"
}
$path = $initscript ? {
'systemd' => "/etc/systemd/system/${name}.service",
--
To view, visit https://gerrit.wikimedia.org/r/193288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If9d589c0c0ba0b522e824b1d09dc2d5dacedca10
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: Giuseppe Lavagetto
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 mediawiki-core-regression-* jobs - change (integration/config)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193583
Change subject: Remove mediawiki-core-regression-* jobs
..
Remove mediawiki-core-regression-* jobs
Bug: T88018
Change-Id: I404eb1ddfb1fa4f4b92f228e30cf0654f56661e4
---
M jjb/mediawiki.yaml
M zuul/layout.yaml
2 files changed, 0 insertions(+), 103 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/83/193583/1
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index b7258e0..2a5c9af 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -286,35 +286,6 @@
- mw-teardown
- job-template:
-name: mediawiki-core-regression-hhvm-{branch}
-node: contintLabsSlave && UbuntuTrusty
-triggers:
- - zuul
-builders:
- - zuul-cloner:
- projects: >
- mediawiki/core
- mediawiki/vendor
- - mw-install-sqlite
- - mw-apply-settings
- - shell:
"/srv/deployment/integration/slave-scripts/bin/mw-run-phpunit-hhvm.sh"
-publishers:
- - phpunit-junit-2
- - archive-log-dir
- - mw-teardown
-wrappers:
- # Failsafe to avoid blocking builds in production since this is still very
- # experimental.
- # TODO remove wrappers and use the default whenever hhvm is ready.
- - timeout:
- timeout: 8
- fail: true
- - timestamps
- - ansicolor
-logrotate:
-daysToKeep: 90
-
-- job-template:
name: 'mediawiki-core-release'
concurrent: true
@@ -375,28 +346,6 @@
- '{name}-ruby1.9.3lint'
- 'mediawiki-phpunit-{phpflavor}'
- 'mediawiki-extensions-{phpflavor}'
-
-# For regression testing:
-
-- job-template:
-name: 'mediawiki-core-regression-{branch}'
-node: hasSlaveScripts && UbuntuPrecise
-triggers:
- - zuul
-builders:
- - zuul-cloner:
- projects: >
- mediawiki/core
- mediawiki/vendor
- - mw-install-sqlite
- - mw-apply-settings
- - shell: "/srv/deployment/integration/slave-scripts/bin/mw-run-phpunit.sh"
-publishers:
- - phpunit-junit-2
- - archive-log-dir
- - mw-teardown
-logrotate:
-daysToKeep: 90
- job:
name: 'mediawiki-core-code-coverage'
@@ -473,18 +422,3 @@
wrappers:
- ansicolor
- timestamps
-
-- project:
-name: mediawiki-core-regression
-branch:
- - master
- - REL1_19
- - REL1_20
- - REL1_21
- - REL1_22
- - REL1_23
- - REL1_24
-# Find a way to support WMF branches
-jobs:
- - 'mediawiki-core-regression-hhvm-{branch}'
- - 'mediawiki-core-regression-{branch}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index db94980..5614379 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1706,33 +1706,6 @@
# transaction.
voting: false
- # MediaWiki core regression tests (on merge and per branches):
- - name: ^mediawiki-core-regression-.*
-failure-message: ERROR! It seems this job introduced a regression although
it might be caused by a previous commit.
- - name: mediawiki-core-regression-master
-branch: ^master$
- - name: mediawiki-core-regression-REL1_19
-branch: ^REL1_19$
- - name: mediawiki-core-regression-REL1_20
-branch: ^REL1_20$
- - name: mediawiki-core-regression-REL1_21
-branch: ^REL1_21
- - name: mediawiki-core-regression-REL1_22
-branch: ^REL1_22
- - name: mediawiki-core-regression-REL1_23
-branch: ^REL1_23
- - name: mediawiki-core-regression-REL1_24
-branch: ^REL1_24
-
- - name: mediawiki-core-regression-hhvm-REL1_23
-branch: ^REL1_23$
-voting: false
- - name: mediawiki-core-regression-hhvm-REL1_24
-branch: ^REL1_24$
-voting: false
- - name: mediawiki-core-regression-hhvm-master
-branch: ^master$
-
# Being worked on with Nik
- name: mwext-browsertests-CirrusSearch-phantomjs
voting: false
@@ -1963,16 +1936,6 @@
- php-composer-validate
postmerge:
- mediawiki-core-jsduck-publish
- - mediawiki-core-regression-master
- - mediawiki-core-regression-REL1_19
- - mediawiki-core-regression-REL1_20
- - mediawiki-core-regression-REL1_21
- - mediawiki-core-regression-REL1_22
- - mediawiki-core-regression-REL1_23
- - mediawiki-core-regression-REL1_24
- - mediawiki-core-regression-hhvm-REL1_23
- - mediawiki-core-regression-hhvm-REL1_24
- - mediawiki-core-regression-hhvm-master
#- mediawiki-core-regression-phpcs-HEAD
- mediawiki-core-doxygen-publish
publish:
--
To view, visit https://gerrit.wikimedia.org/r/193583
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I404eb1ddfb1fa4f4b92f228e30cf0654f56661e4
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing li
[MediaWiki-commits] [Gerrit] installer: Remove unused references to wgResourceLoaderMaxQu... - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193582
Change subject: installer: Remove unused references to
wgResourceLoaderMaxQueryLength
..
installer: Remove unused references to wgResourceLoaderMaxQueryLength
* Added in 40e18e45343.
* Removed in 648bed9f839.
The latter left the Installer::values array still populating this
variable eventhough it was no longer used in the generators output.
The example in overrides.php is also outdated as modifying this
variable there would have no effect.
Change-Id: I0c86e94a004c034702c5fcd83257c0f4c3d15a57
---
M includes/installer/Installer.php
M includes/installer/LocalSettingsGenerator.php
M mw-config/overrides.php
3 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/82/193582/1
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 1036dcd..91195e9 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -186,7 +186,6 @@
'wgUseInstantCommons',
'wgUpgradeKey',
'wgDefaultSkin',
- 'wgResourceLoaderMaxQueryLength',
);
/**
diff --git a/includes/installer/LocalSettingsGenerator.php
b/includes/installer/LocalSettingsGenerator.php
index c0ba300..8724e0d 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -63,7 +63,7 @@
'wgRightsText', 'wgMainCacheType',
'wgEnableUploads',
'wgMainCacheType', '_MemCachedServers',
'wgDBserver', 'wgDBuser',
'wgDBpassword', 'wgUseInstantCommons',
'wgUpgradeKey', 'wgDefaultSkin',
- 'wgMetaNamespace',
'wgResourceLoaderMaxQueryLength', 'wgLogo',
+ 'wgMetaNamespace', 'wgLogo',
),
$db->getGlobalNames()
);
diff --git a/mw-config/overrides.php b/mw-config/overrides.php
index 5758152..40b3dde 100644
--- a/mw-config/overrides.php
+++ b/mw-config/overrides.php
@@ -38,7 +38,7 @@
class MyLocalSettingsGenerator extends LocalSettingsGenerator {
function getText() {
// Modify an existing setting
- $this->values['wgResourceLoaderMaxQueryLength'] = 512;
+ $this->values['wgDefaultSkin'] = 'vector';
// add a new setting
$ls = parent::getText();
return $ls . "\n\$wgUseTex = true;\n";
--
To view, visit https://gerrit.wikimedia.org/r/193582
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c86e94a004c034702c5fcd83257c0f4c3d15a57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Centralauth Account exists messages reworded - change (mediawiki...CentralAuth)
Sumit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193581
Change subject: Centralauth Account exists messages reworded
..
Centralauth Account exists messages reworded
Bug: T90732
Change-Id: I75de54d56230487731c1fc374b74ad5c1244ed87
---
M i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/81/193581/1
diff --git a/i18n/en.json b/i18n/en.json
index 2a392f4..59b2d08 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -214,8 +214,8 @@
"centralauth-renameuser-reserved": "Username $2 is reserved for a
global account.",
"centralauth-invalid-wiki": "No such wiki database: $1",
"centralauth-account-exists": "Cannot create account: The requested
username is already taken by a user on another wiki.",
- "centralauth-account-unattached-exists": "Cannot create account: The
requested username would conflict with another username on another wiki.",
- "centralauth-account-rename-exists": "Cannot create account: The
requested username would conflict with another username on another wiki.",
+ "centralauth-account-unattached-exists": "Cannot create account: The
username is already in use. Please pick another name.",
+ "centralauth-account-rename-exists": "Cannot create account: The
username is already in use. Please pick another name.",
"centralauth-account-exists-reset": "The username $1 is not registered
on this wiki, but you can reset its password on [[Special:CentralAuth/$1|a wiki
where it is]].",
"centralauth-login-progress": "Logging you in to wikis of
{{int:Centralauth-groupname}}:",
"centralauth-logout-progress": "Logging you out from other wikis of
{{int:Centralauth-groupname}}:",
--
To view, visit https://gerrit.wikimedia.org/r/193581
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I75de54d56230487731c1fc374b74ad5c1244ed87
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Sumit
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Add mocha tests - change (mediawiki...citoid)
Mvolz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193580
Change subject: [WIP] Add mocha tests
..
[WIP] Add mocha tests
Add mocha tests to grunt.
Bug: T91168
Change-Id: Id26b25bb14039adf68a8cf66d356f0ad0957bf58
---
M Gruntfile.js
M package.json
A tests/index.js
3 files changed, 133 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid
refs/changes/80/193580/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 4bf92a2..798bb99 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,6 +2,7 @@
// These plugins provide necessary tasks.
grunt.loadNpmTasks('grunt-contrib-jshint');
+ grunt.loadNpmTasks('grunt-simple-mocha');
// Project configuration.
grunt.initConfig({
@@ -16,11 +17,22 @@
'lib/*.js',
'lib/translators/*.js'
]
+ },
+ simplemocha: {
+ options: {
+ globals: ['describe', 'its'],
+ timeout: 3000,
+ ignoreLeaks: false,
+ ui: 'bdd',
+ reporter: 'tap'
+ },
+ all: { src: ['tests/*.js'] }
}
});
// Default task.
- grunt.registerTask( 'test', [ 'jshint:all' ] );
- grunt.registerTask( 'default', 'test' );
+ grunt.registerTask('test', ['jshint:all']);
+ grunt.registerTask('zoterorequired', ['simplemocha']);
+ grunt.registerTask('default', 'test');
};
diff --git a/package.json b/package.json
index fa0c739..2468a97 100644
--- a/package.json
+++ b/package.json
@@ -1,47 +1,49 @@
{
- "name" : "citoid",
- "version" : "0.0.0",
- "description" : "Converts search terms such as URL or DOI into
citations.",
- "scripts": {
- "test": "grunt test"
- },
- "dependencies" : {
- "async" : "0.9.0",
- "bluebird" : "2.3.11",
- "body-parser" : "1.10.0",
- "bunyan" : "1.2.3",
- "cheerio" : "0.18.0",
- "express" : "4.10.4",
- "html-metadata": "0.1.0",
- "path": "0.4.9",
- "request": "2.49.0",
- "xmldom": "0.1.19",
- "xpath": "0.0.7",
- "yargs": "1.3.3"
- },
- "devDependencies": {
- "grunt": "0.4.5",
- "grunt-contrib-jshint": "0.10.0"
- },
- "repository": {
- "type": "git",
- "url":
"https://gerrit.wikimedia.org/r/mediawiki/services/citoid";
- },
- "contributors": [
- {
- "name": "Marielle Volz",
- "email": "marielle.v...@gmail.com"
- },
- {
- "name": "Danny Wu",
- "email": "utf8snow...@gmail.com"
- },
- {
- "name": "Geoffrey Mon",
- "email": "geof...@gmail.com"
- },
- {
- "name": "Dan Michael O. Heggø",
- "email": "danmicha...@gmail.com"
- }]
+ "name": "citoid",
+ "version": "0.0.0",
+ "description": "Converts search terms such as URL or DOI into citations.",
+ "scripts": {
+"test": "grunt test"
+ },
+ "dependencies": {
+"async": "0.9.0",
+"bluebird": "2.3.11",
+"body-parser": "1.10.0",
+"bunyan": "1.2.3",
+"cheerio": "0.18.0",
+"express": "4.10.4",
+"html-metadata": "0.1.0",
+"path": "0.4.9",
+"request": "2.49.0",
+"xmldom": "0.1.19",
+"xpath": "0.0.7",
+"yargs": "1.3.3"
+ },
+ "devDependencies": {
+"grunt": "0.4.5",
+"grunt-contrib-jshint": "0.10.0",
+"grunt-simple-mocha": "0.4.0"
+ },
+ "repository": {
+"type": "git",
+"url": "https://gerrit.wikimedia.org/r/mediawiki/services/citoid";
+ },
+ "contributors": [
+{
+ "name": "Marielle Volz",
+ "email": "marielle.v...@gmail.com"
+},
+{
+ "name": "Danny Wu",
+ "email": "utf8snow...@gmail.com"
+},
+{
+ "name": "Geoffrey Mon",
+ "email": "geof...@gmail.com"
+},
+{
+ "name": "Dan Michael O. Heggø",
+ "email": "danmicha...@gmail.com"
+}
+ ]
}
diff --git a/tests/index.js b/tests/index.js
new file mode 100644
index 000..42a6273
--- /dev/null
+++ b/tests/index.js
@@ -0,0 +1,72 @@
+#!/usr/bin/env node
+/**
+ * https://www.mediawiki.org/wiki/citoid
+ */
+
+// mocha defines to avoid JSHint errors
+/* global describe, it */
+
+var CitoidService = require('../lib/CitoidService.js'),
+ bunyan = require('bunyan'),
+ path = require('path'),
+ opts = require('yargs')
+ .usage('Usage: $0 [-c configfile|--config=configfile]')
+ .default({
+ c: __dirname + '/localsett
[MediaWiki-commits] [Gerrit] [BrowserTest] Use Cucumber tag to specify which scenario to run - change (mediawiki...VisualEditor)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/193579 Change subject: [BrowserTest] Use Cucumber tag to specify which scenario to run .. [BrowserTest] Use Cucumber tag to specify which scenario to run Bug: T90423 Change-Id: I206d512adcb304b6e8823cc9e05acfcf3880c6c8 --- M modules/ve-mw/tests/browser/features/verify_production_wikis.feature 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/79/193579/1 diff --git a/modules/ve-mw/tests/browser/features/verify_production_wikis.feature b/modules/ve-mw/tests/browser/features/verify_production_wikis.feature index df72b1d..6fa7c6f 100644 --- a/modules/ve-mw/tests/browser/features/verify_production_wikis.feature +++ b/modules/ve-mw/tests/browser/features/verify_production_wikis.feature @@ -1,4 +1,4 @@ -@firefox +@firefox @production Feature: VisualEditor on production wikis Verify that VisualEditor is available as -- To view, visit https://gerrit.wikimedia.org/r/193579 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I206d512adcb304b6e8823cc9e05acfcf3880c6c8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] LivePreview: Notifiy user about errors - change (mediawiki/core)
TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193578
Change subject: LivePreview: Notifiy user about errors
..
LivePreview: Notifiy user about errors
Bug: T90490
Change-Id: Ic52311839c175a213065eec442e50b4de0463822
---
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
M resources/src/mediawiki.action/mediawiki.action.edit.preview.js
4 files changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/78/193578/1
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 31c766f..be2f52c 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -597,6 +597,7 @@
"missingcommentheader": "Reminder: You have not
provided a subject/headline for this comment.\nIf you click
\"{{int:savearticle}}\" again, your edit will be saved without one.",
"summary-preview": "Summary preview:",
"subject-preview": "Subject/headline preview:",
+ "previewerrortext": "An error occurred while attempting to preview your
changes.",
"blockedtitle": "User is blocked",
"blockedtext": "Your username or IP address has been
blocked.\n\nThe block was made by $1.\nThe reason given is
$2.\n\n* Start of block: $8\n* Expiry of block: $6\n* Intended
blockee: $7\n\nYou can contact $1 or another
[[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the block.\nYou
cannot use the \"email this user\" feature unless a valid email address is
specified in your [[Special:Preferences|account preferences]] and you have not
been blocked from using it.\nYour current IP address is $3, and the block ID is
#$5.\nPlease include all above details in any queries you make.",
"autoblockedtext": "Your IP address has been automatically blocked
because it was used by another user, who was blocked by $1.\nThe reason given
is:\n\n:$2\n\n* Start of block: $8\n* Expiry of block: $6\n* Intended
blockee: $7\n\nYou may contact $1 or one of the other
[[{{MediaWiki:Grouppage-sysop}}|administrators]] to discuss the block.\n\nNote
that you may not use the \"email this user\" feature unless you have a valid
email address registered in your [[Special:Preferences|user preferences]] and
you have not been blocked from using it.\n\nYour current IP address is $3, and
the block ID is #$5.\nPlease include all above details in any queries you
make.",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 6253fc9..12e6820 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -761,6 +761,7 @@
"missingcommentheader": "Edit summary that is shown if you enable
\"Prompt me when entering a blank summary\" and add a new section without
headline to a talk page.\n\nSee also:\n* {{msg-mw|Missingsummary}}\n*
{{msg-mw|Savearticle}}",
"summary-preview": "Preview of the edit summary, shown under the edit
summary itself.\nShould match: {{msg-mw|summary}}.",
"subject-preview": "Should match {{msg-mw|subject}}",
+ "previewerrortext: "When a user has the editing preference LivePreview
enabled, clicked the Preview or Show Changes button in the edit page and the
action did not succeed.",
"blockedtitle": "Used as title displayed for blocked users. The
corresponding message body is one of the following messages:\n*
{{msg-mw|Blockedtext|notext=1}}\n* {{msg-mw|Autoblockedtext|notext=1}}",
"blockedtext": "Text displayed to blocked users.\n\n\"email this user\"
should be consistent with {{msg-mw|Emailuser}}.\n\nParameters:\n* $1 - the
blocking sysop (with a link to his/her userpage)\n* $2 - the reason for the
block\n* $3 - the current IP address of the blocked user\n* $4 - (Unused) the
blocking sysop's username (plain text, without the link)\n* $5 - the unique
numeric identifier of the applied autoblock\n* $6 - the expiry of the block\n*
$7 - the intended target of the block (what the blocking user specified in the
blocking form)\n* $8 - the timestamp when the block started\nSee also:\n*
{{msg-mw|Grouppage-sysop}}\n* {{msg-mw|Autoblockedtext}}",
"autoblockedtext": "Text displayed to automatically blocked
users.\n\n\"email this user\" should be consistent with
{{msg-mw|Emailuser}}.\n\nParameters:\n* $1 - the blocking sysop (with a link to
his/her userpage)\n* $2 - the reason for the block (in case of autoblocks:
{{msg-mw|autoblocker}})\n* $3 - the current IP address of the blocked user\n*
$4 - (Unused) the blocking sysop's username (plain text, without the link). Use
it for GENDER.\n* $5 - the unique numeric identifier of the applied
autoblock\n* $6 - the expiry of the block\n* $7 - the intended target of the
block (what the blocking user specified in the blocking form)\n* $8 - the
timestamp when the block started\nSee also:\n* {{msg-mw|Grouppage-sysop}}\n*
{{msg-mw|Blockedtext}}",
diff --git a/resources/Resources.php b/resources/
[MediaWiki-commits] [Gerrit] Refactor VisualEditor JJB builder for production status brow... - change (integration/config)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193577
Change subject: Refactor VisualEditor JJB builder for production status
browsertest to use Cucumber tag instead of calling a file directly
..
Refactor VisualEditor JJB builder for production status browsertest to use
Cucumber tag instead of calling a file directly
Updated job: browsertests-VisualEditor-production-linux-firefox-sauce
Bug: T90423
Change-Id: Ic65e65ada53b9e85a44704d348507972980646a9
---
M jjb/browsertests.yaml
M jjb/job-templates-browsertests.yaml
2 files changed, 9 insertions(+), 54 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/77/193577/1
diff --git a/jjb/browsertests.yaml b/jjb/browsertests.yaml
index e4b0088..49d980c 100644
--- a/jjb/browsertests.yaml
+++ b/jjb/browsertests.yaml
@@ -427,6 +427,7 @@
- 'browsertests-{name}-production-{platform}-{browser}-sauce':
browser: firefox
+cucumber_tags: '@production'
- 'browsertests-{name}-language-screenshot-{platform}-{browser}':
browser: firefox
diff --git a/jjb/job-templates-browsertests.yaml
b/jjb/job-templates-browsertests.yaml
index a018f02..d4d4522 100644
--- a/jjb/job-templates-browsertests.yaml
+++ b/jjb/job-templates-browsertests.yaml
@@ -213,60 +213,14 @@
- timed: "@weekly"
builders:
- - VisualEditor:
+ - shell: mkdir -p "$WORKSPACE/log/junit"
+ - browsertest-website:
browser: '{browser}'
+ browser_timeout: '{browser_timeout}'
+ cucumber_tags: '{cucumber_tags}'
+ headless: '{headless}'
folder: '{folder}'
+ mediawiki_credentials_id: '{mediawiki_credentials_id}'
+ mediawiki_url: '{mediawiki_url}'
platform: '{platform}'
-
-- builder:
-name: VisualEditor
-builders:
- - shell: |
- # set up environment variables
- export BROWSER={browser}
- export HEADLESS=false
- export PLATFORM='{platform}'
-
- # We only care about one version of our browser and do not need a job
- # per version. Thus the versions to use are hardcoded there.
- #
- # VERSION is used for SauceLabs
- #
- case "$BROWSER" in
-'firefox')
-export VERSION=27
-;;
-'chrome')
-# Empty version will get us the latest one
-export VERSION=''
-;;
-*)
-echo "Browser '$BROWSER' unsupported. Can not determine
version"
-exit 1
-;;
- esac
- echo "Using browser: $BROWSER at version $VERSION"
-
- # Shared cache of gems to avoid hitting rubygems all the time
- # See https://github.com/bundler/bundler/issues/2856
- export GEM_HOME="$WORKSPACE/../gems/2.0.0"
-
- # install ruby dependencies
- mkdir -p vendor
- gem2.0 install --env-shebang -i vendor bundler --no-ri --no-rdoc
- # Prepare some paths lookup
- export GEM_PATH="`pwd`/vendor"
-
- cd {folder}/browser/
- "$WORKSPACE"/vendor/bin/bundle install --verbose
-
- # run tests
- "$WORKSPACE"/vendor/bin/bundle exec cucumber \
---backtrace \
---color \
---verbose \
---format pretty \
---format Cucumber::Formatter::Sauce \
---out "$WORKSPACE/log/junit" \
-features/verify_production_wikis.feature \
-|| (echo -e "\nJob has failed (exit code: $?)."; false)
+ version: '{version}'
--
To view, visit https://gerrit.wikimedia.org/r/193577
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic65e65ada53b9e85a44704d348507972980646a9
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Preview 2 of metrolook - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged. Change subject: Preview 2 of metrolook .. Preview 2 of metrolook * This release includes more stability and features. * Includes fixes for mobile desgn including ipad desgn and desktop desgn * Fixed some bugs * Changed name of settings again please see the README.md for details on changes. * Added setting to disable mobile desgn. * Re done the logo and sitename support. * New setting to disable sitename. * Full support for logo now. With setting to disable logo. Please see changelog for more details and README.md. Change-Id: I21c744ff96fa59bbf535cac579d83be0ab57c93a --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Paladox: Verified; Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/193570 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I21c744ff96fa59bbf535cac579d83be0ab57c93a Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: test Gerrit-Owner: Paladox Gerrit-Reviewer: Paladox Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged.
Change subject: Localisation updates from https://translatewiki.net.
..
Localisation updates from https://translatewiki.net.
Change-Id: Ibd0e6844c913fae923e35246a55012f38ae26e2c
---
A i18n/ast.json
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/i18n/ast.json b/i18n/ast.json
new file mode 100644
index 000..2bcdfe9
--- /dev/null
+++ b/i18n/ast.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "Xuacu"
+ ]
+ },
+ "metrolook-desc": "Aspeutu Metrolook pa MediaWiki",
+ "metrolook-guest": "Invitáu"
+}
--
To view, visit https://gerrit.wikimedia.org/r/193574
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd0e6844c913fae923e35246a55012f38ae26e2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: test
Gerrit-Owner: Paladox
Gerrit-Reviewer: L10n-bot
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Preview 2 of metrolook - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged. Change subject: Preview 2 of metrolook .. Preview 2 of metrolook * This release includes more stability and features. * Includes fixes for mobile desgn including ipad desgn and desktop desgn * Fixed some bugs * Changed name of settings again please see the README.md for details on changes. * Added setting to disable mobile desgn. * Re done the logo and sitename support. * New setting to disable sitename. * Full support for logo now. With setting to disable logo. Please see changelog for more details and README.md. Change-Id: I7e8a4b880c59883ab5d3452624e1e43d0da79e38 --- M CHANGELOG.md M Metrolook.php M MetrolookTemplate.php M README.md M components/common.less M components/mobile.less M components/navigation.less M components/search.less M i18n/ast.json M i18n/fr.json M i18n/hi.json M i18n/it.json M js/metrolook.js M theme.less 14 files changed, 180 insertions(+), 220 deletions(-) Approvals: Paladox: Verified; Looks good to me, approved diff --git a/CHANGELOG.md b/CHANGELOG.md index a540e3b..954285f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,13 @@ Bump required mediawiki version to mediawiki 1.25 wmf 18 + Mainly new features and desgn are + * Mobile desgn (This is a preview of mobile desgn please report bug in issue section and fix bugs if you know how to thanks. and please also suggest improvements to the desktop and mobile desgn.) + +* Full logo support. * Cleaned up MetrolookTemplate.php file. @@ -19,7 +23,7 @@ * Settings that were renamed -$logo renamed to $wgLogoImage$SearchBar renamed to $wgSearchBar$DownArrow renamed to $wgDownArrow$Line renamed to $wgLine$UploadButton renamed to $wgUploadButton$wgURL1 and $wgImage1 where not renamed instead there settings were changed for url you put in the url to website for image you put in the path to image or url to image. +$logo renamed to $wgMetrolookLogo$SearchBar renamed to $wgMetrolookSearchBar$DownArrow renamed to $wgMetrolookDownArrow$Line renamed to $wgMetrolookLine$UploadButton renamed to $wgMetrolookUploadButton$wgURL1 and $wgImage1 where renamed to $wgMetrolookURL1 and $wgMetrolookImage1 and there settings were changed. for url you put in the url to website for image you put in the path to image or url to image. * Settings that were removed. @@ -27,9 +31,25 @@ * New settings that were added -$wgBartile +$wgMetrolookBartile -$wgTile1$wgTile2$wgTile3$wgTile4$wgTile5$wgTile6$wgTile7$wgTile8$wgTile9$wgTile10 +$wgMetrolookTile1$wgMetrolookTile2$wgMetrolookTile3$wgMetrolookTile4$wgMetrolookTile5$wgMetrolookTile6$wgMetrolookTile7$wgMetrolookTile8$wgMetrolookTile9$wgMetrolookTile10 + +$wgMetrolookSiteName + +$wgMetrolookMobile + + + +Fixes + +Fix for ipad. + +Fix for desktop view. + +Fix for mobile view. + + Note: Please see settings section in README.md for more information on how to enable and disable it. diff --git a/Metrolook.php b/Metrolook.php index 07e37a5..f0d14d4 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -60,28 +60,37 @@ */ $GLOBALS['wgVectorUseIconWatch'] = true; -/* Logo is off by default to turn it on plase see README.md. Note that if enabled it will not show properly.*/ -$GLOBALS['wgLogoImage'] = false; +/** + * Logo + * - true = Logo will show + * - false = Logo will not show + */ + +$GLOBALS['wgMetrolookLogo'] = true; + +$GLOBALS['wgMetrolookSiteName'] = true; /* to enable search bar on the sidebar and disables the search bar on the top bar */ -$GLOBALS['wgSearchBar'] = true; +$GLOBALS['wgMetrolookSearchBar'] = true; -$GLOBALS['wgDownArrow'] = true; +$GLOBALS['wgMetrolookDownArrow'] = true; -$GLOBALS['wgLine'] = true; +$GLOBALS['wgMetrolookLine'] = true; -$GLOBALS['wgUploadButton'] = true; +$GLOBALS['wgMetrolookUploadButton'] = true; + +$GLOBALS['wgMetrolookMobile'] = true; /* To use tile 5 to 10 please diable this */ -$GLOBALS['wgBartile'] = true; +$GLOBALS['wgMetrolookBartile'] = true; -$GLOBALS['wgTile1'] = true; +$GLOBALS['wgMetrolookTile1'] = true; -$GLOBALS['wgTile2'] = true; +$GLOBALS['wgMetrolookTile2'] = true; -$GLOBALS['wgTile3'] = true; +$GLOBALS['wgMetrolookTile3'] = true; -$GLOBALS['wgTile4'] = true; +$GLOBALS['wgMetrolookTile4'] = true; // Register modules $GLOBALS['wgResourceModules']['skins.metrolook.styles'] = array( @@ -110,6 +119,7 @@ 'localBasePath' => __DIR__, ); $GLOBALS['wgResourceModules']['skins.metrolook.collapsibleNav'] = array( + 'position' => 'bottom', 'scripts' => array( 'js/collapsibleNav.js', ), @@ -123,7 +133,6 @@ ), 'remoteSkinPath' => 'Metrolook', 'localBasePath' => __DIR__, - 'position' => 'bottom', ); // Apply module customizations diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 0182464..629a881 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -22,7 +22,
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged.
Change subject: Localisation updates from https://translatewiki.net.
..
Localisation updates from https://translatewiki.net.
Change-Id: I8ed82694205b414e6ca6ef752ac33fd8189db323
---
A i18n/it.json
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/i18n/it.json b/i18n/it.json
new file mode 100644
index 000..bf6f403
--- /dev/null
+++ b/i18n/it.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "Beta16"
+ ]
+ },
+ "metrolook-desc": "Skin Metrolook per MediaWiki",
+ "metrolook-guest": "Ospite"
+}
--
To view, visit https://gerrit.wikimedia.org/r/193573
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ed82694205b414e6ca6ef752ac33fd8189db323
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: test
Gerrit-Owner: Paladox
Gerrit-Reviewer: L10n-bot
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged.
Change subject: Localisation updates from https://translatewiki.net.
..
Localisation updates from https://translatewiki.net.
Change-Id: I9b16156dec9439826b906908930067ae255a344e
---
M i18n/fr.json
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/i18n/fr.json b/i18n/fr.json
index 50f7bc9..709dd79 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -1,8 +1,10 @@
{
"@metadata": {
"authors": [
- "Linedwell"
+ "Linedwell",
+ "Nicolapps"
]
},
+ "metrolook-desc": "Skin Metrolook pour MediaWiki",
"metrolook-guest": "Invité"
}
--
To view, visit https://gerrit.wikimedia.org/r/193572
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b16156dec9439826b906908930067ae255a344e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: test
Gerrit-Owner: Paladox
Gerrit-Reviewer: L10n-bot
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged.
Change subject: Localisation updates from https://translatewiki.net.
..
Localisation updates from https://translatewiki.net.
Change-Id: Icc9ab120d3adb31a2d8e04e1f356360ef172f75a
---
A i18n/hi.json
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/i18n/hi.json b/i18n/hi.json
new file mode 100644
index 000..df2accb
--- /dev/null
+++ b/i18n/hi.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "Siddhartha Ghai"
+ ]
+ },
+ "metrolook-desc": "मीडियाविकि के लिए मेट्रोलुक त्वचा",
+ "metrolook-guest": "अतिथि"
+}
--
To view, visit https://gerrit.wikimedia.org/r/193571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc9ab120d3adb31a2d8e04e1f356360ef172f75a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: test
Gerrit-Owner: Paladox
Gerrit-Reviewer: L10n-bot
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Preview 2 of metrolook - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/193576 Change subject: Preview 2 of metrolook .. Preview 2 of metrolook * This release includes more stability and features. * Includes fixes for mobile desgn including ipad desgn and desktop desgn * Fixed some bugs * Changed name of settings again please see the README.md for details on changes. * Added setting to disable mobile desgn. * Re done the logo and sitename support. * New setting to disable sitename. * Full support for logo now. With setting to disable logo. Please see changelog for more details and README.md. Change-Id: I7e8a4b880c59883ab5d3452624e1e43d0da79e38 --- M CHANGELOG.md M Metrolook.php M MetrolookTemplate.php M README.md M components/common.less M components/mobile.less M components/navigation.less M components/search.less M i18n/ast.json M i18n/fr.json M i18n/hi.json M i18n/it.json M js/metrolook.js M theme.less 14 files changed, 180 insertions(+), 220 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/76/193576/1 diff --git a/CHANGELOG.md b/CHANGELOG.md index a540e3b..954285f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,13 @@ Bump required mediawiki version to mediawiki 1.25 wmf 18 + Mainly new features and desgn are + * Mobile desgn (This is a preview of mobile desgn please report bug in issue section and fix bugs if you know how to thanks. and please also suggest improvements to the desktop and mobile desgn.) + +* Full logo support. * Cleaned up MetrolookTemplate.php file. @@ -19,7 +23,7 @@ * Settings that were renamed -$logo renamed to $wgLogoImage$SearchBar renamed to $wgSearchBar$DownArrow renamed to $wgDownArrow$Line renamed to $wgLine$UploadButton renamed to $wgUploadButton$wgURL1 and $wgImage1 where not renamed instead there settings were changed for url you put in the url to website for image you put in the path to image or url to image. +$logo renamed to $wgMetrolookLogo$SearchBar renamed to $wgMetrolookSearchBar$DownArrow renamed to $wgMetrolookDownArrow$Line renamed to $wgMetrolookLine$UploadButton renamed to $wgMetrolookUploadButton$wgURL1 and $wgImage1 where renamed to $wgMetrolookURL1 and $wgMetrolookImage1 and there settings were changed. for url you put in the url to website for image you put in the path to image or url to image. * Settings that were removed. @@ -27,9 +31,25 @@ * New settings that were added -$wgBartile +$wgMetrolookBartile -$wgTile1$wgTile2$wgTile3$wgTile4$wgTile5$wgTile6$wgTile7$wgTile8$wgTile9$wgTile10 +$wgMetrolookTile1$wgMetrolookTile2$wgMetrolookTile3$wgMetrolookTile4$wgMetrolookTile5$wgMetrolookTile6$wgMetrolookTile7$wgMetrolookTile8$wgMetrolookTile9$wgMetrolookTile10 + +$wgMetrolookSiteName + +$wgMetrolookMobile + + + +Fixes + +Fix for ipad. + +Fix for desktop view. + +Fix for mobile view. + + Note: Please see settings section in README.md for more information on how to enable and disable it. diff --git a/Metrolook.php b/Metrolook.php index 07e37a5..f0d14d4 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -60,28 +60,37 @@ */ $GLOBALS['wgVectorUseIconWatch'] = true; -/* Logo is off by default to turn it on plase see README.md. Note that if enabled it will not show properly.*/ -$GLOBALS['wgLogoImage'] = false; +/** + * Logo + * - true = Logo will show + * - false = Logo will not show + */ + +$GLOBALS['wgMetrolookLogo'] = true; + +$GLOBALS['wgMetrolookSiteName'] = true; /* to enable search bar on the sidebar and disables the search bar on the top bar */ -$GLOBALS['wgSearchBar'] = true; +$GLOBALS['wgMetrolookSearchBar'] = true; -$GLOBALS['wgDownArrow'] = true; +$GLOBALS['wgMetrolookDownArrow'] = true; -$GLOBALS['wgLine'] = true; +$GLOBALS['wgMetrolookLine'] = true; -$GLOBALS['wgUploadButton'] = true; +$GLOBALS['wgMetrolookUploadButton'] = true; + +$GLOBALS['wgMetrolookMobile'] = true; /* To use tile 5 to 10 please diable this */ -$GLOBALS['wgBartile'] = true; +$GLOBALS['wgMetrolookBartile'] = true; -$GLOBALS['wgTile1'] = true; +$GLOBALS['wgMetrolookTile1'] = true; -$GLOBALS['wgTile2'] = true; +$GLOBALS['wgMetrolookTile2'] = true; -$GLOBALS['wgTile3'] = true; +$GLOBALS['wgMetrolookTile3'] = true; -$GLOBALS['wgTile4'] = true; +$GLOBALS['wgMetrolookTile4'] = true; // Register modules $GLOBALS['wgResourceModules']['skins.metrolook.styles'] = array( @@ -110,6 +119,7 @@ 'localBasePath' => __DIR__, ); $GLOBALS['wgResourceModules']['skins.metrolook.collapsibleNav'] = array( + 'position' => 'bottom', 'scripts' => array( 'js/collapsibleNav.js', ), @@ -123,7 +133,6 @@ ), 'remoteSkinPath' => 'Metrolook', 'localBasePath' => __DIR__, - 'position' => 'bottom', ); // Apply module customizations diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 0182464..629a881 100644
[MediaWiki-commits] [Gerrit] Fix: Don't convert ISSN/ISBN in MWDeprecated - change (mediawiki...citoid)
Mvolz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193575
Change subject: Fix: Don't convert ISSN/ISBN in MWDeprecated
..
Fix: Don't convert ISSN/ISBN in MWDeprecated
Changes to fixISBN and fixISSN caused ISBNs and
ISSNs in MWDeprecated to be lists, not strings.
This caused some user gadgets using the older
format to malfunction.
Fixed by removing fixISBN and fixISSN in
convertToMWDeprecatedAsync, leaving them in
their original Zotero format. This will
unbreak existing user gadgets.
Bug: T90463
Change-Id: I9cd957d036171e9efc50d40f73d74870dd149ff3
---
M lib/zotero.js
1 file changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid
refs/changes/75/193575/1
diff --git a/lib/zotero.js b/lib/zotero.js
index 0e19fa5..16fbbf2 100644
--- a/lib/zotero.js
+++ b/lib/zotero.js
@@ -210,10 +210,9 @@
},
fixAccessDate,
replaceCreators,
- addPubMedIdentifiers,
- fixISBN,
- fixISSN
+ addPubMedIdentifiers
], function (err, citation) {
+
callback([citation]);
});
@@ -280,7 +279,6 @@
callback(null, citation);
});
} else {
- //if we add another async function, use async.series
callback(null, citation);
}
};
--
To view, visit https://gerrit.wikimedia.org/r/193575
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cd957d036171e9efc50d40f73d74870dd149ff3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mvolz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] LivePreview: Wrap content preview with mw-content-* - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: LivePreview: Wrap content preview with mw-content-*
..
LivePreview: Wrap content preview with mw-content-*
The content container is needed for CSS selectors based on the direction
of the page content language.
Bug: T85531
Change-Id: I78f6b82972621da8dddc24f0d6d6b2293f7d8876
---
M includes/EditPage.php
M resources/src/mediawiki.action/mediawiki.action.edit.preview.js
2 files changed, 12 insertions(+), 13 deletions(-)
Approvals:
TheDJ: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/EditPage.php b/includes/EditPage.php
index f5d98a7..0d5e63c 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2992,6 +2992,12 @@
if ( $this->formtype == 'preview' ) {
$this->showPreview( $previewOutput );
+ } else {
+ // Empty content container for LivePreview
+ $pageViewLang = $this->mTitle->getPageViewLanguage();
+ $attribs = array( 'lang' =>
$pageViewLang->getHtmlCode(), 'dir' => $pageViewLang->getDir(),
+ 'class' => 'mw-content-' .
$pageViewLang->getDir() );
+ $wgOut->addHTML( Html::rawElement( 'div', $attribs ) );
}
$wgOut->addHTML( '' );
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
index e4ccf2b..7e7fe91 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
@@ -109,7 +109,7 @@
}
request = api.post( postData );
request.done( function ( response ) {
- var li, newList, $next, $parent, $list;
+ var li, newList, $content, $parent, $list;
if ( response.parse.modules ) {
mw.loader.load(
response.parse.modules.concat(
response.parse.modulescripts,
@@ -163,23 +163,16 @@
}
if ( response.parse.text['*'] ) {
- $next = $wikiPreview.next();
- // If there is no next node, use parent
instead.
- // Only query parent if needed, false
otherwise.
- $parent = !$next.length &&
$wikiPreview.parent();
-
- $wikiPreview
+ $content = $wikiPreview.children(
'.mw-content-ltr,.mw-content-rtl' );
+ $content
.detach()
.html( response.parse.text['*']
);
- mw.hook( 'wikipage.content' ).fire(
$wikiPreview );
+ mw.hook( 'wikipage.content' ).fire(
$content );
// Reattach
- if ( $parent ) {
- $parent.append( $wikiPreview );
- } else {
- $next.before( $wikiPreview );
- }
+ $wikiPreview.append( $content );
+
$wikiPreview.show();
}
--
To view, visit https://gerrit.wikimedia.org/r/182293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78f6b82972621da8dddc24f0d6d6b2293f7d8876
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader
Gerrit-Reviewer: Cacycle
Gerrit-Reviewer: Fomafix
Gerrit-Reviewer: Gerrit Patch Uploader
Gerrit-Reviewer: Helder.wiki
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: TheDJ
Gerrit-Reviewer: Tpt
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193573
Change subject: Localisation updates from https://translatewiki.net.
..
Localisation updates from https://translatewiki.net.
Change-Id: I8ed82694205b414e6ca6ef752ac33fd8189db323
---
A i18n/it.json
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/73/193573/1
diff --git a/i18n/it.json b/i18n/it.json
new file mode 100644
index 000..bf6f403
--- /dev/null
+++ b/i18n/it.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "Beta16"
+ ]
+ },
+ "metrolook-desc": "Skin Metrolook per MediaWiki",
+ "metrolook-guest": "Ospite"
+}
--
To view, visit https://gerrit.wikimedia.org/r/193573
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ed82694205b414e6ca6ef752ac33fd8189db323
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: test
Gerrit-Owner: Paladox
Gerrit-Reviewer: L10n-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193572
Change subject: Localisation updates from https://translatewiki.net.
..
Localisation updates from https://translatewiki.net.
Change-Id: I9b16156dec9439826b906908930067ae255a344e
---
M i18n/fr.json
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/72/193572/1
diff --git a/i18n/fr.json b/i18n/fr.json
index 50f7bc9..709dd79 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -1,8 +1,10 @@
{
"@metadata": {
"authors": [
- "Linedwell"
+ "Linedwell",
+ "Nicolapps"
]
},
+ "metrolook-desc": "Skin Metrolook pour MediaWiki",
"metrolook-guest": "Invité"
}
--
To view, visit https://gerrit.wikimedia.org/r/193572
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b16156dec9439826b906908930067ae255a344e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: test
Gerrit-Owner: Paladox
Gerrit-Reviewer: L10n-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193574
Change subject: Localisation updates from https://translatewiki.net.
..
Localisation updates from https://translatewiki.net.
Change-Id: Ibd0e6844c913fae923e35246a55012f38ae26e2c
---
A i18n/ast.json
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/74/193574/1
diff --git a/i18n/ast.json b/i18n/ast.json
new file mode 100644
index 000..2bcdfe9
--- /dev/null
+++ b/i18n/ast.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "Xuacu"
+ ]
+ },
+ "metrolook-desc": "Aspeutu Metrolook pa MediaWiki",
+ "metrolook-guest": "Invitáu"
+}
--
To view, visit https://gerrit.wikimedia.org/r/193574
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd0e6844c913fae923e35246a55012f38ae26e2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: test
Gerrit-Owner: Paladox
Gerrit-Reviewer: L10n-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193571
Change subject: Localisation updates from https://translatewiki.net.
..
Localisation updates from https://translatewiki.net.
Change-Id: Icc9ab120d3adb31a2d8e04e1f356360ef172f75a
---
A i18n/hi.json
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/71/193571/1
diff --git a/i18n/hi.json b/i18n/hi.json
new file mode 100644
index 000..df2accb
--- /dev/null
+++ b/i18n/hi.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "Siddhartha Ghai"
+ ]
+ },
+ "metrolook-desc": "मीडियाविकि के लिए मेट्रोलुक त्वचा",
+ "metrolook-guest": "अतिथि"
+}
--
To view, visit https://gerrit.wikimedia.org/r/193571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc9ab120d3adb31a2d8e04e1f356360ef172f75a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: test
Gerrit-Owner: Paladox
Gerrit-Reviewer: L10n-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Preview 2 of metrolook - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193570
Change subject: Preview 2 of metrolook
..
Preview 2 of metrolook
* This release includes more stability and features.
* Includes fixes for mobile desgn including ipad desgn and desktop desgn
* Fixed some bugs
* Changed name of settings again please see the README.md for details on
changes.
* Added setting to disable mobile desgn.
* Re done the logo and sitename support.
* New setting to disable sitename.
* Full support for logo now. With setting to disable logo.
Please see changelog for more details and README.md.
Change-Id: I21c744ff96fa59bbf535cac579d83be0ab57c93a
---
A .jscsrc
M CHANGELOG.md
M Metrolook.php
M MetrolookTemplate.php
M README.md
M SkinMetrolook.php
M components/common.less
A components/mobile.less
M components/navigation.less
M components/personalMenu.less
M components/search.less
D i18n/ast.json
M i18n/fr.json
D i18n/hi.json
D i18n/it.json
M i18n/qqq.json
M images/bullet-circle-icon.svg
A images/edit-icon.png
A images/edit-icon.svg
A images/hamburger.png
A images/hamburger.svg
A images/user-icon-20.png
A images/user-icon-20.svg
A images/user-icon-40.png
A images/user-icon-40.svg
D images/user-icon.png
D images/user-icon.svg
R js/collapsibleNav.js
R js/collapsibleTabs.js
A js/mediawiki.searchSuggest.custom.js
A js/metrolook.js
R js/overthrow.js
R js/vector.js
M screen.less
M theme.less
35 files changed, 1,591 insertions(+), 587 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/70/193570/1
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..9d22e3f
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,3 @@
+{
+ "preset": "wikimedia"
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6763e99..954285f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,75 @@
Changelog
=
+### 3.0 beta 16
+
+Big release with new desgn for mobile and minor improvements to desktop desgn.
+
+Please see test branch for updates to beta 16 release once it looks like there
arnt many issues and all things have been added to it, it will be released to
the master branch.
+
+Bump required mediawiki version to mediawiki 1.25 wmf 18
+
+
+Mainly new features and desgn are
+
+
+* Mobile desgn (This is a preview of mobile desgn please report bug in issue
section and fix bugs if you know how to thanks. and please also suggest
improvements to the desktop and mobile desgn.)
+
+* Full logo support.
+
+* Cleaned up MetrolookTemplate.php file.
+
+* Cleaned up setting names.
+
+* Settings that were renamed
+
+$logo renamed to $wgMetrolookLogo$SearchBar renamed to
$wgMetrolookSearchBar$DownArrow renamed to $wgMetrolookDownArrow$Line
renamed to $wgMetrolookLine$UploadButton renamed to
$wgMetrolookUploadButton$wgURL1 and $wgImage1 where renamed to
$wgMetrolookURL1 and $wgMetrolookImage1 and there settings were changed. for
url you put in the url to website for image you put in the path to image or url
to image.
+
+* Settings that were removed.
+
+ $link and $picture
+
+* New settings that were added
+
+$wgMetrolookBartile
+
+$wgMetrolookTile1$wgMetrolookTile2$wgMetrolookTile3$wgMetrolookTile4$wgMetrolookTile5$wgMetrolookTile6$wgMetrolookTile7$wgMetrolookTile8$wgMetrolookTile9$wgMetrolookTile10
+
+$wgMetrolookSiteName
+
+$wgMetrolookMobile
+
+
+
+Fixes
+
+Fix for ipad.
+
+Fix for desktop view.
+
+Fix for mobile view.
+
+
+
+Note: Please see settings section in README.md for more information on how to
enable and disable it.
+
+* Remove styles and js from the main MetrolookTemplate.php and seperated it
into own files.
+
+* More new things and changes comming soon to this release. /* This will be
removed once this is ready to be published */
+
+
+
+Revision 3 brings these fixes /* This may be removed near to time of release.
*/
+
+* Fixes for ipad desgn.
+
+* Disabled searchbar js for ipad.
+
+* Fixes for mobile desgn.
+
+* Fixes for desktop desgn.
+
+
### 3.0 beta 15
* Adding copying file for license.
diff --git a/Metrolook.php b/Metrolook.php
index 345e6e3..f0d14d4 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -26,7 +26,7 @@
'name' => 'Metrolook',
'namemsg' => 'skinname-metrolook',
'descriptionmsg' => 'metrolook-desc',
- 'version' => '3.0 beta 15',
+ 'version' => '3.0 beta 16',
'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' => array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' => 'GPL-2.0+',
@@ -60,41 +60,37 @@
*/
$GLOBALS['wgVectorUseIconWatch'] = true;
-/* Logo is off by default to turn it on plase see README.md. Note that if
enabled it will not show properly.*/
-$GLOBALS['logo'] = false;
+/**
+ * Logo
+ * - true = Logo will show
+ * - false = Logo will not show
+ */
+
+$GLOBALS['wgMetrolookLogo'] = true;
+
+$GLOBALS['wgMetrolookSiteName'] = true;
/* to enable
[MediaWiki-commits] [Gerrit] Update .gitreview - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/193568 Change subject: Update .gitreview .. Update .gitreview Change-Id: Icf3ab7cd5320bdd26ef9d98a9ea934e35fceb0a8 --- M .gitreview 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/68/193568/1 diff --git a/.gitreview b/.gitreview index db98503..8791eee 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/skins/Metrolook.git -defaultbranch=master +defaultbranch=test defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/193568 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf3ab7cd5320bdd26ef9d98a9ea934e35fceb0a8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Preview 2 of metrolook - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193569
Change subject: Preview 2 of metrolook
..
Preview 2 of metrolook
* This release includes more stability and features.
* Includes fixes for mobile desgn including ipad desgn and desktop desgn
* Fixed some bugs
* Changed name of settings again please see the README.md for details on
changes.
* Added setting to disable mobile desgn.
* Re done the logo and sitename support.
* New setting to disable sitename.
* Full support for logo now. With setting to disable logo.
Please see changelog for more details and README.md.
Change-Id: I677e991634eaa2929221a9110c872c7121f9e7f1
---
A .jscsrc
M CHANGELOG.md
M Metrolook.php
M MetrolookTemplate.php
M README.md
M SkinMetrolook.php
M components/common.less
A components/mobile.less
M components/navigation.less
M components/personalMenu.less
M components/search.less
D i18n/ast.json
M i18n/fr.json
D i18n/hi.json
D i18n/it.json
M i18n/qqq.json
M images/bullet-circle-icon.svg
A images/edit-icon.png
A images/edit-icon.svg
A images/hamburger.png
A images/hamburger.svg
A images/user-icon-20.png
A images/user-icon-20.svg
A images/user-icon-40.png
A images/user-icon-40.svg
D images/user-icon.png
D images/user-icon.svg
R js/collapsibleNav.js
R js/collapsibleTabs.js
A js/mediawiki.searchSuggest.custom.js
A js/metrolook.js
R js/overthrow.js
R js/vector.js
M screen.less
M theme.less
35 files changed, 1,591 insertions(+), 587 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/69/193569/1
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..9d22e3f
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,3 @@
+{
+ "preset": "wikimedia"
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6763e99..954285f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,75 @@
Changelog
=
+### 3.0 beta 16
+
+Big release with new desgn for mobile and minor improvements to desktop desgn.
+
+Please see test branch for updates to beta 16 release once it looks like there
arnt many issues and all things have been added to it, it will be released to
the master branch.
+
+Bump required mediawiki version to mediawiki 1.25 wmf 18
+
+
+Mainly new features and desgn are
+
+
+* Mobile desgn (This is a preview of mobile desgn please report bug in issue
section and fix bugs if you know how to thanks. and please also suggest
improvements to the desktop and mobile desgn.)
+
+* Full logo support.
+
+* Cleaned up MetrolookTemplate.php file.
+
+* Cleaned up setting names.
+
+* Settings that were renamed
+
+$logo renamed to $wgMetrolookLogo$SearchBar renamed to
$wgMetrolookSearchBar$DownArrow renamed to $wgMetrolookDownArrow$Line
renamed to $wgMetrolookLine$UploadButton renamed to
$wgMetrolookUploadButton$wgURL1 and $wgImage1 where renamed to
$wgMetrolookURL1 and $wgMetrolookImage1 and there settings were changed. for
url you put in the url to website for image you put in the path to image or url
to image.
+
+* Settings that were removed.
+
+ $link and $picture
+
+* New settings that were added
+
+$wgMetrolookBartile
+
+$wgMetrolookTile1$wgMetrolookTile2$wgMetrolookTile3$wgMetrolookTile4$wgMetrolookTile5$wgMetrolookTile6$wgMetrolookTile7$wgMetrolookTile8$wgMetrolookTile9$wgMetrolookTile10
+
+$wgMetrolookSiteName
+
+$wgMetrolookMobile
+
+
+
+Fixes
+
+Fix for ipad.
+
+Fix for desktop view.
+
+Fix for mobile view.
+
+
+
+Note: Please see settings section in README.md for more information on how to
enable and disable it.
+
+* Remove styles and js from the main MetrolookTemplate.php and seperated it
into own files.
+
+* More new things and changes comming soon to this release. /* This will be
removed once this is ready to be published */
+
+
+
+Revision 3 brings these fixes /* This may be removed near to time of release.
*/
+
+* Fixes for ipad desgn.
+
+* Disabled searchbar js for ipad.
+
+* Fixes for mobile desgn.
+
+* Fixes for desktop desgn.
+
+
### 3.0 beta 15
* Adding copying file for license.
diff --git a/Metrolook.php b/Metrolook.php
index 345e6e3..f0d14d4 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -26,7 +26,7 @@
'name' => 'Metrolook',
'namemsg' => 'skinname-metrolook',
'descriptionmsg' => 'metrolook-desc',
- 'version' => '3.0 beta 15',
+ 'version' => '3.0 beta 16',
'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' => array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' => 'GPL-2.0+',
@@ -60,41 +60,37 @@
*/
$GLOBALS['wgVectorUseIconWatch'] = true;
-/* Logo is off by default to turn it on plase see README.md. Note that if
enabled it will not show properly.*/
-$GLOBALS['logo'] = false;
+/**
+ * Logo
+ * - true = Logo will show
+ * - false = Logo will not show
+ */
+
+$GLOBALS['wgMetrolookLogo'] = true;
+
+$GLOBALS['wgMetrolookSiteName'] = true;
/* to enable
[MediaWiki-commits] [Gerrit] WIP T90423 - change (mediawiki...VisualEditor)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/193567 Change subject: WIP T90423 .. WIP T90423 Bug: T90423 Change-Id: I74ac56099961df9444610ef91b4678d6fce7753f --- M modules/ve-mw/tests/browser/features/verify_production_wikis.feature 1 file changed, 1 insertion(+), 299 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/67/193567/1 diff --git a/modules/ve-mw/tests/browser/features/verify_production_wikis.feature b/modules/ve-mw/tests/browser/features/verify_production_wikis.feature index df72b1d..849b761 100644 --- a/modules/ve-mw/tests/browser/features/verify_production_wikis.feature +++ b/modules/ve-mw/tests/browser/features/verify_production_wikis.feature @@ -1,4 +1,4 @@ -@firefox +@firefox @production Feature: VisualEditor on production wikis Verify that VisualEditor is available as @@ -14,301 +14,3 @@ Examples: | wiki| | test.wikipedia.org | -| test2.wikipedia.org | -| www.mediawiki.org | -| meta.wikimedia.org | -| incubator.wikimedia.org | -| aa.wikipedia.org| -| ab.wikipedia.org| -| ace.wikipedia.org | -| af.wikipedia.org| -| ak.wikipedia.org| -| als.wikipedia.org | -| am.wikipedia.org| -| an.wikipedia.org| -| ang.wikipedia.org | -| ar.wikipedia.org| -| arc.wikipedia.org | -| arz.wikipedia.org | -| as.wikipedia.org| -| ast.wikipedia.org | -| av.wikipedia.org| -| ay.wikipedia.org| -| az.wikipedia.org| -| ba.wikipedia.org| -| bar.wikipedia.org | -| bat-smg.wikipedia.org | -| bcl.wikipedia.org | -| be.wikipedia.org| -| be-x-old.wikipedia.org | -| bg.wikipedia.org| -| bh.wikipedia.org| -| bi.wikipedia.org| -| bjn.wikipedia.org | -| bm.wikipedia.org| -| bn.wikipedia.org| -| bo.wikipedia.org| -| bpy.wikipedia.org | -| br.wikipedia.org| -| bs.wikipedia.org| -| bug.wikipedia.org | -| bxr.wikipedia.org | -| ca.wikipedia.org| -| cbk-zam.wikipedia.org | -| cdo.wikipedia.org | -| ce.wikipedia.org| -| ceb.wikipedia.org | -| ch.wikipedia.org| -| cho.wikipedia.org | -| chr.wikipedia.org | -| chy.wikipedia.org | -| ckb.wikipedia.org | -| co.wikipedia.org| -| cr.wikipedia.org| -| crh.wikipedia.org | -| cs.wikipedia.org| -| csb.wikipedia.org | -| cu.wikipedia.org| -| cv.wikipedia.org| -| cy.wikipedia.org| -| da.wikipedia.org| -| de.wikipedia.org| -| diq.wikipedia.org | -| dsb.wikipedia.org | -| dv.wikipedia.org| -| dz.wikipedia.org| -| ee.wikipedia.org| -| el.wikipedia.org| -| eml.wikipedia.org | -| en.wikipedia.org| -| eo.wikipedia.org| -| es.wikipedia.org| -| et.wikipedia.org| -| eu.wikipedia.org| -| ext.wikipedia.org | -| fa.wikipedia.org| -| ff.wikipedia.org| -| fi.wikipedia.org| -| fiu-vro.wikipedia.org | -| fj.wikipedia.org| -| fo.wikipedia.org| -| fr.wikipedia.org| -| frp.wikipedia.org | -| frr.wikipedia.org | -| fur.wikipedia.org | -| fy.wikipedia.org| -| ga.wikipedia.org| -| gag.wikipedia.org | -| gan.wikipedia.org | -| gd.wikipedia.org| -| gl.wikipedia.org| -| glk.wikipedia.org | -| gn.wikipedia.org| -| got.wikipedia.org | -| gu.wikipedia.org| -| gv.wikipedia.org| -| ha.wikipedia.org| -| hak.wikipedia.org | -| haw.wikipedia.org | -| he.wikipedia.org| -| hi.wikipedia.org| -| hif.wikipedia.org | -| ho.wikipedia.org| -| hr.wikipedia.org| -| hsb.wikipedia.org | -| ht.wikipedia.org| -| hu.wikipedia.org| -| hy.wikipedia.org| -| hz.wikipedia.org| -| ia.wikipedia.org| -| id.wikipedia.org| -| ie.wikipedia.org| -| ig.wikipedia.org| -| ii.wikipedia.org| -| ik.wikipedia.org| -| ilo.wikipedia.org | -| io.wikipedia.org| -| is.wikipedia.org| -| it.wikipedia.org| -| iu.wikipedia.org| -| ja.wikipedia.org| -| jbo.wikipedia.org | -
[MediaWiki-commits] [Gerrit] Avoid access to array key that does not exist - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid access to array key that does not exist
..
Avoid access to array key that does not exist
Accessing an array element that is not set
causes a PHP notice. This change first, checks if the
array key is present.
Bug: T91127
Change-Id: I468a95851e6acdb8186a06b0a2ac73499cc4611f
---
M includes/Import.php
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
TTO: Looks good to me, approved
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Import.php b/includes/Import.php
index eb2ca77..c036fbe 100644
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -376,12 +376,12 @@
$page->loadPageData( 'fromdbmaster' );
$content = $page->getContent();
$editInfo = $page->prepareContentForEdit( $content );
-
+ $countKey = 'title_' . $title->getPrefixedText();
$countable = $page->isCountable( $editInfo );
- $oldcountable = $this->countableCache['title_' .
$title->getPrefixedText()];
- if ( isset( $oldcountable ) && $countable != $oldcountable ) {
+ if ( array_key_exists( $countKey, $this->countableCache ) &&
+ $countable != $this->countableCache[ $countKey ] ) {
DeferredUpdates::addUpdate( SiteStatsUpdate::factory(
array(
- 'articles' => ( (int)$countable -
(int)$oldcountable )
+ 'articles' => ( (int)$countable -
(int)$this->countableCache[ $countKey ] )
) ) );
}
@@ -477,7 +477,8 @@
/**
* Retrieves the contents of the named attribute of the current element.
* @param string $attr The name of the attribute
-* @return string The value of the attribute or an empty string if it
is not set in the current element.
+* @return string The value of the attribute or an empty string if it
is not set in the current
+* element.
*/
public function nodeAttribute( $attr ) {
return $this->reader->getAttribute( $attr );
--
To view, visit https://gerrit.wikimedia.org/r/193506
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I468a95851e6acdb8186a06b0a2ac73499cc4611f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt
Gerrit-Reviewer: Physikerwelt
Gerrit-Reviewer: TTO
Gerrit-Reviewer: Umherirrender
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Special:OAuthManageMyGrants: don't escape button labels twice - change (mediawiki...OAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: Special:OAuthManageMyGrants: don't escape button labels twice
..
Special:OAuthManageMyGrants: don't escape button labels twice
'mwoauthmanagemygrants-renounce' and 'mwoauthmanagemygrants-update'
were being ->escaped() before being passed to HTMLForm->addButton(),
causing them to contain HTML entities sometimes.
Call stack:
HTMLForm->show()
-> HTMLForm->displayForm()
--> HTMLForm->getHTML()
---> HTMLForm->getButtons()
> Html::element()
-> Html::rawElement()
--> Html::openElement()
---> Html::expandAttributes()
The latter escapes attribute values.
Change-Id: Iae4397e5aad1e12677417ae66dbf4bacc80599ad
---
M frontend/specialpages/SpecialMWOAuthManageMyGrants.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
b/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
index 49690f4..b4a44fd 100644
--- a/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
+++ b/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
@@ -219,13 +219,13 @@
$form->suppressDefaultSubmit();
if ( $type === 'revoke' ) {
$form->addButton( 'renounce',
- $this->msg( 'mwoauthmanagemygrants-renounce'
)->escaped(),
+ $this->msg( 'mwoauthmanagemygrants-renounce'
)->text(),
null,
array( 'class' => 'mw-ui-button
mw-ui-destructive' )
);
} else {
$form->addButton( 'update',
- $this->msg( 'mwoauthmanagemygrants-update'
)->escaped(),
+ $this->msg( 'mwoauthmanagemygrants-update'
)->text(),
null,
array( 'class' => 'mw-ui-button mw-ui-primary' )
);
--
To view, visit https://gerrit.wikimedia.org/r/193058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae4397e5aad1e12677417ae66dbf4bacc80599ad
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa
Gerrit-Reviewer: Ricordisamoa
Gerrit-Reviewer: Umherirrender
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Escape messages 'word-separator' and 'parentheses' in InfoAc... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Escape messages 'word-separator' and 'parentheses' in InfoAction .. Escape messages 'word-separator' and 'parentheses' in InfoAction This change will not break the usage of the messages, because there are usually used escaped in mediawiki/core. Change-Id: I049134e2fbfadab04ac228090d17fd18c5baca3d --- M includes/actions/InfoAction.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php index ff31eb6..338d939 100644 --- a/includes/actions/InfoAction.php +++ b/includes/actions/InfoAction.php @@ -246,13 +246,13 @@ $pageInfo['header-basic'][] = array( $this->msg( 'pageinfo-redirectsto' ), Linker::link( $this->page->getRedirectTarget() ) . - $this->msg( 'word-separator' )->text() . - $this->msg( 'parentheses', Linker::link( + $this->msg( 'word-separator' )->escaped() . + $this->msg( 'parentheses' )->rawParams( Linker::link( $this->page->getRedirectTarget(), $this->msg( 'pageinfo-redirectsto-info' )->escaped(), array(), array( 'action' => 'info' ) - ) )->text() + ) )->escaped() ); } -- To view, visit https://gerrit.wikimedia.org/r/187696 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I049134e2fbfadab04ac228090d17fd18c5baca3d Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP T91161 - change (integration/config)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193566
Change subject: WIP T91161
..
WIP T91161
Bug: T91161
Change-Id: Ie2806c74154bfb6afec8aec7ad9532c8aee20628
---
M jjb/macro.yaml
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/66/193566/1
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 043dfaa..6dc5dcf 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -164,7 +164,7 @@
export MEDIAWIKI_PASSWORD=testpass
export SCREENSHOT_FAILURES=true
export SCREENSHOT_FAILURES_PATH="$WORKSPACE/log"
-/srv/deployment/integration/slave-scripts/tools/bundler/bundle
exec cucumber --color \
+/srv/deployment/integration/slave-scripts/tools/bundler/bundle
exec xxxcucumber --color \
--tags @clean \
--tags @{browser} \
--format pretty \
--
To view, visit https://gerrit.wikimedia.org/r/193566
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2806c74154bfb6afec8aec7ad9532c8aee20628
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add Christoph Fischer to Wikidata notifications - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: add Christoph Fischer to Wikidata notifications .. add Christoph Fischer to Wikidata notifications Change-Id: I1118d5bfe8465b657097ee0b61448618cf8b5a0e --- M jjb/browsertests.yaml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Tobias Gritschacher: Looks good to me, but someone else must approve Hashar: Looks good to me, but someone else must approve Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/browsertests.yaml b/jjb/browsertests.yaml index 69a78c9..e4b0088 100644 --- a/jjb/browsertests.yaml +++ b/jjb/browsertests.yaml @@ -30,10 +30,10 @@ cmcma...@wikimedia.org jforres...@wikimedia.org qa-ale...@lists.wikimedia.org - Wikidata: &emails-Wikidata-qa -qa-ale...@lists.wikimedia.org tobias.gritschac...@wikimedia.de +qa-ale...@lists.wikimedia.org tobias.gritschac...@wikimedia.de christoph.fisc...@wikimedia.de - Wikidata-devs: &emails-Wikidata-devs -adrian.l...@wikimedia.de katie.filb...@wikimedia.de qa-ale...@lists.wikimedia.org tobias.gritschac...@wikimedia.de +adrian.l...@wikimedia.de katie.filb...@wikimedia.de qa-ale...@lists.wikimedia.org tobias.gritschac...@wikimedia.de christoph.fisc...@wikimedia.de # CentralAuth - project: -- To view, visit https://gerrit.wikimedia.org/r/193379 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1118d5bfe8465b657097ee0b61448618cf8b5a0e Gerrit-PatchSet: 3 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: WMDE-Fisch Gerrit-Reviewer: Cmcmahon Gerrit-Reviewer: Dduvall Gerrit-Reviewer: Hashar Gerrit-Reviewer: Tobias Gritschacher Gerrit-Reviewer: Zfilipin Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] _createQualifiersListview in statementview not just in edit ... - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193565
Change subject: _createQualifiersListview in statementview not just in edit mode
..
_createQualifiersListview in statementview not just in edit mode
otherwise in code like:
statementview = $.data( this, 'statementview' ),
statement = statementview.value()
the statement value has everything but qualifiers.
this breaks authority control gadget, with qualifiers
never linked.
as always, open to alternatives to this.
Bug: T87858
Change-Id: I812f113de14062a43ab217f31b164367b117ea0c
---
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
1 file changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/65/193565/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index 6f91472..b366f37 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -477,13 +477,12 @@
: this.option( 'predefined' ).mainSnak || null
);
- if( this.isInEditMode() ) {
- this._createQualifiersListview(
- this.options.value
- ?
this.options.value.getClaim().getQualifiers()
- : new wb.datamodel.SnakList()
- );
- }
+ this._createQualifiersListview(
+ this.options.value
+ ? this.options.value.getClaim().getQualifiers()
+ : new wb.datamodel.SnakList()
+ );
+
this._createReferences( this.options.value );
return $.Deferred().resolve().promise();
--
To view, visit https://gerrit.wikimedia.org/r/193565
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I812f113de14062a43ab217f31b164367b117ea0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] refreshLinks.php: Tweak exit condition in deleteLinksFromNon... - change (mediawiki/core)
PleaseStand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193564
Change subject: refreshLinks.php: Tweak exit condition in
deleteLinksFromNonexistent()
..
refreshLinks.php: Tweak exit condition in deleteLinksFromNonexistent()
Instead of exiting the do...while loop only once a query returns zero
rows, exit whenever fewer rows than the batch size are returned. This
could save quite a bit of time when the highest nonexistent page_id
found is a relatively low one.
Follows-up 40e300b8273d.
Bug: T44180
Change-Id: I14d2d48c2405fcc0bd05a3181ba6293caef5298c
---
M maintenance/refreshLinks.php
1 file changed, 7 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/64/193564/1
diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php
index 7c85a1c..b2f7497 100644
--- a/maintenance/refreshLinks.php
+++ b/maintenance/refreshLinks.php
@@ -284,7 +284,7 @@
$this->output( "0.." );
do {
- $list = $dbr->selectFieldValues(
+ $ids = $dbr->selectFieldValues(
$table,
$field,
array(
@@ -295,15 +295,16 @@
array( 'DISTINCT', 'ORDER BY' =>
$field, 'LIMIT' => $batchSize )
);
- if ( $list ) {
- $counter += count( $list );
+ $numIds = count( $ids );
+ if ( $numIds ) {
+ $counter += $numIds;
wfWaitForSlaves();
- $dbw->delete( $table, array( $field =>
$list ), __METHOD__ );
+ $dbw->delete( $table, array( $field =>
$ids ), __METHOD__ );
$this->output( $counter . ".." );
- $start = $list[count( $list ) - 1] + 1;
+ $start = $ids[$numIds - 1] + 1;
}
- } while ( $list );
+ } while ( $numIds >= $batchSize );
$this->output( "\n" );
wfWaitForSlaves();
--
To view, visit https://gerrit.wikimedia.org/r/193564
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I14d2d48c2405fcc0bd05a3181ba6293caef5298c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable action=parse web API - change (mediawiki...Lockdown)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193563
Change subject: Disable action=parse web API
..
Disable action=parse web API
https://www.mediawiki.org/wiki/Thread:Extension_talk:Lockdown/How_to_prevent_api_access_locked_page%3F
Change-Id: Ie659579c4bb1b64dbd58b4b691cc97a190f1a9a6
---
M Lockdown.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Lockdown
refs/changes/63/193563/1
diff --git a/Lockdown.php b/Lockdown.php
index 04d3615..eaad425 100644
--- a/Lockdown.php
+++ b/Lockdown.php
@@ -50,6 +50,7 @@
$wgHooks['SearchableNamespaces'][] = 'lockdownSearchableNamespaces';
$wgHooks['SearchGetNearMatchComplete'][] =
'lockdownSearchGetNearMatchComplete';
$wgHooks['SearchEngineReplacePrefixesComplete'][] =
'lockdownSearchEngineReplacePrefixesComplete';
+$wgAPIModules['parse'] = 'ApiDisabled';
function lockdownUserPermissionsErrors( $title, $user, $action, &$result ) {
global $wgNamespacePermissionLockdown, $wgSpecialPageLockdown,
$wgWhitelistRead, $wgLang;
--
To view, visit https://gerrit.wikimedia.org/r/193563
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie659579c4bb1b64dbd58b4b691cc97a190f1a9a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Lockdown
Gerrit-Branch: master
Gerrit-Owner: Nemo bis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add release-notes for message escaping - change (mediawiki/core)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/193562 Change subject: Add release-notes for message escaping .. Add release-notes for message escaping Some of this messages where used with raw html on wmf wikis, that makes it possible there will also be raw html for third party wikis, therefore give a hint in the release notes. This includes release notes for: Id55295a0406659242bbc12a59af7e23fb742237c: editsection Ic4fcb40de844ac51c88fb51d752a4c286313ecf9: redirectto I1e90962c3c94c8b72aadfc4c0d041d52e2cde3f1: version-poweredby-others I7a5dfc8ecd2f84da0dce3e1357af462a3c0da23f: thisisdeleted, viewdeleted Ifb58bd3823aa633135a701ae3e2ae9c955b422c0: protect-summary-cascade Id16d8c8dff73fdacad6c9a4ff7f2919945b7e893: editlink, viewsourcelink Ibcc1b49946bc91e12756eb3866448159493c61f4: lastmodifiedat, laggedslavemode Ifd696ecd93c76e56cb21b3f2645367bb5ba0: retrievedfrom Bug: T85864 Change-Id: I1b144242ccb8780120f1a8ad9e3b6fde0da760f5 --- M RELEASE-NOTES-1.25 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/62/193562/1 diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25 index 45e669a..3c3812b 100644 --- a/RELEASE-NOTES-1.25 +++ b/RELEASE-NOTES-1.25 @@ -384,6 +384,10 @@ * EditPage::attemptSave has been modified not to call handleStatus itself and instead just returns the Status object. Extension calling it should be aware of this. +* (T85864) The following messages no longer support raw html: redirectto, + thisisdeleted, viewdeleted, editlink, retrievedfrom, version-poweredby-others, + retrievedfrom, thisisdeleted, viewsourcelink, lastmodifiedat, laggedslavemode, + protect-summary-cascade == Compatibility == -- To view, visit https://gerrit.wikimedia.org/r/193562 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b144242ccb8780120f1a8ad9e3b6fde0da760f5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Config for MLEB 2015.02 - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Config for MLEB 2015.02 .. Config for MLEB 2015.02 Change-Id: I01e5f0af9cf5d2081c0a3eb8ec4fb85f00777b17 --- M melange/config.ini 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/melange/config.ini b/melange/config.ini index 3eabf9d..f806d35 100644 --- a/melange/config.ini +++ b/melange/config.ini @@ -2,8 +2,8 @@ mediawikirepo=ssh://kar...@gerrit.wikimedia.org:29418/mediawiki/core.git extensionrepo=ssh://kar...@gerrit.wikimedia.org:29418/mediawiki/extensions/ branches=origin/master origin/REL1_21 origin/REL1_20 -releasever=2015.01 -releasever-prev=2014.12 +releasever=2015.02 +releasever-prev=2015.01 bundlename=MediaWiki language extension bundle downloadurl=https://translatewiki.net/mleb hasher=sha256sum -- To view, visit https://gerrit.wikimedia.org/r/193387 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I01e5f0af9cf5d2081c0a3eb8ec4fb85f00777b17 Gerrit-PatchSet: 2 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: KartikMistry Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tools: Remove tomcat node definitions from puppet - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193561
Change subject: tools: Remove tomcat node definitions from puppet
..
tools: Remove tomcat node definitions from puppet
Uses regular generic webservice node now.
Bug: T91066
Change-Id: I6d13d9cc5e8dd6d48aacc246d2f65aa49d90650c
---
M manifests/role/labstools.pp
D modules/toollabs/manifests/node/web/tomcat.pp
2 files changed, 0 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/193561/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 93df1d0..b14853c 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -87,9 +87,4 @@
class webnode inherits role::labs::tools::compute {
include toollabs::node::web::lighttpd
}
-
-class tomcatnode inherits role::labs::tools::compute {
-include toollabs::node::web::tomcat
-}
-
} # class role::labs::tools
diff --git a/modules/toollabs/manifests/node/web/tomcat.pp
b/modules/toollabs/manifests/node/web/tomcat.pp
deleted file mode 100644
index d8dc596..000
--- a/modules/toollabs/manifests/node/web/tomcat.pp
+++ /dev/null
@@ -1,41 +0,0 @@
-# Class: toollabs::node::web::lighttpd
-#
-# This configures the compute node as a tomcat web server
-#
-# Parameters:
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class toollabs::node::web::tomcat inherits toollabs::node::web {
-
-package { [ 'tomcat7-user', 'xmlstarlet' ]:
-ensure => latest,
-}
-
-# For now, the tomcat nodes double as the generic webserver nodes
-class { 'toollabs::queues':
-queues => [ 'webgrid-tomcat', 'webgrid-generic' ]
-}
-
-file { '/usr/local/bin/tool-tomcat':
-ensure => file,
-owner => 'root',
-group => 'root',
-mode => '0555',
-source => 'puppet:///modules/toollabs/tool-tomcat',
-}
-
-file { '/usr/local/bin/tomcat-starter':
-ensure => file,
-owner => 'root',
-group => 'root',
-mode=> '0555',
-source => 'puppet:///modules/toollabs/tomcat-starter',
-require => Package['xmlstarlet'],
-}
-
-}
--
To view, visit https://gerrit.wikimedia.org/r/193561
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d13d9cc5e8dd6d48aacc246d2f65aa49d90650c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bring back hatnotes - change (mediawiki...MobileFrontend)
TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193560
Change subject: Bring back hatnotes
..
Bring back hatnotes
Undo I6b972be and I559281d
dablink and rellink classes were partly replaced by .hatnote.
But If you want to hide content, hide by semantic class, not by a
multipurpose styling class. If templates don't give you a semantic
class, ask for the template to add one.
Remember that these things are also used in sections a LOT. Especially
hiding Main and See also is very annoying.
Bug: T91160
Change-Id: I358cf69270e2a9dcdf4af999a5a9df03d966044e
---
M less/content/hacks.less
1 file changed, 1 insertion(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/60/193560/1
diff --git a/less/content/hacks.less b/less/content/hacks.less
index 1481544..c4dbec8 100644
--- a/less/content/hacks.less
+++ b/less/content/hacks.less
@@ -63,8 +63,6 @@
}
}
-// Hat notes take up too much room in mobile interface
-.hatnote,
// FIXME: Remove when filetoc is stripped from file pages a la table of
contents (toc)
#filetoc,
// FIXME: remove when SkinMobile::doEditSectionLink present in cached pages
@@ -103,6 +101,7 @@
background-color: #ddeeff;
}
+.hatnote,
.dablink,
.rellink {
// Use bottom padding instead of bottom margin so that it doesn't
affect the
@@ -117,14 +116,6 @@
.quotebox {
margin: 0 0 0.8em !important;
width: auto !important;
-}
-
-@media all and (min-width: @wgMFDeviceWidthTablet) {
-
- // Show hatnotes when there is room.
- .hatnote {
- display: block;
- }
}
// Hacks to render galleries better on mobile
--
To view, visit https://gerrit.wikimedia.org/r/193560
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I358cf69270e2a9dcdf4af999a5a9df03d966044e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: TheDJ
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Point users to webservice2 for tomcat - change (labs/toollabs)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193559
Change subject: Point users to webservice2 for tomcat
..
Point users to webservice2 for tomcat
Bug: T91066
Change-Id: I2d0d0011d27784fe9e25742ae474be328f7ab63d
---
M misctools/webservice
1 file changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs
refs/changes/59/193559/1
diff --git a/misctools/webservice b/misctools/webservice
index e5ef365..8edf1cf 100755
--- a/misctools/webservice
+++ b/misctools/webservice
@@ -13,9 +13,8 @@
case "$1" in
-tomcat)
-server="tomcat"
-public="public_tomcat"
-shift
+echo "Use webservice2 tomcat {start|stop|restart} to manage tomcat
webservices"
+exit 0
;;
-lighttpd)
shift
--
To view, visit https://gerrit.wikimedia.org/r/193559
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d0d0011d27784fe9e25742ae474be328f7ab63d
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
