diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-09-25 17:19:23 +0000 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-09-25 17:19:23 +0000 |
commit | 6167615a741bc84db4b54e8fc2c6ce0b05dd3cf4 (patch) | |
tree | a10fb949d3a7aa6729e0e2de485b93212615cbf0 /db | |
parent | 4ca1afec3534b7e70454bfd99552804c55ca0c83 (diff) | |
parent | 15d011d64d579616dd9df3e3e5082ed5b99bcdf8 (diff) | |
download | gitlab-ce-6167615a741bc84db4b54e8fc2c6ce0b05dd3cf4.tar.gz |
Merge branch 'follow-up-geo-sync-disabled-wikis' into 'master'
CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6906
See merge request gitlab-org/gitlab-ce!21903
Diffstat (limited to 'db')
-rw-r--r-- | db/post_migrate/20180917172041_remove_wikis_count_from_site_statistics.rb | 6 | ||||
-rw-r--r-- | db/schema.rb | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/db/post_migrate/20180917172041_remove_wikis_count_from_site_statistics.rb b/db/post_migrate/20180917172041_remove_wikis_count_from_site_statistics.rb new file mode 100644 index 00000000000..0a39abe3bdf --- /dev/null +++ b/db/post_migrate/20180917172041_remove_wikis_count_from_site_statistics.rb @@ -0,0 +1,6 @@ +# frozen_string_literal: true +class RemoveWikisCountFromSiteStatistics < ActiveRecord::Migration + def change + remove_column :site_statistics, :wikis_count, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 16e3c44513b..f92d8005dfb 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: 20180914201132) do +ActiveRecord::Schema.define(version: 20180917172041) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -1908,7 +1908,6 @@ ActiveRecord::Schema.define(version: 20180914201132) do create_table "site_statistics", force: :cascade do |t| t.integer "repositories_count", default: 0, null: false - t.integer "wikis_count", default: 0, null: false end create_table "snippets", force: :cascade do |t| |