Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/257192
Change subject: Fix redirections in gerrit
......................................................................
Fix redirections in gerrit
Currently links in gerrit are linking to wrong places causing errors to
show. This fixes the redirection in gerrit.
Change-Id: I38de3c6b5b6c8924f9ec7f12ed94142b1050185f
---
M GerritApplication.php
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions
refs/changes/92/257192/1
diff --git a/GerritApplication.php b/GerritApplication.php
index 9821376..59a5869 100644
--- a/GerritApplication.php
+++ b/GerritApplication.php
@@ -28,23 +28,23 @@
[gitweb]
url = https://git.wikimedia.org
type = custom
- revision = /r/revision/${project};${commit}
+ revision = /r/project/${project}/revision/${commit}
project = /r/project/${project}
- branch = /r/branch/${project};${branch}
- filehistory = /r/browse/${project};${branch};${file}
+ branch = /r/${project}/branch/${branch}
+ filehistory = /r/${project}/browse/${branch}/${file}
linkname = gitblit
linkDrafts = false
*/
$routes = array(
// filehistory
-
'/r/(?P<action>[a-z]+)/(?P<gerritProject>[^:]+);(?P<branch>[^;]+);(?P<file>[^;]+)',
+
'/r/(?P<action>[a-z]+)/project/(?P<gerritProject>[^:]+)/browse/(?P<branch>[^;]+)/(?P<file>[^;]+)',
// branch
- '/r/(?P<action>[a-z]+)/(?P<gerritProject>[^;]+);(?P<branch>[^;]+)',
+
'/r/(?P<action>[a-z]+)/project/(?P<gerritProject>[^;]+)/branch/(?P<branch>[^;]+)',
// commit
- '/r/(?P<action>[a-z]+)/(?P<gerritProject>[^;]+);(?P<sha>[0-9a-z]+)',
+
'/r/(?P<action>[a-z]+)/project/(?P<gerritProject>[^;]+)/revision/(?P<sha>[0-9a-z]+)',
// project
- '/r/(?P<action>[a-z]+)/(?:(?P<gerritProject>[^;]+)/)',
+ '/r/(?P<action>[a-z]+)/project/(?:(?P<gerritProject>[^;]+)/)',
);
self::$routes = array_fill_keys($routes, 'GerritProjectController');
--
To view, visit https://gerrit.wikimedia.org/r/257192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38de3c6b5b6c8924f9ec7f12ed94142b1050185f
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
