summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-08-24 19:27:58 +0000
committerDouwe Maan <douwe@gitlab.com>2016-08-24 19:27:58 +0000
commit952c501fdf4a22e7ec06f825a36a4cbf5465d090 (patch)
tree4e20d63037016d348e829b515668a86522ffcb50 /lib/api/entities.rb
parent90441e85ddb0b24550521c458fe12baf65e5352c (diff)
parent31b2c1ef880349c9579f41e501de0346e59f0a4c (diff)
downloadgitlab-ce-952c501fdf4a22e7ec06f825a36a4cbf5465d090.tar.gz
Merge branch 'api_only_allow_merge_if_build_succeeds' into 'master'
expose 'only_allow_merge_if_build_succeeds' project setting in the API ## What does this MR do? Adds the 'only_allow_merge_if_build_succeeds' project setting in the API. ## Are there points in the code the reviewer needs to double check? No, but maybe this code is not enough for ACLs or the like. ## Why was this MR needed? Because that's a very useful setting to change via automation (through the API) ## What are the relevant issue numbers? Closes #21085, closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20088. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [X] API support added - Tests - [X] Added for this feature/bug - [X] All builds are passing - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [X] Branch has no merge conflicts with `master` (if you do - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5930
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 5e8729c5342..aaeb3d4800b 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -90,6 +90,7 @@ module API
expose :shared_with_groups do |project, options|
SharedGroup.represent(project.project_group_links.all, options)
end
+ expose :only_allow_merge_if_build_succeeds
end
class Member < UserBasic