diff options
| author | Rui Anderson <anderson.rui@gmail.com> | 2016-04-27 15:34:42 -0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-10 14:36:54 +0200 |
| commit | 07dbd6b3884c4f188b2c3f29dd7419791f1051eb (patch) | |
| tree | 6c00e4b9097f62a89fcd6f506a9c7b3eb27231bc /app/controllers/projects_controller.rb | |
| parent | cfc99bbd1390bc548a703fdc7857c7db5b0e7c13 (diff) | |
| download | gitlab-ce-07dbd6b3884c4f188b2c3f29dd7419791f1051eb.tar.gz | |
Allow or not merge MR with failed build
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 3af62c7696c..a6479c42d94 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -234,7 +234,7 @@ class ProjectsController < Projects::ApplicationController :issues_tracker_id, :default_branch, :wiki_enabled, :visibility_level, :import_url, :last_activity_at, :namespace_id, :avatar, :builds_enabled, :build_allow_git_fetch, :build_timeout_in_minutes, :build_coverage_regex, - :public_builds, + :public_builds, :only_allow_merge_if_build_succeeds ) end |