summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* require uploaded file's name to match in any caseAlexis Reigel2018-06-051-1/+5
|
* ability to get an image's alternative versionAlexis Reigel2018-06-051-1/+7
|
* remove favicon preview on appearance pageAlexis Reigel2018-06-052-25/+1
|
* use inverted style for remove buttonsAlexis Reigel2018-06-051-3/+3
|
* remove all .ico favicon variations, use png alwaysAlexis Reigel2018-06-0538-3/+3
| | | | | the ci status icons are generated client side, wo we don't need the static files anymore.
* create favicon overlay on the clientAlexis Reigel2018-06-057-47/+75
| | | | | | | | | | | | | 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.
* fix resetFavicon so that it actually resetsAlexis Reigel2018-06-052-2/+3
|
* call Gitlab::Favicon.status in serializerAlexis Reigel2018-06-054-16/+16
| | | | | | | | | 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.
* whitelist allowed file types for custom faviconsAlexis Reigel2018-06-051-0/+4
|
* send ico files with inline dispositionAlexis Reigel2018-06-051-1/+1
|
* use custom favicon for ci build status faviconsAlexis Reigel2018-06-051-10/+1
|
* extract favicon logic to lib classAlexis Reigel2018-06-052-9/+1
|
* sort status icon names by nameAlexis Reigel2018-06-051-6/+6
|
* use custom main faviconAlexis Reigel2018-06-052-0/+5
|
* show avatar status versions on appearance pageAlexis Reigel2018-06-051-1/+7
|
* fix carrierwave suffix for different formatAlexis Reigel2018-06-051-8/+15
| | | | | when versions have a different file format from the original file carrierwave constructs a wrong url (with the original file suffix).
* allow uploading favicon in appearance settingsAlexis Reigel2018-06-054-1/+28
|
* favicon uploader generating ci status faviconsAlexis Reigel2018-06-0511-0/+44
|
* Merge branch 'add-background-migrations-for-not-archived-traces' into 'master'Kamil Trzciński2018-06-051-0/+5
|\ | | | | | | | | | | | | Add background migrations to archive legacy job traces Closes #46642 See merge request gitlab-org/gitlab-ce!19194
| * Directly refer application code from migration codeShinya Maeda2018-06-041-0/+5
| |
* | Merge branch ↵Kamil Trzciński2018-06-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '46452-nomethoderror-undefined-method-previous_changes-for-nil-nilclass' into 'master' Resolve "NoMethodError: undefined method `previous_changes' for nil:NilClass" Closes #46452 See merge request gitlab-org/gitlab-ce!19190
| * | Use nullcheck operator instead of checking for nullMatija Čupić2018-06-051-1/+1
| | |
| * | Add check for nil auto_devops in Projects::UpdateServiceMatija Čupić2018-05-281-1/+1
| | |
* | | Merge branch 'optimise-pages-service-calling' into 'master'Grzegorz Bizon2018-06-053-23/+6
|\ \ \ | | | | | | | | | | | | | | | | Optimise pages service calling See merge request gitlab-org/gitlab-ce!19388
| * | | Remove PagesService and instead make it explicit that we call PagesWorkeroptimise-pages-service-callingKamil Trzciński2018-06-052-16/+6
| | | |
| * | | Remove unused running_or_pending_build_countremove-unused-query-in-hooksKamil Trzciński2018-06-042-7/+0
| | | |
* | | | Merge branch 'rs-projects-update-service-parity' into 'master'Rémy Coutable2018-06-051-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Bring CE-EE parity to app/services/projects/update_service.rb See merge request gitlab-org/gitlab-ce!19117
| * | | | Yield to an optional block in Projects::UpdateServicers-projects-update-service-parityRobert Speicher2018-06-041-0/+2
| | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5825#note_75764799
| * | | | Bring CE-EE parity to app/services/projects/update_service.rbRobert Speicher2018-06-041-2/+2
| |/ / /
* | | | Resolve "Add Xcode Button in UI"André Luís2018-06-053-0/+14
| | | |
* | | | Merge branch 'ide-alignment-fixes' into 'master'Filipa Lacerda2018-06-052-6/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed alignment issues with IDE sidebar Closes #47244 See merge request gitlab-org/gitlab-ce!19272
| * | | | fixed SVG alignmentide-alignment-fixesPhil Hughes2018-06-041-1/+1
| | | | |
| * | | | Fixed alignment issues with IDE sidebarPhil Hughes2018-06-042-5/+26
| |/ / / | | | | | | | | | | | | Fixed sidebar tooltips not hiding after clicking
* | | | Merge branch 'fix-jobs-log' into 'master'Filipa Lacerda2018-06-051-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix jobs log background color Closes #47261 See merge request gitlab-org/gitlab-ce!19411
| * | | | Fix jobs log background colorfix-jobs-logClement Ho2018-06-041-0/+5
| | | | |
* | | | | Merge branch 'presigned-multipart-uploads' into 'master'Grzegorz Bizon2018-06-052-16/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Support presigned multipart uploads See merge request gitlab-org/gitlab-ce!18855
| * | | | | Support presigned multipart uploadsKamil Trzciński2018-06-042-16/+7
| | | | | |
* | | | | | Merge branch '47236-print-fix' into 'master'Phil Hughes2018-06-051-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Wiki print view is broken" Closes #47236 See merge request gitlab-org/gitlab-ce!19392
| * | | | | | Remove sidebar and monitoring nav from print view47236-print-fixAnnabel Dunstone Gray2018-06-041-2/+3
| | |_|/ / / | |/| | | |
* | | | | | Support smarter system notesJose Ivan Vargas2018-06-053-1/+112
| | | | | |
* | | | | | Merge branch '36862-subgroup-milestones' into 'master'Sean McGivern2018-06-052-5/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include all ancestors milestones in json list & autocomplete Closes #36862 See merge request gitlab-org/gitlab-ce!19317
| * | | | | | Include all ancestors milestones in json list & autocomplete36862-subgroup-milestonesJarka Kadlecová2018-06-042-5/+6
| | | | | | |
* | | | | | | Merge branch '47266-visiblity-import-sources-checkbox-styling' into 'master'Sean McGivern2018-06-052-4/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Admin area > Import sources and restricted visibility level checkboxes styling" Closes #47266 See merge request gitlab-org/gitlab-ce!19397
| * | | | | | | Add form-check-input class to checkbox input for visibility levels and ↵47266-visiblity-import-sources-checkbox-stylingtauriedavis2018-06-042-4/+6
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | import sources in admin area
* | | | | | | Merge branch 'bvl-hide-archived-shared-projects' into 'master'Sean McGivern2018-06-051-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide archived projects from `shared_projects` Closes #47206 See merge request gitlab-org/gitlab-ce!19361
| * | | | | | | Hide archived projects from `shared_projects`bvl-hide-archived-shared-projectsBob Van Landuyt2018-06-041-1/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we don't show the archived projects, we shouldnot load them and pass them to the fronted to be filtered out again.
* | | | | | | Resolve "New project visibility level description alignment"Taurie Davis2018-06-052-3/+3
| | | | | | |
* | | | | | | Resolve "Markdown blockquote is not displaying properly"Paul Slaughter2018-06-052-11/+13
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch '6287-epics-page-styling-is-broken' into 'master'Clement Ho2018-06-051-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of Resolve "Epics Page Styling is broken" See merge request gitlab-org/gitlab-ce!19407
| * | | | | | Backport of Resolve "Epics Page Styling is broken"Clement Ho2018-06-041-2/+7
| | | | | | |
View Lorry Controller Status