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
Boxiang Sun
gitlab-ce
Commits
3e7e08ad
Commit
3e7e08ad
authored
Jun 22, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show group name instead of path on group page
parent
5cd1a48d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
6 deletions
+10
-6
app/views/groups/_home_panel.html.haml
app/views/groups/_home_panel.html.haml
+1
-1
changelogs/unreleased/dm-group-page-name.yml
changelogs/unreleased/dm-group-page-name.yml
+4
-0
features/steps/groups.rb
features/steps/groups.rb
+1
-1
spec/features/groups/group_settings_spec.rb
spec/features/groups/group_settings_spec.rb
+4
-4
No files found.
app/views/groups/_home_panel.html.haml
View file @
3e7e08ad
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
.avatar-container.s70.group-avatar
.avatar-container.s70.group-avatar
=
image_tag
group_icon
(
@group
),
class:
"avatar s70 avatar-tile"
=
image_tag
group_icon
(
@group
),
class:
"avatar s70 avatar-tile"
%h1
.group-title
%h1
.group-title
@
#{
@group
.
path
}
=
@group
.
name
%span
.visibility-icon.has-tooltip
{
data:
{
container:
'body'
},
title:
visibility_icon_description
(
@group
)
}
%span
.visibility-icon.has-tooltip
{
data:
{
container:
'body'
},
title:
visibility_icon_description
(
@group
)
}
=
visibility_level_icon
(
@group
.
visibility_level
,
fw:
false
)
=
visibility_level_icon
(
@group
.
visibility_level
,
fw:
false
)
...
...
changelogs/unreleased/dm-group-page-name.yml
0 → 100644
View file @
3e7e08ad
---
title
:
Show group name instead of path on group page
merge_request
:
author
:
features/steps/groups.rb
View file @
3e7e08ad
...
@@ -5,7 +5,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
...
@@ -5,7 +5,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
include
SharedUser
include
SharedUser
step
'I should see group "Owned"'
do
step
'I should see group "Owned"'
do
expect
(
page
).
to
have_content
'
@o
wned'
expect
(
page
).
to
have_content
'
O
wned'
end
end
step
'I am a signed out user'
do
step
'I am a signed out user'
do
...
...
spec/features/groups/group_settings_spec.rb
View file @
3e7e08ad
...
@@ -18,14 +18,14 @@ feature 'Edit group settings', feature: true do
...
@@ -18,14 +18,14 @@ feature 'Edit group settings', feature: true do
update_path
(
new_group_path
)
update_path
(
new_group_path
)
visit
new_group_full_path
visit
new_group_full_path
expect
(
current_path
).
to
eq
(
new_group_full_path
)
expect
(
current_path
).
to
eq
(
new_group_full_path
)
expect
(
find
(
'h1.group-title'
)).
to
have_content
(
new_group_path
)
expect
(
find
(
'h1.group-title'
)).
to
have_content
(
group
.
name
)
end
end
scenario
'the old group path redirects to the new path'
do
scenario
'the old group path redirects to the new path'
do
update_path
(
new_group_path
)
update_path
(
new_group_path
)
visit
old_group_full_path
visit
old_group_full_path
expect
(
current_path
).
to
eq
(
new_group_full_path
)
expect
(
current_path
).
to
eq
(
new_group_full_path
)
expect
(
find
(
'h1.group-title'
)).
to
have_content
(
new_group_path
)
expect
(
find
(
'h1.group-title'
)).
to
have_content
(
group
.
name
)
end
end
context
'with a subgroup'
do
context
'with a subgroup'
do
...
@@ -37,14 +37,14 @@ feature 'Edit group settings', feature: true do
...
@@ -37,14 +37,14 @@ feature 'Edit group settings', feature: true do
update_path
(
new_group_path
)
update_path
(
new_group_path
)
visit
new_subgroup_full_path
visit
new_subgroup_full_path
expect
(
current_path
).
to
eq
(
new_subgroup_full_path
)
expect
(
current_path
).
to
eq
(
new_subgroup_full_path
)
expect
(
find
(
'h1.group-title'
)).
to
have_content
(
subgroup
.
path
)
expect
(
find
(
'h1.group-title'
)).
to
have_content
(
subgroup
.
name
)
end
end
scenario
'the old subgroup path redirects to the new path'
do
scenario
'the old subgroup path redirects to the new path'
do
update_path
(
new_group_path
)
update_path
(
new_group_path
)
visit
old_subgroup_full_path
visit
old_subgroup_full_path
expect
(
current_path
).
to
eq
(
new_subgroup_full_path
)
expect
(
current_path
).
to
eq
(
new_subgroup_full_path
)
expect
(
find
(
'h1.group-title'
)).
to
have_content
(
subgroup
.
path
)
expect
(
find
(
'h1.group-title'
)).
to
have_content
(
subgroup
.
name
)
end
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