Commit 62e15207 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'add-project-level-config-for-prospective-merge-pipelines-ce' into 'master'

Backport: Add project level config for merge pipelines

See merge request gitlab-org/gitlab-ce!25385
parents 7df76020 6bbc3801
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
%span.descr %span.descr
Pipelines need to be configured to enable this feature. Pipelines need to be configured to enable this feature.
= link_to icon('question-circle'), help_page_path('user/project/merge_requests/merge_when_pipeline_succeeds', anchor: 'only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds'), target: '_blank' = link_to icon('question-circle'), help_page_path('user/project/merge_requests/merge_when_pipeline_succeeds', anchor: 'only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds'), target: '_blank'
= render_if_exists 'projects/merge_pipelines_settings', form: form
.form-check .form-check
= form.check_box :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-input' = form.check_box :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-input'
= form.label :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-label' do = form.label :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-label' do
......
---
title: Add project level config for merge pipelines
merge_request: 25385
author:
type: added
# frozen_string_literal: true
class AddMergePipelinesEnabledToCiCdSettings < ActiveRecord::Migration[5.0]
include Gitlab::Database::MigrationHelpers
DOWNTIME = false
def change
add_column :project_ci_cd_settings, :merge_pipelines_enabled, :boolean
end
end
...@@ -1575,6 +1575,7 @@ ActiveRecord::Schema.define(version: 20190220150130) do ...@@ -1575,6 +1575,7 @@ ActiveRecord::Schema.define(version: 20190220150130) do
create_table "project_ci_cd_settings", force: :cascade do |t| create_table "project_ci_cd_settings", force: :cascade do |t|
t.integer "project_id", null: false t.integer "project_id", null: false
t.boolean "group_runners_enabled", default: true, null: false t.boolean "group_runners_enabled", default: true, null: false
t.boolean "merge_pipelines_enabled"
t.index ["project_id"], name: "index_project_ci_cd_settings_on_project_id", unique: true, using: :btree t.index ["project_id"], name: "index_project_ci_cd_settings_on_project_id", unique: true, using: :btree
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment