Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-19 15:16:42 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-19 15:16:42 +0400
commite59e48d75a1fba2e0c840acd5bf5125af610297e (patch)
tree19ef82480c31a8bea1bc96c24b6d5be306e7205b /app
parentb64351478a6eec7b50ffa6017bc58fefda60c2a7 (diff)
parentf3369e3a004ad01176b9191e2cb494866f91b637 (diff)
Merge branch 'fix-500-admin-transfer' into 'master'
Fix 500 error when transfer project from admin area Fixes #1349
Diffstat (limited to 'app')
-rw-r--r--app/controllers/admin/projects_controller.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index d2f86369b58..1c7c09d0cd4 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -23,13 +23,9 @@ class Admin::ProjectsController < Admin::ApplicationController
end
def transfer
- result = ::Projects::TransferService.new(@project, current_user, project: params).execute(:admin)
+ ::Projects::TransferService.new(@project, current_user, params.dup).execute
- if result
- redirect_to [:admin, @project]
- else
- render :show
- end
+ redirect_to [:admin, @project.reload]
end
protected