diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-15 19:13:26 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-15 19:16:16 +0100 |
| commit | 59064aeeef8562a87d4d03efa9b11012a007e261 (patch) | |
| tree | 1ecb34e1355a4eb714615b2a9c2727155e8f3ec9 /app/controllers/projects_controller.rb | |
| parent | aaf4434b0e24da916d4392aa9cd001cdb8e0c7dc (diff) | |
| parent | bc590ce63bd2f1af5545b648e6d028a557e7c792 (diff) | |
| download | gitlab-ce-4009-external-users.tar.gz | |
Merge branch 'master' into 4009-external-users4009-external-users
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index c70add86a20..36f37221c58 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -172,10 +172,15 @@ class ProjectsController < ApplicationController def housekeeping ::Projects::HousekeepingService.new(@project).execute - respond_to do |format| - flash[:notice] = "Housekeeping successfully started." - 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 |