From ce6172e863f982c73fedc9f4a73877543c30cb1c Mon Sep 17 00:00:00 2001
From: Alexis Reigel <mail@koffeinfrei.org>
Date: Tue, 26 Sep 2017 09:54:32 +0200
Subject: allow uploading favicon in appearance settings

---
 db/migrate/20170925184228_add_favicon_to_appearances.rb | 7 +++++++
 db/schema.rb                                            | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 db/migrate/20170925184228_add_favicon_to_appearances.rb

(limited to 'db')

diff --git a/db/migrate/20170925184228_add_favicon_to_appearances.rb b/db/migrate/20170925184228_add_favicon_to_appearances.rb
new file mode 100644
index 00000000000..65083733afb
--- /dev/null
+++ b/db/migrate/20170925184228_add_favicon_to_appearances.rb
@@ -0,0 +1,7 @@
+class AddFaviconToAppearances < ActiveRecord::Migration
+  DOWNTIME = false
+
+  def change
+    add_column :appearances, :favicon, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a6b0706b02a..89c8acba3e6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -38,6 +38,7 @@ ActiveRecord::Schema.define(version: 20180529152628) do
     t.integer "cached_markdown_version"
     t.text "new_project_guidelines"
     t.text "new_project_guidelines_html"
+    t.string "favicon"
   end
 
   create_table "application_setting_terms", force: :cascade do |t|
-- 
cgit v1.2.1


From 5484ad78691ab45f79f8b2cf8192cbca8fe7c143 Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Wed, 6 Jun 2018 19:51:33 +0300
Subject: Enable hashed storage for new projects by default in development

---
 db/fixtures/development/04_project.rb  | 4 ++++
 db/fixtures/development/08_settings.rb | 7 +++++++
 2 files changed, 11 insertions(+)
 create mode 100644 db/fixtures/development/08_settings.rb

(limited to 'db')

diff --git a/db/fixtures/development/04_project.rb b/db/fixtures/development/04_project.rb
index 213c8bca639..51e69879c79 100644
--- a/db/fixtures/development/04_project.rb
+++ b/db/fixtures/development/04_project.rb
@@ -67,6 +67,10 @@ Sidekiq::Testing.inline! do
         skip_disk_validation: true
       }
 
+      if i % 2 == 0
+        params[:storage_version] = Project::LATEST_STORAGE_VERSION
+      end
+
       project = Projects::CreateService.new(User.first, params).execute
       # Seed-Fu runs this entire fixture in a transaction, so the `after_commit`
       # hook won't run until after the fixture is loaded. That is too late
diff --git a/db/fixtures/development/08_settings.rb b/db/fixtures/development/08_settings.rb
new file mode 100644
index 00000000000..141465c06cf
--- /dev/null
+++ b/db/fixtures/development/08_settings.rb
@@ -0,0 +1,7 @@
+# We want to enable hashed storage for every new project in development
+# Details https://gitlab.com/gitlab-org/gitlab-ce/issues/46241
+Gitlab::Seeder.quiet do
+  ApplicationSetting.create_from_defaults unless ApplicationSetting.current_without_cache
+  ApplicationSetting.current_without_cache.update!(hashed_storage_enabled: true)
+  print '.'
+end
-- 
cgit v1.2.1