[MediaWiki-commits] [Gerrit] Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/me... - change (mediawiki/core)

2015-05-27 Thread Raimond Spekking (Code Review) 
Raimond Spekking has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/mediawiki/core into add_language_dty
..

Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into 
add_language_dty

Change-Id: I72d7d4910f28d036bffc9812382cad0f26c651b7
---
A languages/messages/MessagesDty.php
1 file changed, 11 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/99/213999/1

diff --git a/languages/messages/MessagesDty.php 
b/languages/messages/MessagesDty.php
new file mode 100644
index 000..f90746c
--- /dev/null
+++ b/languages/messages/MessagesDty.php
@@ -0,0 +1,11 @@
+?php
+/** Doteli (डोटेली)
+ *
+ * To improve a translation please visit https://translatewiki.net
+ *
+ * @ingroup Language
+ * @file
+ *
+ */
+
+$fallback = 'ne';
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I72d7d4910f28d036bffc9812382cad0f26c651b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/me... - change (mediawiki/core)

2014-05-17 Thread Withoutaname (Code Review) 
Withoutaname has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/mediawiki/core into review/withoutaname/133946
..

Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into 
review/withoutaname/133946

Conflicts:
includes/parser/CoreParserFunctions.php

Change-Id: Ib22c22817c6db25a6e014c55426512ec2ad4ec93
---
M includes/parser/CoreParserFunctions.php
1 file changed, 2 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/48/133948/1

diff --git a/includes/parser/CoreParserFunctions.php 
b/includes/parser/CoreParserFunctions.php
index 54ebeb5..9dfaf5d 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -1219,20 +1219,11 @@
$names = array();
$sources = $titleObject-getCascadeProtectionSources();
foreach ( $sources[0] as $sourceTitle ) {
- HEAD   (f99440 Add wikitext formatting to CASCADINGSOURCES)
-   $names[] = *  . $sourceTitle-getText();
-===
-   $names[] = $sourceTitle-getPrefixedText();
- BRANCH (444bcb Localisation updates from https://translatewiki.net.)
+   $names[] = *  . 
$sourceTitle-getPrefixedText();
}
-   return implode( $names, '|' );
+   return implode( $names, '\n' );
}
- HEAD   (f99440 Add wikitext formatting to CASCADINGSOURCES)
-
-   return implode( $names, '\n' );
-===
return '';
- BRANCH (444bcb Localisation updates from https://translatewiki.net.)
}
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib22c22817c6db25a6e014c55426512ec2ad4ec93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Withoutaname drevit...@gmail.com

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/me... - change (mediawiki/core)

2014-01-11 Thread AalekhN (Code Review) 
AalekhN has uploaded a new change for review.

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


Change subject: Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/mediawiki/core into bug/whatlinkshere
..

Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into 
bug/whatlinkshere

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/90/106890/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d4d03e511fc1ecfead3d5374e75eb1d304fe2a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: AalekhN aalekh1...@rediffmail.com

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/me... - change (mediawiki/core)

2013-11-22 Thread Yamelnychuk (Code Review) 
Yamelnychuk has uploaded a new change for review.

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


Change subject: Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/mediawiki/core
..

Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/mediawiki/core

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/97/96997/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8efcaebd5345b575b5145ae65c0a8914e106bae6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Yamelnychuk yaroslavmelnuc...@gmail.com

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/me... - change (mediawiki/core)

2013-03-21 Thread Lwelling (Code Review) 
Lwelling has uploaded a new change for review.

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


Change subject: Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/mediawiki/core into 
review/lwelling/delayed_queue
..

Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into 
review/lwelling/delayed_queue

Conflicts:
includes/job/Job.php
includes/job/JobQueue.php

Change-Id: I5ed1b0897db6ca60e655a64446ee9e52c49af405
---
M includes/job/Job.php
M includes/job/JobQueue.php
2 files changed, 0 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/84/55084/1

diff --git a/includes/job/Job.php b/includes/job/Job.php
index 96c90be..b28bf66 100644
--- a/includes/job/Job.php
+++ b/includes/job/Job.php
@@ -196,15 +196,6 @@
}
 
/**
-   * @return integer|null UNIX timestamp to delay running this job until, 
otherwise null
-   */
-   public function delayUntilTimestamp() {
-   return isset( $this-params['delayUntilTimestamp'] )
-   ? wfTimestampOrNull( TS_UNIX, 
$this-params['delayUntilTimestamp'] )
-   : null;
-   }
-
-   /**
 * @return integer|null UNIX timestamp to delay running this job until, 
otherwise null
 * @since 1.22
 */
diff --git a/includes/job/JobQueue.php b/includes/job/JobQueue.php
index bac4bfd..9c152cd 100644
--- a/includes/job/JobQueue.php
+++ b/includes/job/JobQueue.php
@@ -82,11 +82,7 @@
 *  but not acknowledged as completed after this many 
seconds. Recycling
 *  of jobs simple means re-inserting them into the 
queue. Jobs can be
 *  attempted up to three times before being discarded.
- HEAD   (ee2672 Allow job queues to optionally request jobs not be 
processed)
-*   - checkDelay : If supported, respect Job::delayUntilTimestamp() in 
the push functions.
-===
 *   - checkDelay : If supported, respect Job::getReleaseTimestamp() in 
the push functions.
- BRANCH (45b341 Add SpecialSearchResultsPrepend/Append to release notes)
 *  This lets delayed jobs wait in a staging area until 
a given timestamp is
 *  reached, at which point they will enter the queue. 
If this is not enabled
 *  or not supported, an exception will be thrown on 
delayed job insertion.
@@ -224,10 +220,7 @@
 *
 * @return integer
 * @throws MWException
- HEAD   (ee2672 Allow job queues to optionally request jobs not be 
processed)
-===
 * @since 1.22
- BRANCH (45b341 Add SpecialSearchResultsPrepend/Append to release notes)
 */
final public function getDelayedCount() {
wfProfileIn( __METHOD__ );
@@ -277,11 +270,7 @@
if ( $job-getType() !== $this-type ) {
throw new MWException(
Got '{$job-getType()}' job; expected 
a '{$this-type}' job. );
- HEAD   (ee2672 Allow job queues to optionally request jobs not be 
processed)
-   } elseif ( $job-delayUntilTimestamp()  
!$this-checkDelay ) {
-===
} elseif ( $job-getReleaseTimestamp()  
!$this-checkDelay ) {
- BRANCH (45b341 Add SpecialSearchResultsPrepend/Append to release notes)
throw new MWException(
Got delayed '{$job-getType()}' job; 
delays are not supported. );
}
@@ -550,13 +539,8 @@
 
/**
 * Get an iterator to traverse over all available jobs in this queue.
- HEAD   (ee2672 Allow job queues to optionally request jobs not be 
processed)
-* This does not include jobs that are current acquired. In general,
-* this should only be called on a queue that is no longer being popped.
-===
 * This does not include jobs that are currently acquired or delayed.
 * This should only be called on a queue that is no longer being popped.
- BRANCH (45b341 Add SpecialSearchResultsPrepend/Append to release notes)
 *
 * @return Iterator|Traversable|Array
 * @throws MWException

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ed1b0897db6ca60e655a64446ee9e52c49af405
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Lwelling lwell...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/me... - change (mediawiki/core[master])

2012-12-09 Thread Matthewrbowker (Code Review) 
Matthewrbowker has uploaded a new change for review.

Change subject: Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/mediawiki/core
..

Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/mediawiki/core

Change-Id: I18ef33269468e799eac96c3fbf026072a1651ffb
---
M skins/CologneBlue.php
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/84/37684/1
--
To view, visit https://gerrit.wikimedia.org/r/37684
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I18ef33269468e799eac96c3fbf026072a1651ffb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matthewrbowker matthewrbowker.w...@me.com

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