diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-02-14 16:21:24 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-02-14 16:21:24 +0000 |
| commit | 80a7aa99058c74eaae4466eac53f83a31246a387 (patch) | |
| tree | 1b9f29558b2e83ca37cc4e1460a6f807ce4dd4d5 | |
| parent | a6891eb8ec6512f0f29a410fcb78cf2c65282555 (diff) | |
| download | gitlab-ce-80a7aa99058c74eaae4466eac53f83a31246a387.tar.gz | |
Remove further instances of st_diffs
| -rw-r--r-- | db/migrate/limits_to_mysql.rb | 13 | ||||
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/db/migrate/limits_to_mysql.rb b/db/migrate/limits_to_mysql.rb index 87992b541b1..33cb19aff9e 100644 --- a/db/migrate/limits_to_mysql.rb +++ b/db/migrate/limits_to_mysql.rb @@ -2,19 +2,6 @@ class LimitsToMysql < ActiveRecord::Migration[4.2] def up return unless ActiveRecord::Base.configurations[Rails.env]['adapter'] =~ /^mysql/ - # These columns were removed in 10.3, but this is called from two places: - # 1. A migration run after they were added, but before they were removed. - # 2. A rake task which can be run at any time. - # - # Because of item 2, we need these checks. - if column_exists?(:merge_request_diffs, :st_commits) - change_column :merge_request_diffs, :st_commits, :text, limit: 2147483647 - end - - if column_exists?(:merge_request_diffs, :st_diffs) - change_column :merge_request_diffs, :st_diffs, :text, limit: 2147483647 - end - change_column :snippets, :content, :text, limit: 2147483647 change_column :notes, :st_diff, :text, limit: 2147483647 end diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index 099677a791c..7f8c6d56627 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -133,7 +133,6 @@ excluded_attributes: - :external_diff - :stored_externally - :external_diff_store - - :st_diffs merge_request_diff_files: - :diff - :external_diff_offset |