diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-04 10:32:45 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-04 10:32:45 +0300 |
| commit | 8983ade27df200f7f9376d61de17f329d9d27a33 (patch) | |
| tree | 8986fd0ce6298685a715250202c95eb62ff50f17 /lib/tasks | |
| parent | 12c34c1cbbaeb107b826a52b784e0dc10f5a53ba (diff) | |
| parent | 1a168dc7a587182dc6bd39f543198ada21f87437 (diff) | |
Merge branch '31647-fix-snippet-content_html' into 'master'
Fix caching large snippet HTML content on MySQL databases
Closes #31647
See merge request !11024
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/gitlab/db.rake | 1 | ||||
| -rw-r--r-- | lib/tasks/migrate/add_limits_mysql.rake | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake index 5476438b8fa..139ab70e125 100644 --- a/lib/tasks/gitlab/db.rake +++ b/lib/tasks/gitlab/db.rake @@ -65,6 +65,7 @@ namespace :gitlab do migrations = `git diff #{ref}.. --diff-filter=A --name-only -- db/migrate`.lines .map { |file| Rails.root.join(file.strip).to_s } .select { |file| File.file?(file) } + .select { |file| /\A[0-9]+.*\.rb\z/ =~ File.basename(file) } Gitlab::DowntimeCheck.new.check_and_print(migrations) end diff --git a/lib/tasks/migrate/add_limits_mysql.rake b/lib/tasks/migrate/add_limits_mysql.rake index 6ded519aff2..761f275d42a 100644 --- a/lib/tasks/migrate/add_limits_mysql.rake +++ b/lib/tasks/migrate/add_limits_mysql.rake @@ -1,7 +1,9 @@ require Rails.root.join('db/migrate/limits_to_mysql') +require Rails.root.join('db/migrate/markdown_cache_limits_to_mysql') desc "GitLab | Add limits to strings in mysql database" task add_limits_mysql: :environment do puts "Adding limits to schema.rb for mysql" LimitsToMysql.new.up + MarkdownCacheLimitsToMysql.new.up end |