spec/lib/gitlab/favicon_spec.rb · b7f9dd42d9a2373b0f1ebb62d5d770b083d21628 · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-11 · d76db397
GitLab Bot authored Jun 11, 2018
```
# Conflicts:
#	spec/models/project_spec.rb

[ci skip]
```
d76db397