summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAdam Pahlevi <adam.pahlevi@gmail.com>2017-01-28 09:50:25 +0700
committerAdam Pahlevi <adam.pahlevi@gmail.com>2017-01-31 06:37:05 +0700
commit538d1bffec52ecdaae44eaf9fdbcb6102c1cbefd (patch)
treef994aa765dba6cd56bf97956d3150de8c631eae8 /app
parentd777e6f1da98be64b872a2bea2222f3e037a3d4d (diff)
downloadgitlab-ce-538d1bffec52ecdaae44eaf9fdbcb6102c1cbefd.tar.gz
resolve deprecation warnings
don’t pass AR object, use the ID to avoid depr warning pass in the id instead of AR object to specs for `ProjectDestroyWorker`
Diffstat (limited to 'app')
-rw-r--r--app/controllers/groups_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index f81237db991..264b14713fb 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -84,7 +84,7 @@ class GroupsController < Groups::ApplicationController
if Groups::UpdateService.new(@group, current_user, group_params).execute
redirect_to edit_group_path(@group), notice: "Group '#{@group.name}' was successfully updated."
else
- @group.reset_path!
+ @group.restore_path!
render action: "edit"
end