Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
3be445c5
Commit
3be445c5
authored
Oct 26, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Revert "Change "Group#web_url" to return "/groups/twitter" rather than "/twitter".""
This reverts commit
9dbd5b3c
.
parent
b5797168
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
16 deletions
+25
-16
app/models/group.rb
app/models/group.rb
+1
-1
config/routes/group.rb
config/routes/group.rb
+18
-15
spec/models/group_spec.rb
spec/models/group_spec.rb
+6
-0
No files found.
app/models/group.rb
View file @
3be445c5
...
...
@@ -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
...
...
config/routes/group.rb
View file @
3be445c5
...
...
@@ -12,7 +12,8 @@ constraints(GroupUrlConstrainer.new) do
end
end
resources
:groups
,
constraints:
{
id:
/[a-zA-Z.0-9_\-]+(?<!\.atom)/
}
do
scope
constraints:
{
id:
/[a-zA-Z.0-9_\-]+(?<!\.atom)/
}
do
resources
:groups
,
except:
[
:show
]
do
member
do
get
:issues
get
:merge_requests
...
...
@@ -31,4 +32,6 @@ resources :groups, constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ } do
resources
:labels
,
except:
[
:show
],
constraints:
{
id:
/\d+/
}
end
end
get
'groups/:id'
=>
'groups#show'
,
as: :group_canonical
end
spec/models/group_spec.rb
View file @
3be445c5
...
...
@@ -265,4 +265,10 @@ describe Group, models: true do
members
end
describe
'#web_url'
do
it
'returns the canonical URL'
do
expect
(
group
.
web_url
).
to
include
(
"groups/
#{
group
.
name
}
"
)
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment