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
8c1e9ecd
Commit
8c1e9ecd
authored
Jan 11, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Corrected tests and changed trigger controller redirects to the ci_cd_pipelines_settings controller
parent
e4b345ca
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
app/controllers/projects/triggers_controller.rb
app/controllers/projects/triggers_controller.rb
+3
-3
spec/features/runners_spec.rb
spec/features/runners_spec.rb
+0
-1
No files found.
app/controllers/projects/triggers_controller.rb
View file @
8c1e9ecd
...
@@ -4,7 +4,7 @@ class Projects::TriggersController < Projects::ApplicationController
...
@@ -4,7 +4,7 @@ class Projects::TriggersController < Projects::ApplicationController
layout
'project_settings'
layout
'project_settings'
def
index
def
index
redirect_to
namespace_project_settings_pipelines_path
(
@project
.
namespace
,
@project
)
redirect_to
namespace_project_settings_
ci_cd_
pipelines_path
(
@project
.
namespace
,
@project
)
end
end
def
create
def
create
...
@@ -12,7 +12,7 @@ class Projects::TriggersController < Projects::ApplicationController
...
@@ -12,7 +12,7 @@ class Projects::TriggersController < Projects::ApplicationController
@trigger
.
save
@trigger
.
save
if
@trigger
.
valid?
if
@trigger
.
valid?
redirect_to
namespace_project_settings_pipelines_path
(
@project
.
namespace
,
@project
)
redirect_to
namespace_project_settings_
ci_cd_
pipelines_path
(
@project
.
namespace
,
@project
)
else
else
@triggers
=
project
.
triggers
.
select
(
&
:persisted?
)
@triggers
=
project
.
triggers
.
select
(
&
:persisted?
)
render
:index
render
:index
...
@@ -22,7 +22,7 @@ class Projects::TriggersController < Projects::ApplicationController
...
@@ -22,7 +22,7 @@ class Projects::TriggersController < Projects::ApplicationController
def
destroy
def
destroy
trigger
.
destroy
trigger
.
destroy
redirect_to
namespace_project_settings_pipelines_path
(
@project
.
namespace
,
@project
)
redirect_to
namespace_project_settings_
ci_cd_
pipelines_path
(
@project
.
namespace
,
@project
)
end
end
private
private
...
...
spec/features/runners_spec.rb
View file @
8c1e9ecd
...
@@ -122,7 +122,6 @@ describe "Runners" do
...
@@ -122,7 +122,6 @@ describe "Runners" do
scenario
'user checks default configuration'
do
scenario
'user checks default configuration'
do
visit
namespace_project_runner_path
(
project
.
namespace
,
project
,
runner
)
visit
namespace_project_runner_path
(
project
.
namespace
,
project
,
runner
)
expect
(
page
).
to
have_content
'Can run untagged jobs Yes'
expect
(
page
).
to
have_content
'Can run untagged jobs Yes'
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