summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorblackst0ne <blackst0ne.ru@gmail.com>2017-08-08 12:10:55 +1100
committerblackst0ne <blackst0ne.ru@gmail.com>2017-08-08 12:10:55 +1100
commit98535fc12cc381d562d916c4947a763511a828a7 (patch)
tree8d71012310b6e3dbdc619fffab0abb68b01e88c1 /app/services
parent4490af8cf22416f12c8cf2e00f8b7c293be08167 (diff)
downloadgitlab-ce-98535fc12cc381d562d916c4947a763511a828a7.tar.gz
Add checks for branch existence before changing HEAD36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-one
Diffstat (limited to 'app/services')
-rw-r--r--app/services/projects/update_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb
index d81035e4eba..cf69007bc3b 100644
--- a/app/services/projects/update_service.rb
+++ b/app/services/projects/update_service.rb
@@ -10,7 +10,7 @@ module Projects
end
if changing_default_branch?
- project.change_head(params[:default_branch])
+ return error("Could not set the default branch") unless project.change_head(params[:default_branch])
end
if project.update_attributes(params.except(:default_branch))