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
diff options
context:
space:
mode:
authorMarc Dequènes (Duck) <duck@redhat.com>2016-08-22 06:47:58 +0300
committerMarc Dequènes (Duck) <duck@redhat.com>2016-08-24 11:11:48 +0300
commit31b2c1ef880349c9579f41e501de0346e59f0a4c (patch)
tree110ae90600d1943b06bd30ed1ee31114fec34fab /lib/api/projects.rb
parent02591b043052eb4f8041f8cf51546fab272d7b61 (diff)
expose 'only_allow_merge_if_build_succeeds' project setting in the API
Diffstat (limited to 'lib/api/projects.rb')
-rw-r--r--lib/api/projects.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 60cfc103afd..71efd4f33ca 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -123,7 +123,8 @@ module API
:public,
:visibility_level,
:import_url,
- :public_builds]
+ :public_builds,
+ :only_allow_merge_if_build_succeeds]
attrs = map_public_to_visibility_level(attrs)
@project = ::Projects::CreateService.new(current_user, attrs).execute
if @project.saved?
@@ -172,7 +173,8 @@ module API
:public,
:visibility_level,
:import_url,
- :public_builds]
+ :public_builds,
+ :only_allow_merge_if_build_succeeds]
attrs = map_public_to_visibility_level(attrs)
@project = ::Projects::CreateService.new(user, attrs).execute
if @project.saved?
@@ -234,7 +236,8 @@ module API
:shared_runners_enabled,
:public,
:visibility_level,
- :public_builds]
+ :public_builds,
+ :only_allow_merge_if_build_succeeds]
attrs = map_public_to_visibility_level(attrs)
authorize_admin_project
authorize! :rename_project, user_project if attrs[:name].present?