diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-04 11:21:40 +0100 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-04 11:21:40 +0100 |
commit | d34f6764146add6a9fc928f3a87b902c02b43742 (patch) | |
tree | e133d45819379bedefd3411a246c218e18d05027 /db | |
parent | 77bbc1c4af087d009fdfa3d7d4c9a720b7cc9c5b (diff) | |
parent | ef71bf6278759aafb1a480916cfafb9c9650eddc (diff) | |
download | gitlab-ce-d34f6764146add6a9fc928f3a87b902c02b43742.tar.gz |
Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20170502091007_markdown_cache_limits_to_mysql.rb | 2 | ||||
-rw-r--r-- | db/migrate/markdown_cache_limits_to_mysql.rb | 13 | ||||
-rw-r--r-- | db/schema.rb | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/db/migrate/20170502091007_markdown_cache_limits_to_mysql.rb b/db/migrate/20170502091007_markdown_cache_limits_to_mysql.rb new file mode 100644 index 00000000000..008a94d8334 --- /dev/null +++ b/db/migrate/20170502091007_markdown_cache_limits_to_mysql.rb @@ -0,0 +1,2 @@ +# rubocop:disable all +require_relative 'markdown_cache_limits_to_mysql' diff --git a/db/migrate/markdown_cache_limits_to_mysql.rb b/db/migrate/markdown_cache_limits_to_mysql.rb new file mode 100644 index 00000000000..f6686db3dc0 --- /dev/null +++ b/db/migrate/markdown_cache_limits_to_mysql.rb @@ -0,0 +1,13 @@ +class MarkdownCacheLimitsToMysql < ActiveRecord::Migration + DOWNTIME = false + + def up + return unless Gitlab::Database.mysql? + + change_column :snippets, :content_html, :text, limit: 2147483647 + end + + def down + # no-op + end +end diff --git a/db/schema.rb b/db/schema.rb index 97282e8f970..519a444833b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170428123910) do +ActiveRecord::Schema.define(version: 20170502091007) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |