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
e4b345ca
Commit
e4b345ca
authored
Jan 06, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed options from the gear button in the projects and consolidated into one
Added test for the CiCdPipelinesController
parent
0d4c0e07
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
14 deletions
+22
-14
app/views/layouts/nav/_project_settings.html.haml
app/views/layouts/nav/_project_settings.html.haml
+2
-14
spec/controllers/projects/settings/ci_cd_pipelines_controller_spec.rb
...lers/projects/settings/ci_cd_pipelines_controller_spec.rb
+20
-0
No files found.
app/views/layouts/nav/_project_settings.html.haml
View file @
e4b345ca
...
@@ -18,20 +18,8 @@
...
@@ -18,20 +18,8 @@
Protected Branches
Protected Branches
-
if
@project
.
feature_available?
(
:builds
,
current_user
)
-
if
@project
.
feature_available?
(
:builds
,
current_user
)
=
nav_link
(
controller: :runners
)
do
=
nav_link
(
controller: :ci_cd_pipelines_settings
)
do
=
link_to
namespace_project_runners_path
(
@project
.
namespace
,
@project
),
title:
'Runners'
do
=
link_to
namespace_project_settings_ci_cd_pipelines_path
(
@project
.
namespace
,
@project
),
title:
'CI/CD Pipelines'
do
%span
Runners
=
nav_link
(
controller: :variables
)
do
=
link_to
namespace_project_variables_path
(
@project
.
namespace
,
@project
),
title:
'Variables'
do
%span
Variables
=
nav_link
(
controller: :triggers
)
do
=
link_to
namespace_project_triggers_path
(
@project
.
namespace
,
@project
),
title:
'Triggers'
do
%span
Triggers
=
nav_link
(
controller: :pipelines_settings
)
do
=
link_to
namespace_project_pipelines_settings_path
(
@project
.
namespace
,
@project
),
title:
'CI/CD Pipelines'
do
%span
%span
CI/CD Pipelines
CI/CD Pipelines
=
nav_link
(
controller: :pages
)
do
=
nav_link
(
controller: :pages
)
do
...
...
spec/controllers/projects/settings/ci_cd_pipelines_controller_spec.rb
0 → 100644
View file @
e4b345ca
require
(
'spec_helper'
)
describe
Projects
::
Settings
::
CiCdPipelinesController
do
let
(
:project
)
{
create
(
:empty_project
,
:public
,
:access_requestable
)
}
let
(
:user
)
{
create
(
:user
)
}
before
do
project
.
team
<<
[
user
,
:master
]
sign_in
(
user
)
end
describe
'GET show'
do
it
'renders show with 200 status code'
do
get
:show
,
namespace_id:
project
.
namespace
,
project_id:
project
expect
(
response
).
to
have_http_status
(
200
)
expect
(
response
).
to
render_template
(
:show
)
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