summaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-09-26 09:54:32 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2018-06-05 16:20:18 +0200
commitce6172e863f982c73fedc9f4a73877543c30cb1c (patch)
treec35bc83d94504d1aa55086d62ff2234d12fe62d4 /app/controllers/admin
parentc8a4d202c99c772822a2b9b09fa6da2c90b2ae81 (diff)
downloadgitlab-ce-ce6172e863f982c73fedc9f4a73877543c30cb1c.tar.gz
allow uploading favicon in appearance settings
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/appearances_controller.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/app/controllers/admin/appearances_controller.rb b/app/controllers/admin/appearances_controller.rb
index ea302f17d16..9aaec905734 100644
--- a/app/controllers/admin/appearances_controller.rb
+++ b/app/controllers/admin/appearances_controller.rb
@@ -41,6 +41,13 @@ class Admin::AppearancesController < Admin::ApplicationController
redirect_to admin_appearances_path, notice: 'Header logo was succesfully removed.'
end
+ def favicon
+ @appearance.remove_favicon!
+ @appearance.save
+
+ redirect_to admin_appearances_path, notice: 'Favicon was succesfully removed.'
+ end
+
private
# Use callbacks to share common setup or constraints between actions.
@@ -61,6 +68,8 @@ class Admin::AppearancesController < Admin::ApplicationController
logo_cache
header_logo
header_logo_cache
+ favicon
+ favicon_cache
new_project_guidelines
updated_by
]