Commit Graph

19 Commits

Author SHA1 Message Date
GitLab Bot 84a0e65ac8 Add latest changes from gitlab-org/gitlab@master 2019-11-07 12:06:21 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Roger Meier 38514630c0 fix(favicon): get favicon_path, so it works also with uploads object store 2019-06-14 13:58:51 +02:00
Yorick Peterse 5d654a224f
Refactor Gitlab::Favicon for EE
This moves the development favicon name in Gitlab::Favicon to a separate
method, allowing EE to redefine it to return a custom favicon.
2019-03-12 11:10:40 +01:00
gfyoung c858f70d07 Enable frozen string for lib/gitlab/*.rb 2018-10-22 07:00:50 +00:00
Michael Kozono a54a5d9f39 Use `Gitlab::SafeRequestStore` in more places
Even if it doesn’t save lines of code, since people will tend to use
code they’ve seen. And `SafeRequestStore` is safer since you
don’t have to remember to check `RequestStore.active?`.
2018-09-24 12:11:27 -07:00
Douwe Maan f83f1db4bd
Read asset host from ActionController::Base instead of application config 2018-06-29 11:22:51 +02:00
Alexis Reigel b612670cc0 Fix: Serve favicon image always from the main GitLab domain to avoid issues with CORS 2018-06-20 14:00:13 +00:00
Douwe Maan 5fc3b8a08d
Remove FaviconUploader favicon_main version
See https://gitlab.com/gitlab-org/gitlab-ce/issues/47677 for more information
2018-06-15 12:28:23 +02:00
Alexis Reigel 9151aed773
dry up asset path helper calls 2018-06-05 16:20:23 +02:00
Alexis Reigel 46328b1242
the '?' favicon hack doesn't seem to be required
probably due to recent changes in `UploadsController`.
2018-06-05 16:20:23 +02:00
Alexis Reigel b4d84c07bc
remove favicon preview on appearance page 2018-06-05 16:20:22 +02:00
Alexis Reigel 949c30d42b
remove all .ico favicon variations, use png always
the ci status icons are generated client side, wo we don't need the
static files anymore.
2018-06-05 16:20:22 +02:00
Alexis Reigel 9e14f437b6
create favicon overlay on the client
the initial reason for this change was that graphicsmagick does not
support writing to ico files. this fact lead to a chain of changes:

1. use png instead of ico (browser support is good enough)
2. render the overlays on the client using the canvas API. this way we
   only need to store the original favion and generate the overlay versions
   dynamically.
   this change also enables (next step) to simplify the handling of the
   stock favicons as well, as we don't need to generate all the versions
   upfront.
2018-06-05 16:20:21 +02:00
Alexis Reigel 67fe0a17d8
call Gitlab::Favicon.status in serializer
this ways we can keep the `lib/gitlab/ci/status/*` classes to return the
bare favicon name as it was before.

also the favicon uploader versions are now have the same names as the
stock favicons (+ `favicon_` prefix), which makes working with the
status names easier.
2018-06-05 16:20:21 +02:00
Alexis Reigel 40ffa8401b
add request store caching to favicon 2018-06-05 16:20:21 +02:00
Alexis Reigel 822023c64c
Add a '?' to the custom favicon's urls
Without the '?' at the end of the favicon url the custom favicon (i.e.
the favicons that are served through `UploadController`) are not shown
in the browser. It may have something to do with how `#send_file` /
`#send_data` set http headers. When serving the same icon file from the
public directory everything is fine.
2018-06-05 16:20:20 +02:00
Alexis Reigel 44d7b15833
use custom favicon for ci build status favicons 2018-06-05 16:20:19 +02:00
Alexis Reigel a6f3f6b8cd
extract favicon logic to lib class 2018-06-05 16:20:19 +02:00