diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-02-07 14:46:17 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-02-07 14:46:17 +0000 |
| commit | c3da8849c364885841fddf592346974ff4148c8d (patch) | |
| tree | 32ee05526f2b193dbd92db8d13e84cf909f1777d /db/migrate | |
| parent | 1a0bab0ab2896f021a5d3a80e84b5e9d6678f6c0 (diff) | |
| parent | c8fe0d6a8a76ee5865c71b5b6627608e5075797d (diff) | |
| download | gitlab-ce-c3da8849c364885841fddf592346974ff4148c8d.tar.gz | |
Merge branch 'master' into fabsrc/gitlab-ce-2105-add-setting-for-first-day-of-the-week
Diffstat (limited to 'db/migrate')
| -rw-r--r-- | db/migrate/20140502125220_migrate_repo_size.rb | 2 | ||||
| -rw-r--r-- | db/migrate/20190130091630_add_local_cached_markdown_version.rb | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/db/migrate/20140502125220_migrate_repo_size.rb b/db/migrate/20140502125220_migrate_repo_size.rb index a69b02cddc4..bff1f01c654 100644 --- a/db/migrate/20140502125220_migrate_repo_size.rb +++ b/db/migrate/20140502125220_migrate_repo_size.rb @@ -11,7 +11,7 @@ class MigrateRepoSize < ActiveRecord::Migration[4.2] path = File.join(namespace_path, project['project_path'] + '.git') begin - repo = Gitlab::Git::Repository.new('default', path, '') + repo = Gitlab::Git::Repository.new('default', path, '', '') if repo.empty? print '-' else diff --git a/db/migrate/20190130091630_add_local_cached_markdown_version.rb b/db/migrate/20190130091630_add_local_cached_markdown_version.rb new file mode 100644 index 00000000000..00570e6458c --- /dev/null +++ b/db/migrate/20190130091630_add_local_cached_markdown_version.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class AddLocalCachedMarkdownVersion < ActiveRecord::Migration[5.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def change + add_column :application_settings, :local_markdown_version, :integer, default: 0, null: false + end +end |