summaryrefslogtreecommitdiff
path: root/db/schema.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-06-07 16:54:41 +0000
committerDouwe Maan <douwe@gitlab.com>2018-06-07 16:54:41 +0000
commit290ca339adc952bcd939d1782af95f90d3b88716 (patch)
tree99d6b6bc75727949f1d3410bef321d31406668ca /db/schema.rb
parent7b562c972713d19c2e537eb4df7cbe072ada8bbe (diff)
parent366e1331692900300df42e9c38fc17bd46b7ca1c (diff)
downloadgitlab-ce-290ca339adc952bcd939d1782af95f90d3b88716.tar.gz
Merge branch 'feature/customizable-favicon' into 'master'
Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
Diffstat (limited to 'db/schema.rb')
-rw-r--r--db/schema.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb
index f6fb1c92f8d..5a2592b9efa 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -38,6 +38,7 @@ ActiveRecord::Schema.define(version: 20180603190921) 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|