summaryrefslogtreecommitdiff
path: root/app/models/key.rb
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-16 15:32:50 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-16 15:32:50 +0000
commit5b57f72de9800df2263bf634bfef6893c3c6538c (patch)
tree37d7603c43e926989743461dc4f26c2e25cd6f7b /app/models/key.rb
parent5fbda2af920a86e11696cae5b3397c3241f21b77 (diff)
parent0332356d9275d58c1a3050b54c2a6d653299c6df (diff)
downloadgitlab-ce-5b57f72de9800df2263bf634bfef6893c3c6538c.tar.gz
Merge branch 'brand_header_change' into 'master'
When a custom header logo is present, don't show GitLab type logo See merge request gitlab-org/gitlab-ce!15410
Diffstat (limited to 'app/models/key.rb')
0 files changed, 0 insertions, 0 deletions