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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
5600b17d
Commit
5600b17d
authored
7 years ago
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Code style improvements
parent
5b3d143a
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
52 additions
and
22 deletions
+52
-22
app/views/groups/_head.html.haml
app/views/groups/_head.html.haml
+19
-0
app/views/groups/_head_issues.html.haml
app/views/groups/_head_issues.html.haml
+19
-0
app/views/groups/activity.html.haml
app/views/groups/activity.html.haml
+2
-1
app/views/groups/group_members/index.html.haml
app/views/groups/group_members/index.html.haml
+1
-0
app/views/groups/issues.html.haml
app/views/groups/issues.html.haml
+1
-0
app/views/groups/labels/index.html.haml
app/views/groups/labels/index.html.haml
+1
-0
app/views/groups/milestones/index.html.haml
app/views/groups/milestones/index.html.haml
+1
-0
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+1
-0
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+2
-18
changelogs/unreleased/26348-cleanup-navigation-order-groups.yml
...logs/unreleased/26348-cleanup-navigation-order-groups.yml
+4
-0
features/steps/group/milestones.rb
features/steps/group/milestones.rb
+1
-3
No files found.
app/views/groups/_head.html.haml
0 → 100644
View file @
5600b17d
=
content_for
:sub_nav
do
.scrolling-tabs-container.sub-nav-scroll
=
render
'shared/nav_scroll'
.nav-links.sub-nav.scrolling-tabs
%ul
{
class:
container_class
}
=
nav_link
(
path:
'groups#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
group_path
(
@group
),
title:
'Group Home'
do
%span
Home
=
nav_link
(
path:
'groups#activity'
)
do
=
link_to
activity_group_path
(
@group
),
title:
'Activity'
do
%span
Activity
=
nav_link
(
path:
'group_members#index'
)
do
=
link_to
group_group_members_path
(
@group
),
title:
'Members'
do
%span
Members
This diff is collapsed.
Click to expand it.
app/views/groups/_head_issues.html.haml
0 → 100644
View file @
5600b17d
=
content_for
:sub_nav
do
.scrolling-tabs-container.sub-nav-scroll
=
render
'shared/nav_scroll'
.nav-links.sub-nav.scrolling-tabs
%ul
{
class:
container_class
}
=
nav_link
(
path:
'groups#issues'
,
html_options:
{
class:
'home'
})
do
=
link_to
issues_group_path
(
@group
),
title:
'List'
do
%span
List
=
nav_link
(
path:
'labels#index'
)
do
=
link_to
group_labels_path
(
@group
),
title:
'Labels'
do
%span
Labels
=
nav_link
(
path:
'milestones#index'
)
do
=
link_to
group_milestones_path
(
@group
),
title:
'Milestones'
do
%span
Milestones
This diff is collapsed.
Click to expand it.
app/views/groups/activity.html.haml
View file @
5600b17d
...
...
@@ -2,7 +2,8 @@
-
if
current_user
=
auto_discovery_link_tag
(
:atom
,
group_url
(
@group
,
format: :atom
,
private_token:
current_user
.
private_token
),
title:
"
#{
@group
.
name
}
activity"
)
-
page_title
"Activity"
-
page_title
"Activity"
=
render
'groups/head'
%section
.activities
=
render
'activities'
This diff is collapsed.
Click to expand it.
app/views/groups/group_members/index.html.haml
View file @
5600b17d
-
page_title
"Members"
=
render
'groups/head'
.project-members-page.prepend-top-default
%h4
...
...
This diff is collapsed.
Click to expand it.
app/views/groups/issues.html.haml
View file @
5600b17d
-
page_title
"Issues"
=
render
"head_issues"
=
content_for
:meta_tags
do
-
if
current_user
=
auto_discovery_link_tag
(
:atom
,
url_for
(
params
.
merge
(
format: :atom
,
private_token:
current_user
.
private_token
)),
title:
"
#{
@group
.
name
}
issues"
)
...
...
This diff is collapsed.
Click to expand it.
app/views/groups/labels/index.html.haml
View file @
5600b17d
-
page_title
'Labels'
=
render
"groups/head_issues"
.top-area.adjust
.nav-text
...
...
This diff is collapsed.
Click to expand it.
app/views/groups/milestones/index.html.haml
View file @
5600b17d
-
page_title
"Milestones"
=
render
"groups/head_issues"
.top-area
=
render
'shared/milestones_filter'
...
...
This diff is collapsed.
Click to expand it.
app/views/groups/show.html.haml
View file @
5600b17d
...
...
@@ -4,6 +4,7 @@
-
if
current_user
=
auto_discovery_link_tag
(
:atom
,
group_url
(
@group
,
format: :atom
,
private_token:
current_user
.
private_token
),
title:
"
#{
@group
.
name
}
activity"
)
=
render
'groups/head'
=
render
'groups/home_panel'
...
...
This diff is collapsed.
Click to expand it.
app/views/layouts/nav/_group.html.haml
View file @
5600b17d
...
...
@@ -5,23 +5,11 @@
.fade-right
=
icon
(
'angle-right'
)
%ul
.nav-links.scrolling-tabs
=
nav_link
(
path:
'groups#show'
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
[
'groups#show'
,
'groups#activity'
,
'group_members#index'
],
html_options:
{
class:
'home'
})
do
=
link_to
group_path
(
@group
),
title:
'Home'
do
%span
Group
=
nav_link
(
path:
'groups#activity'
)
do
=
link_to
activity_group_path
(
@group
),
title:
'Activity'
do
%span
Activity
=
nav_link
(
controller:
[
:group
,
:labels
])
do
=
link_to
group_labels_path
(
@group
),
title:
'Labels'
do
%span
Labels
=
nav_link
(
controller:
[
:group
,
:milestones
])
do
=
link_to
group_milestones_path
(
@group
),
title:
'Milestones'
do
%span
Milestones
=
nav_link
(
path:
'groups#issues'
)
do
=
nav_link
(
path:
[
'groups#issues'
,
'labels#index'
,
'milestones#index'
])
do
=
link_to
issues_group_path
(
@group
),
title:
'Issues'
do
%span
Issues
...
...
@@ -33,7 +21,3 @@
Merge Requests
-
merge_requests
=
MergeRequestsFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
,
non_archived:
true
).
execute
%span
.badge.count
=
number_with_delimiter
(
merge_requests
.
count
)
=
nav_link
(
controller:
[
:group_members
])
do
=
link_to
group_group_members_path
(
@group
),
title:
'Members'
do
%span
Members
This diff is collapsed.
Click to expand it.
changelogs/unreleased/26348-cleanup-navigation-order-groups.yml
0 → 100644
View file @
5600b17d
---
title
:
Clean-up Groups navigation order
merge_request
:
9309
author
:
This diff is collapsed.
Click to expand it.
features/steps/group/milestones.rb
View file @
5600b17d
...
...
@@ -5,9 +5,7 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
include
SharedUser
step
'I click on group milestones'
do
page
.
within
(
'.layout-nav'
)
do
click_link
'Milestones'
end
visit
group_milestones_path
(
'owned'
)
end
step
'I should see group milestones index page has no milestones'
do
...
...
This diff is collapsed.
Click to expand it.
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