diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-02-15 15:47:29 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-02-15 15:47:29 +0300 |
| commit | ab06c9b654c5f26fbe9e3fce22a54f7944ee4dab (patch) | |
| tree | 667658495fbead19c7035c7f317db4182d3c9c41 | |
| parent | d02ca097312245e13ba9e1301964342a4327859a (diff) | |
| parent | 80a7aa99058c74eaae4466eac53f83a31246a387 (diff) | |
Merge branch 'remove-ignored-columns' into 'master'
Remove two ignored columns
See merge request gitlab-org/gitlab-ce!25250
| -rw-r--r-- | app/models/merge_request_diff.rb | 3 | ||||
| -rw-r--r-- | db/migrate/limits_to_mysql.rb | 13 | ||||
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 1 |
3 files changed, 0 insertions, 17 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 712347e76ed..e286a4e57f2 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -12,9 +12,6 @@ class MergeRequestDiff < ActiveRecord::Base # Don't display more than 100 commits at once COMMITS_SAFE_SIZE = 100 - ignore_column :st_commits, - :st_diffs - belongs_to :merge_request manual_inverse_association :merge_request, :merge_request_diff 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 |