diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-10-27 17:06:37 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-10-27 17:06:37 +0000 |
| commit | 084dde9e16ae429b3a19c78c23706c59957a3b7a (patch) | |
| tree | c02ef0f6fcde9d33beaf80aa93e6d4a5f0c3c571 /app | |
| parent | b3210df33e0e4af677666d2044f029c6aeac0d9e (diff) | |
| parent | 3be445c58e820035a7da6800beba6a13f3ca742f (diff) | |
| download | gitlab-ce-084dde9e16ae429b3a19c78c23706c59957a3b7a.tar.gz | |
Merge branch 'dz-revert-revert' into 'master'
Revert "Revert "Change "Group#web_url" to return "/groups/twitter" rather than "/twitter".""
Looks like I accidently reverted https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7035 although I did not want to . This MR reverts my revert.
See merge request !7127
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/group.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index 552e1154df6..d9e90cd256a 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -68,7 +68,7 @@ class Group < Namespace end def web_url - Gitlab::Routing.url_helpers.group_url(self) + Gitlab::Routing.url_helpers.group_canonical_url(self) end def human_name |