Commit graph

13 commits

Author SHA1 Message Date
DJ Mountney
1d1363e2bb Bring in security changes from the 9.2.5 release
Ran:
 - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
 - git checkout -b 9-2-5-security-patch origin/v9.2.2
 - git apply patchfile.patch
 - git commit
 - [Got the sha ref for the commit]
 - git checkout -b upstream-9-2-security master
 - git cherry-pick <SHA of the patchfile commit>
 - [Resolved conflicts]
 - git cherry-pick --continue
2017-06-07 21:16:20 -07:00
Simon Knox
679ce9dbb3 dev favicon is blue, not purple 2017-02-16 06:55:52 +11:00
Simon Knox
e15032eded override favicon for development to find tabs more easily 2017-02-16 01:07:29 +11:00
Robert Speicher
01fc7633d0 Update Hamlit to 2.6.1
Fixes gitlab-org/gitlab-ce#21025 and gitlab-org/gitlab-ce#21017
2016-08-18 13:26:32 -05:00
Douwe Maan
384445eca6 Don't override issue page description in project layout. 2016-01-06 13:02:51 +01:00
Robert Speicher
43053c2e6f Make page_description less magical 2016-01-05 14:54:59 -05:00
Robert Speicher
a298f69432 Use User#avatar_url instead of avatar_icon helper 2016-01-05 14:50:52 -05:00
Robert Speicher
dcca64a523 Use assign instead of instance_variable_set 2015-12-27 19:58:44 -05:00
Robert Speicher
a7756a4b51 Add specs for page_image using a Group's avatar 2015-12-27 19:49:48 -05:00
Robert Speicher
ab3d855c0e Add support for twitter:label meta tags 2015-12-24 17:11:08 -05:00
Robert Speicher
c6d2508362 Truncate page_description to 30 words 2015-12-24 16:26:52 -05:00
Robert Speicher
5a3b9c97e3 Account for @project.description being nil 2015-12-23 17:14:18 -05:00
Robert Speicher
b26eb782f5 Add page descriptions and images
A limited number of pages have defined their own descriptions, but
otherwise we default to the Project's description (if `@project` is
set), or the old `brand_title` fallback.

The image will either be the uploaded project icon (never a generated
one), the user's uploaded icon or Gravatar, or, finally, the GitLab
logo.
2015-12-23 16:56:27 -05:00