summaryrefslogtreecommitdiff
path: root/app/services/groups
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-12-20 17:52:27 +0100
committerJames Lopez <james@jameslopez.es>2016-12-20 17:52:27 +0100
commitb82fdf6257255b720526ccef716759892e88de09 (patch)
tree52c4adbaa69a9e4b4174b6efc0f817ffda64d815 /app/services/groups
parentad1a1d976c877eca16858368db0c5b3ef800db8b (diff)
downloadgitlab-ce-b82fdf6257255b720526ccef716759892e88de09.tar.gz
Fix error 500 renaming group. Also added specs and changelog.
Diffstat (limited to 'app/services/groups')
-rw-r--r--app/services/groups/update_service.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/services/groups/update_service.rb b/app/services/groups/update_service.rb
index fff2273f402..4e878ec556a 100644
--- a/app/services/groups/update_service.rb
+++ b/app/services/groups/update_service.rb
@@ -14,7 +14,13 @@ module Groups
group.assign_attributes(params)
- group.save
+ begin
+ group.save
+ rescue Gitlab::UpdatePathError => e
+ group.errors.add(:base, e.message)
+
+ false
+ end
end
end
end