Merge branch 'feature/customizable-favicon' into 'master'
Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
Showing
... | ... | @@ -108,6 +108,7 @@ gem 'hamlit', '~> 2.6.1' |
# Files attachments | ||
gem 'carrierwave', '~> 1.2' | ||
gem 'mini_magick' | ||
# Drag and Drop UI | ||
gem 'dropzonejs-rails', '~> 0.7.1' | ||
... | ... |
4.2 KB
4.2 KB
864 字节
4.2 KB
889 字节
4.2 KB
1015 字节
4.2 KB
1.0 KB
945 字节
4.2 KB
919 字节
4.2 KB
1.1 KB
4.2 KB
923 字节
4.2 KB
1.0 KB
4.2 KB
830 字节
1.5 KB
5.3 KB
1.6 KB
app/assets/images/favicon.ico
已删除
100644 → 0
5.3 KB
app/assets/images/favicon.png
0 → 100644
1.6 KB
app/helpers/favicon_helper.rb
0 → 100644
app/uploaders/favicon_uploader.rb
0 → 100644
config/locales/carrierwave.en.yml
0 → 100644
doc/customization/favicon.md
0 → 100644
51.0 KB
58.7 KB
lib/gitlab/favicon.rb
0 → 100644
public/favicon.ico
已删除
100644 → 0
5.3 KB
public/favicon.png
0 → 100644
1.6 KB
spec/lib/gitlab/favicon_spec.rb
0 → 100644