diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-14 13:59:19 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-14 13:59:19 +0200 |
| commit | ec913402408d149ba3ecb79f4af511cd8ac63fe7 (patch) | |
| tree | 562ea6f4e69a82a5d10de7e0b5faabdda171bc8d | |
| parent | 09bd8a8b0dbaed79e2a2b8b2416fe80809df8918 (diff) | |
| download | gitlab-ce-ec913402408d149ba3ecb79f4af511cd8ac63fe7.tar.gz | |
Remove duplicate notices
| -rw-r--r-- | app/controllers/ci/services_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/layouts/ci/_info.html.haml | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/app/controllers/ci/services_controller.rb b/app/controllers/ci/services_controller.rb index e99f40f3a0a..42ffd41fe42 100644 --- a/app/controllers/ci/services_controller.rb +++ b/app/controllers/ci/services_controller.rb @@ -20,7 +20,7 @@ module Ci def update 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 render 'edit' end diff --git a/app/views/layouts/ci/_info.html.haml b/app/views/layouts/ci/_info.html.haml index 9bc23cfad05..f7230f44242 100644 --- a/app/views/layouts/ci/_info.html.haml +++ b/app/views/layouts/ci/_info.html.haml @@ -1,9 +1,3 @@ .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? = render 'ci/shared/no_runners' |