diff options
author | Robert Speicher <robert@gitlab.com> | 2015-10-21 07:27:49 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-10-21 09:30:04 +0200 |
commit | e8d5582729b801f5223c803dd5331e7a089be159 (patch) | |
tree | e6c26eb793ed79c9916ee426fdf17ebe8dcc08b4 | |
parent | def48f0ad361dc7bc583ee0649d3f9f54a9dc274 (diff) | |
download | gitlab-ce-e8d5582729b801f5223c803dd5331e7a089be159.tar.gz |
Merge branch 'fix-mysql-ci-limits-migration' into 'master'
Ensure MySQL CI limits DB migrations occur after the fields have been created
Closes https://github.com/gitlabhq/gitlabhq/issues/9753
See merge request !1653
-rw-r--r-- | CHANGELOG | 2 | ||||
-rw-r--r-- | db/migrate/20151020173516_ci_limits_to_mysql.rb | 9 | ||||
-rw-r--r-- | db/migrate/limits_to_mysql.rb | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index 8ea1161a4cf..87019454357 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.2.0 (unreleased) + - Ensure MySQL CI limits DB migrations occur after the fields have been created (Stan Hu) + - Improved performance of replacing references in comments - Fix duplicate repositories in GitHub import page (Stan Hu) - Redirect to a default path if HTTP_REFERER is not set (Stan Hu) - Show last project commit to default branch on project home page diff --git a/db/migrate/20151020173516_ci_limits_to_mysql.rb b/db/migrate/20151020173516_ci_limits_to_mysql.rb new file mode 100644 index 00000000000..9bb960082f5 --- /dev/null +++ b/db/migrate/20151020173516_ci_limits_to_mysql.rb @@ -0,0 +1,9 @@ +class CiLimitsToMysql < ActiveRecord::Migration + def change + return unless ActiveRecord::Base.configurations[Rails.env]['adapter'] =~ /^mysql/ + + # CI + change_column :ci_builds, :trace, :text, limit: 1073741823 + change_column :ci_commits, :push_data, :text, limit: 16777215 + end +end diff --git a/db/migrate/limits_to_mysql.rb b/db/migrate/limits_to_mysql.rb index 73605d4c5e3..2b7afae6d7c 100644 --- a/db/migrate/limits_to_mysql.rb +++ b/db/migrate/limits_to_mysql.rb @@ -6,9 +6,5 @@ class LimitsToMysql < ActiveRecord::Migration change_column :merge_request_diffs, :st_diffs, :text, limit: 2147483647 change_column :snippets, :content, :text, limit: 2147483647 change_column :notes, :st_diff, :text, limit: 2147483647 - - # CI - change_column :ci_builds, :trace, :text, limit: 1073741823 - change_column :ci_commits, :push_data, :text, limit: 16777215 end end |