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
ec913402
Commit
ec913402
authored
Sep 14, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove duplicate notices
parent
09bd8a8b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
7 deletions
+1
-7
app/controllers/ci/services_controller.rb
app/controllers/ci/services_controller.rb
+1
-1
app/views/layouts/ci/_info.html.haml
app/views/layouts/ci/_info.html.haml
+0
-6
No files found.
app/controllers/ci/services_controller.rb
View file @
ec913402
...
@@ -20,7 +20,7 @@ module Ci
...
@@ -20,7 +20,7 @@ module Ci
def
update
def
update
if
@service
.
update_attributes
(
service_params
)
if
@service
.
update_attributes
(
service_params
)
redirect_to
edit_ci_project_service_path
(
@project
,
@service
.
to_param
)
,
notice:
'Service was successfully updated.'
redirect_to
edit_ci_project_service_path
(
@project
,
@service
.
to_param
)
else
else
render
'edit'
render
'edit'
end
end
...
...
app/views/layouts/ci/_info.html.haml
View file @
ec913402
.container
.container
-
if
alert
||
notice
-
if
alert
.alert.alert-danger
=
alert
-
if
notice
.alert.alert-info
=
notice
-
if
current_user
&&
current_user
.
is_admin?
&&
Ci
::
Runner
.
count
.
zero?
-
if
current_user
&&
current_user
.
is_admin?
&&
Ci
::
Runner
.
count
.
zero?
=
render
'ci/shared/no_runners'
=
render
'ci/shared/no_runners'
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