diff options
author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-11-11 14:23:08 -0300 |
---|---|---|
committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-11-11 14:23:08 -0300 |
commit | 2eae8867be934db6dd9cdb50b0ff4aa4f0f64279 (patch) | |
tree | 28a9285eab46e5c15a73e337a219fe466d319823 | |
parent | 67041e63c283fe4586251fdc56eaa02cc9a22241 (diff) | |
download | gitlab-ce-24386-8-14-rc1-requires-quite-amount-of-downtime.tar.gz |
Update 8.14-rc1 migrations to minimize downtime and deploy time24386-8-14-rc1-requires-quite-amount-of-downtime
See https://gitlab.com/gitlab-org/gitlab-ce/issues/24386
-rw-r--r-- | db/migrate/20160914131004_only_allow_merge_if_all_discussions_are_resolved.rb | 5 | ||||
-rw-r--r-- | db/post_migrate/20161011222551_remove_inactive_jira_service_properties.rb (renamed from db/migrate/20161011222551_remove_inactive_jira_service_properties.rb) | 0 | ||||
-rw-r--r-- | db/schema.rb | 2 | ||||
-rw-r--r-- | lib/api/entities.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/projects_spec.rb | 8 |
5 files changed, 11 insertions, 6 deletions
diff --git a/db/migrate/20160914131004_only_allow_merge_if_all_discussions_are_resolved.rb b/db/migrate/20160914131004_only_allow_merge_if_all_discussions_are_resolved.rb index fad62d716b3..4da5ec9bd28 100644 --- a/db/migrate/20160914131004_only_allow_merge_if_all_discussions_are_resolved.rb +++ b/db/migrate/20160914131004_only_allow_merge_if_all_discussions_are_resolved.rb @@ -5,10 +5,7 @@ class OnlyAllowMergeIfAllDiscussionsAreResolved < ActiveRecord::Migration disable_ddl_transaction! def up - add_column_with_default(:projects, - :only_allow_merge_if_all_discussions_are_resolved, - :boolean, - default: false) + add_column :projects, :only_allow_merge_if_all_discussions_are_resolved, :boolean end def down diff --git a/db/migrate/20161011222551_remove_inactive_jira_service_properties.rb b/db/post_migrate/20161011222551_remove_inactive_jira_service_properties.rb index 319d86ac159..319d86ac159 100644 --- a/db/migrate/20161011222551_remove_inactive_jira_service_properties.rb +++ b/db/post_migrate/20161011222551_remove_inactive_jira_service_properties.rb diff --git a/db/schema.rb b/db/schema.rb index 64d744d8268..9db61635f8e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -912,7 +912,7 @@ ActiveRecord::Schema.define(version: 20161109150329) do t.boolean "has_external_wiki" t.boolean "lfs_enabled" t.text "description_html" - t.boolean "only_allow_merge_if_all_discussions_are_resolved", default: false, null: false + t.boolean "only_allow_merge_if_all_discussions_are_resolved" end add_index "projects", ["ci_id"], name: "index_projects_on_ci_id", using: :btree diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 1942aeea656..7d3df00c05f 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -83,6 +83,7 @@ module API expose(:wiki_enabled) { |project, options| project.feature_available?(:wiki, options[:user]) } expose(:builds_enabled) { |project, options| project.feature_available?(:builds, options[:user]) } expose(:snippets_enabled) { |project, options| project.feature_available?(:snippets, options[:user]) } + expose(:only_allow_merge_if_all_discussions_are_resolved) { |project, options| project.only_allow_merge_if_all_discussions_are_resolved || false } expose :created_at, :last_activity_at expose :shared_runners_enabled @@ -100,7 +101,6 @@ module API end expose :only_allow_merge_if_build_succeeds expose :request_access_enabled - expose :only_allow_merge_if_all_discussions_are_resolved end class Member < UserBasic diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index d6e9fd2c4b2..f020d471422 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -360,6 +360,14 @@ describe API::API, api: true do expect(json_response['only_allow_merge_if_all_discussions_are_resolved']).to be_falsey end + it 'sets a project as allowing merge if only_allow_merge_if_all_discussions_are_resolved is nil' do + project = attributes_for(:project, only_allow_merge_if_all_discussions_are_resolved: nil) + + post api('/projects', user), project + + expect(json_response['only_allow_merge_if_all_discussions_are_resolved']).to be_falsey + end + it 'sets a project as allowing merge only if all discussions are resolved' do project = attributes_for(:project, { only_allow_merge_if_all_discussions_are_resolved: true }) |