diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-14 15:55:00 -0500 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-14 15:55:00 -0500 |
commit | 2566c89a3232d6d4d5aa5d77821819e86424548d (patch) | |
tree | 998fc498861cbffa138c9d8a0ff76ed6d0e526c9 /app/controllers/projects/pipelines_controller.rb | |
parent | 7d907acc3805a692fd9f6f29e529c5b5fe15ec11 (diff) | |
download | gitlab-ce-2566c89a3232d6d4d5aa5d77821819e86424548d.tar.gz |
Remove testing delegate
Diffstat (limited to 'app/controllers/projects/pipelines_controller.rb')
-rw-r--r-- | app/controllers/projects/pipelines_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index f3f5338003a..78b85ea9a71 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -22,10 +22,10 @@ class Projects::PipelinesController < Projects::ApplicationController pipeline = Ci::CreatePipelineService.new(project, current_user, create_params).execute redirect_to namespace_project_pipeline_path(project.namespace, project, pipeline) rescue ArgumentError => e - @error = e.message + flash[:alert] = e.message render 'new' rescue - @error = 'Undefined error' + flash[:alert] = 'Undefined error' render 'new' end end |