diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-07 16:54:41 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-07 16:54:41 +0000 |
| commit | 290ca339adc952bcd939d1782af95f90d3b88716 (patch) | |
| tree | 99d6b6bc75727949f1d3410bef321d31406668ca /config/initializers | |
| parent | 7b562c972713d19c2e537eb4df7cbe072ada8bbe (diff) | |
| parent | 366e1331692900300df42e9c38fc17bd46b7ca1c (diff) | |
| download | gitlab-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 'config/initializers')
| -rw-r--r-- | config/initializers/mime_types.rb | 2 | ||||
| -rw-r--r-- | config/initializers/mini_magick.rb | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index e9326653cbe..acbdf8de5a6 100644 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.rb @@ -15,3 +15,5 @@ Mime::Type.register "video/ogg", :ogv Mime::Type.unregister :json Mime::Type.register 'application/json', :json, [LfsRequest::CONTENT_TYPE, 'application/json'] + +Mime::Type.register 'image/x-icon', :ico diff --git a/config/initializers/mini_magick.rb b/config/initializers/mini_magick.rb new file mode 100644 index 00000000000..db0e7bbaaa3 --- /dev/null +++ b/config/initializers/mini_magick.rb @@ -0,0 +1,3 @@ +MiniMagick.configure do |config| + config.cli = :graphicsmagick +end |