from:"QChris \(Code Review\)"

[MediaWiki-commits] [Gerrit] mediawiki...Whoops[master]: Switch .gitreview from defaultbranch to track

2017-05-21 Thread QChris (Code Review)

QChris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/355041 )

Change subject: Switch .gitreview from defaultbranch to track
..

Switch .gitreview from defaultbranch to track

Bug: T146293
Change-Id: I55d33510dc027fd266c85236d8144dde8a6c2f5a
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Whoops 
refs/changes/41/355041/1

diff --git a/.gitreview b/.gitreview
index 49667b8..a76fdd7 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/Whoops.git
-defaultbranch=master
+track=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I55d33510dc027fd266c85236d8144dde8a6c2f5a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Whoops
Gerrit-Branch: master
Gerrit-Owner: QChris 

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

[MediaWiki-commits] [Gerrit] labs...ZppixBot[master]: DO NOT SUBMIT. Test commit for grrrit.

2016-10-23 Thread QChris (Code Review)

QChris has uploaded a new change for review.

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

Change subject: DO NOT SUBMIT. Test commit for grrrit.
..

DO NOT SUBMIT. Test commit for grrrit.

Change-Id: Ibd49d52b54c15741cecb601a2595ecf8b1e8f542
---
A test-file
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/ZppixBot 
refs/changes/47/317447/1

diff --git a/test-file b/test-file
new file mode 100644
index 000..073bdfe
--- /dev/null
+++ b/test-file
@@ -0,0 +1 @@
+test-file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd49d52b54c15741cecb601a2595ecf8b1e8f542
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/ZppixBot
Gerrit-Branch: master
Gerrit-Owner: QChris 

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

[MediaWiki-commits] [Gerrit] mediawiki...SearchStats[master]: DO NOT MERGE. Demo commit for Sorvis

2016-09-15 Thread QChris (Code Review)

QChris has uploaded a new change for review.

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

Change subject: DO NOT MERGE. Demo commit for Sorvis
..

DO NOT MERGE. Demo commit for Sorvis

Change-Id: Ia1a70db83141d26eae27a539bd7ff4951452380e
---
A foo
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SearchStats 
refs/changes/50/310950/1

diff --git a/foo b/foo
new file mode 100644
index 000..257cc56
--- /dev/null
+++ b/foo
@@ -0,0 +1 @@
+foo

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1a70db83141d26eae27a539bd7ff4951452380e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SearchStats
Gerrit-Branch: master
Gerrit-Owner: QChris 

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

[MediaWiki-commits] [Gerrit] Modify access rules - change (wikibase)

2016-05-04 Thread QChris (Code Review)

QChris has submitted this change and it was merged.

Change subject: Modify access rules
..


Modify access rules
---
M groups
M project.config
2 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/groups b/groups
index 2d20f14..56fbfff 100644
--- a/groups
+++ b/groups
@@ -1,3 +1,6 @@
 # UUID Group Name
 #
+2bc47fcadf4e44ec9a1a73bcfa06232554f47ce2   JenkinsBot
+58f296e12def7ca8f52f35079396b524838a0398   wikidata
+cc37d98e3a4301744a0c0a9249173ae170696072   l10n-bot
 d138c5c3d9a84c49008893eaaae20a0a127a201b   wikibase
diff --git a/project.config b/project.config
index bc77588..2f4ea6d 100644
--- a/project.config
+++ b/project.config
@@ -4,3 +4,6 @@
mergeContent = true
 [access "refs/*"]
owner = group wikibase
+   owner = group wikidata
+   submit = group JenkinsBot
+   submit = group l10n-bot

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie453aabb3336149446df642d29dd12bd486db2c4
Gerrit-PatchSet: 1
Gerrit-Project: wikibase
Gerrit-Branch: refs/meta/config
Gerrit-Owner: JanZerebecki 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: QChris 

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

[MediaWiki-commits] [Gerrit] Document gerrit's limitations for regexp matching in Phabric... - change (operations/puppet)

2015-10-07 Thread QChris (Code Review)

QChris has uploaded a new change for review.

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

Change subject: Document gerrit's limitations for regexp matching in 
Phabricator URLs
..

Document gerrit's limitations for regexp matching in Phabricator URLs

We keep getting patches that try to fix matching Phabricator URLs. By
documenting the limitations, we can hopefully spare to repeat the
discussions again and again, and spare people the time to prepare
patches for it.

Change-Id: I4e3d3d7ee2e5da58abcf34fe91762eba1e58bfef
---
M modules/gerrit/templates/gerrit.config.erb
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index c142bdd..28678f9 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -97,6 +97,10 @@
 match = "([^ ]+) (https://integration\\.wikimedia\\.org/ci/[a-zA-Z0-9/_.-]+\; 
target=\"_blank\">)[^<]+ : ([a-zA-Z_]+)([^<]*)"
 html  = "$2$1 $3$4"
 [commentlink "its-phabricator"]
+# Due to limitations of our old gerrit (and hence the old plugins)
+# that we use, $1 needs to hold the bug number. By the way the
+# pattern gets used, neither non-capturing groups nor
+# look-aheads/look-backs work reliably.
 match =  "\\bT(\\d+)\\b"
 link = https://phabricator.wikimedia.org/T$1
 [mimetype "application/javascript"]

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

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

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

[MediaWiki-commits] [Gerrit] Update delete-project plugin to the deployed version - change (operations...plugins)

2015-09-16 Thread QChris (Code Review)

QChris has uploaded a new change for review.

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

Change subject: Update delete-project plugin to the deployed version
..

Update delete-project plugin to the deployed version

Change-Id: Ica115d6f6168ca30138b1cd27b71c54dad730e5f
---
D delete-project.jar
A deleteproject.jar
2 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/gerrit/plugins 
refs/changes/57/238857/1

diff --git a/delete-project.jar b/delete-project.jar
deleted file mode 100644
index 4349406..000
--- a/delete-project.jar
+++ /dev/null
Binary files differ
diff --git a/deleteproject.jar b/deleteproject.jar
new file mode 100644
index 000..ae1e682
--- /dev/null
+++ b/deleteproject.jar
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica115d6f6168ca30138b1cd27b71c54dad730e5f
Gerrit-PatchSet: 1
Gerrit-Project: operations/gerrit/plugins
Gerrit-Branch: master
Gerrit-Owner: QChris 

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

[MediaWiki-commits] [Gerrit] Ensure gerrit's plugins are kept in sync with plugin repo - change (operations/puppet)

2015-09-16 Thread QChris (Code Review)

QChris has uploaded a new change for review.

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

Change subject: Ensure gerrit's plugins are kept in sync with plugin repo
..

Ensure gerrit's plugins are kept in sync with plugin repo

It seems at some point in the past Gerrit's plugin repo went out of
sync with what is really deployed in Gerrit. This makes it
unnecessarily hard to recover in case the machine dies. To improve on
that, we make sure that the clone is current, so we at least notice if
we're running out of sync with the plugin repo.

Change-Id: Icb0e5997fc70bb2bfbc1ffa90bf460e84af4dbff
---
M modules/gerrit/manifests/jetty.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/238976/1

diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index 6ccdbf9..84231c3 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -197,6 +197,7 @@
 }
 
 git::clone { 'operations/gerrit/plugins':
+ensure=> latest,
 directory => '/var/lib/gerrit2/review_site/plugins',
 branch=> 'master',
 origin=> 
'https://gerrit.wikimedia.org/r/p/operations/gerrit/plugins.git',

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

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

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

[MediaWiki-commits] [Gerrit] Add jar for BouncyCastle 1.44 from Debian wheezy - change (operations...plugins)

2015-09-12 Thread QChris (Code Review)

QChris has uploaded a new change for review.

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

Change subject: Add jar for BouncyCastle 1.44 from Debian wheezy
..

Add jar for BouncyCastle 1.44 from Debian wheezy

To teach Gerrit suitable key exchange algorithms for OpenSSH >=7, we
need to add BouncyCastle to Gerrit to avoid having to upgrade
Gerrit.

But deploying jars from plain puppet is just a pain right now. To
spare us from having to create yet another repo whose sole purpose
would be to hold the bcprov jar needed for deployment, we slightly
abuse the gerrit/plugins repository, and add the needed jar just
here. As bcprov somehow has functionality that is pluggable for
Gerrit, it's not a too bad match anyways.

We want to avoid Gerrit to try loading the BouncyCastle jar as Gerrit
plugin. Hence, we put the BouncyCastle jar into a separate directory.

Bug: T112025
Change-Id: If6646f7a50271ccdc0f2b6d2575520d8e4fd64c5
---
A bouncycastle/bcprov-1.44-from-Debian-wheezy.jar
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/gerrit/plugins 
refs/changes/18/237918/1

diff --git a/bouncycastle/bcprov-1.44-from-Debian-wheezy.jar 
b/bouncycastle/bcprov-1.44-from-Debian-wheezy.jar
new file mode 100644
index 000..741e837
--- /dev/null
+++ b/bouncycastle/bcprov-1.44-from-Debian-wheezy.jar
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6646f7a50271ccdc0f2b6d2575520d8e4fd64c5
Gerrit-PatchSet: 1
Gerrit-Project: operations/gerrit/plugins
Gerrit-Branch: master
Gerrit-Owner: QChris 

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

[MediaWiki-commits] [Gerrit] Make gerrit offer newer key exchange algorithms for new sshs - change (operations/puppet)

2015-09-11 Thread QChris (Code Review)

QChris has uploaded a new change for review.

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

Change subject: Make gerrit offer newer key exchange algorithms for new sshs
..

Make gerrit offer newer key exchange algorithms for new sshs

OpenSSH 7 onwards has gerrit's default key exchange algorithm
deprecated. Hence, people with a recent OpenSSH can no longer push to
gerrit over ssh without adapting the ssh configs. This is on the one
hand annoying, on the other, we really should offer recent secure
algorithms. Hence, we make gerrit use BounceCastle, which (even for
our old gerrit) offers key exchange algorithms that OpenSSH >=7 still
accepts.

Bug: T112025
Change-Id: I48b9385cbf67f64c4299a41005bc8ca094cfc96f
---
A modules/gerrit/files/bcprov-jdk16-144.jar
M modules/gerrit/manifests/jetty.pp
2 files changed, 24 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/53/237753/1

diff --git a/modules/gerrit/files/bcprov-jdk16-144.jar 
b/modules/gerrit/files/bcprov-jdk16-144.jar
new file mode 100644
index 000..591554b
--- /dev/null
+++ b/modules/gerrit/files/bcprov-jdk16-144.jar
Binary files differ
diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index 6ccdbf9..b299f2d 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -196,6 +196,27 @@
 require => Exec['install_gerrit_jetty'],
 }
 
+file { '/var/lib/gerrit2/review_site/lib':
+ensure  => directory,
+owner   => 'gerrit2',
+group   => 'gerrit2',
+mode=> '0755',
+require => [Exec['install_gerrit_jetty'],
+File['/var/lib/gerrit2/review_site']
+],
+}
+
+# This file is tuned for gerrit-2.8.1-4-ga1048ce. If you update gerrit,
+# you also need to update this jar to match the BouncyCastle version
+# required by the fresh gerrit.
+file { '/var/lib/gerrit2/review_site/lib/bcprov-jdk16-144.jar':
+owner   => 'gerrit2',
+group   => 'gerrit2',
+mode=> '0444',
+source  => 'puppet:///modules/gerrit/bcprov-jdk16-144.jar',
+require => Exec['install_gerrit_jetty'],
+}
+
 git::clone { 'operations/gerrit/plugins':
 directory => '/var/lib/gerrit2/review_site/plugins',
 branch=> 'master',
@@ -224,7 +245,9 @@
 enable=> true,
 hasstatus => false,
 status=> '/etc/init.d/gerrit check',
-require   => Exec['install_gerrit_jetty'],
+require   => [Exec['install_gerrit_jetty'],
+  
File['/var/lib/gerrit2/review_site/lib/bcprov-jdk16-144.jar']
+],
 }
 
 nrpe::monitor_service { 'gerrit':

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

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

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

[MediaWiki-commits] [Gerrit] Import code from WikiPage - change (mediawiki...ImportArticles)

2015-09-08 Thread QChris (Code Review)

QChris has submitted this change and it was merged.

Change subject: Import code from WikiPage
..


Import code from WikiPage

The imported code is from

  
https://www.mediawiki.org/w/index.php?title=Extension:ImportArticles/code=1405628

Change-Id: I6b6ee8b2f5ad579cd0e2929862e34aabee905350
---
A ImportArticles.php
1 file changed, 140 insertions(+), 0 deletions(-)

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



diff --git a/ImportArticles.php b/ImportArticles.php
new file mode 100644
index 000..530e2cb
--- /dev/null
+++ b/ImportArticles.php
@@ -0,0 +1,140 @@
+http://www.gnu.org/licenses/>.
+*/
+
+# Only run if included by MediaWiki
+if ( !defined( 'MEDIAWIKI' ) ) die();
+
+$wgExtensionCredits['other'][] = array(
+'name' => 'ImportArticles',
+'author' => 'Kris Blair', 
+'description' => 'Allow the usage of ImportArticles JavaScript to import 
multiple pages at once',
+'version'  => 1.2,
+);
+$wgHooks['BeforePageDisplay'][] = 'BeforePageDisplay';
+
+public static function BeforePageDisplay( &$out, &$skin ) {
+   $script = <<
+ */
+
+/**
+ * Call the api and send the data then output the return
+ *
+ * @param {Array} The data to use.
+ * @param String The method to use: either 'GET' or 'POST'.
+ * @param Function The function to call back to.
+ */
+function callAPI( data, method, callback )
+{
+   data.format = 'json';
+   $.ajax(
+   {
+   data: data,
+   dataType: 'json',
+   url: '/api.php',
+   type: method,
+   success: function( response )
+   {
+   if( response.error ) {
+   console.log( 'API error: ' + 
response.error.info );
+   return false;
+   } else if( response.warnings ) {
+   console.log( 'API Warning: ' + 
response.warnings.main['*'] );
+   } else {
+   callback( response );
+   }
+   },
+   error: function( xhr, error )
+   {
+   console.log( 'AJAX error: ' + error );
+   }
+   });
+}
+
+/*
+ *
+ * >> Examples:
+ *
+ * // Importing multiple JavaScript files
+ * importArticles(
+ * 'script', [
+ * 'Mediawiki:MyCustomJavaScript.js',
+ * 'Mediawiki:MyCustomJavaScript.js2',
+ * ]
+ * });
+ *
+ * @param String The type to load: Either 'script' or 'style'.
+ * @param (String/{Array}) The file(s) to load.
+ * @returns Boolean Whether success or fail
+ */
+function importArticles( type, pages ) {
+   var output,
+   page,
+   outputText = '',
+   query = {
+   'action': 'query',
+   'prop': 'revisions',
+   'rvprop': 'content',
+   'indexpageids': 'true'
+   };
+   if ( $.isArray( pages ) ) {
+   query.titles = pages.join( '|' );
+   } else {
+   query.titles = pages;
+   }
+   if ( type == 'script' ) {
+   window.output = document.createElement( 'script' );
+   window.output.type = 'text/javascript';
+   } else if ( type == 'style' ) {
+   window.output = document.createElement( 'style' );
+   } else {
+   console.log( 'Invalid article type: ' + type );
+   return false;
+   }
+   callAPI(
+   query,
+   'GET',
+   function( response )
+   {
+   for( var i = 0; i < response.query.pageids.length; i++ 
) {
+   page = 
response.query.pages[response.query.pageids[i]];
+   if( response.query.pageids[i] == '-1' ) {
+   console.log( 'The page does not exist: 
' + page.title );
+   } else {
+   outputText = outputText + "\n" + 
page.revisions[0]['*'].replace( "'", "\'" );
+   }
+   }
+   try {
+   window.output.appendChild( 
document.createTextNode( outputText ) );
+   } catch ( e ) {
+   window.output.text = outputText;
+   }
+   document.body.appendChild( window.output );
+   }
+   );
+}
+SCRIPT;
+   if (version_compare( $wgVersion, '1.16', '>=' ) ) {
+   $out->addInlineScript( $script );
+   } else {
+   $out->addScript( '