summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-0792-128/+515
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add changelog for custom faviconsiemens/gitlab-ce-feature/customizable-faviconAlexis Reigel2018-06-061-0/+5
| * | | | | | | | | | | | | | document custom faviconAlexis Reigel2018-06-064-0/+17
| * | | | | | | | | | | | | | move favicon admin section upAlexis Reigel2018-06-061-19/+19
| * | | | | | | | | | | | | | find assets in test for CI and local testAlexis Reigel2018-06-063-2/+19
| * | | | | | | | | | | | | | hint the allowed image formats on favicon uploadAlexis Reigel2018-06-063-2/+13
| * | | | | | | | | | | | | | use build image with picturemagickAlexis Reigel2018-06-061-1/+1
| * | | | | | | | | | | | | | allow only png, ico for favicon uploadsAlexis Reigel2018-06-052-2/+2
| * | | | | | | | | | | | | | remove obsolete favicon related specAlexis Reigel2018-06-051-10/+0
| * | | | | | | | | | | | | | use Gitlab::Favicon for jira serviceAlexis Reigel2018-06-053-5/+23
| * | | | | | | | | | | | | | dry up asset path helper callsAlexis Reigel2018-06-051-3/+10
| * | | | | | | | | | | | | | simplify uploader versions checkAlexis Reigel2018-06-051-9/+4
| * | | | | | | | | | | | | | require uploaded file's name to match in any caseAlexis Reigel2018-06-052-39/+59
| * | | | | | | | | | | | | | ability to get an image's alternative versionAlexis Reigel2018-06-052-1/+29
| * | | | | | | | | | | | | | the '?' favicon hack doesn't seem to be requiredAlexis Reigel2018-06-051-8/+1
| * | | | | | | | | | | | | | remove favicon preview on appearance pageAlexis Reigel2018-06-054-34/+3
| * | | | | | | | | | | | | | use inverted style for remove buttonsAlexis Reigel2018-06-051-3/+3
| * | | | | | | | | | | | | | force minimagick to use graphicsmagickAlexis Reigel2018-06-051-0/+3
| * | | | | | | | | | | | | | remove all .ico favicon variations, use png alwaysAlexis Reigel2018-06-0555-40/+39
| * | | | | | | | | | | | | | create favicon overlay on the clientAlexis Reigel2018-06-0514-108/+169
| * | | | | | | | | | | | | | fix resetFavicon so that it actually resetsAlexis Reigel2018-06-053-5/+11
| * | | | | | | | | | | | | | call Gitlab::Favicon.status in serializerAlexis Reigel2018-06-0515-42/+45
| * | | | | | | | | | | | | | add request store caching to faviconAlexis Reigel2018-06-052-2/+2
| * | | | | | | | | | | | | | whitelist allowed file types for custom faviconsAlexis Reigel2018-06-053-0/+24
| * | | | | | | | | | | | | | Add a '?' to the custom favicon's urlsAlexis Reigel2018-06-052-4/+11
| * | | | | | | | | | | | | | send ico files with inline dispositionAlexis Reigel2018-06-054-4/+4
| * | | | | | | | | | | | | | register ico mime typeAlexis Reigel2018-06-051-0/+2
| * | | | | | | | | | | | | | use custom favicon for ci build status faviconsAlexis Reigel2018-06-0511-21/+37
| * | | | | | | | | | | | | | extract favicon logic to lib classAlexis Reigel2018-06-055-31/+49
| * | | | | | | | | | | | | | sort status icon names by nameAlexis Reigel2018-06-051-6/+6
| * | | | | | | | | | | | | | use custom main faviconAlexis Reigel2018-06-053-0/+10
| * | | | | | | | | | | | | | feature spec for managing appearance > faviconAlexis Reigel2018-06-051-0/+34
| * | | | | | | | | | | | | | show avatar status versions on appearance pageAlexis Reigel2018-06-051-1/+7
| * | | | | | | | | | | | | | fix carrierwave suffix for different formatAlexis Reigel2018-06-051-8/+15
| * | | | | | | | | | | | | | allow uploading favicon in appearance settingsAlexis Reigel2018-06-058-2/+38
| * | | | | | | | | | | | | | favicon uploader generating ci status faviconsAlexis Reigel2018-06-0514-0/+85
* | | | | | | | | | | | | | | Merge branch 'sh-fix-schema-migrations-seq-scans' into 'master'Douwe Maan2018-06-072-55/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Make Gitlab::CurrentSettings.current_application_settings return cached setti...Rémy Coutable2018-06-072-57/+92
| * | | | | | | | | | | | | | | Avoid sequential scans loading schema_migrations table when loading applicati...Stan Hu2018-06-071-0/+13
* | | | | | | | | | | | | | | | Merge branch 'n-plus-one-notification-recipients' into 'master'Rémy Coutable2018-06-074-2/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix some N+1s when calculating notification recipientsSean McGivern2018-06-074-2/+46
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '47504-mobile-nav' into 'master'Clement Ho2018-06-071-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix mobile navbarAnnabel Dunstone Gray2018-06-071-1/+9
* | | | | | | | | | | | | | | | Merge branch 'ide-url-util-relative-url-fix' into 'master'Filipa Lacerda2018-06-074-3/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fixed more specsPhil Hughes2018-06-071-1/+11
| * | | | | | | | | | | | | | | fixed karmaPhil Hughes2018-06-072-2/+6
| * | | | | | | | | | | | | | | Fixes IDE button on merge requests not working with relative URL configPhil Hughes2018-06-073-1/+32
* | | | | | | | | | | | | | | | Merge branch 'fj-applying-lfs-options-to-newer-git-version' into 'master'Douwe Maan2018-06-071-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add git filter flag only if it is supportedFrancisco Javier López2018-06-071-1/+5
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch '46922-hashed-storage-single-project' into 'master'Nick Thomas2018-06-079-69/+243
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \