[MediaWiki-commits] [Gerrit] fix / add - tagging via dulwich, refactor using Tag object /... - change (sartoris)
Rfaulk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82367
Change subject: fix / add - tagging via dulwich, refactor using Tag object /
user.name and user.email to config.
..
fix / add - tagging via dulwich, refactor using Tag object / user.name and
user.email to config.
Change-Id: I267a27961d5d25fcf50263b6cd9a5df3610be223
---
M sartoris/sartoris.py
1 file changed, 44 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/sartoris refs/changes/67/82367/1
diff --git a/sartoris/sartoris.py b/sartoris/sartoris.py
index 1a8fd51..4887f4e 100755
--- a/sartoris/sartoris.py
+++ b/sartoris/sartoris.py
@@ -29,7 +29,7 @@
import subprocess
from dulwich.config import StackedConfig
from dulwich.repo import Repo
-from dulwich.objects import Blob, Tree, Commit, parse_timezone
+from dulwich.objects import Tag, Commit, parse_timezone
from datetime import datetime
import json
from time import time
@@ -57,6 +57,8 @@
25: 'Missing system configuration item target. Exiting.',
26: 'Missing system configuration item remote. Exiting.',
27: 'Missing system configuration item branch. Exiting.',
+28: 'Missing system configuration item user.name. Exiting.',
+29: 'Missing system configuration item user.email. Exiting.',
30: 'No deploy started. Please run: git deploy start',
31: 'Failed to write tag on sync. Exiting.',
32: 'Failed to write the .deploy file. Exiting.',
@@ -157,6 +159,9 @@
# Name of lock file
LOCK_FILE_HANDLE = 'lock'
+# Default tag message
+DEFAULT_TAG_MSG = 'Sartoris Tag.'
+
# class instance
__instance = None
@@ -241,7 +246,7 @@
log.error({0} :: {1}.format(__name__, exit_codes[exit_code]))
sys.exit(exit_code)
-# Get config for deploy.target
+# Get config for deploy.remote
try:
self.config['remote'] = sc.get('deploy', 'remote')
except KeyError:
@@ -249,11 +254,27 @@
log.error({0} :: {1}.format(__name__, exit_codes[exit_code]))
sys.exit(exit_code)
-# Get config for deploy.target
+# Get config for deploy.branch
try:
self.config['branch'] = sc.get('deploy', 'branch')
except KeyError:
exit_code = 27
+log.error({0} :: {1}.format(__name__, exit_codes[exit_code]))
+sys.exit(exit_code)
+
+# Get config for user.name
+try:
+self.config['user.name'] = sc.get('user', 'name')
+except KeyError:
+exit_code = 28
+log.error({0} :: {1}.format(__name__, exit_codes[exit_code]))
+sys.exit(exit_code)
+
+# Get config for user.email
+try:
+self.config['user.email'] = sc.get('user', 'email')
+except KeyError:
+exit_code = 29
log.error({0} :: {1}.format(__name__, exit_codes[exit_code]))
sys.exit(exit_code)
@@ -371,42 +392,30 @@
raise SartorisError(message=exit_codes[8], exit_code=8)
return 0
-def _dulwich_tag(self, tag, author, message=None):
- Creates a tag in git via dulwich calls:
-
-**tag** - string :: project-[start|sync]-timestamp
-**author** - string :: Your Name your.em...@example.com
+def _dulwich_tag(self, tag, author, message=DEFAULT_TAG_MSG):
-if not message:
-message = tag
+Creates a tag in git via dulwich calls:
+
+Parameters:
+tag - string :: project-[start|sync]-timestamp
+author - string :: Your Name your.em...@example.com
+
# Open the repo
_repo = Repo(self.config['top_dir'])
-master_branch = 'master'
-# Build the commit object
-blob = Blob.from_string(empty)
-tree = Tree()
-tree.add(tag, 0100644, blob.id)
+# Create the tag object
+tag_obj = Tag()
+tag_obj.tagger = author
+tag_obj.message = message
+tag_obj.name = tag
+tag_obj.object = (Commit, _repo.refs['HEAD'])
+tag_obj.tag_time = int(time())
+tag_obj.tag_timezone = parse_timezone('-0200')[0]
-commit = Commit()
-commit.tree = tree.id
-commit.author = commit.committer = author
-commit.commit_time = commit.author_time = int(time())
-tz = parse_timezone('-0200')[0]
-commit.commit_timezone = commit.author_timezone = tz
-commit.encoding = UTF-8
-commit.message = 'Tagging repo for deploy: ' + message
-
-# Add objects to the repo store instance
-object_store = _repo.object_store
-object_store.add_object(blob)
-object_store.add_object(tree)
-object_store.add_object(commit)
-_repo.refs['refs/heads/' + master_branch] = commit.id
-
-# Build the tag object and tag
-
[MediaWiki-commits] [Gerrit] fix / add - tagging via dulwich, refactor using Tag object /... - change (sartoris)
Rfaulk has submitted this change and it was merged.
Change subject: fix / add - tagging via dulwich, refactor using Tag object /
user.name and user.email to config.
..
fix / add - tagging via dulwich, refactor using Tag object / user.name and
user.email to config.
Change-Id: I267a27961d5d25fcf50263b6cd9a5df3610be223
---
M sartoris/sartoris.py
1 file changed, 44 insertions(+), 35 deletions(-)
Approvals:
Rfaulk: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/sartoris/sartoris.py b/sartoris/sartoris.py
index 1a8fd51..4887f4e 100755
--- a/sartoris/sartoris.py
+++ b/sartoris/sartoris.py
@@ -29,7 +29,7 @@
import subprocess
from dulwich.config import StackedConfig
from dulwich.repo import Repo
-from dulwich.objects import Blob, Tree, Commit, parse_timezone
+from dulwich.objects import Tag, Commit, parse_timezone
from datetime import datetime
import json
from time import time
@@ -57,6 +57,8 @@
25: 'Missing system configuration item target. Exiting.',
26: 'Missing system configuration item remote. Exiting.',
27: 'Missing system configuration item branch. Exiting.',
+28: 'Missing system configuration item user.name. Exiting.',
+29: 'Missing system configuration item user.email. Exiting.',
30: 'No deploy started. Please run: git deploy start',
31: 'Failed to write tag on sync. Exiting.',
32: 'Failed to write the .deploy file. Exiting.',
@@ -157,6 +159,9 @@
# Name of lock file
LOCK_FILE_HANDLE = 'lock'
+# Default tag message
+DEFAULT_TAG_MSG = 'Sartoris Tag.'
+
# class instance
__instance = None
@@ -241,7 +246,7 @@
log.error({0} :: {1}.format(__name__, exit_codes[exit_code]))
sys.exit(exit_code)
-# Get config for deploy.target
+# Get config for deploy.remote
try:
self.config['remote'] = sc.get('deploy', 'remote')
except KeyError:
@@ -249,11 +254,27 @@
log.error({0} :: {1}.format(__name__, exit_codes[exit_code]))
sys.exit(exit_code)
-# Get config for deploy.target
+# Get config for deploy.branch
try:
self.config['branch'] = sc.get('deploy', 'branch')
except KeyError:
exit_code = 27
+log.error({0} :: {1}.format(__name__, exit_codes[exit_code]))
+sys.exit(exit_code)
+
+# Get config for user.name
+try:
+self.config['user.name'] = sc.get('user', 'name')
+except KeyError:
+exit_code = 28
+log.error({0} :: {1}.format(__name__, exit_codes[exit_code]))
+sys.exit(exit_code)
+
+# Get config for user.email
+try:
+self.config['user.email'] = sc.get('user', 'email')
+except KeyError:
+exit_code = 29
log.error({0} :: {1}.format(__name__, exit_codes[exit_code]))
sys.exit(exit_code)
@@ -371,42 +392,30 @@
raise SartorisError(message=exit_codes[8], exit_code=8)
return 0
-def _dulwich_tag(self, tag, author, message=None):
- Creates a tag in git via dulwich calls:
-
-**tag** - string :: project-[start|sync]-timestamp
-**author** - string :: Your Name your.em...@example.com
+def _dulwich_tag(self, tag, author, message=DEFAULT_TAG_MSG):
-if not message:
-message = tag
+Creates a tag in git via dulwich calls:
+
+Parameters:
+tag - string :: project-[start|sync]-timestamp
+author - string :: Your Name your.em...@example.com
+
# Open the repo
_repo = Repo(self.config['top_dir'])
-master_branch = 'master'
-# Build the commit object
-blob = Blob.from_string(empty)
-tree = Tree()
-tree.add(tag, 0100644, blob.id)
+# Create the tag object
+tag_obj = Tag()
+tag_obj.tagger = author
+tag_obj.message = message
+tag_obj.name = tag
+tag_obj.object = (Commit, _repo.refs['HEAD'])
+tag_obj.tag_time = int(time())
+tag_obj.tag_timezone = parse_timezone('-0200')[0]
-commit = Commit()
-commit.tree = tree.id
-commit.author = commit.committer = author
-commit.commit_time = commit.author_time = int(time())
-tz = parse_timezone('-0200')[0]
-commit.commit_timezone = commit.author_timezone = tz
-commit.encoding = UTF-8
-commit.message = 'Tagging repo for deploy: ' + message
-
-# Add objects to the repo store instance
-object_store = _repo.object_store
-object_store.add_object(blob)
-object_store.add_object(tree)
-object_store.add_object(commit)
-_repo.refs['refs/heads/' + master_branch] = commit.id
-
-# Build the tag object and tag
-_repo['refs/tags/' + tag] =
[MediaWiki-commits] [Gerrit] mod - config section. - change (sartoris)
Rfaulk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82368
Change subject: mod - config section.
..
mod - config section.
Change-Id: Ieb5bd6520c7f92a38cc7abab797d2ad262698e7f
---
M README.rst
1 file changed, 13 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/sartoris refs/changes/68/82368/1
diff --git a/README.rst b/README.rst
index a896fbb..ef59e82 100644
--- a/README.rst
+++ b/README.rst
@@ -20,29 +20,28 @@
Source: http://en.wikipedia.org/wiki/Sartoris
-Usage
--
-First set the hook-dir and tag-prefix for the deploy section in your
global .gitconfig:
- git config deploy.target {%target host%} # e.g. my.remotehost.com:8080
a.k.a deploy host
+Configuration
+-
- git config deploy.path {%remote deploy path%}
+First set the hook-dir and tag-prefix and other dependencies for the
deploy section in your global .gitconfig:
- git config deploy.user {%authorized user on deploy target%}
+git config --global deploy.target {%target host%} # e.g.
my.remotehost.com:8080 a.k.a deploy host
- git config deploy.hook-dir .git/deploy/hooks
+git config --global deploy.path {%remote deploy path%}
- git config deploy.tag-prefix {%project name%}
+git config --global deploy.user {%authorized user on deploy target%}
-git config deploy.remote {%remote name%}
+git config --global deploy.hook-dir .git/deploy/hooks
-git config deploy.branch {%deploy branch name%}
+git config --global deploy.tag-prefix {%project name%}
-Next create the sartoris configuration file by first copying
./sartoris/config.py.example to
-./sartoris/config.py then setting the TEST_REPO and SARTORIS_HOME variables.
The TEST_REPO
-should be defined in your /tmp folder while SARTORIS_HOME should point to the
your local
-Sartoris project home.
+git config --global deploy.remote {%remote name%}
+
+git config --global deploy.branch {%deploy branch name%}
+
+Also ensure that the global git params user.name and user.email are defined.
To start a new deployment issue a 'start' command:
--
To view, visit https://gerrit.wikimedia.org/r/82368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb5bd6520c7f92a38cc7abab797d2ad262698e7f
Gerrit-PatchSet: 1
Gerrit-Project: sartoris
Gerrit-Branch: master
Gerrit-Owner: Rfaulk rfaulk...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add - new usage section. - change (sartoris)
Rfaulk has uploaded a new change for review. https://gerrit.wikimedia.org/r/82369 Change subject: add - new usage section. .. add - new usage section. Change-Id: I8177cdc210663f2b0d6caaff4f102b344317680f --- M README.rst 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/sartoris refs/changes/69/82369/1 diff --git a/README.rst b/README.rst index ef59e82..b96dded 100644 --- a/README.rst +++ b/README.rst @@ -21,6 +21,13 @@ Source: http://en.wikipedia.org/wiki/Sartoris +Usage +- + +Basic usage involves cloning the remote working repo to the deploy target and all client nodes. When +a client is ready to deploy 'start' is invoked to obtain a lock on the remote and 'sync' is called to +push changes to the target. On completion th elock is removed. + Configuration - -- To view, visit https://gerrit.wikimedia.org/r/82369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8177cdc210663f2b0d6caaff4f102b344317680f Gerrit-PatchSet: 1 Gerrit-Project: sartoris Gerrit-Branch: master Gerrit-Owner: Rfaulk rfaulk...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mod - config section. - change (sartoris)
Rfaulk has submitted this change and it was merged.
Change subject: mod - config section.
..
mod - config section.
Change-Id: Ieb5bd6520c7f92a38cc7abab797d2ad262698e7f
---
M README.rst
1 file changed, 13 insertions(+), 14 deletions(-)
Approvals:
Rfaulk: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/README.rst b/README.rst
index a896fbb..ef59e82 100644
--- a/README.rst
+++ b/README.rst
@@ -20,29 +20,28 @@
Source: http://en.wikipedia.org/wiki/Sartoris
-Usage
--
-First set the hook-dir and tag-prefix for the deploy section in your
global .gitconfig:
- git config deploy.target {%target host%} # e.g. my.remotehost.com:8080
a.k.a deploy host
+Configuration
+-
- git config deploy.path {%remote deploy path%}
+First set the hook-dir and tag-prefix and other dependencies for the
deploy section in your global .gitconfig:
- git config deploy.user {%authorized user on deploy target%}
+git config --global deploy.target {%target host%} # e.g.
my.remotehost.com:8080 a.k.a deploy host
- git config deploy.hook-dir .git/deploy/hooks
+git config --global deploy.path {%remote deploy path%}
- git config deploy.tag-prefix {%project name%}
+git config --global deploy.user {%authorized user on deploy target%}
-git config deploy.remote {%remote name%}
+git config --global deploy.hook-dir .git/deploy/hooks
-git config deploy.branch {%deploy branch name%}
+git config --global deploy.tag-prefix {%project name%}
-Next create the sartoris configuration file by first copying
./sartoris/config.py.example to
-./sartoris/config.py then setting the TEST_REPO and SARTORIS_HOME variables.
The TEST_REPO
-should be defined in your /tmp folder while SARTORIS_HOME should point to the
your local
-Sartoris project home.
+git config --global deploy.remote {%remote name%}
+
+git config --global deploy.branch {%deploy branch name%}
+
+Also ensure that the global git params user.name and user.email are defined.
To start a new deployment issue a 'start' command:
--
To view, visit https://gerrit.wikimedia.org/r/82368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb5bd6520c7f92a38cc7abab797d2ad262698e7f
Gerrit-PatchSet: 1
Gerrit-Project: sartoris
Gerrit-Branch: master
Gerrit-Owner: Rfaulk rfaulk...@wikimedia.org
Gerrit-Reviewer: Rfaulk rfaulk...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add - new usage section. - change (sartoris)
Rfaulk has submitted this change and it was merged. Change subject: add - new usage section. .. add - new usage section. Change-Id: I8177cdc210663f2b0d6caaff4f102b344317680f --- M README.rst 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Rfaulk: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/README.rst b/README.rst index ef59e82..b96dded 100644 --- a/README.rst +++ b/README.rst @@ -21,6 +21,13 @@ Source: http://en.wikipedia.org/wiki/Sartoris +Usage +- + +Basic usage involves cloning the remote working repo to the deploy target and all client nodes. When +a client is ready to deploy 'start' is invoked to obtain a lock on the remote and 'sync' is called to +push changes to the target. On completion th elock is removed. + Configuration - -- To view, visit https://gerrit.wikimedia.org/r/82369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8177cdc210663f2b0d6caaff4f102b344317680f Gerrit-PatchSet: 1 Gerrit-Project: sartoris Gerrit-Branch: master Gerrit-Owner: Rfaulk rfaulk...@wikimedia.org Gerrit-Reviewer: Rfaulk rfaulk...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix and document parameters that Site.newpages was passing t... - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Fix and document parameters that Site.newpages was passing to Site.recentchanges .. Fix and document parameters that Site.newpages was passing to Site.recentchanges Also added type hinting to the various parameters. Change-Id: Icbc9f988a6c533788f1d1d9867411eda901017c2 --- M pywikibot/site.py 1 file changed, 22 insertions(+), 1 deletion(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 1b1f1d6..1c0b144 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2242,29 +2242,43 @@ namespaces=None, pagelist=None, changetype=None, showMinor=None, showBot=None, showAnon=None, showRedirects=None, showPatrolled=None, topOnly=False, - step=None, total=None): + step=None, total=None, user=None, excludeuser=None): Iterate recent changes. @param start: Timestamp to start listing from +@type start: pywikibot.Timestamp @param end: Timestamp to end listing at +@type end: pywikibot.Timestamp @param reverse: if True, start with oldest changes (default: newest) +@type reverse: bool @param pagelist: iterate changes to pages in this list only @param pagelist: list of Pages @param changetype: only iterate changes of this type (edit for edits to existing pages, new for new pages, log for log entries) +@type changetype: basestring @param showMinor: if True, only list minor edits; if False (and not None), only list non-minor edits +@type showMinor: bool @param showBot: if True, only list bot edits; if False (and not None), only list non-bot edits +@type showBot: bool @param showAnon: if True, only list anon edits; if False (and not None), only list non-anon edits +@type showAnon: bool @param showRedirects: if True, only list edits to redirect pages; if False (and not None), only list edits to non-redirect pages +@type showRedirects: bool @param showPatrolled: if True, only list patrolled edits; if False (and not None), only list non-patrolled edits +@type showPatrolled: bool @param topOnly: if True, only list changes that are the latest revision (default False) +@type topOnly: bool +@param user: if not None, only list edits by this user or users +@type user: basestring|list +@param excludeuser: if not None, exclude edits by this user or users +@type excludeuser: basestring|list if start and end: @@ -2312,6 +2326,13 @@ rcshow.append(filters[item] and item or (! + item)) if rcshow: rcgen.request[rcshow] = |.join(rcshow) + +if user: +rcgen.request['rcuser'] = user + +if excludeuser: +rcgen.request['rcexcludeuser'] = excludeuser + return rcgen @deprecate_arg(number, limit) -- To view, visit https://gerrit.wikimedia.org/r/82220 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icbc9f988a6c533788f1d1d9867411eda901017c2 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [IndexFunction] Re-add extension after import from SVN - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [IndexFunction] Re-add extension after import from SVN .. [IndexFunction] Re-add extension after import from SVN Change-Id: Iae833db2e7694abd492fc888287a62a488764279 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index fb0aea2..5f99ff0 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -700,6 +700,10 @@ descmsg = imagemap_desc optional = imagemap_desc_types +Index Function +aliasfile = IndexFunction/IndexFunction.alias.php +ignored = index-exclude-categories + Inline Categorizer # Inline Editor: Disabled per https://www.mediawiki.org/wiki/Special:Code/MediaWiki/82789#c14456 -- To view, visit https://gerrit.wikimedia.org/r/82371 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iae833db2e7694abd492fc888287a62a488764279 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [IndexFunction] Re-add extension after import from SVN - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/82371 Change subject: [IndexFunction] Re-add extension after import from SVN .. [IndexFunction] Re-add extension after import from SVN Change-Id: Iae833db2e7694abd492fc888287a62a488764279 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/71/82371/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index fb0aea2..5f99ff0 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -700,6 +700,10 @@ descmsg = imagemap_desc optional = imagemap_desc_types +Index Function +aliasfile = IndexFunction/IndexFunction.alias.php +ignored = index-exclude-categories + Inline Categorizer # Inline Editor: Disabled per https://www.mediawiki.org/wiki/Special:Code/MediaWiki/82789#c14456 -- To view, visit https://gerrit.wikimedia.org/r/82371 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae833db2e7694abd492fc888287a62a488764279 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Run cucumber tests in different OS/browser combinations - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: Run cucumber tests in different OS/browser combinations
..
Run cucumber tests in different OS/browser combinations
Change-Id: I3e0ee463f4b67cde3488fe78df48725f7e1a7211
---
A selenium_cuc/config/browsers.yml
M selenium_cuc/features/support/env.rb
2 files changed, 84 insertions(+), 3 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/selenium_cuc/config/browsers.yml b/selenium_cuc/config/browsers.yml
new file mode 100644
index 000..6e2eea0
--- /dev/null
+++ b/selenium_cuc/config/browsers.yml
@@ -0,0 +1,74 @@
+chrome_linux:
+ name: chrome
+ platform: Linux
+ version:
+
+chrome_win:
+ name: chrome
+ platform: Windows 7
+ version:
+
+chrome_mac:
+ name: chrome
+ platform: OS X 10.8
+ version:
+
+firefox_linux:
+ name: firefox
+ platform: Linux
+ version: 23
+
+firefox_win:
+ name: firefox
+ platform: Windows 7
+ version: 23
+
+firefox_mac:
+ name: firefox
+ platform: OS X 10.6
+ version: 21
+
+safari_5:
+ name: safari
+ platform: OS X 10.6
+ version: 5
+
+safari_6:
+ name: safari
+ platform: OS X 10.8
+ version: 6
+
+ie_6:
+ name: internet_explorer
+ platform: Windows XP
+ version: 6
+
+ie_7:
+ name: internet_explorer
+ platform: Windows XP
+ version: 7
+
+ie_8:
+ name: internet_explorer
+ platform: Windows 7
+ version: 8
+
+ie_9:
+ name: internet_explorer
+ platform: Windows 7
+ version: 9
+
+ie_10:
+ name: internet_explorer
+ platform: Windows 8
+ version: 10
+
+opera_linux:
+ name: opera
+ platform: Linux
+ version: 12
+
+opera_win:
+ name: opera
+ platform: Windows 7
+ version: 12
\ No newline at end of file
diff --git a/selenium_cuc/features/support/env.rb
b/selenium_cuc/features/support/env.rb
index 2e4b2a5..4155059 100644
--- a/selenium_cuc/features/support/env.rb
+++ b/selenium_cuc/features/support/env.rb
@@ -46,9 +46,16 @@
end
def sauce_browser(test_name)
- caps = Selenium::WebDriver::Remote::Capabilities.firefox
- caps.version = 23
- caps.platform = Windows 7
+ browsers = YAML.load_file('config/browsers.yml')
+ if ENV['BROWSER_LABEL']
+browser_label = browsers[ENV['BROWSER_LABEL']]
+ else
+browser_label = browsers['firefox_linux']
+ end
+
+ caps = Selenium::WebDriver::Remote::Capabilities.send(browser_label['name'])
+ caps.platform = browser_label['platform']
+ caps.version = browser_label['version']
caps[:name] = #{test_name} #{ENV['JOB_NAME']}##{ENV['BUILD_NUMBER']}
require 'selenium/webdriver/remote/http/persistent' # http_client
--
To view, visit https://gerrit.wikimedia.org/r/81010
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e0ee463f4b67cde3488fe78df48725f7e1a7211
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use RestClient to communicate with saucelabs API - change (mediawiki...Wikibase)
Tobias Gritschacher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/81186
Change subject: Use RestClient to communicate with saucelabs API
..
Use RestClient to communicate with saucelabs API
Change-Id: I9968136cd0eb9d5399e40d25b7d4ae96e8661295
---
M selenium_cuc/Gemfile
M selenium_cuc/Gemfile.lock
M selenium_cuc/features/support/env.rb
3 files changed, 24 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/86/81186/1
diff --git a/selenium_cuc/Gemfile b/selenium_cuc/Gemfile
index 2ab087d..a3a4fae 100644
--- a/selenium_cuc/Gemfile
+++ b/selenium_cuc/Gemfile
@@ -8,3 +8,4 @@
gem 'json'
gem 'activesupport'
gem 'net-http-persistent'
+gem 'rest-client'
\ No newline at end of file
diff --git a/selenium_cuc/Gemfile.lock b/selenium_cuc/Gemfile.lock
index 720daf3..da9f775 100644
--- a/selenium_cuc/Gemfile.lock
+++ b/selenium_cuc/Gemfile.lock
@@ -31,6 +31,7 @@
multi_json (~ 1.3)
i18n (0.6.5)
json (1.8.0)
+mime-types (1.24)
minitest (4.7.5)
multi_json (1.7.9)
multi_test (0.0.2)
@@ -42,6 +43,8 @@
page_navigation (0.9)
data_magic (= 0.14)
require_all (1.2.1)
+rest-client (1.6.7)
+ mime-types (= 1.16)
rspec-expectations (2.14.2)
diff-lcs (= 1.1.3, 2.0)
rubyzip (0.9.9)
@@ -70,5 +73,6 @@
net-http-persistent
page-object
require_all
+ rest-client
rspec-expectations
syntax
diff --git a/selenium_cuc/features/support/env.rb
b/selenium_cuc/features/support/env.rb
index 2e4b2a5..62ee28a 100644
--- a/selenium_cuc/features/support/env.rb
+++ b/selenium_cuc/features/support/env.rb
@@ -16,6 +16,7 @@
require 'yaml'
require 'net/http'
require 'active_support/all'
+require 'rest_client'
require 'require_all'
config = YAML.load_file('config/config.yml')
@@ -102,10 +103,25 @@
%x{curl -H 'Content-Type:text/json' -s -X PUT -d '#{json}'
http://#{ENV['SAUCE_ONDEMAND_USERNAME']}:#{ENV['SAUCE_ONDEMAND_ACCESS_KEY']}@saucelabs.com/rest/v1/#{ENV['SAUCE_ONDEMAND_USERNAME']}/jobs/#{$session_id}}
end
+def sauce_rest(body)
+ http =
https://saucelabs.com/rest/v1/#{ENV['SAUCE_ONDEMAND_USERNAME']}/jobs/#{$session_id}
+
+ RestClient::Request.execute(
+ :method = :put,
+ :url = http,
+ :user = ENV['SAUCE_ONDEMAND_USERNAME'],
+ :password = ENV['SAUCE_ONDEMAND_ACCESS_KEY'],
+ :headers = {:content_type = application/json},
+ :payload = body.to_json
+ )
+end
+
After do |scenario|
- if environment == :cloudbees !ENV[windir]
-sauce_api(%Q{{passed: #{scenario.passed?}}})
-sauce_api(%Q{{public: true}})
+ if environment == :cloudbees# !ENV[windir]
+#sauce_api(%Q{{passed: #{scenario.passed?}}})
+#sauce_api(%Q{{public: true}})
+sauce_rest(%Q{{passed: #{scenario.passed?}}})
+sauce_rest(%Q{{public: true}})
end
@browser.close
end
--
To view, visit https://gerrit.wikimedia.org/r/81186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9968136cd0eb9d5399e40d25b7d4ae96e8661295
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tweak operations-dns-lint - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/82372 Change subject: tweak operations-dns-lint .. tweak operations-dns-lint Faidon wrote the authdns::lint class in puppet which provides a shell script to lint the operations/dns.git checkout. https://gerrit.wikimedia.org/r/#/c/82264 Change-Id: I2d418cee9f1d97b8d470de4af2bb6e224525d840 --- M operations-misc.yaml 1 file changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/72/82372/1 diff --git a/operations-misc.yaml b/operations-misc.yaml index 192ac30..3e46fc1 100644 --- a/operations-misc.yaml +++ b/operations-misc.yaml @@ -20,12 +20,9 @@ - zuul builders: - shell: | - # Prepare the zone files - mkdir -p $WORKSPACE/chroot/zones - authdns-gen-zones $WORKSPACE/templates $WORKSPACE/chroot/zones - - # lint them - gdnsd -d $WORKSPACE + mkdir -p $WORKSPACE/build + # Lint script provided via puppet authdns::lint class + /usr/local/bin/authdns-lint $WORKSPACE $WORKSPACE/build - project: name: 'operations-dns' -- To view, visit https://gerrit.wikimedia.org/r/82372 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d418cee9f1d97b8d470de4af2bb6e224525d840 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] authdns: introduce an authdns::lint class - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: authdns: introduce an authdns::lint class
..
authdns: introduce an authdns::lint class
It sets up gdnsd dependencies but without the service running. This is
to be used by contint to lint authdns proposed changesets.
RT: 5688
Change-Id: Ic204f65c6fd5743249ba90391cf3874d39932693
---
A modules/authdns/files/authdns-lint
A modules/authdns/manifests/lint.pp
M modules/authdns/manifests/scripts.pp
M modules/contint/manifests/packages.pp
4 files changed, 91 insertions(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/authdns/files/authdns-lint
b/modules/authdns/files/authdns-lint
new file mode 100644
index 000..539449c
--- /dev/null
+++ b/modules/authdns/files/authdns-lint
@@ -0,0 +1,60 @@
+#!/bin/bash
+#
+# Shell script to use for linting zone templates config. It sets up a gdnsd
+# chroot directory, generates zone files based on the templates using
+# authdns-gen-zones and runs gdnsd checkconf.
+#
+# Written by Faidon Liambotis, Aug 2013
+
+set -e
+
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+die() { echo 2 E: $*; exit 1; }
+
+cleanup() {
+ if [ $CLEANUP = yes ] [ -d $TESTDIR ]; then
+ rm -rf $TESTDIR
+ fi
+}
+trap cleanup EXIT
+
+WORKINGDIR=$1
+TESTDIR=$2
+
+if [ -z $WORKINGDIR ]; then
+die no template dir specified
+fi
+echo Using $WORKINGDIR as the input working directory
+
+if [ -z $TESTDIR ]; then
+# no test directory passed, generate one and clean it up on exit
+TESTDIR=$(mktemp -d --tmpdir 'authdns-lint.XX')
+CLEANUP=yes
+fi
+echo Using $TESTDIR as the output working directory (gdnsd chroot)
+mkdir -p $TESTDIR/etc/zones
+
+if [ ! -e $WORKINGDIR/templates ]; then
+die templates not found, system misconfigured?
+fi
+if [ ! -e $WORKINGDIR/config-geo ]; then
+die config-geo not found, system misconfigured?
+fi
+
+echo Generating zonefiles from zone templates
+authdns-gen-zones $WORKINGDIR/templates $TESTDIR/etc/zones
+
+echo Generating gdnsd config
+cp -f $WORKINGDIR/config-geo $TESTDIR/etc/config
+
+echo Copying GeoIP databases inside the chroot:
+sed -nr 's/.*(geoip_db(.*)?|city_region_names)\s*=\s*//p' $TESTDIR/etc/config
\
+ | sort -u | while read file; do
+dirname=$(dirname $file)
+mkdir -p $TESTDIR/$dirname
+cp $file $TESTDIR/$dirname/
+echo $file
+done
+
+gdnsd -d $TESTDIR checkconf
diff --git a/modules/authdns/manifests/lint.pp
b/modules/authdns/manifests/lint.pp
new file mode 100644
index 000..7acc50a
--- /dev/null
+++ b/modules/authdns/manifests/lint.pp
@@ -0,0 +1,19 @@
+# == Class authdns::lint
+# A class to lint Wikimedia's authoritative DNS system
+#
+class authdns::lint {
+include authdns::scripts
+include geoip
+
+package { 'gdnsd':
+ensure = installed,
+}
+
+service { 'gdnsd':
+ensure = 'stopped',
+enable = false,
+hasrestart = true,
+hasstatus = true,
+require= Package['gdnsd'],
+}
+}
diff --git a/modules/authdns/manifests/scripts.pp
b/modules/authdns/manifests/scripts.pp
index afb0edc..9e9f832 100644
--- a/modules/authdns/manifests/scripts.pp
+++ b/modules/authdns/manifests/scripts.pp
@@ -22,6 +22,15 @@
group = 'root',
source = puppet:///modules/${module_name}/authdns-gen-zones.py,
}
+
+file { '/usr/local/bin/authdns-lint':
+ensure = present,
+mode = '0555',
+owner = 'root',
+group = 'root',
+source = puppet:///modules/${module_name}/authdns-lint,
+}
+
file { '/usr/local/sbin/authdns-update':
ensure = present,
mode = '0555',
diff --git a/modules/contint/manifests/packages.pp
b/modules/contint/manifests/packages.pp
index bba5b1c..c63457b 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -28,6 +28,9 @@
# Let us create packages from Jenkins jobs
include misc::package-builder
+ # Lint authdns templates config
+ include authdns::lint
+
include svn::client
# PHP related packages
--
To view, visit https://gerrit.wikimedia.org/r/82264
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic204f65c6fd5743249ba90391cf3874d39932693
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
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 .gitreview - change (mediawiki...HSTS)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/82373 Change subject: Add .gitreview .. Add .gitreview Change-Id: I8a6f780e4fce9240607510112065787856695b47 --- A .gitreview 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/HSTS refs/changes/73/82373/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..cf10c74 --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=mediawiki/extensions/HSTS.git +defaultbranch=master -- To view, visit https://gerrit.wikimedia.org/r/82373 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a6f780e4fce9240607510112065787856695b47 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/HSTS 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] Add message documentation - change (mediawiki...LifeWeb)
Raimond Spekking has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82374
Change subject: Add message documentation
..
Add message documentation
Change-Id: Idb0d00ca6c1c522670510922870093adb8560366
---
M LifeWeb.i18n.php
1 file changed, 11 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LifeWeb
refs/changes/74/82374/1
diff --git a/LifeWeb.i18n.php b/LifeWeb.i18n.php
index 8d24bc4..c32d8d8 100644
--- a/LifeWeb.i18n.php
+++ b/LifeWeb.i18n.php
@@ -1,5 +1,4 @@
?php
-
/**
* Internationalisation for LifeWeb
*
@@ -9,14 +8,20 @@
* @ingroup Extensions
*/
-namespace LifeWeb;
-
$messages = array();
/** English
- * @author your username
+ * @author Simon A. Eugster
*/
$messages[ 'en' ] = array(
-'lifeweb' = LifeWeb, // Important! This is the string that appears on
Special:SpecialPages
-'lifeweb-desc' = Identification key generator and editor,
+ 'lifeweb' = 'LifeWeb',
+ 'lifeweb-desc' = 'Identification key generator and editor',
+);
+
+/** Message documentation (Message documentation)
+ * @author Raymond
+ */
+$messages['qqq'] = array(
+ 'lifeweb' = 'This is the string that appears on Special:SpecialPages',
+ 'lifeweb-desc' =
'{{desc|name=LifeWeb|url=https://www.mediawiki.org/wiki/Extension:LifeWeb}}',
);
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/82374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb0d00ca6c1c522670510922870093adb8560366
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LifeWeb
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] tweak operations-dns-lint - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: tweak operations-dns-lint .. tweak operations-dns-lint Faidon wrote the authdns::lint class in puppet which provides a shell script to lint the operations/dns.git checkout. https://gerrit.wikimedia.org/r/#/c/82264 That requires the label hasContintPackages (ie the production contint::packages manifest is applied on the slave). Change-Id: I2d418cee9f1d97b8d470de4af2bb6e224525d840 --- M operations-misc.yaml 1 file changed, 4 insertions(+), 6 deletions(-) Approvals: Hashar: Looks good to me, approved Faidon Liambotis: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/operations-misc.yaml b/operations-misc.yaml index 192ac30..3fd5edf 100644 --- a/operations-misc.yaml +++ b/operations-misc.yaml @@ -15,17 +15,15 @@ - job-template: name: 'operations-dns-lint' +node: hasContintPackages defaults: use-zuul triggers: - zuul builders: - shell: | - # Prepare the zone files - mkdir -p $WORKSPACE/chroot/zones - authdns-gen-zones $WORKSPACE/templates $WORKSPACE/chroot/zones - - # lint them - gdnsd -d $WORKSPACE + mkdir -p $WORKSPACE/build + # Lint script provided via puppet authdns::lint class + /usr/local/bin/authdns-lint $WORKSPACE $WORKSPACE/build - project: name: 'operations-dns' -- To view, visit https://gerrit.wikimedia.org/r/82372 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2d418cee9f1d97b8d470de4af2bb6e224525d840 Gerrit-PatchSet: 2 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improvements to GUID generation code - change (mediawiki...Wikibase)
Addshore has submitted this change and it was merged.
Change subject: Improvements to GUID generation code
..
Improvements to GUID generation code
Change-Id: I8a8c9dfcd33afc0b59398ebfd302e2aa290342bd
---
M lib/WikibaseLib.classes.php
A lib/includes/ClaimGuidGenerator.php
M lib/includes/GuidGenerator.php
A lib/includes/V4GuidGenerator.php
A lib/tests/phpunit/ClaimGuidGeneratorTest.php
5 files changed, 140 insertions(+), 153 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/WikibaseLib.classes.php b/lib/WikibaseLib.classes.php
index bbcdcc5..7fa82fc 100644
--- a/lib/WikibaseLib.classes.php
+++ b/lib/WikibaseLib.classes.php
@@ -43,10 +43,10 @@
'Wikibase\LanguageFallbackChainFactory' =
'includes/LanguageFallbackChainFactory.php',
'Wikibase\LanguageWithConversion' =
'includes/LanguageWithConversion.php',
'Wikibase\Lib\GuidGenerator' = 'includes/GuidGenerator.php',
- 'Wikibase\Lib\V4GuidGenerator' = 'includes/GuidGenerator.php',
+ 'Wikibase\Lib\V4GuidGenerator' =
'includes/V4GuidGenerator.php',
'Wikibase\Lib\EntityRetrievingDataTypeLookup' =
'includes/EntityRetrievingDataTypeLookup.php',
'Wikibase\Lib\PropertyInfoDataTypeLookup' =
'includes/PropertyInfoDataTypeLookup.php',
- 'Wikibase\Lib\ClaimGuidGenerator' =
'includes/GuidGenerator.php',
+ 'Wikibase\Lib\ClaimGuidGenerator' =
'includes/ClaimGuidGenerator.php',
'Wikibase\Lib\ClaimGuidValidator' =
'includes/ClaimGuidValidator.php',
'Wikibase\Lib\InMemoryDataTypeLookup' =
'includes/InMemoryDataTypeLookup.php',
'Wikibase\LibRegistry' = 'includes/LibRegistry.php',
diff --git a/lib/includes/ClaimGuidGenerator.php
b/lib/includes/ClaimGuidGenerator.php
new file mode 100644
index 000..4ef3ad3
--- /dev/null
+++ b/lib/includes/ClaimGuidGenerator.php
@@ -0,0 +1,48 @@
+?php
+
+namespace Wikibase\Lib;
+
+use Wikibase\DataModel\Entity\EntityId;
+
+/**
+ * @since 0.3
+ *
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw jeroended...@gmail.com
+ */
+class ClaimGuidGenerator implements GuidGenerator {
+
+ /**
+* @since 0.3
+* @var GuidGenerator
+*/
+ protected $baseGenerator;
+
+ /**
+* @since 0.5
+* @var EntityId
+*/
+ protected $entityId;
+
+ /**
+* @param EntityId $entityId
+*/
+ public function __construct( EntityId $entityId ) {
+ $this-entityId = $entityId;
+ $this-baseGenerator = new V4GuidGenerator();
+ }
+
+ /**
+* Generates and returns a GUID.
+* @see http://php.net/manual/en/function.com-create-guid.php
+* @see GuidGenerator::newGuid
+*
+* @since 0.3
+*
+* @return string
+*/
+ public function newGuid() {
+ return $this-entityId-getSerialization() . '$' .
$this-baseGenerator-newGuid();
+ }
+
+}
diff --git a/lib/includes/GuidGenerator.php b/lib/includes/GuidGenerator.php
index 4106d7f..3f1a7d7 100644
--- a/lib/includes/GuidGenerator.php
+++ b/lib/includes/GuidGenerator.php
@@ -5,25 +5,7 @@
/**
* Globally Unique IDentifier generator.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
* @since 0.3
- *
- * @file
- * @ingroup WikibaseLib
*
* @licence GNU GPL v2+
* @author Jeroen De Dauw jeroended...@gmail.com
@@ -31,144 +13,12 @@
interface GuidGenerator {
/**
-* Generates and returns a Globally Unique IDentifier.
+* Generates and returns a Globally Unique Identifier.
*
* @since 0.3
*
* @return string
*/
public function newGuid();
-
-}
-
-/**
- * Globally Unique IDentifier generator.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but
[MediaWiki-commits] [Gerrit] operations-dns-lint is now voting - change (integration/zuul-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82375
Change subject: operations-dns-lint is now voting
..
operations-dns-lint is now voting
The dns linter is now working :-] Faidon created a DNS linting puppet
class with https://gerrit.wikimedia.org/r/#/c/82264
The Jenkins job got updated with
https://gerrit.wikimedia.org/r/#/c/82372/
Change-Id: I2d418cee9f1d97b8d470de4af2bb6e224525d840
---
M layout.yaml
1 file changed, 0 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config
refs/changes/75/82375/1
diff --git a/layout.yaml b/layout.yaml
index ffa1021..5c256e7 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -266,9 +266,6 @@
files:
- '^.*\.(pl|pm)$'
- - name: operations-dns-lint
-voting: false
-
- name: operations-puppet-pep8
voting: true
failure-pattern:
'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/violations/'
--
To view, visit https://gerrit.wikimedia.org/r/82375
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d418cee9f1d97b8d470de4af2bb6e224525d840
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add missing wikibase-comment-add message - change (mediawiki...Wikibase)
Addshore has submitted this change and it was merged. Change subject: add missing wikibase-comment-add message .. add missing wikibase-comment-add message this message should be rarely seen but can be seen when an item get created and then linked to existing page in client, in such time frame that the changes do not get batched. Change-Id: I18275e3be723ae8b021637500de418c3b345c8cd --- M client/WikibaseClient.i18n.php 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/client/WikibaseClient.i18n.php b/client/WikibaseClient.i18n.php index 7ea1e95..091b643 100644 --- a/client/WikibaseClient.i18n.php +++ b/client/WikibaseClient.i18n.php @@ -26,6 +26,7 @@ 'tooltip-t-wikibase' = 'Link to connected data repository item', 'wikibase-after-page-move' = 'You may also [$1 update] the associated Wikidata item to maintain language links on moved page.', 'wikibase-after-page-move-queued' = 'The [$1 Wikidata item] associated with this page will be automatically updated soon.', + 'wikibase-comment-add' = 'A Wikidata item has been created.', 'wikibase-comment-remove' = 'Associated Wikidata item deleted. Language links removed.', 'wikibase-comment-linked' = 'A Wikidata item has been linked to this page.', 'wikibase-comment-unlink' = 'This page has been unlinked from Wikidata item. Language links removed.', @@ -100,7 +101,8 @@ Parameters: * $1 - the link for the associated Wikibase item.', - 'wikibase-comment-remove' = 'Autocomment message for client (e.g. Wikipedia) recent changes when a Wikidata item connected to a page gets deleted. This results in all the language links being removed from the page on the client.', + 'wikibase-comment-add' = 'Autocomment message in the client for when an item is created (and then is linked to the client page).', +'wikibase-comment-remove' = 'Autocomment message for client (e.g. Wikipedia) recent changes when a Wikidata item connected to a page gets deleted. This results in all the language links being removed from the page on the client.', 'wikibase-comment-linked' = 'Autocomment message in the client for when a Wikidata item is linked to a page in the client.', 'wikibase-comment-unlink' = 'Autocomment message for client (e.g. Wikipedia) recent changes when a site link to a page gets removed. This results in the associated item being disconnected from the client page and all the language links being removed.', 'wikibase-comment-restore' = 'Autocomment message for client (e.g. Wikipedia) recent changes when a Wikidata item gets undeleted and has a site link to this page. Language links get readded to the client page.', -- To view, visit https://gerrit.wikimedia.org/r/82250 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I18275e3be723ae8b021637500de418c3b345c8cd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: Addshore addshorew...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations-dns-lint is now voting - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged.
Change subject: operations-dns-lint is now voting
..
operations-dns-lint is now voting
The dns linter is now working :-] Faidon created a DNS linting puppet
class with https://gerrit.wikimedia.org/r/#/c/82264
The Jenkins job got updated with
https://gerrit.wikimedia.org/r/#/c/82372/
Change-Id: I2d418cee9f1d97b8d470de4af2bb6e224525d840
---
M layout.yaml
1 file changed, 0 insertions(+), 3 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/layout.yaml b/layout.yaml
index ffa1021..5c256e7 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -266,9 +266,6 @@
files:
- '^.*\.(pl|pm)$'
- - name: operations-dns-lint
-voting: false
-
- name: operations-puppet-pep8
voting: true
failure-pattern:
'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/violations/'
--
To view, visit https://gerrit.wikimedia.org/r/82375
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2d418cee9f1d97b8d470de4af2bb6e224525d840
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins validation (please ignore) - change (operations/dns)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/82376 Change subject: Jenkins validation (please ignore) .. Jenkins validation (please ignore) Change-Id: I2d418cee9f1d97b8d470de4af2bb6e224525d840 --- M templates/wikimedia.org 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/76/82376/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 39fff34..26eca48 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -10,7 +10,7 @@ ; Name servers - 1D IN NS ns0.wikimedia.org. + 1D IN ns0.wikimedia.org. 1D IN NS ns1.wikimedia.org. 1D IN NS ns2.wikimedia.org. -- To view, visit https://gerrit.wikimedia.org/r/82376 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d418cee9f1d97b8d470de4af2bb6e224525d840 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Consistency tweaks in preparation for adding extension to tr... - change (mediawiki...Model)
Raimond Spekking has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82378
Change subject: Consistency tweaks in preparation for adding extension to
translatewiki.net
..
Consistency tweaks in preparation for adding extension to translatewiki.net
* Extension description key to code convention
* Add message documentation
* Add URL
Change-Id: Id6961c00151782cef8b9e189ca6e282006662f44
---
M Model.i18n.php
M Model.php
2 files changed, 12 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Model
refs/changes/78/82378/1
diff --git a/Model.i18n.php b/Model.i18n.php
index 4ed6dbd..3fc39e2 100644
--- a/Model.i18n.php
+++ b/Model.i18n.php
@@ -3,12 +3,17 @@
$messages = array();
-/* English */
+/**
+ * English
+ * @author Andrew Garrett
+ */
$messages['en'] = array(
-'Model-desc' = 'ORM Abstraction model for mediawiki developers'
+ 'model-desc' = 'ORM Abstraction model for MediaWiki developers'
);
-/* Russian */
-$messages['ru'] = array(
-'Model-desc' = 'ORM Abstraction model for mediawiki developers'
+/** Message documentation (Message documentation)
+ * @author Raymond
+ */
+$messages['qqq'] = array(
+ 'model-desc' =
'{{desc|name=Model|url=https://www.mediawiki.org/wiki/Extension:Model}}',
);
diff --git a/Model.php b/Model.php
index e1e4b0e..f6f3a66 100644
--- a/Model.php
+++ b/Model.php
@@ -26,8 +26,8 @@
'name' = 'Model',
'version' = '0.1',
'author' = 'Vedmaka',
-'url' = '',
-'descriptionmsg' = 'Model-desc',
+'url' = 'https://www.mediawiki.org/wiki/Extension:Model',
+'descriptionmsg' = 'model-desc',
);
/* Resource modules */
--
To view, visit https://gerrit.wikimedia.org/r/82378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6961c00151782cef8b9e189ca6e282006662f44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Model
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] Remove old EntityId usage from api/getclaims - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82377
Change subject: Remove old EntityId usage from api/getclaims
..
Remove old EntityId usage from api/getclaims
Change-Id: Iaf419c59032a15b97868c611489a4ed479f7a5ec
---
M repo/includes/api/GetClaims.php
1 file changed, 3 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/77/82377/1
diff --git a/repo/includes/api/GetClaims.php b/repo/includes/api/GetClaims.php
index d7cd810..140cf86 100644
--- a/repo/includes/api/GetClaims.php
+++ b/repo/includes/api/GetClaims.php
@@ -4,38 +4,19 @@
use ApiBase;
use MWException;
-
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\Lib\ClaimGuidValidator;
-use Wikibase\Lib\EntityIdFormatter;
-use Wikibase\Lib\EntityIdParser;
use Wikibase\Lib\Serializers\ClaimSerializer;
use Wikibase\Lib\Serializers\SerializerFactory;
-use Wikibase\EntityId;
use Wikibase\Entity;
use Wikibase\EntityContentFactory;
use Wikibase\Property;
-use Wikibase\Statement;
use Wikibase\Claims;
use Wikibase\Claim;
use Wikibase\Repo\WikibaseRepo;
/**
* API module for getting claims.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
*
* @since 0.3
*
@@ -66,7 +47,8 @@
list( $id, $claimGuid ) = $this-getIdentifiers( $params );
- $entityId = EntityId::newFromPrefixedId( $id );
+ $entityIdParser =
WikibaseRepo::getDefaultInstance()-getEntityIdParser();
+ $entityId = $entityIdParser-parse( $id );
$entity = $entityId ? $this-getEntity( $entityId ) : null;
if ( !$entity ) {
--
To view, visit https://gerrit.wikimedia.org/r/82377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf419c59032a15b97868c611489a4ed479f7a5ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove old EntityId usage from api/getentities - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82379
Change subject: Remove old EntityId usage from api/getentities
..
Remove old EntityId usage from api/getentities
Change-Id: Iad26f6028fca6aea86ae5a3517c5a84789e2f5fa
---
M repo/includes/api/GetEntities.php
1 file changed, 5 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/79/82379/1
diff --git a/repo/includes/api/GetEntities.php
b/repo/includes/api/GetEntities.php
index 6bd366f..c46468d 100644
--- a/repo/includes/api/GetEntities.php
+++ b/repo/includes/api/GetEntities.php
@@ -4,16 +4,13 @@
use ApiBase;
use MWException;
-
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\Lib\Serializers\EntitySerializationOptions;
use Wikibase\Lib\Serializers\SerializerFactory;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Utils;
use Wikibase\StoreFactory;
-use Wikibase\EntityId;
use Wikibase\Item;
-use Wikibase\Settings;
-use Wikibase\LibRegistry;
use Wikibase\EntityContentFactory;
/**
@@ -142,13 +139,13 @@
$entityContentFactory = EntityContentFactory::singleton();
$entityIdFormatter =
WikibaseRepo::getDefaultInstance()-getEntityIdFormatter();
+ $entityIdParser =
WikibaseRepo::getDefaultInstance()-getEntityIdParser();
$res = $this-getResult();
- $entityId = EntityId::newFromPrefixedId( $id );
-
- if ( !$entityId ) {
- //TODO: report as missing instead?
+ try{
+ $entityId = $entityIdParser-parse( $id );
+ } catch( \ValueParsers\ParseException $e ){
wfProfileOut( __METHOD__ );
$this-dieUsage( Invalid id: $id, 'no-such-entity' );
}
--
To view, visit https://gerrit.wikimedia.org/r/82379
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad26f6028fca6aea86ae5a3517c5a84789e2f5fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove old EntityId usage from api/ItemByTitleHelp - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82380
Change subject: Remove old EntityId usage from api/ItemByTitleHelp
..
Remove old EntityId usage from api/ItemByTitleHelp
Change-Id: I891953c93ecbad19a5a2ee38368b4c02b30f9b49
---
M repo/includes/api/ItemByTitleHelper.php
1 file changed, 6 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/80/82380/1
diff --git a/repo/includes/api/ItemByTitleHelper.php
b/repo/includes/api/ItemByTitleHelper.php
index f136c78..1c6c769 100644
--- a/repo/includes/api/ItemByTitleHelper.php
+++ b/repo/includes/api/ItemByTitleHelper.php
@@ -1,27 +1,14 @@
?php
namespace Wikibase\Api;
-use Wikibase\EntityId;
+
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Item;
use Wikibase\Repo\WikibaseRepo;
/**
* Helper class for api modules to resolve page+title pairs into items.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
*
* @since 0.4
*
@@ -56,6 +43,7 @@
* @param \ApiBase $apiBase
* @param \Wikibase\SiteLinkCache $siteLinkCache
* @param \SiteStore $siteStore
+* @param \Wikibase\StringNormalizer $stringNormalizer
*/
public function __construct( \ApiBase $apiBase, \Wikibase\SiteLinkCache
$siteLinkCache, \SiteStore $siteStore, \Wikibase\StringNormalizer
$stringNormalizer ) {
$this-apiBase = $apiBase;
@@ -110,7 +98,7 @@
} else {
$entityIdFormatter =
WikibaseRepo::getDefaultInstance()-getEntityIdFormatter();
- $id = new EntityId( Item::ENTITY_TYPE, $id );
+ $id = ItemId::newFromNumber( $id );
$ids[] = $entityIdFormatter-format( $id );
}
}
@@ -123,7 +111,7 @@
* Updates $title accordingly and adds the normalization to the API
output.
*
* @param string $title
-* @param \Site $siteId
+* @param \Site $site
*
* @return integer|boolean
*/
--
To view, visit https://gerrit.wikimedia.org/r/82380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I891953c93ecbad19a5a2ee38368b4c02b30f9b49
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add message documentation - change (mediawiki...LifeWeb)
LivingShadow has submitted this change and it was merged.
Change subject: Add message documentation
..
Add message documentation
Change-Id: Idb0d00ca6c1c522670510922870093adb8560366
---
M LifeWeb.i18n.php
1 file changed, 11 insertions(+), 6 deletions(-)
Approvals:
LivingShadow: Verified; Looks good to me, approved
diff --git a/LifeWeb.i18n.php b/LifeWeb.i18n.php
index 8d24bc4..c32d8d8 100644
--- a/LifeWeb.i18n.php
+++ b/LifeWeb.i18n.php
@@ -1,5 +1,4 @@
?php
-
/**
* Internationalisation for LifeWeb
*
@@ -9,14 +8,20 @@
* @ingroup Extensions
*/
-namespace LifeWeb;
-
$messages = array();
/** English
- * @author your username
+ * @author Simon A. Eugster
*/
$messages[ 'en' ] = array(
-'lifeweb' = LifeWeb, // Important! This is the string that appears on
Special:SpecialPages
-'lifeweb-desc' = Identification key generator and editor,
+ 'lifeweb' = 'LifeWeb',
+ 'lifeweb-desc' = 'Identification key generator and editor',
+);
+
+/** Message documentation (Message documentation)
+ * @author Raymond
+ */
+$messages['qqq'] = array(
+ 'lifeweb' = 'This is the string that appears on Special:SpecialPages',
+ 'lifeweb-desc' =
'{{desc|name=LifeWeb|url=https://www.mediawiki.org/wiki/Extension:LifeWeb}}',
);
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/82374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb0d00ca6c1c522670510922870093adb8560366
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LifeWeb
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: LivingShadow simon...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] points wikidata.org to pmtpa wikidata lb - change (operations/dns)
Faidon Liambotis has submitted this change and it was merged. Change subject: points wikidata.org to pmtpa wikidata lb .. points wikidata.org to pmtpa wikidata lb The wikidata.org. zone was missing an entry for IPv6. The entry points to pmtpa just like the A entry. bug: 46772 Change-Id: I84d3215f047e14621f83c529fe315caba9eb882f --- M templates/wikidata.org 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wikidata.org b/templates/wikidata.org index 3f1104b..8a1a5c1 100644 --- a/templates/wikidata.org +++ b/templates/wikidata.org @@ -23,7 +23,10 @@ ; Canonical names -1H IN A208.80.152.218 +; Point to wikidata-lb.pmtpa.wikimedia.org. +1H IN A 208.80.152.218 +1H IN 2620:0:860:ed1a::12 + localhost 1W IN A127.0.0.1 -- To view, visit https://gerrit.wikimedia.org/r/80993 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84d3215f047e14621f83c529fe315caba9eb882f Gerrit-PatchSet: 3 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Run unit tests for SemanticMaps and Serialization - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Run unit tests for SemanticMaps and Serialization .. Run unit tests for SemanticMaps and Serialization Change-Id: I3d2c2e572f134243aa6992bc496ce835d993ec1c --- M layout.yaml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 5c256e7..a28b103 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1892,7 +1892,7 @@ - name: mediawiki/extensions/SemanticMaps template: - - name: extension-checks + - name: extension-unittests extname: SemanticMaps - name: mediawiki/extensions/SemanticMediaWiki @@ -1942,7 +1942,7 @@ - name: mediawiki/extensions/Serialization template: - - name: extension-checks + - name: extension-unittests extname: Serialization - name: mediawiki/extensions/Scribunto -- To view, visit https://gerrit.wikimedia.org/r/80767 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d2c2e572f134243aa6992bc496ce835d993ec1c Gerrit-PatchSet: 3 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cucumber: set cookies for licence anonymousediting messages - change (mediawiki...Wikibase)
Tobias Gritschacher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82383
Change subject: Cucumber: set cookies for licence anonymousediting messages
..
Cucumber: set cookies for licence anonymousediting messages
Change-Id: I0eb21638b37ddf20d5256e6d8de96bf9f073bead
---
M repo/resources/wikibase.ui.entityViewInit.js
M selenium_cuc/features/label.feature
M selenium_cuc/features/step_definitions/entity_steps.rb
M selenium_cuc/features/support/modules/entity_module.rb
4 files changed, 21 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/83/82383/1
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index 55e54c2..065bda0 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -213,7 +213,9 @@
} );
// Display anonymous user edit warning:
- if ( mw.user mw.user.isAnon() $.find(
'.mw-notification-content' ).length === 0 ) {
+ if ( mw.user mw.user.isAnon()
+$.find( '.mw-notification-content' ).length
=== 0
+!$.cookie(
'wikibase-no-anonymouseditwarning' ) ) {
mw.notify(
mw.msg( 'wikibase-anonymouseditwarning',
mw.msg( 'wikibase-entity-' +
wb.entity.getType() )
diff --git a/selenium_cuc/features/label.feature
b/selenium_cuc/features/label.feature
index 181d01e..f1bb8cc 100644
--- a/selenium_cuc/features/label.feature
+++ b/selenium_cuc/features/label.feature
@@ -73,7 +73,7 @@
Scenario: Label with 0 as value
When I click the label edit button
And I enter 0 as label
- And I click the label save buttn
+ And I click the label save button
Then 0 should be displayed as label
@save_label
diff --git a/selenium_cuc/features/step_definitions/entity_steps.rb
b/selenium_cuc/features/step_definitions/entity_steps.rb
index d74b547..2a0c9b4 100644
--- a/selenium_cuc/features/step_definitions/entity_steps.rb
+++ b/selenium_cuc/features/step_definitions/entity_steps.rb
@@ -10,7 +10,12 @@
item_data = '{labels:{en:{language:en,value:' +
generate_random_string(8) +
'}},descriptions:{en:{language:en,value:' +
generate_random_string(20) + '}}}'
item = create_new_entity(item_data, 'item')
@entity = item
- on(ItemPage).navigate_to_entity item[url]
+ on(ItemPage) do |page|
+page.navigate_to_entity item[url]
+page.set_copyright_ack_cookie
+page.set_noanonymouseditwarning_cookie
+ end
+
end
Given /^I am on an item page with empty label and description$/ do
diff --git a/selenium_cuc/features/support/modules/entity_module.rb
b/selenium_cuc/features/support/modules/entity_module.rb
index b537302..768b3ad 100644
--- a/selenium_cuc/features/support/modules/entity_module.rb
+++ b/selenium_cuc/features/support/modules/entity_module.rb
@@ -68,7 +68,7 @@
end
def wait_for_api_callback
-#TODO: workaround for weird error randomly claiming that
apiCallWaitingMessage-element is not attached to the DOM anymore
+ajax_wait
wait_until do
apiCallWaitingMessage? == false
end
@@ -127,4 +127,14 @@
length.times { string chars[rand(chars.size)] }
return string
end
+
+ def set_copyright_ack_cookie
+cookie = $.cookie( 'wikibase.acknowledgedcopyrightversion', 'wikibase-1',
{ 'expires': null, 'path': '/' } );
+@browser.execute_script(cookie)
+ end
+
+ def set_noanonymouseditwarning_cookie
+cookie = $.cookie( 'wikibase-no-anonymouseditwarning', '1', { 'expires':
null, 'path': '/' } );
+@browser.execute_script(cookie)
+ end
end
--
To view, visit https://gerrit.wikimedia.org/r/82383
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0eb21638b37ddf20d5256e6d8de96bf9f073bead
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...SemanticMaps)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/82384 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I3d2c2e572f134243aa6992bc496ce835d993ec1c --- A JENKINS A jenkins.js A jenkins.php 3 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMaps refs/changes/84/82384/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php -- To view, visit https://gerrit.wikimedia.org/r/82384 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3d2c2e572f134243aa6992bc496ce835d993ec1c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticMaps Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...Serialization)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/82385 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I3d2c2e572f134243aa6992bc496ce835d993ec1c --- A JENKINS A jenkins.js A jenkins.php 3 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Serialization refs/changes/85/82385/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php -- To view, visit https://gerrit.wikimedia.org/r/82385 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3d2c2e572f134243aa6992bc496ce835d993ec1c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Serialization Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make more tests pass in sandbox.translatewiki.net - change (mediawiki...UniversalLanguageSelector)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82387
Change subject: Make more tests pass in sandbox.translatewiki.net
..
Make more tests pass in sandbox.translatewiki.net
* When ULS is in personal, cancel opens the language selector
again but apply doesn't.
* Created separate steps for testing the ULS trigger in personal
position, different behavior with different configuration.
Change-Id: Ifb7f101f2bfacd32c11cba69e7f2c01fe9bd9bb7
---
M tests/browser/features/step_definitions/panel_steps.rb
M tests/browser/features/step_definitions/uls_triggers_steps.rb
M tests/browser/features/support/pages/panel_page.rb
M tests/browser/features/support/pages/random_page.rb
M tests/browser/features/uls_triggers.feature
5 files changed, 35 insertions(+), 8 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/87/82387/1
diff --git a/tests/browser/features/step_definitions/panel_steps.rb
b/tests/browser/features/step_definitions/panel_steps.rb
index 6737682..b89c8a1 100644
--- a/tests/browser/features/step_definitions/panel_steps.rb
+++ b/tests/browser/features/step_definitions/panel_steps.rb
@@ -43,7 +43,13 @@
end
When(/^I close the panel to discard the changes$/) do
- on(ULSPage).panel_button_close_element.click
+ on(ULSPage) do |page|
+ page.panel_button_close_element.click
+ # Also close the ULS language selection if open
+ if uls_position() == 'personal'
+ page.uls_button_close_element.when_visible.click
+ end
+ end
end
Then(/^the active (.*?) font must be the same as font prior to the preview$/)
do |type|
diff --git a/tests/browser/features/step_definitions/uls_triggers_steps.rb
b/tests/browser/features/step_definitions/uls_triggers_steps.rb
index 266188e..7f4cf1d 100644
--- a/tests/browser/features/step_definitions/uls_triggers_steps.rb
+++ b/tests/browser/features/step_definitions/uls_triggers_steps.rb
@@ -2,6 +2,6 @@
on(RandomPage).uls_trigger
end
-Then(/^I should see the Language selector$/) do
- on(RandomPage).language_settings_dialog_element.should be_visible
+Then(/^I should see the language selector$/) do
+ on(ULSPage).uls_element.should be_visible
end
diff --git a/tests/browser/features/support/pages/panel_page.rb
b/tests/browser/features/support/pages/panel_page.rb
index d937b32..4308964 100644
--- a/tests/browser/features/support/pages/panel_page.rb
+++ b/tests/browser/features/support/pages/panel_page.rb
@@ -4,6 +4,9 @@
include URL
page_url URL.url('?%=params[:extra]%')
+ div(:uls, class: 'uls-menu')
+ span(:uls_button_close, id: 'uls-close')
+
div(:panel_display, id: 'display-settings-block')
div(:panel_input, id: 'input-settings-block')
button(:panel_fonts, id: 'uls-display-settings-fonts-tab')
diff --git a/tests/browser/features/support/pages/random_page.rb
b/tests/browser/features/support/pages/random_page.rb
index 54ddb24..38de138 100644
--- a/tests/browser/features/support/pages/random_page.rb
+++ b/tests/browser/features/support/pages/random_page.rb
@@ -14,7 +14,6 @@
ul(:input_method_language_list, class: 'ime-language-list')
div(:input_method_selector_menu, class: 'imeselector-menu')
text_field(:language_filter, id: 'languagefilter')
- div(:language_settings_dialog, id: 'language-settings-dialog')
li(:main_page, id: 'n-mainpage-description')
a(:malayalam_link, title: 'Malayalam')
a(:more_languages, class: 'ime-selector-more-languages')
diff --git a/tests/browser/features/uls_triggers.feature
b/tests/browser/features/uls_triggers.feature
index 319c803..6f7b009 100644
--- a/tests/browser/features/uls_triggers.feature
+++ b/tests/browser/features/uls_triggers.feature
@@ -1,11 +1,30 @@
@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org
Feature: ULS trigger in personal toolbar
- @uls-in-personal-only
- Scenario: Open language selector
-Given I visit a random page
+ @login @uls-in-personal-only
+ Scenario: Open language selector when logged in
+Given I am logged in
When I click language selector trigger element
-Then I should see the Language selector
+Then I should see the language selector
+
+ @uls-in-personal-only @no-anon-language-selection
+ Scenario: Open language settings when logged out and language change not
allowed
+
+If the user is logged out, the user will either see the language selector
+or the settings panel, depending on whether language selection for
+anonymous users is disabled. This and next test cover both cases.
+
+Given I am at random page
+When I click language selector trigger element
+Then I see the logged in language settings panel
+
+ @uls-in-personal-only @anon-language-selection
+ Scenario: Open language selector when
[MediaWiki-commits] [Gerrit] mwext-SemanticMaps-testextensions-master non voting - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/82388 Change subject: mwext-SemanticMaps-testextensions-master non voting .. mwext-SemanticMaps-testextensions-master non voting The unit tests do not pass yet: 1) Warning No tests found in class SM\Test\KMLPrinterTest. tests/phpunit/MediaWikiPHPUnitCommand.php:80 tests/phpunit/MediaWikiPHPUnitCommand.php:64 2) Warning No tests found in class SM\Test\MapPrinterTest. tests/phpunit/MediaWikiPHPUnitCommand.php:80 tests/phpunit/MediaWikiPHPUnitCommand.php:64 Change-Id: Id4137e3885007c66403e3c0cf9268d20985709b8 --- M layout.yaml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/88/82388/1 diff --git a/layout.yaml b/layout.yaml index 5c256e7..15e8615 100644 --- a/layout.yaml +++ b/layout.yaml @@ -467,6 +467,10 @@ - name: ^mwext-NaturalLanguageList-testextensions.* voting: false + # Tests not passing yet + - name: ^mwext-SemanticMaps-testextensions-.* +voting: false + # https://bugzilla.wikimedia.org/49882 - name: ^mwext-Transliterator-testextensions.* voting: false -- To view, visit https://gerrit.wikimedia.org/r/82388 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4137e3885007c66403e3c0cf9268d20985709b8 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwext-SemanticMaps-testextensions-master non voting - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: mwext-SemanticMaps-testextensions-master non voting .. mwext-SemanticMaps-testextensions-master non voting The unit tests do not pass yet: 1) Warning No tests found in class SM\Test\KMLPrinterTest. tests/phpunit/MediaWikiPHPUnitCommand.php:80 tests/phpunit/MediaWikiPHPUnitCommand.php:64 2) Warning No tests found in class SM\Test\MapPrinterTest. tests/phpunit/MediaWikiPHPUnitCommand.php:80 tests/phpunit/MediaWikiPHPUnitCommand.php:64 Change-Id: Id4137e3885007c66403e3c0cf9268d20985709b8 --- M layout.yaml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index a28b103..f23a71d 100644 --- a/layout.yaml +++ b/layout.yaml @@ -467,6 +467,10 @@ - name: ^mwext-NaturalLanguageList-testextensions.* voting: false + # Tests not passing yet + - name: ^mwext-SemanticMaps-testextensions-.* +voting: false + # https://bugzilla.wikimedia.org/49882 - name: ^mwext-Transliterator-testextensions.* voting: false -- To view, visit https://gerrit.wikimedia.org/r/82388 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id4137e3885007c66403e3c0cf9268d20985709b8 Gerrit-PatchSet: 2 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [LifeWeb] Register extension - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/82390 Change subject: [LifeWeb] Register extension .. [LifeWeb] Register extension Change-Id: I1cf401c8673529efc9542fb5858ab44258f664f3 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/90/82390/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 5f99ff0..0ec9180 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -756,6 +756,8 @@ Less +Life Web + Lightweight RDFa Lingo -- To view, visit https://gerrit.wikimedia.org/r/82390 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1cf401c8673529efc9542fb5858ab44258f664f3 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [LifeWeb] Register extension - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [LifeWeb] Register extension .. [LifeWeb] Register extension Change-Id: I1cf401c8673529efc9542fb5858ab44258f664f3 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 5f99ff0..0ec9180 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -756,6 +756,8 @@ Less +Life Web + Lightweight RDFa Lingo -- To view, visit https://gerrit.wikimedia.org/r/82390 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1cf401c8673529efc9542fb5858ab44258f664f3 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove old EntityId usage from api/ModifyEntity - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82386
Change subject: Remove old EntityId usage from api/ModifyEntity
..
Remove old EntityId usage from api/ModifyEntity
Change-Id: I9103185827944125d6b8a0de7640db3d0794692d
---
M repo/includes/api/ModifyEntity.php
1 file changed, 8 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/86/82386/2
diff --git a/repo/includes/api/ModifyEntity.php
b/repo/includes/api/ModifyEntity.php
index 3c5d299..cd881d8 100644
--- a/repo/includes/api/ModifyEntity.php
+++ b/repo/includes/api/ModifyEntity.php
@@ -6,7 +6,6 @@
use User;
use Title;
use ApiBase;
-use Wikibase\EntityId;
use Wikibase\Entity;
use Wikibase\EntityContent;
use Wikibase\EntityContentFactory;
@@ -78,15 +77,19 @@
if ( isset( $params['id'] ) ) {
$id = $params['id'];
- $entityContentFactory =
EntityContentFactory::singleton();
+ $entityContentFactory =
WikibaseRepo::getDefaultInstance()-getEntityContentFactory();
- //NOTE: $id is user-supplied and may be invalid!
- $entityId = EntityId::newFromPrefixedId( $id );
+ try{
+ $entityId =
WikibaseRepo::getDefaultInstance()-getEntityIdParser()-parse( $id );
+ } catch( \ValueParsers\ParseException $e ){
+ $this-dieUsage( Could not parse {$id}, No
entity found, 'no-such-entity-id' );
+ }
+
$entityTitle = $entityId ?
$entityContentFactory-getTitleForId( $entityId, \Revision::FOR_THIS_USER ) :
null;
-
if ( is_null( $entityTitle ) ) {
$this-dieUsage( No entity found matching ID
$id, 'no-such-entity-id' );
}
+
}
// Otherwise check if we have a link and try that.
// This will always result in an item, because only items have
sitelinks.
--
To view, visit https://gerrit.wikimedia.org/r/82386
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9103185827944125d6b8a0de7640db3d0794692d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Unbreaking translatewiki.net script - change (mediawiki...LifeWeb)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/82391 Change subject: Unbreaking translatewiki.net script .. Unbreaking translatewiki.net script Change-Id: Ifa5d6300aa569206003a72a85679535508dfd7bd --- M LifeWeb.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LifeWeb refs/changes/91/82391/1 diff --git a/LifeWeb.i18n.php b/LifeWeb.i18n.php index c32d8d8..f57e0e9 100644 --- a/LifeWeb.i18n.php +++ b/LifeWeb.i18n.php @@ -13,7 +13,7 @@ /** English * @author Simon A. Eugster */ -$messages[ 'en' ] = array( +$messages['en'] = array( 'lifeweb' = 'LifeWeb', 'lifeweb-desc' = 'Identification key generator and editor', ); -- To view, visit https://gerrit.wikimedia.org/r/82391 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa5d6300aa569206003a72a85679535508dfd7bd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LifeWeb 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] Unbreaking translatewiki.net script - change (mediawiki...LifeWeb)
Raimond Spekking has submitted this change and it was merged. Change subject: Unbreaking translatewiki.net script .. Unbreaking translatewiki.net script Change-Id: Ifa5d6300aa569206003a72a85679535508dfd7bd --- M LifeWeb.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/LifeWeb.i18n.php b/LifeWeb.i18n.php index c32d8d8..f57e0e9 100644 --- a/LifeWeb.i18n.php +++ b/LifeWeb.i18n.php @@ -13,7 +13,7 @@ /** English * @author Simon A. Eugster */ -$messages[ 'en' ] = array( +$messages['en'] = array( 'lifeweb' = 'LifeWeb', 'lifeweb-desc' = 'Identification key generator and editor', ); -- To view, visit https://gerrit.wikimedia.org/r/82391 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifa5d6300aa569206003a72a85679535508dfd7bd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LifeWeb Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use RestClient to communicate with saucelabs API - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: Use RestClient to communicate with saucelabs API
..
Use RestClient to communicate with saucelabs API
Change-Id: I9968136cd0eb9d5399e40d25b7d4ae96e8661295
---
M selenium_cuc/Gemfile
M selenium_cuc/Gemfile.lock
M selenium_cuc/features/support/env.rb
3 files changed, 17 insertions(+), 2 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
diff --git a/selenium_cuc/Gemfile b/selenium_cuc/Gemfile
index 39a9f70..7d86f78 100644
--- a/selenium_cuc/Gemfile
+++ b/selenium_cuc/Gemfile
@@ -11,3 +11,4 @@
gem 'json'
gem 'activesupport'
gem 'net-http-persistent'
+gem 'rest-client'
diff --git a/selenium_cuc/Gemfile.lock b/selenium_cuc/Gemfile.lock
index 720daf3..da9f775 100644
--- a/selenium_cuc/Gemfile.lock
+++ b/selenium_cuc/Gemfile.lock
@@ -31,6 +31,7 @@
multi_json (~ 1.3)
i18n (0.6.5)
json (1.8.0)
+mime-types (1.24)
minitest (4.7.5)
multi_json (1.7.9)
multi_test (0.0.2)
@@ -42,6 +43,8 @@
page_navigation (0.9)
data_magic (= 0.14)
require_all (1.2.1)
+rest-client (1.6.7)
+ mime-types (= 1.16)
rspec-expectations (2.14.2)
diff-lcs (= 1.1.3, 2.0)
rubyzip (0.9.9)
@@ -70,5 +73,6 @@
net-http-persistent
page-object
require_all
+ rest-client
rspec-expectations
syntax
diff --git a/selenium_cuc/features/support/env.rb
b/selenium_cuc/features/support/env.rb
index 4155059..c1d8604 100644
--- a/selenium_cuc/features/support/env.rb
+++ b/selenium_cuc/features/support/env.rb
@@ -16,6 +16,7 @@
require 'yaml'
require 'net/http'
require 'active_support/all'
+require 'rest_client'
require 'require_all'
config = YAML.load_file('config/config.yml')
@@ -106,11 +107,20 @@
end
def sauce_api(json)
- %x{curl -H 'Content-Type:text/json' -s -X PUT -d '#{json}'
http://#{ENV['SAUCE_ONDEMAND_USERNAME']}:#{ENV['SAUCE_ONDEMAND_ACCESS_KEY']}@saucelabs.com/rest/v1/#{ENV['SAUCE_ONDEMAND_USERNAME']}/jobs/#{$session_id}}
+ url =
https://saucelabs.com/rest/v1/#{ENV['SAUCE_ONDEMAND_USERNAME']}/jobs/#{$session_id}
+
+ RestClient::Request.execute(
+ :method = :put,
+ :url = url,
+ :user = ENV['SAUCE_ONDEMAND_USERNAME'],
+ :password = ENV['SAUCE_ONDEMAND_ACCESS_KEY'],
+ :headers = {:content_type = application/json},
+ :payload = json
+ )
end
After do |scenario|
- if environment == :cloudbees !ENV[windir]
+ if environment == :cloudbees
sauce_api(%Q{{passed: #{scenario.passed?}}})
sauce_api(%Q{{public: true}})
end
--
To view, visit https://gerrit.wikimedia.org/r/81186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9968136cd0eb9d5399e40d25b7d4ae96e8661295
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove old EntityId usage from api/linktitles - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82381
Change subject: Remove old EntityId usage from api/linktitles
..
Remove old EntityId usage from api/linktitles
Change-Id: I1835e0caf3f1a0b778a19ee59f6f8c72cd010002
---
M repo/includes/api/LinkTitles.php
1 file changed, 8 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/81/82381/1
diff --git a/repo/includes/api/LinkTitles.php b/repo/includes/api/LinkTitles.php
index ff6276b..90ca0d8 100644
--- a/repo/includes/api/LinkTitles.php
+++ b/repo/includes/api/LinkTitles.php
@@ -3,17 +3,15 @@
namespace Wikibase\Api;
use ApiBase, User, Status;
-
+use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SimpleSiteLink;
-use Wikibase\SiteLink;
-use Wikibase\EntityId;
use Wikibase\Entity;
use Wikibase\EntityContentFactory;
use Wikibase\Item;
use Wikibase\ItemContent;
+use Wikibase\Repo\WikibaseRepo;
use Wikibase\StoreFactory;
use Wikibase\Summary;
-use Wikibase\Settings;
/**
* API module to associate two pages on two different sites with a Wikibase
item .
@@ -87,6 +85,8 @@
$summary = new Summary( $this-getModuleName() );
$summary-addAutoSummaryArgs( $fromSite-getGlobalId() .
:$fromPage, $toSite-getGlobalId() . :$toPage );
+ $entityContentFactory =
WikibaseRepo::getDefaultInstance()-getEntityContentFactory();
+
// Figure out which parts to use and what to create anew
if ( !$fromId !$toId ) {
// create new item
@@ -103,9 +103,8 @@
}
elseif ( !$fromId $toId ) {
// reuse to-site's item
- $itemContent =
EntityContentFactory::singleton()-getFromId(
- new EntityId( Item::ENTITY_TYPE, $toId )
- );
+ /** @var ItemContent $itemContent */
+ $itemContent = $entityContentFactory-getFromId(
ItemId::newFromNumber( $toId ) );
$fromLink = new SimpleSiteLink(
$fromSite-getGlobalId(), $fromPage );
$itemContent-getItem()-addSimpleSiteLink( $fromLink );
$return[] = $fromLink;
@@ -113,9 +112,8 @@
}
elseif ( $fromId !$toId ) {
// reuse from-site's item
- $itemContent =
EntityContentFactory::singleton()-getFromId(
- new EntityId( Item::ENTITY_TYPE, $fromId )
- );
+ /** @var ItemContent $itemContent */
+ $itemContent = $entityContentFactory-getFromId(
ItemId::newFromNumber( $fromId ) );
$toLink = new SimpleSiteLink( $toSite-getGlobalId(),
$toPage );
$itemContent-getItem()-addSimpleSiteLink( $toLink );
$return[] = $toLink;
--
To view, visit https://gerrit.wikimedia.org/r/82381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1835e0caf3f1a0b778a19ee59f6f8c72cd010002
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove old EntityId usage from api/ModifyClaim - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/82382 Change subject: Remove old EntityId usage from api/ModifyClaim .. Remove old EntityId usage from api/ModifyClaim Change-Id: I5cb0e6e9cf4372e5e07027b7c9744f67893bba6e --- M repo/includes/api/ModifyClaim.php 1 file changed, 1 insertion(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/82/82382/1 diff --git a/repo/includes/api/ModifyClaim.php b/repo/includes/api/ModifyClaim.php index 61d3f08..17a82e9 100644 --- a/repo/includes/api/ModifyClaim.php +++ b/repo/includes/api/ModifyClaim.php @@ -1,4 +1,5 @@ ?php + namespace Wikibase\Api; use ApiMain; @@ -6,32 +7,14 @@ use Wikibase\EntityContent; use Wikibase\Claim; use Wikibase\Summary; -use Wikibase\Lib\Serializers\SerializerFactory; use Wikibase\Repo\WikibaseRepo; use Wikibase\Entity; -use Wikibase\EntityId; use Wikibase\Property; use Wikibase\EntityContentFactory; -use Wikibase\Lib\ClaimGuidValidator; use Wikibase\Validators\ValidatorErrorLocalizer; /** * Base class for modifying claims. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * http://www.gnu.org/copyleft/gpl.html * * @since 0.4 * -- To view, visit https://gerrit.wikimedia.org/r/82382 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5cb0e6e9cf4372e5e07027b7c9744f67893bba6e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Addshore addshorew...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove old EntityId usage from api/getclaims - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove old EntityId usage from api/getclaims
..
Remove old EntityId usage from api/getclaims
Change-Id: Iaf419c59032a15b97868c611489a4ed479f7a5ec
---
M repo/includes/api/GetClaims.php
1 file changed, 3 insertions(+), 21 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/GetClaims.php b/repo/includes/api/GetClaims.php
index d7cd810..140cf86 100644
--- a/repo/includes/api/GetClaims.php
+++ b/repo/includes/api/GetClaims.php
@@ -4,38 +4,19 @@
use ApiBase;
use MWException;
-
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\Lib\ClaimGuidValidator;
-use Wikibase\Lib\EntityIdFormatter;
-use Wikibase\Lib\EntityIdParser;
use Wikibase\Lib\Serializers\ClaimSerializer;
use Wikibase\Lib\Serializers\SerializerFactory;
-use Wikibase\EntityId;
use Wikibase\Entity;
use Wikibase\EntityContentFactory;
use Wikibase\Property;
-use Wikibase\Statement;
use Wikibase\Claims;
use Wikibase\Claim;
use Wikibase\Repo\WikibaseRepo;
/**
* API module for getting claims.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
*
* @since 0.3
*
@@ -66,7 +47,8 @@
list( $id, $claimGuid ) = $this-getIdentifiers( $params );
- $entityId = EntityId::newFromPrefixedId( $id );
+ $entityIdParser =
WikibaseRepo::getDefaultInstance()-getEntityIdParser();
+ $entityId = $entityIdParser-parse( $id );
$entity = $entityId ? $this-getEntity( $entityId ) : null;
if ( !$entity ) {
--
To view, visit https://gerrit.wikimedia.org/r/82377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf419c59032a15b97868c611489a4ed479f7a5ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
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 commented out extensionx. - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/82392 Change subject: Remove commented out extensionx. .. Remove commented out extensionx. These were never migrated from SVN to Git Change-Id: Icb39d7345a20193cb3312cc3ec0e16c94e1df0b6 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/92/82392/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 0ec9180..2e126c4 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -706,8 +706,6 @@ Inline Categorizer -# Inline Editor: Disabled per https://www.mediawiki.org/wiki/Special:Code/MediaWiki/82789#c14456 - Input Box # Create a symbolic link Installer to mediawiki core's includes/installer in extensions/ to make this work. @@ -727,10 +725,6 @@ aliasfile = Interwiki/Interwiki.alias.php optional = interwiki_url, interwiki-url-label ignored = interwiki-defaulturl, logentry-interwiki-interwiki - -# 2010-06-22: Disabled for the moment. Under heavy construction -#Interwiki Integration -#aliasfile = InterwikiIntegration/InterwikiIntegration.alias.php Insider -- To view, visit https://gerrit.wikimedia.org/r/82392 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb39d7345a20193cb3312cc3ec0e16c94e1df0b6 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove commented out extensionx. - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: Remove commented out extensionx. .. Remove commented out extensionx. These were never migrated from SVN to Git Change-Id: Icb39d7345a20193cb3312cc3ec0e16c94e1df0b6 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 0ec9180..2e126c4 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -706,8 +706,6 @@ Inline Categorizer -# Inline Editor: Disabled per https://www.mediawiki.org/wiki/Special:Code/MediaWiki/82789#c14456 - Input Box # Create a symbolic link Installer to mediawiki core's includes/installer in extensions/ to make this work. @@ -727,10 +725,6 @@ aliasfile = Interwiki/Interwiki.alias.php optional = interwiki_url, interwiki-url-label ignored = interwiki-defaulturl, logentry-interwiki-interwiki - -# 2010-06-22: Disabled for the moment. Under heavy construction -#Interwiki Integration -#aliasfile = InterwikiIntegration/InterwikiIntegration.alias.php Insider -- To view, visit https://gerrit.wikimedia.org/r/82392 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icb39d7345a20193cb3312cc3ec0e16c94e1df0b6 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable SocialProfile extension for translation - change (translatewiki)
Jack Phoenix has uploaded a new change for review. https://gerrit.wikimedia.org/r/82393 Change subject: Enable SocialProfile extension for translation .. Enable SocialProfile extension for translation Change-Id: Ifaadfbf33aef731117f0b5fad0785333d4ec6212 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 35 insertions(+), 39 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/93/82393/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 5f99ff0..8cc1b9c 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -1415,52 +1415,48 @@ magicfile = SmoothGallery/SmoothGallery.i18n.magic.php ignored = smoothgallery-pagetext -#Social Profile - System Gifts -#aliasfile = SocialProfile/SocialProfile.alias.php -#id = ext-socialprofile-systemgifts -#file = SocialProfile/SystemGifts/SystemGift.i18n.php -#descmsg = systemgiftmanager +Social Profile - System Gifts +aliasfile = SocialProfile/SocialProfile.alias.php +id = ext-socialprofile-systemgifts +file = SocialProfile/SystemGifts/SystemGift.i18n.php +descmsg = systemgiftmanager -#Social Profile - User Activity -#id = ext-socialprofile-useractivity -#file = SocialProfile/UserActivity/UserActivity.i18n.php -#descmsg = useractivity +Social Profile - User Activity +id = ext-socialprofile-useractivity +file = SocialProfile/UserActivity/UserActivity.i18n.php +descmsg = useractivity -#Social Profile - User Board -#id = ext-socialprofile-userboard -#file = SocialProfile/UserBoard/UserBoard.i18n.php -#descmsg = boardblasttitle +Social Profile - User Board +id = ext-socialprofile-userboard +file = SocialProfile/UserBoard/UserBoard.i18n.php +descmsg = boardblasttitle -#Social Profile - User Gifts -#id = ext-socialprofile-usergifts -#file = SocialProfile/UserGifts/UserGifts.i18n.php -#descmsg = g-give-no-user-message +Social Profile - User Gifts +id = ext-socialprofile-usergifts +file = SocialProfile/UserGifts/UserGifts.i18n.php +descmsg = g-give-no-user-message -#Social Profile - User Profile -#id = ext-socialprofile-userprofile -#file = SocialProfile/UserProfile/UserProfile.i18n.php -#descmsg = edit-profile-title -#optional = avatarlogentry, profilelogentry -#ignored = userprofile-country-list +Social Profile - User Profile +id = ext-socialprofile-userprofile +file = SocialProfile/UserProfile/UserProfile.i18n.php +descmsg = edit-profile-title +optional = avatarlogentry, profilelogentry +ignored = userprofile-country-list -#Social Profile - User Relationship -#id = ext-socialprofile-userrelationship -#file = SocialProfile/UserRelationship/UserRelationship.i18n.php -#descmsg = ur-requests-title +Social Profile - User Relationship +id = ext-socialprofile-userrelationship +file = SocialProfile/UserRelationship/UserRelationship.i18n.php +descmsg = ur-requests-title -#Social Profile - User Stats -#id = ext-socialprofile-userstats -#file = SocialProfile/UserStats/UserStats.i18n.php -#descmsg = topusers +Social Profile - User Stats +id = ext-socialprofile-userstats +file = SocialProfile/UserStats/UserStats.i18n.php +descmsg = topusers -#Social Profile - User Status -#id = ext-socialprofile-userstatus -#file = SocialProfile/UserStatus/UserStatus.i18n.php - -#Social Profile - User Welcome -#id = ext-socialprofile-userwelcome -#file = SocialProfile/UserWelcome/UserWelcome.i18n.php -#descmsg = userwelcome-desc +Social Profile - User Welcome +id = ext-socialprofile-userwelcome +file = SocialProfile/UserWelcome/UserWelcome.i18n.php +descmsg = userwelcome-desc Solarium -- To view, visit https://gerrit.wikimedia.org/r/82393 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifaadfbf33aef731117f0b5fad0785333d4ec6212 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Jack Phoenix j...@countervandalism.net ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add i18n file - change (mediawiki...WikiCategoryTagCloud)
Raimond Spekking has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82394
Change subject: Add i18n file
..
Add i18n file
Change-Id: I96a75a8bf2440355132175f52c49ea017e5e9071
---
A WikiCategoryTagCloud.i18n.php
M WikiCategoryTagCloud.php
2 files changed, 27 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiCategoryTagCloud
refs/changes/94/82394/1
diff --git a/WikiCategoryTagCloud.i18n.php b/WikiCategoryTagCloud.i18n.php
new file mode 100644
index 000..f69d8c5
--- /dev/null
+++ b/WikiCategoryTagCloud.i18n.php
@@ -0,0 +1,23 @@
+?php
+/**
+ * Internationalisation for Wiki Category Tag Cloud
+ *
+ * @file
+ * @ingroup Extensions
+ */
+$messages = array();
+
+/** English
+ * @author Daniel Friesen
+ */
+$messages['en'] = array(
+ 'wikicategorytagcloud-desc' = 'Allows to add tag clouds based on
categories to a page',
+);
+
+/** Message documentation (Message documentation)
+ * @author Daniel Friesen
+ */
+$messages['qqq'] = array(
+ 'wikicategorytagcloud-desc' = '{{desc|name=Wiki Category Tag
Cloud|http://www.mediawiki.org/wiki/Extension:wikicategorytagcloud}}',
+);
+
diff --git a/WikiCategoryTagCloud.php b/WikiCategoryTagCloud.php
index 3ff2747..a31b60a 100644
--- a/WikiCategoryTagCloud.php
+++ b/WikiCategoryTagCloud.php
@@ -21,10 +21,13 @@
'name' = 'Wiki Category Tag Cloud',
'version' = '1.1',
'author' = '[http://danf.ca/mw/ Daniel Friesen]',
- 'description' = 'A Category Tag Cloud derived, improved, and fixed
from the YetAnotherTagCloud Extension',
+ 'descriptionmsg' = 'wikicategorytagcloud-desc',
'url' =
'https://www.mediawiki.org/wiki/Extension:WikiCategoryTagCloud',
);
+// i18n
+$wgExtensionMessagesFiles['WikiCategoryTagCloud'] = __DIR__ .
'/WikiCategoryTagCloud.i18n.php';
+
// Avoid unstubbing $wgParser too early on modern (1.12+) MW versions, as per
r35980
$wgHooks['ParserFirstCallInit'][] = 'registerTagCloudExtension';
--
To view, visit https://gerrit.wikimedia.org/r/82394
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I96a75a8bf2440355132175f52c49ea017e5e9071
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiCategoryTagCloud
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] Add i18n file - change (mediawiki...StarterWiki)
Raimond Spekking has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82395
Change subject: Add i18n file
..
Add i18n file
Change-Id: Ic779aea4cf43c23f4593208db9ee6c20b843b3b9
---
A StarterWiki.i18n.php
M StarterWiki.php
2 files changed, 27 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/StarterWiki
refs/changes/95/82395/1
diff --git a/StarterWiki.i18n.php b/StarterWiki.i18n.php
new file mode 100644
index 000..a24c9cf
--- /dev/null
+++ b/StarterWiki.i18n.php
@@ -0,0 +1,23 @@
+?php
+/**
+ * Internationalisation for StarterWiki
+ *
+ * @file
+ * @ingroup Extensions
+ */
+$messages = array();
+
+/** English
+ * @author Daniel Friesen
+ */
+$messages['en'] = array(
+ 'starterwiki-desc' = 'Provides a set of maintenance scripts and
functions to allow for creation of wiki databases based off a starter wiki',
+);
+
+/** Message documentation (Message documentation)
+ * @author Daniel Friesen
+ */
+$messages['qqq'] = array(
+ 'starterwiki-desc' = '{{desc|name=Starter
Wiki|http://www.mediawiki.org/wiki/Extension:StarterWiki}}',
+);
+
diff --git a/StarterWiki.php b/StarterWiki.php
index 2c048c1..c59bec1 100644
--- a/StarterWiki.php
+++ b/StarterWiki.php
@@ -17,9 +17,12 @@
'url' = 'https://www.mediawiki.org/wiki/Extension:StarterWiki',
'version' = '1.2a',
'author' = [http://danf.ca/mw/ Daniel Friesen],
- 'description' = Provides a set of maintenance scripts and functions
to allow for creation of wiki databases based off a starter wiki.
+ 'descriptionmsg' = 'starterwiki-desc'
);
+## i18n
+$wgExtensionMessagesFiles['StarterWiki'] = __DIR__ . '/StarterWiki.i18n.php';
+
## A list of pages to convert titles and override when cloning the database.
## Key is the ns:title on starter, value is the ns:title to use on the other
wiki.
$wgStarterWikiPageAliases = array(
--
To view, visit https://gerrit.wikimedia.org/r/82395
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic779aea4cf43c23f4593208db9ee6c20b843b3b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/StarterWiki
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] Fix Mock Escaper not returning anything - change (mediawiki...WikibaseDatabase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82396
Change subject: Fix Mock Escaper not returning anything
..
Fix Mock Escaper not returning anything
Change-Id: I258d3dab155733641f8e4004d9ffed72a5caaf63
---
M tests/phpunit/MySQL/MySQLTableSqlBuilderTest.php
1 file changed, 6 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseDatabase
refs/changes/96/82396/1
diff --git a/tests/phpunit/MySQL/MySQLTableSqlBuilderTest.php
b/tests/phpunit/MySQL/MySQLTableSqlBuilderTest.php
index 88adff4..56e1d61 100644
--- a/tests/phpunit/MySQL/MySQLTableSqlBuilderTest.php
+++ b/tests/phpunit/MySQL/MySQLTableSqlBuilderTest.php
@@ -32,10 +32,14 @@
}
protected function newInstance() {
+
+ $mockEscaper = $this-getMock( 'Wikibase\Database\Escaper' );
+ $mockEscaper-expects( $this-any() )-method(
'getEscapedValue' )-will( $this-returnArgument(0) );
+
return new MySqlTableSqlBuilder(
self::DB_NAME,
self::TABLE_PREFIX,
- $this-getMock( 'Wikibase\Database\Escaper' )
+ $mockEscaper
);
}
@@ -78,7 +82,7 @@
),
)
),
- 'CREATE TABLE `dbName`.prefix_tableName (primaryField
INT NOT NULL, textField BLOB NULL, intField INT DEFAULT NOT NULL)
ENGINE=InnoDB, DEFAULT CHARSET=binary'
+ 'CREATE TABLE `dbName`.prefix_tableName (primaryField
INT NOT NULL, textField BLOB NULL, intField INT DEFAULT 42 NOT NULL)
ENGINE=InnoDB, DEFAULT CHARSET=binary'
);
return $argLists;
--
To view, visit https://gerrit.wikimedia.org/r/82396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I258d3dab155733641f8e4004d9ffed72a5caaf63
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseDatabase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clean up the rest of the api uses - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82389
Change subject: Clean up the rest of the api uses
..
Clean up the rest of the api uses
Change-Id: Ia3ea86ccdd3fdd85868db049966bcf763b26028f
---
M repo/includes/api/RemoveClaims.php
M repo/includes/api/RemoveQualifiers.php
M repo/includes/api/RemoveReferences.php
M repo/includes/api/SearchEntities.php
M repo/includes/api/SetClaim.php
M repo/includes/api/SetClaimValue.php
M repo/includes/api/SetDescription.php
M repo/includes/api/SetReference.php
M repo/includes/api/SetSiteLink.php
M repo/includes/api/SetStatementRank.php
10 files changed, 3 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/89/82389/1
diff --git a/repo/includes/api/RemoveClaims.php
b/repo/includes/api/RemoveClaims.php
index 7075a83..8674260 100644
--- a/repo/includes/api/RemoveClaims.php
+++ b/repo/includes/api/RemoveClaims.php
@@ -4,7 +4,7 @@
use ApiBase;
use Wikibase\Claims;
-use Wikibase\EntityId;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\Entity;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\ChangeOps;
diff --git a/repo/includes/api/RemoveQualifiers.php
b/repo/includes/api/RemoveQualifiers.php
index b8e907a..d867a55 100644
--- a/repo/includes/api/RemoveQualifiers.php
+++ b/repo/includes/api/RemoveQualifiers.php
@@ -5,7 +5,6 @@
use ApiBase;
use Wikibase\Entity;
use Wikibase\Claim;
-use Wikibase\Claims;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\ChangeOpQualifier;
use Wikibase\ChangeOps;
diff --git a/repo/includes/api/RemoveReferences.php
b/repo/includes/api/RemoveReferences.php
index dfaa150..5b5819a 100644
--- a/repo/includes/api/RemoveReferences.php
+++ b/repo/includes/api/RemoveReferences.php
@@ -5,7 +5,6 @@
use ApiBase;
use Wikibase\Entity;
use Wikibase\Statement;
-use Wikibase\Claims;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\ChangeOpReference;
use Wikibase\ChangeOps;
diff --git a/repo/includes/api/SearchEntities.php
b/repo/includes/api/SearchEntities.php
index 6588465..bb31c74 100644
--- a/repo/includes/api/SearchEntities.php
+++ b/repo/includes/api/SearchEntities.php
@@ -3,7 +3,7 @@
namespace Wikibase\Api;
use ApiBase;
-
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\StoreFactory;
use Wikibase\EntityContentFactory;
use Wikibase\EntityFactory;
@@ -125,7 +125,7 @@
$entries = array();
/**
-* var EntityId $id
+* @var EntityId $id
*/
foreach ( $ids as $id ) {
$entry = array();
diff --git a/repo/includes/api/SetClaim.php b/repo/includes/api/SetClaim.php
index 3b09813..1789c52 100644
--- a/repo/includes/api/SetClaim.php
+++ b/repo/includes/api/SetClaim.php
@@ -17,7 +17,6 @@
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Summary;
use Wikibase\Validators\ValidatorErrorLocalizer;
-use Wikibase\validators\SnakValidator;
/**
* API module for creating or updating an entire Claim.
diff --git a/repo/includes/api/SetClaimValue.php
b/repo/includes/api/SetClaimValue.php
index d126f87..d1b4cea 100644
--- a/repo/includes/api/SetClaimValue.php
+++ b/repo/includes/api/SetClaimValue.php
@@ -3,9 +3,7 @@
namespace Wikibase\Api;
use ApiBase;
-use Wikibase\EntityId;
use Wikibase\Entity;
-use Wikibase\Claims;
use Wikibase\ChangeOpMainSnak;
use Wikibase\ChangeOpException;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/includes/api/SetDescription.php
b/repo/includes/api/SetDescription.php
index 683a46b..0438eb6 100644
--- a/repo/includes/api/SetDescription.php
+++ b/repo/includes/api/SetDescription.php
@@ -3,7 +3,6 @@
namespace Wikibase\Api;
use ApiBase;
-
use Wikibase\Entity;
use Wikibase\EntityContent;
use Wikibase\Utils;
diff --git a/repo/includes/api/SetReference.php
b/repo/includes/api/SetReference.php
index 66ce0b7..943aa8c 100644
--- a/repo/includes/api/SetReference.php
+++ b/repo/includes/api/SetReference.php
@@ -4,7 +4,6 @@
use ApiBase;
use Wikibase\Entity;
-use Wikibase\Claims;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\ChangeOpReference;
use Wikibase\ChangeOpException;
diff --git a/repo/includes/api/SetSiteLink.php
b/repo/includes/api/SetSiteLink.php
index 7120451..4a60e15 100644
--- a/repo/includes/api/SetSiteLink.php
+++ b/repo/includes/api/SetSiteLink.php
@@ -4,11 +4,9 @@
use Wikibase\ChangeOpSiteLink;
use ApiBase, User;
-use Wikibase\DataModel\SimpleSiteLink;
use Wikibase\Entity;
use Wikibase\EntityContent;
use Wikibase\ItemContent;
-use Wikibase\SiteLink;
use Wikibase\Utils;
/**
diff --git a/repo/includes/api/SetStatementRank.php
b/repo/includes/api/SetStatementRank.php
index 129c42f..42c7115 100644
--- a/repo/includes/api/SetStatementRank.php
+++ b/repo/includes/api/SetStatementRank.php
@@ -4,7 +4,6 @@
use ApiBase;
use Wikibase\Entity;
-use Wikibase\Claims;
use Wikibase\Claim;
use
[MediaWiki-commits] [Gerrit] Cucumber: set cookies for licence anonymousediting messages - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Cucumber: set cookies for licence anonymousediting messages
..
Cucumber: set cookies for licence anonymousediting messages
Change-Id: I0eb21638b37ddf20d5256e6d8de96bf9f073bead
---
M repo/resources/wikibase.ui.entityViewInit.js
M selenium_cuc/features/label.feature
M selenium_cuc/features/step_definitions/entity_steps.rb
M selenium_cuc/features/support/modules/entity_module.rb
4 files changed, 21 insertions(+), 4 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
Zfilipin: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index 55e54c2..065bda0 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -213,7 +213,9 @@
} );
// Display anonymous user edit warning:
- if ( mw.user mw.user.isAnon() $.find(
'.mw-notification-content' ).length === 0 ) {
+ if ( mw.user mw.user.isAnon()
+$.find( '.mw-notification-content' ).length
=== 0
+!$.cookie(
'wikibase-no-anonymouseditwarning' ) ) {
mw.notify(
mw.msg( 'wikibase-anonymouseditwarning',
mw.msg( 'wikibase-entity-' +
wb.entity.getType() )
diff --git a/selenium_cuc/features/label.feature
b/selenium_cuc/features/label.feature
index 181d01e..f1bb8cc 100644
--- a/selenium_cuc/features/label.feature
+++ b/selenium_cuc/features/label.feature
@@ -73,7 +73,7 @@
Scenario: Label with 0 as value
When I click the label edit button
And I enter 0 as label
- And I click the label save buttn
+ And I click the label save button
Then 0 should be displayed as label
@save_label
diff --git a/selenium_cuc/features/step_definitions/entity_steps.rb
b/selenium_cuc/features/step_definitions/entity_steps.rb
index d74b547..2a0c9b4 100644
--- a/selenium_cuc/features/step_definitions/entity_steps.rb
+++ b/selenium_cuc/features/step_definitions/entity_steps.rb
@@ -10,7 +10,12 @@
item_data = '{labels:{en:{language:en,value:' +
generate_random_string(8) +
'}},descriptions:{en:{language:en,value:' +
generate_random_string(20) + '}}}'
item = create_new_entity(item_data, 'item')
@entity = item
- on(ItemPage).navigate_to_entity item[url]
+ on(ItemPage) do |page|
+page.navigate_to_entity item[url]
+page.set_copyright_ack_cookie
+page.set_noanonymouseditwarning_cookie
+ end
+
end
Given /^I am on an item page with empty label and description$/ do
diff --git a/selenium_cuc/features/support/modules/entity_module.rb
b/selenium_cuc/features/support/modules/entity_module.rb
index b537302..768b3ad 100644
--- a/selenium_cuc/features/support/modules/entity_module.rb
+++ b/selenium_cuc/features/support/modules/entity_module.rb
@@ -68,7 +68,7 @@
end
def wait_for_api_callback
-#TODO: workaround for weird error randomly claiming that
apiCallWaitingMessage-element is not attached to the DOM anymore
+ajax_wait
wait_until do
apiCallWaitingMessage? == false
end
@@ -127,4 +127,14 @@
length.times { string chars[rand(chars.size)] }
return string
end
+
+ def set_copyright_ack_cookie
+cookie = $.cookie( 'wikibase.acknowledgedcopyrightversion', 'wikibase-1',
{ 'expires': null, 'path': '/' } );
+@browser.execute_script(cookie)
+ end
+
+ def set_noanonymouseditwarning_cookie
+cookie = $.cookie( 'wikibase-no-anonymouseditwarning', '1', { 'expires':
null, 'path': '/' } );
+@browser.execute_script(cookie)
+ end
end
--
To view, visit https://gerrit.wikimedia.org/r/82383
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0eb21638b37ddf20d5256e6d8de96bf9f073bead
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove old EntityId usage from api/ItemByTitleHelp - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove old EntityId usage from api/ItemByTitleHelp
..
Remove old EntityId usage from api/ItemByTitleHelp
Change-Id: I891953c93ecbad19a5a2ee38368b4c02b30f9b49
---
M repo/includes/api/ItemByTitleHelper.php
1 file changed, 6 insertions(+), 18 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/ItemByTitleHelper.php
b/repo/includes/api/ItemByTitleHelper.php
index f136c78..1c6c769 100644
--- a/repo/includes/api/ItemByTitleHelper.php
+++ b/repo/includes/api/ItemByTitleHelper.php
@@ -1,27 +1,14 @@
?php
namespace Wikibase\Api;
-use Wikibase\EntityId;
+
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Item;
use Wikibase\Repo\WikibaseRepo;
/**
* Helper class for api modules to resolve page+title pairs into items.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
*
* @since 0.4
*
@@ -56,6 +43,7 @@
* @param \ApiBase $apiBase
* @param \Wikibase\SiteLinkCache $siteLinkCache
* @param \SiteStore $siteStore
+* @param \Wikibase\StringNormalizer $stringNormalizer
*/
public function __construct( \ApiBase $apiBase, \Wikibase\SiteLinkCache
$siteLinkCache, \SiteStore $siteStore, \Wikibase\StringNormalizer
$stringNormalizer ) {
$this-apiBase = $apiBase;
@@ -110,7 +98,7 @@
} else {
$entityIdFormatter =
WikibaseRepo::getDefaultInstance()-getEntityIdFormatter();
- $id = new EntityId( Item::ENTITY_TYPE, $id );
+ $id = ItemId::newFromNumber( $id );
$ids[] = $entityIdFormatter-format( $id );
}
}
@@ -123,7 +111,7 @@
* Updates $title accordingly and adds the normalization to the API
output.
*
* @param string $title
-* @param \Site $siteId
+* @param \Site $site
*
* @return integer|boolean
*/
--
To view, visit https://gerrit.wikimedia.org/r/82380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I891953c93ecbad19a5a2ee38368b4c02b30f9b49
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
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 old EntityId usage from api/ModifyEntity - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove old EntityId usage from api/ModifyEntity
..
Remove old EntityId usage from api/ModifyEntity
Change-Id: I9103185827944125d6b8a0de7640db3d0794692d
---
M repo/includes/api/ModifyEntity.php
1 file changed, 8 insertions(+), 5 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/ModifyEntity.php
b/repo/includes/api/ModifyEntity.php
index 3c5d299..cd881d8 100644
--- a/repo/includes/api/ModifyEntity.php
+++ b/repo/includes/api/ModifyEntity.php
@@ -6,7 +6,6 @@
use User;
use Title;
use ApiBase;
-use Wikibase\EntityId;
use Wikibase\Entity;
use Wikibase\EntityContent;
use Wikibase\EntityContentFactory;
@@ -78,15 +77,19 @@
if ( isset( $params['id'] ) ) {
$id = $params['id'];
- $entityContentFactory =
EntityContentFactory::singleton();
+ $entityContentFactory =
WikibaseRepo::getDefaultInstance()-getEntityContentFactory();
- //NOTE: $id is user-supplied and may be invalid!
- $entityId = EntityId::newFromPrefixedId( $id );
+ try{
+ $entityId =
WikibaseRepo::getDefaultInstance()-getEntityIdParser()-parse( $id );
+ } catch( \ValueParsers\ParseException $e ){
+ $this-dieUsage( Could not parse {$id}, No
entity found, 'no-such-entity-id' );
+ }
+
$entityTitle = $entityId ?
$entityContentFactory-getTitleForId( $entityId, \Revision::FOR_THIS_USER ) :
null;
-
if ( is_null( $entityTitle ) ) {
$this-dieUsage( No entity found matching ID
$id, 'no-such-entity-id' );
}
+
}
// Otherwise check if we have a link and try that.
// This will always result in an item, because only items have
sitelinks.
--
To view, visit https://gerrit.wikimedia.org/r/82386
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9103185827944125d6b8a0de7640db3d0794692d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
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 old EntityId usage from api/linktitles - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove old EntityId usage from api/linktitles
..
Remove old EntityId usage from api/linktitles
Change-Id: I1835e0caf3f1a0b778a19ee59f6f8c72cd010002
---
M repo/includes/api/LinkTitles.php
1 file changed, 8 insertions(+), 10 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/LinkTitles.php b/repo/includes/api/LinkTitles.php
index ff6276b..90ca0d8 100644
--- a/repo/includes/api/LinkTitles.php
+++ b/repo/includes/api/LinkTitles.php
@@ -3,17 +3,15 @@
namespace Wikibase\Api;
use ApiBase, User, Status;
-
+use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SimpleSiteLink;
-use Wikibase\SiteLink;
-use Wikibase\EntityId;
use Wikibase\Entity;
use Wikibase\EntityContentFactory;
use Wikibase\Item;
use Wikibase\ItemContent;
+use Wikibase\Repo\WikibaseRepo;
use Wikibase\StoreFactory;
use Wikibase\Summary;
-use Wikibase\Settings;
/**
* API module to associate two pages on two different sites with a Wikibase
item .
@@ -87,6 +85,8 @@
$summary = new Summary( $this-getModuleName() );
$summary-addAutoSummaryArgs( $fromSite-getGlobalId() .
:$fromPage, $toSite-getGlobalId() . :$toPage );
+ $entityContentFactory =
WikibaseRepo::getDefaultInstance()-getEntityContentFactory();
+
// Figure out which parts to use and what to create anew
if ( !$fromId !$toId ) {
// create new item
@@ -103,9 +103,8 @@
}
elseif ( !$fromId $toId ) {
// reuse to-site's item
- $itemContent =
EntityContentFactory::singleton()-getFromId(
- new EntityId( Item::ENTITY_TYPE, $toId )
- );
+ /** @var ItemContent $itemContent */
+ $itemContent = $entityContentFactory-getFromId(
ItemId::newFromNumber( $toId ) );
$fromLink = new SimpleSiteLink(
$fromSite-getGlobalId(), $fromPage );
$itemContent-getItem()-addSimpleSiteLink( $fromLink );
$return[] = $fromLink;
@@ -113,9 +112,8 @@
}
elseif ( $fromId !$toId ) {
// reuse from-site's item
- $itemContent =
EntityContentFactory::singleton()-getFromId(
- new EntityId( Item::ENTITY_TYPE, $fromId )
- );
+ /** @var ItemContent $itemContent */
+ $itemContent = $entityContentFactory-getFromId(
ItemId::newFromNumber( $fromId ) );
$toLink = new SimpleSiteLink( $toSite-getGlobalId(),
$toPage );
$itemContent-getItem()-addSimpleSiteLink( $toLink );
$return[] = $toLink;
--
To view, visit https://gerrit.wikimedia.org/r/82381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1835e0caf3f1a0b778a19ee59f6f8c72cd010002
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
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 old EntityId usage from api/ModifyClaim - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Remove old EntityId usage from api/ModifyClaim .. Remove old EntityId usage from api/ModifyClaim Change-Id: I5cb0e6e9cf4372e5e07027b7c9744f67893bba6e --- M repo/includes/api/ModifyClaim.php 1 file changed, 1 insertion(+), 18 deletions(-) Approvals: Tobias Gritschacher: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/includes/api/ModifyClaim.php b/repo/includes/api/ModifyClaim.php index 61d3f08..17a82e9 100644 --- a/repo/includes/api/ModifyClaim.php +++ b/repo/includes/api/ModifyClaim.php @@ -1,4 +1,5 @@ ?php + namespace Wikibase\Api; use ApiMain; @@ -6,32 +7,14 @@ use Wikibase\EntityContent; use Wikibase\Claim; use Wikibase\Summary; -use Wikibase\Lib\Serializers\SerializerFactory; use Wikibase\Repo\WikibaseRepo; use Wikibase\Entity; -use Wikibase\EntityId; use Wikibase\Property; use Wikibase\EntityContentFactory; -use Wikibase\Lib\ClaimGuidValidator; use Wikibase\Validators\ValidatorErrorLocalizer; /** * Base class for modifying claims. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * http://www.gnu.org/copyleft/gpl.html * * @since 0.4 * -- To view, visit https://gerrit.wikimedia.org/r/82382 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5cb0e6e9cf4372e5e07027b7c9744f67893bba6e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Addshore addshorew...@gmail.com Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix Mock Escaper not returning anything - change (mediawiki...WikibaseDatabase)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix Mock Escaper not returning anything
..
Fix Mock Escaper not returning anything
Change-Id: I258d3dab155733641f8e4004d9ffed72a5caaf63
---
M tests/phpunit/MySQL/MySQLTableSqlBuilderTest.php
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/MySQL/MySQLTableSqlBuilderTest.php
b/tests/phpunit/MySQL/MySQLTableSqlBuilderTest.php
index 88adff4..56e1d61 100644
--- a/tests/phpunit/MySQL/MySQLTableSqlBuilderTest.php
+++ b/tests/phpunit/MySQL/MySQLTableSqlBuilderTest.php
@@ -32,10 +32,14 @@
}
protected function newInstance() {
+
+ $mockEscaper = $this-getMock( 'Wikibase\Database\Escaper' );
+ $mockEscaper-expects( $this-any() )-method(
'getEscapedValue' )-will( $this-returnArgument(0) );
+
return new MySqlTableSqlBuilder(
self::DB_NAME,
self::TABLE_PREFIX,
- $this-getMock( 'Wikibase\Database\Escaper' )
+ $mockEscaper
);
}
@@ -78,7 +82,7 @@
),
)
),
- 'CREATE TABLE `dbName`.prefix_tableName (primaryField
INT NOT NULL, textField BLOB NULL, intField INT DEFAULT NOT NULL)
ENGINE=InnoDB, DEFAULT CHARSET=binary'
+ 'CREATE TABLE `dbName`.prefix_tableName (primaryField
INT NOT NULL, textField BLOB NULL, intField INT DEFAULT 42 NOT NULL)
ENGINE=InnoDB, DEFAULT CHARSET=binary'
);
return $argLists;
--
To view, visit https://gerrit.wikimedia.org/r/82396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I258d3dab155733641f8e4004d9ffed72a5caaf63
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseDatabase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Denny Vrandecic denny.vrande...@wikimedia.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clean up the rest of the api uses - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Clean up the rest of the api uses
..
Clean up the rest of the api uses
Change-Id: Ia3ea86ccdd3fdd85868db049966bcf763b26028f
---
M repo/includes/api/RemoveClaims.php
M repo/includes/api/RemoveQualifiers.php
M repo/includes/api/RemoveReferences.php
M repo/includes/api/SearchEntities.php
M repo/includes/api/SetClaim.php
M repo/includes/api/SetClaimValue.php
M repo/includes/api/SetDescription.php
M repo/includes/api/SetReference.php
M repo/includes/api/SetSiteLink.php
M repo/includes/api/SetStatementRank.php
10 files changed, 3 insertions(+), 13 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/RemoveClaims.php
b/repo/includes/api/RemoveClaims.php
index 7075a83..8674260 100644
--- a/repo/includes/api/RemoveClaims.php
+++ b/repo/includes/api/RemoveClaims.php
@@ -4,7 +4,7 @@
use ApiBase;
use Wikibase\Claims;
-use Wikibase\EntityId;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\Entity;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\ChangeOps;
diff --git a/repo/includes/api/RemoveQualifiers.php
b/repo/includes/api/RemoveQualifiers.php
index b8e907a..d867a55 100644
--- a/repo/includes/api/RemoveQualifiers.php
+++ b/repo/includes/api/RemoveQualifiers.php
@@ -5,7 +5,6 @@
use ApiBase;
use Wikibase\Entity;
use Wikibase\Claim;
-use Wikibase\Claims;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\ChangeOpQualifier;
use Wikibase\ChangeOps;
diff --git a/repo/includes/api/RemoveReferences.php
b/repo/includes/api/RemoveReferences.php
index dfaa150..5b5819a 100644
--- a/repo/includes/api/RemoveReferences.php
+++ b/repo/includes/api/RemoveReferences.php
@@ -5,7 +5,6 @@
use ApiBase;
use Wikibase\Entity;
use Wikibase\Statement;
-use Wikibase\Claims;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\ChangeOpReference;
use Wikibase\ChangeOps;
diff --git a/repo/includes/api/SearchEntities.php
b/repo/includes/api/SearchEntities.php
index 6588465..bb31c74 100644
--- a/repo/includes/api/SearchEntities.php
+++ b/repo/includes/api/SearchEntities.php
@@ -3,7 +3,7 @@
namespace Wikibase\Api;
use ApiBase;
-
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\StoreFactory;
use Wikibase\EntityContentFactory;
use Wikibase\EntityFactory;
@@ -125,7 +125,7 @@
$entries = array();
/**
-* var EntityId $id
+* @var EntityId $id
*/
foreach ( $ids as $id ) {
$entry = array();
diff --git a/repo/includes/api/SetClaim.php b/repo/includes/api/SetClaim.php
index 3b09813..1789c52 100644
--- a/repo/includes/api/SetClaim.php
+++ b/repo/includes/api/SetClaim.php
@@ -17,7 +17,6 @@
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Summary;
use Wikibase\Validators\ValidatorErrorLocalizer;
-use Wikibase\validators\SnakValidator;
/**
* API module for creating or updating an entire Claim.
diff --git a/repo/includes/api/SetClaimValue.php
b/repo/includes/api/SetClaimValue.php
index d126f87..d1b4cea 100644
--- a/repo/includes/api/SetClaimValue.php
+++ b/repo/includes/api/SetClaimValue.php
@@ -3,9 +3,7 @@
namespace Wikibase\Api;
use ApiBase;
-use Wikibase\EntityId;
use Wikibase\Entity;
-use Wikibase\Claims;
use Wikibase\ChangeOpMainSnak;
use Wikibase\ChangeOpException;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/includes/api/SetDescription.php
b/repo/includes/api/SetDescription.php
index 683a46b..0438eb6 100644
--- a/repo/includes/api/SetDescription.php
+++ b/repo/includes/api/SetDescription.php
@@ -3,7 +3,6 @@
namespace Wikibase\Api;
use ApiBase;
-
use Wikibase\Entity;
use Wikibase\EntityContent;
use Wikibase\Utils;
diff --git a/repo/includes/api/SetReference.php
b/repo/includes/api/SetReference.php
index 66ce0b7..943aa8c 100644
--- a/repo/includes/api/SetReference.php
+++ b/repo/includes/api/SetReference.php
@@ -4,7 +4,6 @@
use ApiBase;
use Wikibase\Entity;
-use Wikibase\Claims;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\ChangeOpReference;
use Wikibase\ChangeOpException;
diff --git a/repo/includes/api/SetSiteLink.php
b/repo/includes/api/SetSiteLink.php
index 7120451..4a60e15 100644
--- a/repo/includes/api/SetSiteLink.php
+++ b/repo/includes/api/SetSiteLink.php
@@ -4,11 +4,9 @@
use Wikibase\ChangeOpSiteLink;
use ApiBase, User;
-use Wikibase\DataModel\SimpleSiteLink;
use Wikibase\Entity;
use Wikibase\EntityContent;
use Wikibase\ItemContent;
-use Wikibase\SiteLink;
use Wikibase\Utils;
/**
diff --git a/repo/includes/api/SetStatementRank.php
b/repo/includes/api/SetStatementRank.php
index 129c42f..42c7115 100644
--- a/repo/includes/api/SetStatementRank.php
+++ b/repo/includes/api/SetStatementRank.php
@@ -4,7 +4,6 @@
use ApiBase;
use Wikibase\Entity;
-use Wikibase\Claims;
use Wikibase\Claim;
use Wikibase\Repo\WikibaseRepo;
use
[MediaWiki-commits] [Gerrit] Remove old EntityId usage from api/getentities - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove old EntityId usage from api/getentities
..
Remove old EntityId usage from api/getentities
Change-Id: Iad26f6028fca6aea86ae5a3517c5a84789e2f5fa
---
M repo/includes/api/GetEntities.php
1 file changed, 5 insertions(+), 8 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/GetEntities.php
b/repo/includes/api/GetEntities.php
index 6bd366f..410bfc6 100644
--- a/repo/includes/api/GetEntities.php
+++ b/repo/includes/api/GetEntities.php
@@ -4,16 +4,13 @@
use ApiBase;
use MWException;
-
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\Lib\Serializers\EntitySerializationOptions;
use Wikibase\Lib\Serializers\SerializerFactory;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Utils;
use Wikibase\StoreFactory;
-use Wikibase\EntityId;
use Wikibase\Item;
-use Wikibase\Settings;
-use Wikibase\LibRegistry;
use Wikibase\EntityContentFactory;
/**
@@ -142,13 +139,13 @@
$entityContentFactory = EntityContentFactory::singleton();
$entityIdFormatter =
WikibaseRepo::getDefaultInstance()-getEntityIdFormatter();
+ $entityIdParser =
WikibaseRepo::getDefaultInstance()-getEntityIdParser();
$res = $this-getResult();
- $entityId = EntityId::newFromPrefixedId( $id );
-
- if ( !$entityId ) {
- //TODO: report as missing instead?
+ try {
+ $entityId = $entityIdParser-parse( $id );
+ } catch( \ValueParsers\ParseException $e ) {
wfProfileOut( __METHOD__ );
$this-dieUsage( Invalid id: $id, 'no-such-entity' );
}
--
To view, visit https://gerrit.wikimedia.org/r/82379
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad26f6028fca6aea86ae5a3517c5a84789e2f5fa
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update url for Slovakia website - change (mediawiki...WikiLovesMonuments)
Platonides has uploaded a new change for review. https://gerrit.wikimedia.org/r/82397 Change subject: Update url for Slovakia website .. Update url for Slovakia website http://lists.wikimedia.org/pipermail/wikilovesmonuments/2013-September/006471.html Change-Id: I624ff45fe7c37386671be6ea75010d9ecb8ab3aa --- M WikiLovesMonuments_body.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLovesMonuments refs/changes/97/82397/1 diff --git a/WikiLovesMonuments_body.php b/WikiLovesMonuments_body.php index a72dd1e..2364549 100644 --- a/WikiLovesMonuments_body.php +++ b/WikiLovesMonuments_body.php @@ -171,7 +171,7 @@ 'ro' = 'http://wikilovesmonuments.ro/', // Romania WP 'ru' = 'http://wikilovesmonuments.ru/', // Russia WP 'rs' = 'http://wlm.rs/', // Serbia custom - 'sk' = 'http://sk.wikipedia.org/wiki/Wikip%C3%A9dia:WikiProjekt_Wiki_miluje_pamiatky', // Slovakia + 'sk' = 'http://wikilovesmonuments.sk/', // Slovakia 'sv' = 'http://wikilovesmonumentselsalvador.org/', // El Salvador 'sy' = 'http://wikilovesmonuments-sy.org/', // Syria WP 'th' = 'https://commons.wikimedia.org/wiki/Commons:Wiki_Loves_Monuments_2013_in_Thailand/th', // Thailand - Redirect from http://th.wikilovesmonuments.org/ -- To view, visit https://gerrit.wikimedia.org/r/82397 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I624ff45fe7c37386671be6ea75010d9ecb8ab3aa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiLovesMonuments Gerrit-Branch: master Gerrit-Owner: Platonides platoni...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update url for Slovakia website - change (mediawiki...WikiLovesMonuments)
Platonides has submitted this change and it was merged. Change subject: Update url for Slovakia website .. Update url for Slovakia website http://lists.wikimedia.org/pipermail/wikilovesmonuments/2013-September/006471.html Change-Id: I624ff45fe7c37386671be6ea75010d9ecb8ab3aa --- M WikiLovesMonuments_body.php 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WikiLovesMonuments_body.php b/WikiLovesMonuments_body.php index a72dd1e..2364549 100644 --- a/WikiLovesMonuments_body.php +++ b/WikiLovesMonuments_body.php @@ -171,7 +171,7 @@ 'ro' = 'http://wikilovesmonuments.ro/', // Romania WP 'ru' = 'http://wikilovesmonuments.ru/', // Russia WP 'rs' = 'http://wlm.rs/', // Serbia custom - 'sk' = 'http://sk.wikipedia.org/wiki/Wikip%C3%A9dia:WikiProjekt_Wiki_miluje_pamiatky', // Slovakia + 'sk' = 'http://wikilovesmonuments.sk/', // Slovakia 'sv' = 'http://wikilovesmonumentselsalvador.org/', // El Salvador 'sy' = 'http://wikilovesmonuments-sy.org/', // Syria WP 'th' = 'https://commons.wikimedia.org/wiki/Commons:Wiki_Loves_Monuments_2013_in_Thailand/th', // Thailand - Redirect from http://th.wikilovesmonuments.org/ -- To view, visit https://gerrit.wikimedia.org/r/82397 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I624ff45fe7c37386671be6ea75010d9ecb8ab3aa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiLovesMonuments Gerrit-Branch: master Gerrit-Owner: Platonides platoni...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add i18n file - change (mediawiki...StarterWiki)
Siebrand has submitted this change and it was merged.
Change subject: Add i18n file
..
Add i18n file
PS2: http-https per Daniel
Change-Id: Ic779aea4cf43c23f4593208db9ee6c20b843b3b9
---
A StarterWiki.i18n.php
M StarterWiki.php
2 files changed, 27 insertions(+), 1 deletion(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/StarterWiki.i18n.php b/StarterWiki.i18n.php
new file mode 100644
index 000..8e74c8e
--- /dev/null
+++ b/StarterWiki.i18n.php
@@ -0,0 +1,23 @@
+?php
+/**
+ * Internationalisation for StarterWiki
+ *
+ * @file
+ * @ingroup Extensions
+ */
+$messages = array();
+
+/** English
+ * @author Daniel Friesen
+ */
+$messages['en'] = array(
+ 'starterwiki-desc' = 'Provides a set of maintenance scripts and
functions to allow for creation of wiki databases based off a starter wiki',
+);
+
+/** Message documentation (Message documentation)
+ * @author Daniel Friesen
+ */
+$messages['qqq'] = array(
+ 'starterwiki-desc' = '{{desc|name=Starter
Wiki|https://www.mediawiki.org/wiki/Extension:StarterWiki}}',
+);
+
diff --git a/StarterWiki.php b/StarterWiki.php
index 2c048c1..c59bec1 100644
--- a/StarterWiki.php
+++ b/StarterWiki.php
@@ -17,9 +17,12 @@
'url' = 'https://www.mediawiki.org/wiki/Extension:StarterWiki',
'version' = '1.2a',
'author' = [http://danf.ca/mw/ Daniel Friesen],
- 'description' = Provides a set of maintenance scripts and functions
to allow for creation of wiki databases based off a starter wiki.
+ 'descriptionmsg' = 'starterwiki-desc'
);
+## i18n
+$wgExtensionMessagesFiles['StarterWiki'] = __DIR__ . '/StarterWiki.i18n.php';
+
## A list of pages to convert titles and override when cloning the database.
## Key is the ns:title on starter, value is the ns:title to use on the other
wiki.
$wgStarterWikiPageAliases = array(
--
To view, visit https://gerrit.wikimedia.org/r/82395
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic779aea4cf43c23f4593208db9ee6c20b843b3b9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/StarterWiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Consistency tweaks in preparation for adding extension to tr... - change (mediawiki...SectionDisqus)
Siebrand has submitted this change and it was merged.
Change subject: Consistency tweaks in preparation for adding extension to
translatewiki.net
..
Consistency tweaks in preparation for adding extension to translatewiki.net
* Fix type of extension. It is not a special pahe
* Fix extension name in qqq section
* Remove full stop at end of description message
Change-Id: Iaab4609a9210c4ad4d95ec1c0a72c7ab7d37d06e
---
M SectionDisqus.i18n.php
M SectionDisqus.php
2 files changed, 5 insertions(+), 6 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/SectionDisqus.i18n.php b/SectionDisqus.i18n.php
index 509e78f..9ec33a1 100644
--- a/SectionDisqus.i18n.php
+++ b/SectionDisqus.i18n.php
@@ -12,15 +12,15 @@
* @author Luis Felipe Schenone
*/
$messages['en'] = array(
- 'sectiondisqus-desc' = 'Adds a Discuss button next to the Edit
button of every section, that when clicked, opens a Disqus lightbox for that
section.',
+ 'sectiondisqus-desc' = 'Adds a Discuss button next to the Edit
button of every section, that when clicked, opens a Disqus lightbox for that
section',
);
/** Message documentation (Message documentation)
+ * @author Luis Felipe Schenone
* @author Raimond Spekking
- * @author Shirayuki
*/
$messages['qqq'] = array(
- 'sectiondisqus-desc' =
'{{desc|name=SectionDisqus|url=http://www.mediawiki.org/wiki/Extension:HoverGallery}}',
+ 'sectiondisqus-desc' =
'{{desc|name=SectionDisqus|url=https://www.mediawiki.org/wiki/Extension:SectionDisqus}}',
);
/** Spanish (español)
diff --git a/SectionDisqus.php b/SectionDisqus.php
index ff28796..a1261ce 100644
--- a/SectionDisqus.php
+++ b/SectionDisqus.php
@@ -10,14 +10,13 @@
* @version 0.1
*/
-$wgExtensionCredits['specialpage'][] = array(
+$wgExtensionCredits['other'][] = array(
'path' = __FILE__,
'name' = 'SectionDisqus',
- 'description'= 'Adds a disqus button next to the edit button
of every section, that when clicked, opens a Disqus dialog for that section.',
'descriptionmsg' = 'sectiondisqus-desc',
'version'= '0.1',
'author' = 'Luis Felipe Schenone',
- 'url'=
'http://www.mediawiki.org/wiki/Extension:SectionDisqus'
+ 'url'=
'https://www.mediawiki.org/wiki/Extension:SectionDisqus'
);
$wgResourceModules['ext.SectionDisqus'] = array(
--
To view, visit https://gerrit.wikimedia.org/r/79980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaab4609a9210c4ad4d95ec1c0a72c7ab7d37d06e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SectionDisqus
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Some consistency tweaks in preparation for adding extension ... - change (mediawiki...TimezoneSelector)
Siebrand has submitted this change and it was merged.
Change subject: Some consistency tweaks in preparation for adding extension to
translatewiki.net
..
Some consistency tweaks in preparation for adding extension to translatewiki.net
* Fix type of extenson credits ('skin' is not defined)
* Remove translations which are identical to source
** The message keys will be set to 'optional'
* Kill trailing spaces
Change-Id: Ib425e34eab0e3aadd33645e66708b7c01864a520
---
M TimezoneSelector.i18n.php
M TimezoneSelector.php
2 files changed, 3 insertions(+), 7 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/TimezoneSelector.i18n.php b/TimezoneSelector.i18n.php
index d51688b..530bf9f 100644
--- a/TimezoneSelector.i18n.php
+++ b/TimezoneSelector.i18n.php
@@ -130,9 +130,6 @@
'timezoneselector-pref-message-no' = 'Die Beschreibung der obigen
Zeitzoneneinstellungen nicht anzeigen.',
'timezoneselector-pref-message-short' = 'Beschreibung der obigen
Zeitzoneneinstellungen anzeigen',
'timezoneselector-pref-use' = 'Die Erweiterung zur Zeitzonenauswahl
verwenden',
- 'timezoneselector-message-long' = '$1 $2 $3',
- 'timezoneselector-message-short' = '$4',
- 'timezoneselector-message-verbose' = '$1 $2 $3 $4',
'timezoneselector-set-temp' = 'Die von den Systemnachrichten genutzte
Zeitzone vorübergehend ändern.',
'timezoneselector-show-cur' = 'Die aktuell eingestellte Zeitzone ist
„$1“.',
'timezoneselector-show-cur-lastmod' = 'Die aktuelle Zeitzone ist
„$1“.',
@@ -163,7 +160,6 @@
'timezoneselector-pref-message-short' = '短い説明を表示する',
'timezoneselector-pref-use' = 'TimezoneSelector拡張機能を使う',
'timezoneselector-message-long' = '$1$2$3',
- 'timezoneselector-message-short' = '$4',
'timezoneselector-message-verbose' = '$1$2$3$4',
'timezoneselector-set-temp' = 'メッセージ向けタイムゾーンの一時的な変更',
'timezoneselector-show-cur' = '現在使われているメッセージ向けタイムゾーンは「$1」です。',
diff --git a/TimezoneSelector.php b/TimezoneSelector.php
index 8a626b0..708c285 100644
--- a/TimezoneSelector.php
+++ b/TimezoneSelector.php
@@ -22,11 +22,11 @@
die();
}
-$wgExtensionCredits['skin'][] = array(
+$wgExtensionCredits['other'][] = array(
'path' = __FILE__,
'name' = 'TimezoneSelector',
- 'author' = array( 'Burthsceh', '...' ),
- 'url' = 'https://www.mediawiki.org/wiki/Extension:TimezoneSelector',
+ 'author' = array( 'Burthsceh', '...' ),
+ 'url' = 'https://www.mediawiki.org/wiki/Extension:TimezoneSelector',
'descriptionmsg' = 'timezoneselector-desc',
'version' = '0.3',
);
--
To view, visit https://gerrit.wikimedia.org/r/81015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib425e34eab0e3aadd33645e66708b7c01864a520
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimezoneSelector
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Burthsceh burths...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add .gitreview - change (mediawiki...HSTS)
Siebrand has submitted this change and it was merged. Change subject: Add .gitreview .. Add .gitreview Change-Id: I8a6f780e4fce9240607510112065787856695b47 --- A .gitreview 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Siebrand: Verified; Looks good to me, approved diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..cf10c74 --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=mediawiki/extensions/HSTS.git +defaultbranch=master -- To view, visit https://gerrit.wikimedia.org/r/82373 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a6f780e4fce9240607510112065787856695b47 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/HSTS Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: Seb35 seb35wikipe...@gmail.com Gerrit-Reviewer: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Consistency tweaks in preparation for adding extension to tr... - change (mediawiki...Model)
Siebrand has submitted this change and it was merged.
Change subject: Consistency tweaks in preparation for adding extension to
translatewiki.net
..
Consistency tweaks in preparation for adding extension to translatewiki.net
* Extension description key to code convention
* Add message documentation
* Add URL
Change-Id: Id6961c00151782cef8b9e189ca6e282006662f44
---
M Model.i18n.php
M Model.php
2 files changed, 12 insertions(+), 7 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/Model.i18n.php b/Model.i18n.php
index 4ed6dbd..3fc39e2 100644
--- a/Model.i18n.php
+++ b/Model.i18n.php
@@ -3,12 +3,17 @@
$messages = array();
-/* English */
+/**
+ * English
+ * @author Andrew Garrett
+ */
$messages['en'] = array(
-'Model-desc' = 'ORM Abstraction model for mediawiki developers'
+ 'model-desc' = 'ORM Abstraction model for MediaWiki developers'
);
-/* Russian */
-$messages['ru'] = array(
-'Model-desc' = 'ORM Abstraction model for mediawiki developers'
+/** Message documentation (Message documentation)
+ * @author Raymond
+ */
+$messages['qqq'] = array(
+ 'model-desc' =
'{{desc|name=Model|url=https://www.mediawiki.org/wiki/Extension:Model}}',
);
diff --git a/Model.php b/Model.php
index e1e4b0e..f6f3a66 100644
--- a/Model.php
+++ b/Model.php
@@ -26,8 +26,8 @@
'name' = 'Model',
'version' = '0.1',
'author' = 'Vedmaka',
-'url' = '',
-'descriptionmsg' = 'Model-desc',
+'url' = 'https://www.mediawiki.org/wiki/Extension:Model',
+'descriptionmsg' = 'model-desc',
);
/* Resource modules */
--
To view, visit https://gerrit.wikimedia.org/r/82378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id6961c00151782cef8b9e189ca6e282006662f44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Model
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Vedmaka Wakalaka god.vedm...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add i18n file - change (mediawiki...WikiCategoryTagCloud)
Siebrand has submitted this change and it was merged.
Change subject: Add i18n file
..
Add i18n file
Change-Id: I96a75a8bf2440355132175f52c49ea017e5e9071
---
A WikiCategoryTagCloud.i18n.php
M WikiCategoryTagCloud.php
2 files changed, 27 insertions(+), 1 deletion(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/WikiCategoryTagCloud.i18n.php b/WikiCategoryTagCloud.i18n.php
new file mode 100644
index 000..6879969
--- /dev/null
+++ b/WikiCategoryTagCloud.i18n.php
@@ -0,0 +1,23 @@
+?php
+/**
+ * Internationalisation for Wiki Category Tag Cloud
+ *
+ * @file
+ * @ingroup Extensions
+ */
+$messages = array();
+
+/** English
+ * @author Daniel Friesen
+ */
+$messages['en'] = array(
+ 'wikicategorytagcloud-desc' = 'Allows to add tag clouds based on
categories to a page',
+);
+
+/** Message documentation (Message documentation)
+ * @author Daniel Friesen
+ */
+$messages['qqq'] = array(
+ 'wikicategorytagcloud-desc' = '{{desc|name=Wiki Category Tag
Cloud|http://www.mediawiki.org/wiki/Extension:WikiCategoryTagCloud}}',
+);
+
diff --git a/WikiCategoryTagCloud.php b/WikiCategoryTagCloud.php
index 3ff2747..a31b60a 100644
--- a/WikiCategoryTagCloud.php
+++ b/WikiCategoryTagCloud.php
@@ -21,10 +21,13 @@
'name' = 'Wiki Category Tag Cloud',
'version' = '1.1',
'author' = '[http://danf.ca/mw/ Daniel Friesen]',
- 'description' = 'A Category Tag Cloud derived, improved, and fixed
from the YetAnotherTagCloud Extension',
+ 'descriptionmsg' = 'wikicategorytagcloud-desc',
'url' =
'https://www.mediawiki.org/wiki/Extension:WikiCategoryTagCloud',
);
+// i18n
+$wgExtensionMessagesFiles['WikiCategoryTagCloud'] = __DIR__ .
'/WikiCategoryTagCloud.i18n.php';
+
// Avoid unstubbing $wgParser too early on modern (1.12+) MW versions, as per
r35980
$wgHooks['ParserFirstCallInit'][] = 'registerTagCloudExtension';
--
To view, visit https://gerrit.wikimedia.org/r/82394
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I96a75a8bf2440355132175f52c49ea017e5e9071
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikiCategoryTagCloud
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixup truncated license header - change (mediawiki...TorBlock)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixup truncated license header
..
Fixup truncated license header
Add a few braces and spaces and function paramter type documentation
Made torproject.crt eolstyle unix not windows
Change-Id: I1fb5cb0e394d31a5ff41edc280e24514340a15b5
---
M ASN1Parser.php
M TorBlock.class.php
M TorExitNodes.php
M torproject.crt
4 files changed, 70 insertions(+), 42 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ASN1Parser.php b/ASN1Parser.php
index 29cb79d..5a3e356 100644
--- a/ASN1Parser.php
+++ b/ASN1Parser.php
@@ -31,19 +31,30 @@
const IA5String = 22;
const UTCTime = 23;
- static function encodeLength($number) {
- if ($number 128)
- return chr($number);
+ /**
+* @param $number int
+* @return string
+*/
+ public static function encodeLength( $number ) {
+ if ( $number 128 ) {
+ return chr( $number );
+ }
- $out = pack(N*, $number);
+ $out = pack( N*, $number );
$out = ltrim( $out, \0 );
- return chr( 0x80 | strlen($out) ) . $out;
+ return chr( 0x80 | strlen( $out ) ) . $out;
}
- static function decode($buffer) {
- if ( strlen( $buffer ) 2 )
+ /**
+* @param $buffer string
+* @return array
+* @throws ASN1Exception
+*/
+ public static function decode( $buffer ) {
+ if ( strlen( $buffer ) 2 ) {
throw new ASN1Exception( 'ASN1 string is too short' );
+ }
$i = 0;
$result = array();
@@ -63,7 +74,7 @@
$item['tag'] = $tag;
} else {
$tag = 0;
- for (; $i strlen($buffer); $i++) {
+ for (; $i strlen( $buffer ); $i++) {
$t = ord( $buffer[$i] );
$tag = ( $tag 7 ) | ( $t 0x7f );
@@ -72,8 +83,9 @@
break;
}
}
- if ( $i == strlen($buffer) )
+ if ( $i == strlen( $buffer ) ) {
throw new ASN1Exception( 'End of data
found when processing tag identifier' );
+ }
$item['tag'] = $tag;
$i++;
@@ -96,8 +108,9 @@
for ($j = 0; $j $l; $j++, $i++) {
$length = ( $length 8 ) | ord(
$lengthBytes[$j] );
- if ( $length 0 )
+ if ( $length 0 ) {
throw new ASN1Exception(
'Overflow calculating length' );
+ }
}
$item['length'] = $length;
@@ -114,7 +127,7 @@
* project or crypto/objects/obj_dat.txt (where
hexadecimal
* data is available )
*/
- $item['contents'] = $item['contents'];
+ // $item['contents'] = $item['contents'];
}
/* Else, we leave contents as binary data */
@@ -125,17 +138,22 @@
}
/**
-* Prettifies an array output by decode()
+* @param $decodedArray array
+* @return array
*/
- static function prettyDecode($decodedArray) {
+ public static function prettyDecode($decodedArray) {
$decoded = $decodedArray;
- array_walk_recursive($decoded, array( __CLASS__, 'prettyItem' )
);
+ array_walk_recursive( $decoded, array( __CLASS__, 'prettyItem'
) );
return $decoded;
}
- static protected function prettyItem($value, $key) {
- switch ($key) {
+ /**
+* @param $value string
+* @param $key string
+*/
+ static protected function prettyItem( $value, $key ) {
+ switch ( $key ) {
case 'contents': // Not called when contents is an array
$value = strlen( $value ) ? '0x' . bin2hex(
$value ) : '';
break;
@@ -147,7 +165,13 @@
}
}
- static function buildTag($tagId, $contents) {
+ /**
+* @param $tagId
+* @param
[MediaWiki-commits] [Gerrit] Method parameter type hints - change (mediawiki...CleanChanges)
jenkins-bot has submitted this change and it was merged.
Change subject: Method parameter type hints
..
Method parameter type hints
Reduce some else indenting
Change-Id: Ic0e81231e5e9f86946b984f03d495e7f08014c1b
---
M CleanChanges_body.php
M Filters.php
2 files changed, 55 insertions(+), 13 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CleanChanges_body.php b/CleanChanges_body.php
index 35ebc2d..5f339cc 100644
--- a/CleanChanges_body.php
+++ b/CleanChanges_body.php
@@ -36,6 +36,10 @@
protected static $userinfo = array();
+ /**
+* @param $vars array
+* @return bool
+*/
public static function addScriptVariables( $vars ) {
$vars += self::$userinfo;
return true;
@@ -52,6 +56,9 @@
*/
protected $direction = true;
+ /**
+* @param IContextSource|Skin $skin
+*/
public function __construct( $skin ) {
$lang = $this-getLanguage();
parent::__construct( $skin );
@@ -59,6 +66,9 @@
$this-dir = $lang-getDirMark();
}
+ /**
+* @return String
+*/
public function beginRecentChangesList() {
parent::beginRecentChangesList();
$dir = $this-direction ? 'ltr' : 'rtl';
@@ -69,6 +79,9 @@
);
}
+ /**
+* @return string
+*/
public function endRecentChangesList() {
return parent::endRecentChangesList() . '/div';
}
@@ -80,9 +93,8 @@
protected function isLog( RCCacheEntry $rc = null ) {
if ( $rc $rc-getAttribute( 'rc_type' ) == RC_LOG ) {
return 2;
- } else {
- return 0;
}
+ return 0;
}
/**
@@ -215,7 +227,8 @@
$rc-_histLink = Linker::link( $rc-getTitle(),
$this-message['hist'], array(),
- $rc-_reqCurId + array( 'action' = 'history' )
);
+ $rc-_reqCurId + array( 'action' = 'history' )
+ );
}
}
@@ -423,12 +436,10 @@
$priviledged = $this-getUser()-isAllowed(
'deleterevision' );
if ( $priviledged ) {
return $action . ' span
class=history-deleted' . $comment . '/span';
- } else {
- return $action . ' span
class=history-deleted' . $this-msg( 'rev-deleted-comment' )-escaped() .
'/span';
}
- } else {
- return $action . Linker::commentBlock( $comment,
$rc-getTitle() );
+ return $action . ' span class=history-deleted' .
$this-msg( 'rev-deleted-comment' )-escaped() . '/span';
}
+ return $action . Linker::commentBlock( $comment,
$rc-getTitle() );
}
/**
@@ -456,7 +467,6 @@
$users[] = $userText;
$userindex = count( $users ) -1;
}
-
global $wgStylePath;
$image = Xml::element( 'img', array(
@@ -614,16 +624,21 @@
return $this-XMLwrapper( 'mw-plusminus-null',
$cache[$szdiff], $tag );
} elseif ( $szdiff 0 ) {
return $this-XMLwrapper( 'mw-plusminus-pos',
$cache[$szdiff], $tag );
- } else {
- return $this-XMLwrapper( 'mw-plusminus-neg',
$cache[$szdiff], $tag );
}
+ return $this-XMLwrapper( 'mw-plusminus-neg', $cache[$szdiff],
$tag );
}
+ /**
+* @param $class
+* @param $content
+* @param string $tag
+* @param bool $escape
+* @return string
+*/
protected function XMLwrapper( $class, $content, $tag = 'span', $escape
= true ) {
if ( $escape ) {
return Xml::element( $tag, array( 'class' = $class ),
$content );
- } else {
- return Xml::tags( $tag, array( 'class' = $class ),
$content );
}
+ return Xml::tags( $tag, array( 'class' = $class ), $content );
}
}
diff --git a/Filters.php b/Filters.php
index 01b7cbf..d6e9939 100644
--- a/Filters.php
+++ b/Filters.php
@@ -1,11 +1,21 @@
?php
class CCFilters {
+
+ /**
+* @param array $conds
+* @param array $tables
+* @param array $join_conds
+* @param FormOptions $opts
+* @return bool
+*/
public static function user( $conds, $tables, $join_conds,
FormOptions $opts ) {
global $wgRequest;
$opts-add(
[MediaWiki-commits] [Gerrit] Tool Labs: package python-scipy - change (operations/puppet)
coren has uploaded a new change for review. https://gerrit.wikimedia.org/r/82398 Change subject: Tool Labs: package python-scipy .. Tool Labs: package python-scipy Bug: 53624 Change-Id: I68e1ea44da294bd4f6b67abff2b527d9433f5fb4 --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/98/82398/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 4efb96b..e01ff18 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -109,6 +109,7 @@ 'python-problem-report', 'python-redis', 'python-requests', + 'python-scipy', 'python-sqlalchemy', 'python-twisted', 'python-uwsgi', -- To view, visit https://gerrit.wikimedia.org/r/82398 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68e1ea44da294bd4f6b67abff2b527d9433f5fb4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: coren mpellet...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tool Labs: package python-scipy - change (operations/puppet)
coren has submitted this change and it was merged. Change subject: Tool Labs: package python-scipy .. Tool Labs: package python-scipy Bug: 53624 Change-Id: I68e1ea44da294bd4f6b67abff2b527d9433f5fb4 --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: coren: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 4efb96b..e01ff18 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -109,6 +109,7 @@ 'python-problem-report', 'python-redis', 'python-requests', + 'python-scipy', 'python-sqlalchemy', 'python-twisted', 'python-uwsgi', -- To view, visit https://gerrit.wikimedia.org/r/82398 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I68e1ea44da294bd4f6b67abff2b527d9433f5fb4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: coren mpellet...@wikimedia.org Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: coren mpellet...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tool Labs: package python-rsvg - change (operations/puppet)
coren has uploaded a new change for review. https://gerrit.wikimedia.org/r/82399 Change subject: Tool Labs: package python-rsvg .. Tool Labs: package python-rsvg Bug: 53626 Change-Id: If43a379274a0228b0345209c4c9f4fb0f9617aa8 --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/99/82399/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index e01ff18..2343609 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -109,6 +109,7 @@ 'python-problem-report', 'python-redis', 'python-requests', + 'python-rsvg', 'python-scipy', 'python-sqlalchemy', 'python-twisted', -- To view, visit https://gerrit.wikimedia.org/r/82399 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If43a379274a0228b0345209c4c9f4fb0f9617aa8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: coren mpellet...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tool Labs: package python-rsvg - change (operations/puppet)
coren has submitted this change and it was merged. Change subject: Tool Labs: package python-rsvg .. Tool Labs: package python-rsvg Bug: 53626 Change-Id: If43a379274a0228b0345209c4c9f4fb0f9617aa8 --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: coren: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index e01ff18..2343609 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -109,6 +109,7 @@ 'python-problem-report', 'python-redis', 'python-requests', + 'python-rsvg', 'python-scipy', 'python-sqlalchemy', 'python-twisted', -- To view, visit https://gerrit.wikimedia.org/r/82399 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If43a379274a0228b0345209c4c9f4fb0f9617aa8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: coren mpellet...@wikimedia.org Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: coren mpellet...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tool Labs: Boost for python - change (operations/puppet)
coren has uploaded a new change for review. https://gerrit.wikimedia.org/r/82401 Change subject: Tool Labs: Boost for python .. Tool Labs: Boost for python Bug: 53627 Change-Id: I1e50b981867faf2751fdea173f0e400c85a2b9e6 --- M modules/toollabs/manifests/dev_environ.pp M modules/toollabs/manifests/exec_environ.pp 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/01/82401/1 diff --git a/modules/toollabs/manifests/dev_environ.pp b/modules/toollabs/manifests/dev_environ.pp index 1b02891..6512a21 100644 --- a/modules/toollabs/manifests/dev_environ.pp +++ b/modules/toollabs/manifests/dev_environ.pp @@ -25,6 +25,7 @@ 'autoconf', 'sqlite3', 'python-dev', + 'libboost-python1.48-dev', 'libmariadbclient-dev', 'libpng3-dev', 'libfreetype6-dev', diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 2343609..c8f7558 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -80,6 +80,7 @@ 'libxml-xpathengine-perl', # For Checkwiki. # Python libraries + 'libboost-python1.48.0', 'python-apport', 'python-beautifulsoup',# For valhallasw. 'python-celery', -- To view, visit https://gerrit.wikimedia.org/r/82401 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e50b981867faf2751fdea173f0e400c85a2b9e6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: coren mpellet...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tool Labs: Boost for python - change (operations/puppet)
coren has submitted this change and it was merged. Change subject: Tool Labs: Boost for python .. Tool Labs: Boost for python Bug: 53627 Change-Id: I1e50b981867faf2751fdea173f0e400c85a2b9e6 --- M modules/toollabs/manifests/dev_environ.pp M modules/toollabs/manifests/exec_environ.pp 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: coren: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/toollabs/manifests/dev_environ.pp b/modules/toollabs/manifests/dev_environ.pp index 1b02891..6512a21 100644 --- a/modules/toollabs/manifests/dev_environ.pp +++ b/modules/toollabs/manifests/dev_environ.pp @@ -25,6 +25,7 @@ 'autoconf', 'sqlite3', 'python-dev', + 'libboost-python1.48-dev', 'libmariadbclient-dev', 'libpng3-dev', 'libfreetype6-dev', diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 2343609..c8f7558 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -80,6 +80,7 @@ 'libxml-xpathengine-perl', # For Checkwiki. # Python libraries + 'libboost-python1.48.0', 'python-apport', 'python-beautifulsoup',# For valhallasw. 'python-celery', -- To view, visit https://gerrit.wikimedia.org/r/82401 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1e50b981867faf2751fdea173f0e400c85a2b9e6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: coren mpellet...@wikimedia.org Gerrit-Reviewer: coren mpellet...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't show the IME in the CodeEditor textarea - change (operations/mediawiki-config)
coren has submitted this change and it was merged.
Change subject: Don't show the IME in the CodeEditor textarea
..
Don't show the IME in the CodeEditor textarea
Without this change the IME selector appears in in unexpected places
in the CodeEditor.
This should be fixed in a better way, but until
it's fixed it's better to disable it.
Bug: 53300
Change-Id: I0cc1e92a8fda4822e2ce786e618aac1713fc4676
---
M wmf-config/CommonSettings.php
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index c0f9ffc..67c80ce 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2479,6 +2479,9 @@
$wgULSAnonCanChangeLanguage = false;
$wgULSPosition = $wmgULSPosition;
$wgULSIMEEnabled = $wmgULSIMEEnabled;
+ if ( $wmgUseCodeEditorForCore || $wmgUseScribunto ||
$wmgUseZeroNamespace ) {
+ $wgULSNoImeSelectors[] = '.ace_editor textarea';
+ }
}
if ( $wmgUseWikibaseRepo || $wmgUseWikibaseClient ) {
--
To view, visit https://gerrit.wikimedia.org/r/80717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0cc1e92a8fda4822e2ce786e618aac1713fc4676
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Greg Grossmeier g...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tool Labs: User-requested perl packages - change (operations/puppet)
coren has uploaded a new change for review. https://gerrit.wikimedia.org/r/82403 Change subject: Tool Labs: User-requested perl packages .. Tool Labs: User-requested perl packages With URI::Encode installed as the supported alternative to URI::Escape. Bug: 53694 Change-Id: If0b0ef001f3bb1efd1d3c41f2c19580bfc9183d3 --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/03/82403/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index c8f7558..cc42e11 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -51,13 +51,18 @@ 'libdigest-hmac-perl', 'libhtml-html5-entities-perl', 'libhtml-parser-perl', + 'libio-socket-ssl-perl', 'libipc-run-perl', 'libirc-utils-perl', 'libjson-perl', 'libjson-xs-perl', + 'libio-socket-ssl-perl', + 'liblwp-protocol-https-perl', 'libmediawiki-api-perl', 'libmediawiki-bot-perl', + 'libnet-netmask-perl', 'libnet-oauth-perl', + 'libnet-ssleay-perl', 'libnetaddr-ip-perl', 'libobject-pluggable-perl', 'libpod-simple-wiki-perl', @@ -73,6 +78,8 @@ 'libtest-exception-perl', # For Checkwiki. 'libthreads-perl', 'libthreads-shared-perl', + 'libtime-local-perl', + 'liburi-encode-perl', 'liburi-perl', 'libwww-perl', 'libxml-libxml-perl', -- To view, visit https://gerrit.wikimedia.org/r/82403 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0b0ef001f3bb1efd1d3c41f2c19580bfc9183d3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: coren mpellet...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tool Labs: User-requested perl packages - change (operations/puppet)
coren has submitted this change and it was merged. Change subject: Tool Labs: User-requested perl packages .. Tool Labs: User-requested perl packages With URI::Encode installed as the supported alternative to URI::Escape. Bug: 53694 Change-Id: If0b0ef001f3bb1efd1d3c41f2c19580bfc9183d3 --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: coren: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index c8f7558..cc42e11 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -51,13 +51,18 @@ 'libdigest-hmac-perl', 'libhtml-html5-entities-perl', 'libhtml-parser-perl', + 'libio-socket-ssl-perl', 'libipc-run-perl', 'libirc-utils-perl', 'libjson-perl', 'libjson-xs-perl', + 'libio-socket-ssl-perl', + 'liblwp-protocol-https-perl', 'libmediawiki-api-perl', 'libmediawiki-bot-perl', + 'libnet-netmask-perl', 'libnet-oauth-perl', + 'libnet-ssleay-perl', 'libnetaddr-ip-perl', 'libobject-pluggable-perl', 'libpod-simple-wiki-perl', @@ -73,6 +78,8 @@ 'libtest-exception-perl', # For Checkwiki. 'libthreads-perl', 'libthreads-shared-perl', + 'libtime-local-perl', + 'liburi-encode-perl', 'liburi-perl', 'libwww-perl', 'libxml-libxml-perl', -- To view, visit https://gerrit.wikimedia.org/r/82403 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If0b0ef001f3bb1efd1d3c41f2c19580bfc9183d3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: coren mpellet...@wikimedia.org Gerrit-Reviewer: coren mpellet...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ChangeOpClaim now uses the claim guids - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: ChangeOpClaim now uses the claim guids
..
ChangeOpClaim now uses the claim guids
Change-Id: I117f0b10ee4e1782bbaaad77248e226773b23a64
---
M repo/includes/changeop/ChangeOpClaim.php
M repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
2 files changed, 122 insertions(+), 37 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/changeop/ChangeOpClaim.php
b/repo/includes/changeop/ChangeOpClaim.php
index f5cd0a8..5a7667b 100644
--- a/repo/includes/changeop/ChangeOpClaim.php
+++ b/repo/includes/changeop/ChangeOpClaim.php
@@ -4,6 +4,7 @@
use InvalidArgumentException;
use Wikibase\Lib\ClaimGuidGenerator;
+use Wikibase\Lib\ClaimGuidValidator;
/**
* Class for claim change operation
@@ -32,14 +33,22 @@
protected $action;
/**
+* @since 0.5
+*
+* @var ClaimGuidGenerator
+*/
+ protected $guidGenerator;
+
+ /**
* @since 0.4
*
* @param Claim $claim
* @param string $action should be add or remove
*
-* @throws InvalidArgumentException
+* @param ClaimGuidGenerator $guidGenerator
+* @throws \InvalidArgumentException
*/
- public function __construct( $claim, $action ) {
+ public function __construct( $claim, $action, ClaimGuidGenerator
$guidGenerator ) {
if ( !$claim instanceof Claim ) {
throw new InvalidArgumentException( '$claim needs to be
an instance of Claim' );
}
@@ -50,6 +59,7 @@
$this-claim = $claim;
$this-action = $action;
+ $this-guidGenerator = $guidGenerator;
}
/**
@@ -65,16 +75,36 @@
* @throws ChangeOpException
*/
public function apply( Entity $entity, Summary $summary = null ) {
+
if ( $this-action === add ) {
- $guidGenerator = new ClaimGuidGenerator(
$entity-getId() );
- $this-claim-setGuid( $guidGenerator-newGuid() );
+
+ $guidValidator = new ClaimGuidValidator();
+
+ if( $this-claim-getGuid() === null ){
+ $this-claim-setGuid(
$this-guidGenerator-newGuid() );
+ }
+ $guid = $this-claim-getGuid();
+
+ if ( $guidValidator-validate( $guid ) === false ) {
+ throw new ChangeOpException( Claim does not
have a valid GUID );
+ } else if ( strtoupper(
$entity-getId()-getPrefixedId() ) !== substr( $guid, 0, strpos( $guid, '$' )
) ){
+ throw new ChangeOpException( Claim GUID
invalid for given entity );
+ }
+
$entity-addClaim( $this-claim );
$this-updateSummary( $summary, 'add' );
+
} elseif ( $this-action === remove ) {
+
+ $guid = $this-claim-getGuid();
$claims = new Claims ( $entity-getClaims() );
- $claims-removeClaim( $this-claim );
+ if( !$claims-hasClaimWithGuid( $guid ) ){
+ throw new ChangeOpException( 'Cannot remove a
claim that does not exist on given entity' );
+ }
+ $claims-removeClaimWithGuid( $guid );
$entity-setClaims( $claims );
$this-updateSummary( $summary, 'remove' );
+
} else {
throw new ChangeOpException( Unknown action for change
op: $this-action );
}
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
b/repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
index ed9e8c7..413d566 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
+++ b/repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
@@ -5,10 +5,12 @@
use Wikibase\ChangeOpClaim;
use Wikibase\Claim;
use Wikibase\Claims;
+use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Entity;
-use Wikibase\EntityId;
+use Wikibase\Item;
use Wikibase\ItemContent;
use InvalidArgumentException;
+use Wikibase\Lib\ClaimGuidGenerator;
use Wikibase\PropertyNoValueSnak;
use Wikibase\PropertySomeValueSnak;
use Wikibase\SnakObject;
@@ -32,10 +34,12 @@
class ChangeOpClaimTest extends \PHPUnit_Framework_TestCase {
public function invalidConstructorProvider() {
+ $validGuidGenerator = new ClaimGuidGenerator(
ItemId::newFromNumber( 42 ) );
+
$args = array();
- $args[] = array( 42, 'add' );
- $args[] = array( 'en', 'remove' );
- $args[] = array( array(), 'remove' );
+
[MediaWiki-commits] [Gerrit] Show entire link (including wgServer and protocol) in summar... - change (mediawiki...LiquidThreads)
jenkins-bot has submitted this change and it was merged.
Change subject: Show entire link (including wgServer and protocol) in summary
Link To box
..
Show entire link (including wgServer and protocol) in summary Link To box
Bug: 25765
Change-Id: Id3e4d67769d0ed8eba9d37381482da9ef2188ce4
---
M lqt.js
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Helder.wiki: Looks good to me, but someone else must approve
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lqt.js b/lqt.js
index 0992770..2d8b908 100644
--- a/lqt.js
+++ b/lqt.js
@@ -812,7 +812,10 @@
'showSummaryLinkWindow' : function ( e ) {
e.preventDefault();
- var linkURL = $( this ).attr( 'href' );
+ var linkURL = mw.config.get( 'wgServer' ) + $( this ).attr(
'href' );
+ if ( linkURL.substr( 0, 2 ) === '//' ) {
+ linkURL = window.location.protocol + linkURL;
+ }
var linkTitle = $( this ).parent().find(
'input[name=summary-title]' ).val();
liquidThreads.showLinkWindow( linkTitle, linkURL );
},
--
To view, visit https://gerrit.wikimedia.org/r/66334
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id3e4d67769d0ed8eba9d37381482da9ef2188ce4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Helder.wiki helder.w...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't show edit form open warning when saving thread summary - change (mediawiki...LiquidThreads)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't show edit form open warning when saving thread summary
..
Don't show edit form open warning when saving thread summary
Also fix the non-AJAX fallback to not show warning
Bug: 46040
Change-Id: I5d9b8cd18707cc97afc24c50752b7db259cb0f14
---
M lqt.js
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lqt.js b/lqt.js
index 9069a9d..57326b8 100644
--- a/lqt.js
+++ b/lqt.js
@@ -917,6 +917,7 @@
var form = editform.find( '#editform' );
form.append( saveHidden );
+ form.parent().data( 'non-ajax-submit', true ); // To
avoid edit form open warning
form.submit();
}
@@ -1599,9 +1600,9 @@
$( window ).bind( 'beforeunload', function() {
var confirmExitPage = false;
- $( '.lqt-edit-form' ).each( function( index, element ) {
+ $( '.lqt-edit-form:not(.lqt-summarize-form)' ).each( function(
index, element ) {
var textArea = $( element ).children( 'form' ).find(
'textarea' );
- if ( element.style.display !== 'none' textArea.val()
) {
+ if ( element.style.display !== 'none' !$( element
).data( 'non-ajax-submit' ) textArea.val() ) {
confirmExitPage = true;
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/82251
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5d9b8cd18707cc97afc24c50752b7db259cb0f14
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add full-stops to messages - change (mediawiki...LiquidThreads)
Shirayuki has uploaded a new change for review. https://gerrit.wikimedia.org/r/82404 Change subject: Add full-stops to messages .. Add full-stops to messages For consistency Change-Id: I0e95934355875bfdef84231adb65a9041b135d92 --- M i18n/Lqt.i18n.php 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LiquidThreads refs/changes/04/82404/1 diff --git a/i18n/Lqt.i18n.php b/i18n/Lqt.i18n.php index ebf1068..c95 100644 --- a/i18n/Lqt.i18n.php +++ b/i18n/Lqt.i18n.php @@ -64,15 +64,15 @@ 'lqt_change_new_thread' = 'This is the thread\'s initial revision.', 'lqt_change_reply_created' = 'The [$1 highlighted comment] was created in this revision.', 'lqt_change_edited_root' = 'The [$1 highlighted comment] was edited in this revision.', - 'lqt_change_edited_summary' = The thread's summary was edited, - 'lqt_change_deleted' = '[$1 This thread] or its parent was deleted', - 'lqt_change_undeleted' = 'The [$1 highlighted post] was undeleted', - 'lqt_change_moved' = '[$1 This thread] was moved to another discussion page', - 'lqt_change_split' = '[$1 This thread] was split from another thread', - 'lqt_change_edited_subject' = 'The subject of this thread was changed from $2 to $3', - 'lqt_change_merged_from' = 'A [$1 reply] to this thread was moved to another thread', - 'lqt_change_merged_to' = 'The [$1 highlighted reply] was moved from another thread', - 'lqt_change_split_from' = 'A [$1 subthread] of this thread was split into its own thread', + 'lqt_change_edited_summary' = The thread's summary was edited., + 'lqt_change_deleted' = '[$1 This thread] or its parent was deleted.', + 'lqt_change_undeleted' = 'The [$1 highlighted post] was undeleted.', + 'lqt_change_moved' = '[$1 This thread] was moved to another discussion page.', + 'lqt_change_split' = '[$1 This thread] was split from another thread.', + 'lqt_change_edited_subject' = 'The subject of this thread was changed from $2 to $3.', + 'lqt_change_merged_from' = 'A [$1 reply] to this thread was moved to another thread.', + 'lqt_change_merged_to' = 'The [$1 highlighted reply] was moved from another thread.', + 'lqt_change_split_from' = 'A [$1 subthread] of this thread was split into its own thread.', 'lqt_change_root_blanked' = 'The text of [$1 a comment] was removed.', 'lqt_youhavenewmessages' = 'You have [[$1|new messages]].', -- To view, visit https://gerrit.wikimedia.org/r/82404 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e95934355875bfdef84231adb65a9041b135d92 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LiquidThreads Gerrit-Branch: master Gerrit-Owner: Shirayuki shirayuk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add full-stops to messages - change (mediawiki...LiquidThreads)
jenkins-bot has submitted this change and it was merged. Change subject: Add full-stops to messages .. Add full-stops to messages For consistency Change-Id: I0e95934355875bfdef84231adb65a9041b135d92 --- M i18n/Lqt.i18n.php 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/Lqt.i18n.php b/i18n/Lqt.i18n.php index ebf1068..c95 100644 --- a/i18n/Lqt.i18n.php +++ b/i18n/Lqt.i18n.php @@ -64,15 +64,15 @@ 'lqt_change_new_thread' = 'This is the thread\'s initial revision.', 'lqt_change_reply_created' = 'The [$1 highlighted comment] was created in this revision.', 'lqt_change_edited_root' = 'The [$1 highlighted comment] was edited in this revision.', - 'lqt_change_edited_summary' = The thread's summary was edited, - 'lqt_change_deleted' = '[$1 This thread] or its parent was deleted', - 'lqt_change_undeleted' = 'The [$1 highlighted post] was undeleted', - 'lqt_change_moved' = '[$1 This thread] was moved to another discussion page', - 'lqt_change_split' = '[$1 This thread] was split from another thread', - 'lqt_change_edited_subject' = 'The subject of this thread was changed from $2 to $3', - 'lqt_change_merged_from' = 'A [$1 reply] to this thread was moved to another thread', - 'lqt_change_merged_to' = 'The [$1 highlighted reply] was moved from another thread', - 'lqt_change_split_from' = 'A [$1 subthread] of this thread was split into its own thread', + 'lqt_change_edited_summary' = The thread's summary was edited., + 'lqt_change_deleted' = '[$1 This thread] or its parent was deleted.', + 'lqt_change_undeleted' = 'The [$1 highlighted post] was undeleted.', + 'lqt_change_moved' = '[$1 This thread] was moved to another discussion page.', + 'lqt_change_split' = '[$1 This thread] was split from another thread.', + 'lqt_change_edited_subject' = 'The subject of this thread was changed from $2 to $3.', + 'lqt_change_merged_from' = 'A [$1 reply] to this thread was moved to another thread.', + 'lqt_change_merged_to' = 'The [$1 highlighted reply] was moved from another thread.', + 'lqt_change_split_from' = 'A [$1 subthread] of this thread was split into its own thread.', 'lqt_change_root_blanked' = 'The text of [$1 a comment] was removed.', 'lqt_youhavenewmessages' = 'You have [[$1|new messages]].', -- To view, visit https://gerrit.wikimedia.org/r/82404 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e95934355875bfdef84231adb65a9041b135d92 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LiquidThreads Gerrit-Branch: master Gerrit-Owner: Shirayuki shirayuk...@gmail.com Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix comments for grep - change (mediawiki...OAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix comments for grep
..
Fix comments for grep
* Remove unused messages
See also:
http://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Mwoauthmanageconsumers-success-reanable/en
Change-Id: Ia48898626c4e716c00830b6e365ecd4e281e1686
---
M frontend/specialpages/SpecialMWOAuth.php
M frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
M frontend/specialpages/SpecialMWOAuthManageConsumers.php
M frontend/specialpages/SpecialMWOAuthManageMyGrants.php
4 files changed, 15 insertions(+), 24 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/frontend/specialpages/SpecialMWOAuth.php
b/frontend/specialpages/SpecialMWOAuth.php
index 8866cb8..5420a99 100644
--- a/frontend/specialpages/SpecialMWOAuth.php
+++ b/frontend/specialpages/SpecialMWOAuth.php
@@ -177,12 +177,9 @@
$out-addHTML( Html::element( 'p', array(), $this-msg(
'mwoauth-authorize-form' )-text() ) );
$description = '';
foreach ( $params['description'] as $descKey = $descVal ) {
- /* Messages:
- 'mwoauth-authorize-form-user'
- 'mwoauth-authorize-form-name'
- 'mwoauth-authorize-form-description'
- 'mwoauth-authorize-form-version'
- 'mwoauth-authorize-form-wiki'*/
+ // Messages: mwoauth-authorize-form-user,
mwoauth-authorize-form-name,
+ // mwoauth-authorize-form-description,
mwoauth-authorize-form-version,
+ // mwoauth-authorize-form-wiki
$description .= Html::element(
'li',
array(),
diff --git a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
index ce30d3c..fd3efe9 100644
--- a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
+++ b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
@@ -382,9 +382,8 @@
$cmr-get( 'name', function( $s ) use ( $cmr ) {
return $s . ' [' . $cmr-get( 'version'
) . ']'; } )
),
- // Give grep a chance to find the usages:
- // mwoauth-consumer-stage-proposed,
mwoauth-consumer-stage-rejected, mwoauth-consumer-stage-expired,
- // mwoauth-consumer-stage-approved,
mwoauth-consumer-stage-disabled, mwoauth-consumer-stage-suppressed
+ // Messages: mwoauth-consumer-stage-proposed,
mwoauth-consumer-stage-rejected,
+ // mwoauth-consumer-stage-expired,
mwoauth-consumer-stage-approved, mwoauth-consumer-stage-disabled
'mwoauthconsumerregistration-stage' =
$this-msg( mwoauth-consumer-stage-$stageKey
)-escaped(),
'mwoauthconsumerregistration-description' =
htmlspecialchars(
diff --git a/frontend/specialpages/SpecialMWOAuthManageConsumers.php
b/frontend/specialpages/SpecialMWOAuthManageConsumers.php
index 450fa35..6cc7179 100644
--- a/frontend/specialpages/SpecialMWOAuthManageConsumers.php
+++ b/frontend/specialpages/SpecialMWOAuthManageConsumers.php
@@ -165,8 +165,7 @@
$tag .
Linker::makeKnownLinkObj(
$this-getTitle( $stageKey ),
- // Give grep a chance to find the
usages:
- // mwoauthmanageconsumers-q-proposed,
mwoauthmanageconsumers-q-rejected,
+ // Messages:
mwoauthmanageconsumers-q-proposed, mwoauthmanageconsumers-q-rejected,
// mwoauthmanageconsumers-q-expired
$this-msg( 'mwoauthmanageconsumers-q-'
. $stageKey )-escaped()
) .
@@ -183,8 +182,7 @@
'li' .
Linker::makeKnownLinkObj(
$this-getTitle( $stageKey ),
- // Give grep a chance to find the
usages:
- // mwoauthmanageconsumers-l-approved,
mwoauthmanageconsumers-l-disabled
+ // Messages:
mwoauthmanageconsumers-l-approved, mwoauthmanageconsumers-l-disabled
$this-msg( 'mwoauthmanageconsumers-l-'
. $stageKey )-escaped()
) .
[$counts[$stage]] .
@@ -302,10 +300,9 @@
'stage' = array(
[MediaWiki-commits] [Gerrit] Fix license name CC BY-SA - change (mediawiki...WikimediaMessages)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix license name CC BY-SA
..
Fix license name CC BY-SA
Change-Id: I9b23716109766fc3e96877d96de636ba32616c73
---
M WikimediaMessages.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikimediaMessages.i18n.php b/WikimediaMessages.i18n.php
index b5b9983..3babab6 100644
--- a/WikimediaMessages.i18n.php
+++ b/WikimediaMessages.i18n.php
@@ -231,7 +231,7 @@
additional terms may apply.
See a href=https://wikimediafoundation.org/wiki/Terms_of_Use;
title=Wikimedia Foundation Terms of UseTerms of Use/a for details.',
'wikidata-shortcopyrightwarning' = 'By clicking
{{int:wikibase-save}}, you agree to the
[https://wikimediafoundation.org/wiki/Terms_of_Use terms of use], and you
irrevocably agree to release your contribution under the
[https://creativecommons.org/publicdomain/zero/1.0/ CC0 license].',
- 'wikimedia-copyrightwarning' = 'By clicking the {{int:savearticle}}
button, you agree to the [https://wikimediafoundation.org/wiki/Terms_of_Use
Terms of Use], and you irrevocably agree to release your contribution under the
[https://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License
CC-BY-SA 3.0 License] and the
[https://en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License
GFDL].
+ 'wikimedia-copyrightwarning' = 'By clicking the {{int:savearticle}}
button, you agree to the [https://wikimediafoundation.org/wiki/Terms_of_Use
Terms of Use], and you irrevocably agree to release your contribution under the
[https://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License
CC BY-SA 3.0 License] and the
[https://en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License
GFDL].
You agree that a hyperlink or URL is sufficient attribution under the Creative
Commons license.',
# Wikidata-specific messages
--
To view, visit https://gerrit.wikimedia.org/r/82083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b23716109766fc3e96877d96de636ba32616c73
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix license name CC BY-SA - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Fix license name CC BY-SA .. Fix license name CC BY-SA Change-Id: I65731cf853b505c1130a23b3c62f24fe539d4669 --- M MobileFrontend.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/MobileFrontend.i18n.php b/MobileFrontend.i18n.php index 9cab202..0bcb221 100644 --- a/MobileFrontend.i18n.php +++ b/MobileFrontend.i18n.php @@ -258,7 +258,7 @@ 'mobile-frontend-editor-save' = 'Save', 'mobile-frontend-editor-cancel' = 'Cancel', 'mobile-frontend-editor-keep-editing' = 'Keep editing', - 'mobile-frontend-editor-license' = 'By clicking Save, you agree to our [//wikimediafoundation.org/wiki/Terms_of_use Terms of Use] and agree to release your text under the [//creativecommons.org/licenses/by-sa/3.0/ CC-BY-SA 3.0 License] and [//en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License GFDL].', + 'mobile-frontend-editor-license' = 'By clicking Save, you agree to our [//wikimediafoundation.org/wiki/Terms_of_use Terms of Use] and agree to release your text under the [//creativecommons.org/licenses/by-sa/3.0/ CC BY-SA 3.0 License] and [//en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License GFDL].', 'mobile-frontend-editor-placeholder' = 'This section is empty. Be the first to expand it!', 'mobile-frontend-editor-summary-placeholder' = 'Tell us what you changed (optional)', 'mobile-frontend-editor-cancel-confirm' = 'Do you really want to abandon your edit?', -- To view, visit https://gerrit.wikimedia.org/r/82082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I65731cf853b505c1130a23b3c62f24fe539d4669 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Shirayuki shirayuk...@gmail.com Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add/update comments for grep - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Add/update comments for grep
..
Add/update comments for grep
Change-Id: I6402a593872480cac4b76492957771529c1adeb8
---
M includes/specials/SpecialListfiles.php
M languages/Language.php
M languages/classes/LanguageZh_hans.php
3 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialListfiles.php
b/includes/specials/SpecialListfiles.php
index 9377628..d34c44e 100644
--- a/includes/specials/SpecialListfiles.php
+++ b/includes/specials/SpecialListfiles.php
@@ -443,6 +443,7 @@
case 'count':
return intval( $value ) + 1;
case 'top':
+ // Messages: listfiles-latestversion-yes,
listfiles-latestversion-no
return $this-msg( 'listfiles-latestversion-' .
$value );
}
}
diff --git a/languages/Language.php b/languages/Language.php
index 00c3faf..355a834 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -2093,8 +2093,8 @@
$segments = array();
foreach ( $intervals as $intervalName = $intervalValue ) {
- // Messages: duration-centuries, duration-decades,
duration-years, duration-days,
- // duration-hours, duration-minutes, duration-seconds
+ // Messages: duration-seconds, duration-minutes,
duration-hours, duration-days, duration-weeks,
+ // duration-years, duration-decades,
duration-centuries, duration-millennia
$message = wfMessage( 'duration-' . $intervalName
)-numParams( $intervalValue );
$segments[] = $message-inLanguage( $this )-escaped();
}
diff --git a/languages/classes/LanguageZh_hans.php
b/languages/classes/LanguageZh_hans.php
index 04b2e16..3851c8f 100644
--- a/languages/classes/LanguageZh_hans.php
+++ b/languages/classes/LanguageZh_hans.php
@@ -86,6 +86,8 @@
$segments = array();
foreach ( $intervals as $intervalName = $intervalValue ) {
+ // Messages: duration-seconds, duration-minutes,
duration-hours, duration-days, duration-weeks,
+ // duration-years, duration-decades,
duration-centuries, duration-millennia
$message = wfMessage( 'duration-' . $intervalName
)-numParams( $intervalValue );
$segments[] = $message-inLanguage( $this )-escaped();
}
--
To view, visit https://gerrit.wikimedia.org/r/82084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6402a593872480cac4b76492957771529c1adeb8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com
Gerrit-Reviewer: Liangent liang...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace e-mail by email - change (mediawiki...SemanticWatchlist)
jenkins-bot has submitted this change and it was merged.
Change subject: Replace e-mail by email
..
Replace e-mail by email
For consistency
Change-Id: Idc84a01db459462be4aa0a325b78eb3982e7037b
---
M SemanticWatchlist.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SemanticWatchlist.i18n.php b/SemanticWatchlist.i18n.php
index 5817be8..41e3fa8 100644
--- a/SemanticWatchlist.i18n.php
+++ b/SemanticWatchlist.i18n.php
@@ -75,7 +75,7 @@
'prefs-swl' = 'Semantic watchlist',
'prefs-swlgroup' = 'Groups to watch',
'prefs-swlglobal' = 'General options',
- 'swl-prefs-emailnofity' = 'E-mail me on changes to properties I am
watching',
+ 'swl-prefs-emailnofity' = 'Email me on changes to properties I am
watching',
'swl-prefs-watchlisttoplink' = 'Show a link to the Semantic Watchlist
on the top of the page',
'swl-prefs-category-label' = '''$1''':
{{PLURAL:$2|property|properties}} $3 from category ''$4'',
'swl-prefs-namespace-label' = '''$1''':
{{PLURAL:$2|property|properties}} $3 from namespace ''$4'',
--
To view, visit https://gerrit.wikimedia.org/r/81921
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idc84a01db459462be4aa0a325b78eb3982e7037b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticWatchlist
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace e-mail by email - change (mediawiki...SemanticSignup)
jenkins-bot has submitted this change and it was merged. Change subject: Replace e-mail by email .. Replace e-mail by email For consistency Change-Id: I7b78117b880dadf4a1a1d18faebd800bd1321260 --- M SemanticSignup.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/SemanticSignup.i18n.php b/SemanticSignup.i18n.php index c016b96..a3f0a4e 100644 --- a/SemanticSignup.i18n.php +++ b/SemanticSignup.i18n.php @@ -20,7 +20,7 @@ 'ses-nopwdmatch' = 'Password and password confirmation do not match.', 'ses-norealname' = 'Real name is required but has not been specified.', 'ses-userexists' = 'User already exists.', - 'ses-emailfailed' = 'Confirmation e-mail sending failed.', + 'ses-emailfailed' = 'Confirmation email sending failed.', 'ses-createforbidden' = 'Current user is not allowed to create accounts.', 'ses-throttlehit' = 'The maximum number of new user accounts per day has been exceeded for this IP address.', 'ses-userexists' = 'User already exists.' -- To view, visit https://gerrit.wikimedia.org/r/81918 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7b78117b880dadf4a1a1d18faebd800bd1321260 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticSignup Gerrit-Branch: master Gerrit-Owner: Shirayuki shirayuk...@gmail.com Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace e-mail by email - change (mediawiki...SemanticTasks)
jenkins-bot has submitted this change and it was merged. Change subject: Replace e-mail by email .. Replace e-mail by email For consistency Change-Id: I326feb980036650d6fbc0bdf86b8a9c73b49ec73 --- M SemanticTasks.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/SemanticTasks.i18n.php b/SemanticTasks.i18n.php index 2090d65..965adfd 100644 --- a/SemanticTasks.i18n.php +++ b/SemanticTasks.i18n.php @@ -12,7 +12,7 @@ * @author Steren Giannini */ $messages['en'] = array( - 'semantictasks-desc' = 'E-mail notifications for assigned or updated tasks', + 'semantictasks-desc' = 'Email notifications for assigned or updated tasks', 'semantictasks-newtask' = 'New task:', 'semantictasks-taskassigned' = 'Task assigned:', 'semantictasks-taskupdated' = 'Task updated:', -- To view, visit https://gerrit.wikimedia.org/r/81919 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I326feb980036650d6fbc0bdf86b8a9c73b49ec73 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticTasks Gerrit-Branch: master Gerrit-Owner: Shirayuki shirayuk...@gmail.com Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace e-mail by email - change (mediawiki...Phalanx)
Siebrand has submitted this change and it was merged. Change subject: Replace e-mail by email .. Replace e-mail by email For consistency Change-Id: I14167f43f62caff2d7e01347424a2a7065b28d5f --- M Phalanx.i18n.php 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Siebrand: Verified; Looks good to me, approved diff --git a/Phalanx.i18n.php b/Phalanx.i18n.php index b922dd5..a8ff0a1 100644 --- a/Phalanx.i18n.php +++ b/Phalanx.i18n.php @@ -22,7 +22,7 @@ 'phalanx-type-summary' = 'article summary', 'phalanx-type-title' = 'article title', 'phalanx-type-user' = 'user', - 'phalanx-type-user-email' = 'e-mail', + 'phalanx-type-user-email' = 'email', 'phalanx-type-answers-question-title' = 'question title', 'phalanx-type-answers-recent-questions' = 'recent questions', 'phalanx-type-wiki-creation' = 'wiki creation', @@ -75,7 +75,7 @@ 'phalanx-help-type-answers-recent-questions' = 'This filter prevents questions (pages) from being displayed in a number of outputs (widgets, lists, tag-generated listings). It does not prevent those articles from being created. Note: works only on Answers-type wikis', - 'phalanx-help-type-user-email' = 'This filter prevents account creation using a blocked e-mail address.', + 'phalanx-help-type-user-email' = 'This filter prevents account creation using a blocked email address.', 'phalanx-user-block-new-account' = 'Username is not available for registration. Please choose another one.', // block reason overrides, when no block reason was given (original usage) @@ -91,8 +91,8 @@ 'phalanx-user-block-withreason-similar' = 'This username is prevented from editing due to vandalism or other disruption by a user with a similar name. Please [[Special:Contact|contact us]] about the problem.br /The blocker also gave this additional reason: $1.', - 'phalanx-blacklisted-email' = 'Blacklisted e-mail address', - 'phalanx-blacklisted-email-text' = 'Your e-mail address is currently blacklisted from sending e-mails to other users.', + 'phalanx-blacklisted-email' = 'Blacklisted email address', + 'phalanx-blacklisted-email-text' = 'Your email address is currently blacklisted from sending emails to other users.', 'phalanx-title-move-summary' = 'The reason you entered contained a blocked phrase.', 'phalanx-plain-text' = 'plain text', 'phalanx-list-regex' = 'regex', @@ -102,7 +102,7 @@ 'phalanx-no-matches' = 'No matches found.', // Special:PhalanxStats 'phalanxstats' = 'Phalanx statistics', - 'phalanx-email-filter-hidden' = 'E-mail filter hidden. You do not have permission to view text.', + 'phalanx-email-filter-hidden' = 'Email filter hidden. You do not have permission to view text.', 'phalanx-yes' = 'Yes', 'phalanx-no' = 'No', 'phalanx-stats-table-id' = 'Block ID', @@ -131,8 +131,8 @@ // Private logs (Special:Log/phalanx) 'phalanx-rule-log-name' = 'Phalanx rules log', 'phalanx-rule-log-header' = 'This is a log of changes to Phalanx rules.', - 'phalanx-email-rule-log-name' = 'Phalanx e-mail rules log', - 'phalanx-email-rule-log-header' = 'This is a log of changes to Phalanx rules for type e-mail.', + 'phalanx-email-rule-log-name' = 'Phalanx email rules log', + 'phalanx-email-rule-log-header' = 'This is a log of changes to Phalanx rules for type email.', 'phalanx-rule-log-add' = 'Phalanx rule added: $1', 'phalanx-rule-log-edit' = 'Phalanx rule edited: $1', 'phalanx-rule-log-delete' = 'Phalanx rule deleted: $1', @@ -142,7 +142,7 @@ // For Special:ListGroupRights 'right-phalanx' = 'Add, modify and remove different spam filters', 'right-phalanxexempt' = 'Exempt from Phalanx spam filter', - 'right-phalanxemailblock' = 'Can file, view and manage e-mail based blocks', + 'right-phalanxemailblock' = 'Can file, view and manage email based blocks', ); /** Message documentation (Message documentation) -- To view, visit https://gerrit.wikimedia.org/r/81914 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I14167f43f62caff2d7e01347424a2a7065b28d5f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Phalanx Gerrit-Branch: master Gerrit-Owner: Shirayuki shirayuk...@gmail.com Gerrit-Reviewer: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace e-mail by email - change (mediawiki...PrivateDomains)
Siebrand has submitted this change and it was merged. Change subject: Replace e-mail by email .. Replace e-mail by email For consistency Change-Id: I4b7ada1e95ce6eac5f86f11727d96597ddcd4e3d --- M PrivateDomains.i18n.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Siebrand: Verified; Looks good to me, approved diff --git a/PrivateDomains.i18n.php b/PrivateDomains.i18n.php index 461ce75..b11b3bd 100644 --- a/PrivateDomains.i18n.php +++ b/PrivateDomains.i18n.php @@ -20,15 +20,15 @@ 'privatedomains-ifemailcontact' = 'Otherwise, please contact [[Special:EmailUser/$1|$1]] if you have any questions.', 'saveprivatedomains-success' = 'Private domains changes saved.', 'privatedomains-invalidemail' = 'Sorry, access to this wiki is restricted to members of $1. -If you have an e-mail address affiliated with $1, you can enter or reconfirm your e-mail address on your [[Special:Preferences|account preference page]]. +If you have an email address affiliated with $1, you can enter or reconfirm your email address on your [[Special:Preferences|account preference page]]. You can still view pages on this wiki, but you will be unable to edit.', 'privatedomains-affiliatenamelabel' = 'Name of organization:', 'privatedomains-emailadminlabel' = 'Contact username for access problems or queries:', 'privatedomains-instructions' = Below is the list of email domains allowed for editors of this wiki. -Each line designates an e-mail suffix that is given access for editing. +Each line designates an email suffix that is given access for editing. This should be formatted with one suffix per line. For example:div style=\width: 20%; padding:5px; border: 1px solid grey;\cs.stanford.edubr /stanfordalumni.org/div -This would allow edits from anyone with the e-mail address whate...@cs.stanford.edu or whate...@stanfordalumni.org +This would allow edits from anyone with the email address whate...@cs.stanford.edu or whate...@stanfordalumni.org bEnter the allowed domains in the text box below, and click \save\./b, // For Special:ListGroupRights 'right-privatedomains' = 'Manage private domains', -- To view, visit https://gerrit.wikimedia.org/r/81916 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4b7ada1e95ce6eac5f86f11727d96597ddcd4e3d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PrivateDomains Gerrit-Branch: master Gerrit-Owner: Shirayuki shirayuk...@gmail.com Gerrit-Reviewer: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use the long PHP tag - change (mediawiki...SemanticWebBrowser)
Siebrand has submitted this change and it was merged.
Change subject: Use the long PHP tag
..
Use the long PHP tag
Change-Id: I47be14d14c227dceb07fe08ed787da54904f3b25
---
M lib/examples/basic_sparql.php
M lib/examples/httpget.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/lib/examples/basic_sparql.php b/lib/examples/basic_sparql.php
index c5a8cd1..2e36049 100644
--- a/lib/examples/basic_sparql.php
+++ b/lib/examples/basic_sparql.php
@@ -31,7 +31,7 @@
h2Doctor Who - Series 1/h2
ul
-?
+?php
$series1 = 'http://www.bbc.co.uk/programmes/b007vvcq#programme';
$result = $sparql-query(
SELECT * WHERE {.
diff --git a/lib/examples/httpget.php b/lib/examples/httpget.php
index 5cd8c04..1554fc3 100644
--- a/lib/examples/httpget.php
+++ b/lib/examples/httpget.php
@@ -58,7 +58,7 @@
/p
p class=headers
-?
+?php
foreach ($response-getHeaders() as $name = $value) {
echo b$name/b: $valuebr /\n;
}
--
To view, visit https://gerrit.wikimedia.org/r/81913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47be14d14c227dceb07fe08ed787da54904f3b25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticWebBrowser
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only show search form if LuceneSearch is detected - change (mediawiki...LiquidThreads)
jenkins-bot has submitted this change and it was merged.
Change subject: Only show search form if LuceneSearch is detected
..
Only show search form if LuceneSearch is detected
As far as I know Lucene is the only engine that supports it.
I haven't been able to test this change as I do not have Lucene installed.
Change-Id: I7615dd926c33873524fae8837f923fef52e7b1c0
---
M pages/TalkpageView.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pages/TalkpageView.php b/pages/TalkpageView.php
index 1cbeb9b..b9ad029 100644
--- a/pages/TalkpageView.php
+++ b/pages/TalkpageView.php
@@ -307,7 +307,10 @@
$talkpageHeader .= $newThreadLink;
}
- $talkpageHeader .= $this-getSearchBox();
+ global $wgSearchTypeAlternatives;
+ if ( in_array( LuceneSearch, $wgSearchTypeAlternatives ?:
array() ) ) {
+ $talkpageHeader .= $this-getSearchBox();
+ }
$talkpageHeader .= $this-showTalkpageViewOptions( $article );
$talkpageHeader = Xml::tags(
'div',
--
To view, visit https://gerrit.wikimedia.org/r/82111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7615dd926c33873524fae8837f923fef52e7b1c0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add JS hook for user scripts to add buttons to all LQT texta... - change (mediawiki...LiquidThreads)
jenkins-bot has submitted this change and it was merged.
Change subject: Add JS hook for user scripts to add buttons to all LQT
textareas as they are created
..
Add JS hook for user scripts to add buttons to all LQT textareas as they are
created
Bug: 21692
Change-Id: If49ef4ac51850355a7f2be8252255534c5dd44a8
---
A hooks.txt
M lqt.js
2 files changed, 5 insertions(+), 0 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hooks.txt b/hooks.txt
new file mode 100644
index 000..75e6e01
--- /dev/null
+++ b/hooks.txt
@@ -0,0 +1,4 @@
+== JS hooks ==
+'ext.lqt.textareaCreated' is fired whenever a new LQT textarea is created.
+Params:
+* {jQuery} currentFocused The textarea element
diff --git a/lqt.js b/lqt.js
index 0992770..a482eda 100644
--- a/lqt.js
+++ b/lqt.js
@@ -220,6 +220,7 @@
mwSetupToolbar();
}
currentFocused = $( container ).find( '#wpTextbox1' );
+ mw.hook( 'ext.lqt.textareaCreated' ).fire(
currentFocused );
$( container ).find( '#wpTextbox1,#wpSummary' ).focus(
function () {
currentFocused = this;
} );
--
To view, visit https://gerrit.wikimedia.org/r/77052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If49ef4ac51850355a7f2be8252255534c5dd44a8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Helder.wiki helder.w...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Werdna agarr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tool Labs: fix doubled up package inclusion - change (operations/puppet)
coren has uploaded a new change for review. https://gerrit.wikimedia.org/r/82406 Change subject: Tool Labs: fix doubled up package inclusion .. Tool Labs: fix doubled up package inclusion Cut-n-paste error. Change-Id: I85f7a05754a09fb22d4c43b8874d0be4e64c55ce --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/06/82406/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index cc42e11..1051515 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -56,7 +56,6 @@ 'libirc-utils-perl', 'libjson-perl', 'libjson-xs-perl', - 'libio-socket-ssl-perl', 'liblwp-protocol-https-perl', 'libmediawiki-api-perl', 'libmediawiki-bot-perl', -- To view, visit https://gerrit.wikimedia.org/r/82406 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85f7a05754a09fb22d4c43b8874d0be4e64c55ce Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: coren mpellet...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Watching and Unwatching made 'Change Subject' disappear. - change (mediawiki...LiquidThreads)
jenkins-bot has submitted this change and it was merged.
Change subject: Watching and Unwatching made 'Change Subject' disappear.
..
Watching and Unwatching made 'Change Subject' disappear.
instead of doing a .load() we try to cleverly build the html in client
side itself.
Bug: 45618
Change-Id: I78788348bf6b61cbb9e47ed3d2a2855c3ed54541
---
M lqt.js
1 file changed, 26 insertions(+), 7 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lqt.js b/lqt.js
index 0992770..568fa73 100644
--- a/lqt.js
+++ b/lqt.js
@@ -775,24 +775,43 @@
'asyncWatch' : function ( e ) {
var button = $( this ),
- oldButton = $( this ).clone(),
tlcOffset = 'lqt-threadlevel-commands-'.length,
+ oldButton = button.clone();
// Find the title of the thread
threadLevelCommands = button.closest(
'.lqt_threadlevel_commands' ),
title = $( '#lqt-thread-title-' +
threadLevelCommands.attr( 'id' ).substring( tlcOffset ) ).val();
+ // Check if we're watching or unwatching.
+ var action = '';
+ if ( button.hasClass( 'lqt-command-watch' ) ) {
+ button.removeClass( 'lqt-command-watch' ).addClass(
'lqt-command-unwatch' );
+ button.find( 'a' ).attr( 'href', button.find( 'a'
).attr( 'href' ).replace( 'watch', 'unwatch' ) ).text( mw.msg( 'unwatch' ) );
+ action = 'watch';
+ } else if ( button.hasClass( 'lqt-command-unwatch' ) ) {
+ button.removeClass( 'lqt-command-unwatch' ).addClass(
'lqt-command-watch' );
+ action = 'unwatch';
+ button.find( 'a' ).attr( 'href', button.find( 'a'
).attr( 'href' ).replace( 'unwatch', 'watch' ) ).text( mw.msg( 'watch' ) );
+ }
+
// Replace the watch link with a spinner
- button.empty().addClass( 'mw-small-spinner' );
+ var spinner = $( 'li/' ).html( 'nbsp;' ).addClass(
'mw-small-spinner' );
+ button.replaceWith( spinner );
// Check if we're watching or unwatching.
var api = new mw.Api(),
success = function () {
- threadLevelCommands.load( window.location.href
+ ' #' + threadLevelCommands.attr( 'id' ) + ' *' );
+ spinner.replaceWith( button );
+ },
+ error = function () {
+ // FIXME: Use a better i18n way to show this
+ alert( 'failed to connect.. Please try again!'
);
+ spinner.replaceWith( oldButton );
};
- if ( oldButton.hasClass( 'lqt-command-unwatch' ) ) {
- api.unwatch( title ).done( success );
- } else if ( oldButton.hasClass( 'lqt-command-watch' ) ) {
- api.watch( title ).done( success );
+
+ if ( action === 'unwatch' ) {
+ api.unwatch( title ).done( success ).fail( error );
+ } else if ( action === 'watch' ) {
+ api.watch( title ).done( success ).fail( error );
}
e.preventDefault();
--
To view, visit https://gerrit.wikimedia.org/r/51834
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78788348bf6b61cbb9e47ed3d2a2855c3ed54541
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Nischayn22 nischay...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Martineznovo martinezn...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Nischayn22 nischay...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Werdna agarr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Register 4 extensions - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/82407 Change subject: Register 4 extensions .. Register 4 extensions * Model * Section Disqus * Starter Wiki * Timezone Selector Change-Id: I0f1364a692951faba4b807c886e739c8b56e7fc3 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/07/82407/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 2e126c4..9b2b37f 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -850,6 +850,8 @@ ignored = mobile-frontend-sopa-notice, mobile-frontend-current-language ignored = mobile-frontend-page-menu-language +Model + Mood Bar aliasfile = MoodBar/MoodBar.alias.php optional = moodbar-what-collapsed, moodbar-respond-collapsed, moodbar-respond-expanded, moodbar-response-cc @@ -1253,6 +1255,8 @@ Search Extra NS +Section Disqus + Secure HTML Secure Passwords @@ -1485,6 +1489,8 @@ Stalker Log +Starter Wiki + Stick To That Language Strategy Wiki - Active Strategy @@ -1569,6 +1575,10 @@ Timeline file = timeline/Timeline.i18n.php + +Timezone Selector +optional = timezoneselector-message-long, timezoneselector-message-verbose +ignored = timezoneselector-message-short Title Blacklist @@ -1712,6 +1722,8 @@ Wiki Article Feeds +Wiki Category Tag Cloud + Wiki Editor optional = wikieditor-toolbar-help-content-rereference-syntax, wikieditor-toolbar-help-content-showreferences-syntax optional = wikieditor-toolbar-tool-table-example-text -- To view, visit https://gerrit.wikimedia.org/r/82407 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f1364a692951faba4b807c886e739c8b56e7fc3 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Register 4 extensions - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: Register 4 extensions .. Register 4 extensions * Model * Section Disqus * Starter Wiki * Timezone Selector Change-Id: I0f1364a692951faba4b807c886e739c8b56e7fc3 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 2e126c4..9b2b37f 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -850,6 +850,8 @@ ignored = mobile-frontend-sopa-notice, mobile-frontend-current-language ignored = mobile-frontend-page-menu-language +Model + Mood Bar aliasfile = MoodBar/MoodBar.alias.php optional = moodbar-what-collapsed, moodbar-respond-collapsed, moodbar-respond-expanded, moodbar-response-cc @@ -1253,6 +1255,8 @@ Search Extra NS +Section Disqus + Secure HTML Secure Passwords @@ -1485,6 +1489,8 @@ Stalker Log +Starter Wiki + Stick To That Language Strategy Wiki - Active Strategy @@ -1569,6 +1575,10 @@ Timeline file = timeline/Timeline.i18n.php + +Timezone Selector +optional = timezoneselector-message-long, timezoneselector-message-verbose +ignored = timezoneselector-message-short Title Blacklist @@ -1712,6 +1722,8 @@ Wiki Article Feeds +Wiki Category Tag Cloud + Wiki Editor optional = wikieditor-toolbar-help-content-rereference-syntax, wikieditor-toolbar-help-content-showreferences-syntax optional = wikieditor-toolbar-tool-table-example-text -- To view, visit https://gerrit.wikimedia.org/r/82407 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0f1364a692951faba4b807c886e739c8b56e7fc3 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tool Labs: fix doubled up package inclusion - change (operations/puppet)
coren has submitted this change and it was merged. Change subject: Tool Labs: fix doubled up package inclusion .. Tool Labs: fix doubled up package inclusion Cut-n-paste error. Change-Id: I85f7a05754a09fb22d4c43b8874d0be4e64c55ce --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: coren: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index cc42e11..1051515 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -56,7 +56,6 @@ 'libirc-utils-perl', 'libjson-perl', 'libjson-xs-perl', - 'libio-socket-ssl-perl', 'liblwp-protocol-https-perl', 'libmediawiki-api-perl', 'libmediawiki-bot-perl', -- To view, visit https://gerrit.wikimedia.org/r/82406 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I85f7a05754a09fb22d4c43b8874d0be4e64c55ce Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: coren mpellet...@wikimedia.org Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: coren mpellet...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Used /*_*/ before the table name in the db patches for renam... - change (mediawiki...Annotator)
Rjain has uploaded a new change for review. https://gerrit.wikimedia.org/r/82408 Change subject: Used /*_*/ before the table name in the db patches for renaming user_id and rev_id. .. Used /*_*/ before the table name in the db patches for renaming user_id and rev_id. Change-Id: I66440eeb3962b33d649d5ad44f568b45b90ccad3 --- M sql/db_patches/patch-rev_id-rename.sql M sql/db_patches/patch-user_id-rename.sql 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Annotator refs/changes/08/82408/1 diff --git a/sql/db_patches/patch-rev_id-rename.sql b/sql/db_patches/patch-rev_id-rename.sql index 1894dab..738fef2 100644 --- a/sql/db_patches/patch-rev_id-rename.sql +++ b/sql/db_patches/patch-rev_id-rename.sql @@ -1 +1 @@ -ALTER TABLE annotator CHANGE COLUMN rev_id annotation_rev_id int(10) unsigned NOT NULL; \ No newline at end of file +ALTER TABLE /*_*/annotator CHANGE COLUMN rev_id annotation_rev_id int(10) unsigned NOT NULL; \ No newline at end of file diff --git a/sql/db_patches/patch-user_id-rename.sql b/sql/db_patches/patch-user_id-rename.sql index 5445c46..581dfc2 100644 --- a/sql/db_patches/patch-user_id-rename.sql +++ b/sql/db_patches/patch-user_id-rename.sql @@ -1 +1 @@ -ALTER TABLE annotator CHANGE COLUMN user_id annotation_user_id int(10) unsigned NOT NULL; \ No newline at end of file +ALTER TABLE /*_*/annotator CHANGE COLUMN user_id annotation_user_id int(10) unsigned NOT NULL; \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/82408 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I66440eeb3962b33d649d5ad44f568b45b90ccad3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Annotator Gerrit-Branch: master Gerrit-Owner: Rjain richa.jain1...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
