summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorAshley Dumaine <adumaine@datto.com>2017-09-01 18:39:22 -0400
committerSean McGivern <sean@gitlab.com>2017-09-06 10:07:47 +0100
commita3f76b76a4b8db85c6fa557a5e801dcea7195735 (patch)
tree730f99b9e673ed511a41113cd713ed39702c839f /db
parent959e6d221d6b11c64d17fc9d4734200806c293ab (diff)
downloadgitlab-ce-a3f76b76a4b8db85c6fa557a5e801dcea7195735.tar.gz
change collapse to resolve and comments to discussions
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20170825154015_resolve_outdated_diff_discussions.rb (renamed from db/migrate/20170825154015_collapse_outdated_diff_comments.rb)5
-rw-r--r--db/schema.rb2
2 files changed, 3 insertions, 4 deletions
diff --git a/db/migrate/20170825154015_collapse_outdated_diff_comments.rb b/db/migrate/20170825154015_resolve_outdated_diff_discussions.rb
index cbfdd3ba2c2..8ee474e908e 100644
--- a/db/migrate/20170825154015_collapse_outdated_diff_comments.rb
+++ b/db/migrate/20170825154015_resolve_outdated_diff_discussions.rb
@@ -1,4 +1,3 @@
-# rubocop:disable Migration/AddColumnWithDefaultToLargeTable
class CollapseOutdatedDiffComments < ActiveRecord::Migration
include Gitlab::Database::MigrationHelpers
@@ -7,12 +6,12 @@ class CollapseOutdatedDiffComments < ActiveRecord::Migration
def up
add_column_with_default(:projects,
- :collapse_outdated_diff_comments,
+ :resolve_outdated_diff_discussions,
:boolean,
default: false)
end
def down
- remove_column(:projects, :collapse_outdated_diff_comments)
+ remove_column(:projects, :resolve_outdated_diff_discussions)
end
end
diff --git a/db/schema.rb b/db/schema.rb
index 02b365a8743..c25ca40b906 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1202,7 +1202,7 @@ ActiveRecord::Schema.define(version: 20170901071411) do
t.boolean "public_builds", default: true, null: false
t.boolean "last_repository_check_failed"
t.datetime "last_repository_check_at"
- t.boolean "collapse_outdated_diff_comments", default: false, null: false
+ t.boolean "resolve_outdated_diff_discussions", default: false, null: false
t.boolean "container_registry_enabled"
t.boolean "only_allow_merge_if_pipeline_succeeds", default: false, null: false
t.boolean "has_external_issue_tracker"