Revert "Merge branch 'bvl-instance-stats-default' into 'master'"revert-77c75d2b

This reverts merge request !21044

3 files changed, 3 insertions, 26 deletions

diff --git a/db/migrate/20180718005113_add_instance_statistics_visibility_to_application_setting.rb b/db/migrate/20180718005113_add_instance_statistics_visibility_to_application_setting.rb
index f5106f07500..4b6c1f74346 100644
--- a/db/migrate/20180718005113_add_instance_statistics_visibility_to_application_setting.rb
+++ b/db/migrate/20180718005113_add_instance_statistics_visibility_to_application_setting.rb
@@ -10,7 +10,7 @@ class AddInstanceStatisticsVisibilityToApplicationSetting < ActiveRecord::Migrat
   def up
     add_column_with_default(:application_settings, :instance_statistics_visibility_private,
                             :boolean,
-                            default: true,
+                            default: false,
                             allow_null: false)
   end
 
diff --git a/db/migrate/20180806094307_change_instance_stats_visibility_default.rb b/db/migrate/20180806094307_change_instance_stats_visibility_default.rb
deleted file mode 100644
index 4c27cfb8cab..00000000000
--- a/db/migrate/20180806094307_change_instance_stats_visibility_default.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-# See http://doc.gitlab.com/ce/development/migration_style_guide.html
-# for more information on how to write migrations for GitLab.
-
-class ChangeInstanceStatsVisibilityDefault < ActiveRecord::Migration
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = false
-
-  def up
-    change_column_default :application_settings,
-                          :instance_statistics_visibility_private,
-                          true
-    ApplicationSetting.update_all(instance_statistics_visibility_private: true)
-  end
-
-  def down
-    change_column_default :application_settings,
-                          :instance_statistics_visibility_private,
-                          false
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 924d2d81dcc..2bef2971f29 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: 20180806094307) do
+ActiveRecord::Schema.define(version: 20180726172057) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -168,7 +168,7 @@ ActiveRecord::Schema.define(version: 20180806094307) do
     t.boolean "enforce_terms", default: false
     t.boolean "mirror_available", default: true, null: false
     t.boolean "hide_third_party_offers", default: false, null: false
-    t.boolean "instance_statistics_visibility_private", default: true, null: false
+    t.boolean "instance_statistics_visibility_private", default: false, null: false
   end
 
   create_table "audit_events", force: :cascade do |t|