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
390ea8e0
Commit
390ea8e0
authored
May 28, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge Builds and Pipelines tab into one
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
f9bb9151
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
9 deletions
+22
-9
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+6
-9
app/views/projects/builds/index.html.haml
app/views/projects/builds/index.html.haml
+1
-0
app/views/projects/pipelines/_head.html.haml
app/views/projects/pipelines/_head.html.haml
+14
-0
app/views/projects/pipelines/index.html.haml
app/views/projects/pipelines/index.html.haml
+1
-0
No files found.
app/views/layouts/nav/_project.html.haml
View file @
390ea8e0
...
@@ -52,15 +52,6 @@
...
@@ -52,15 +52,6 @@
=
icon
(
'ship fw'
)
=
icon
(
'ship fw'
)
%span
%span
Pipelines
Pipelines
%span
.badge.count.ci_counter
=
number_with_delimiter
(
@project
.
ci_commits
.
running_or_pending
.
count
)
-
if
project_nav_tab?
:builds
=
nav_link
(
controller:
%w(builds)
)
do
=
link_to
project_builds_path
(
@project
),
title:
'Builds'
,
class:
'shortcuts-builds'
do
=
icon
(
'cubes fw'
)
%span
Builds
%span
.badge.count.builds_counter
=
number_with_delimiter
(
@project
.
builds
.
running_or_pending
.
count
(
:all
))
-
if
project_nav_tab?
:container_registry
-
if
project_nav_tab?
:container_registry
=
nav_link
(
controller:
%w(container_registry)
)
do
=
nav_link
(
controller:
%w(container_registry)
)
do
...
@@ -132,4 +123,10 @@
...
@@ -132,4 +123,10 @@
=
link_to
new_namespace_project_issue_path
(
@project
.
namespace
,
@project
),
class:
'shortcuts-new-issue'
do
=
link_to
new_namespace_project_issue_path
(
@project
.
namespace
,
@project
),
class:
'shortcuts-new-issue'
do
Create a new issue
Create a new issue
-# Shortcut to builds page
-
if
project_nav_tab?
:builds
%li
.hidden
=
link_to
project_builds_path
(
@project
),
title:
'Builds'
,
class:
'shortcuts-builds'
do
Builds
.fade-right
.fade-right
app/views/projects/builds/index.html.haml
View file @
390ea8e0
-
page_title
"Builds"
-
page_title
"Builds"
=
render
"projects/pipelines/head"
.top-area
.top-area
%ul
.nav-links
%ul
.nav-links
...
...
app/views/projects/pipelines/_head.html.haml
0 → 100644
View file @
390ea8e0
%ul
.nav-links
-
if
project_nav_tab?
:pipelines
=
nav_link
(
controller: :pipelines
)
do
=
link_to
project_pipelines_path
(
@project
),
title:
'Pipelines'
,
class:
'shortcuts-pipelines'
do
%span
Pipelines
%span
.badge.count.ci_counter
=
number_with_delimiter
(
@project
.
ci_commits
.
running_or_pending
.
count
)
-
if
project_nav_tab?
:builds
=
nav_link
(
controller:
%w(builds)
)
do
=
link_to
project_builds_path
(
@project
),
title:
'Builds'
,
class:
'shortcuts-builds'
do
%span
Builds
%span
.badge.count.builds_counter
=
number_with_delimiter
(
@project
.
builds
.
running_or_pending
.
count
(
:all
))
app/views/projects/pipelines/index.html.haml
View file @
390ea8e0
-
page_title
"Pipelines"
-
page_title
"Pipelines"
=
render
"projects/pipelines/head"
.top-area
.top-area
%ul
.nav-links
%ul
.nav-links
...
...
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