diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-03-15 11:03:43 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-03-15 11:03:43 +0100 |
| commit | 30b36c92c386e93b432166fb6f9dd973882a6d82 (patch) | |
| tree | 3a1ad27bee57f67a2c16bc44aaad38cbae51bf3e /app/controllers/projects_controller.rb | |
| parent | 0beae70efaafc361cf15c13231bdc5ed6de8569f (diff) | |
| download | gitlab-ce-30b36c92c386e93b432166fb6f9dd973882a6d82.tar.gz | |
Use an exception to pass messages
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 2a3dc5c79f7..36f37221c58 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -170,12 +170,17 @@ class ProjectsController < ApplicationController end def housekeeping - message = ::Projects::HousekeepingService.new(@project).execute + ::Projects::HousekeepingService.new(@project).execute - respond_to do |format| - flash[:notice] = message - format.html { redirect_to project_path(@project) } - end + redirect_to( + project_path(@project), + notice: "Housekeeping successfully started" + ) + rescue ::Projects::HousekeepingService::LeaseTaken => ex + redirect_to( + edit_project_path(@project), + alert: ex.to_s + ) end def toggle_star |