diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:19:22 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:19:22 +0000 |
| commit | 6848c4f93c7727d6975632135a04c5633c1781f1 (patch) | |
| tree | 79de7b002747e9906e7563a81bba5a1f1979b679 /app/controllers/admin | |
| parent | ccd8cd283c4fade866542ea70caed770f675940c (diff) | |
| parent | d3a407d66fa553f3ff8afd1b9e42f01b9912e14a (diff) | |
| download | gitlab-ce-gl-ui-tooltip.tar.gz | |
Merge branch 'master' into 'gl-ui-tooltip'gl-ui-tooltip
# Conflicts:
# app/assets/javascripts/commons/gitlab_ui.js
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/appearances_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/admin/appearances_controller.rb b/app/controllers/admin/appearances_controller.rb index fdd3b4126ff..e3226c86b0b 100644 --- a/app/controllers/admin/appearances_controller.rb +++ b/app/controllers/admin/appearances_controller.rb @@ -33,21 +33,21 @@ class Admin::AppearancesController < Admin::ApplicationController @appearance.save - redirect_to admin_appearances_path, notice: 'Logo was succesfully removed.' + redirect_to admin_appearances_path, notice: 'Logo was successfully removed.' end def header_logos @appearance.remove_header_logo! @appearance.save - redirect_to admin_appearances_path, notice: 'Header logo was succesfully removed.' + redirect_to admin_appearances_path, notice: 'Header logo was successfully removed.' end def favicon @appearance.remove_favicon! @appearance.save - redirect_to admin_appearances_path, notice: 'Favicon was succesfully removed.' + redirect_to admin_appearances_path, notice: 'Favicon was successfully removed.' end private |