summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch ↵Kamil Trzciński2018-06-075-0/+133
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '46075-automatically-provide-deploy-token-when-autodevops-is-enabled' into 'master' Resolve "Automatically provide a Deploy Token to projects when Auto DevOps is enabled" Closes #46075 See merge request gitlab-org/gitlab-ce!19507
| * | | | | | | | | | | | | | | | | | | | | | | | Resolve "Automatically provide a Deploy Token to projects when Auto DevOps ↵Mayra Cabrera2018-06-075-0/+133
|/ / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is enabled"
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch '44267-improve-failed-jobs-tab' into 'master'Phil Hughes2018-06-076-25/+220
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Show `failure_reason` and improve failed jobs tab in pipeline detail view" Closes #44267 See merge request gitlab-org/gitlab-ce!19485
| * | | | | | | | | | | | | | | | | | | | | | | | Resolve "Show `failure_reason` and improve failed jobs tab in pipeline ↵André Luís2018-06-076-25/+220
|/ / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | detail view"
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'introduce-job-keep-alive-api-endpoint' into 'master'Tomasz Maczukin2018-06-074-2/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make CI job update entrypoint to work as keep-alive endpoint See merge request gitlab-org/gitlab-ce!19543
| * | | | | | | | | | | | | | | | | | | | | | | | Update CHANGELOGTomasz Maczukin2018-06-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Change update entrypoint instead of adding new keep-alive oneTomasz Maczukin2018-06-073-76/+35
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Add CHANGELOG entryTomasz Maczukin2018-06-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Introduce new keep-alive API entrypoint for CI jobTomasz Maczukin2018-06-072-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'add-new-arg-to-git-rev-list-call' into 'master'Douwe Maan2018-06-073-6/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the --in-commit-order arg to `git-rev-list` Closes #45062 See merge request gitlab-org/gitlab-ce!19494
| * | | | | | | | | | | | | | | | | | | | | | | | | Pass the --in-commit-order arg to `git-rev-list`Rubén Dávila2018-06-073-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @jamedjo has found a good improvement in the performance of the LFS integrity check by passing this arg
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ce-4936-roadmap-navigation-presets' into 'master'Phil Hughes2018-06-072-41/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport: Add timeframe helper methods See merge request gitlab-org/gitlab-ce!19553
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add timeframe helper methodsKushal Pandya2018-06-072-41/+59
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch ↵Rémy Coutable2018-06-072-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '46241-enable-hashed-storage-for-new-projects-by-default-in-development' into 'master' Resolve "Enable hashed storage for new projects by default in development" Closes #46241 See merge request gitlab-org/gitlab-ce!19488
| * | | | | | | | | | | | | | | | | | | | | | | | | Enable hashed storage for new projects by default in developmentValery Sizov2018-06-072-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-0792-128/+515
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
| * | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the change in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14583/diffs we can't use the same method to access assets in a CI and the local test environment anymore.
| * | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the related omnibus graphicsmagick package only supports those formats. see https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1975
| * | | | | | | | | | | | | | | | | | | | | | | | | | remove obsolete favicon related specAlexis Reigel2018-06-051-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the favicon variations don't need to be tested on the entity anymore, as they are A) tested in the dedicated `Gitlab::Favicon` and B) they are created on the client (i.e. the overlays are always the same for all base favicon variants).
| * | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | probably due to recent changes in `UploadsController`.
| * | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0514-108/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-053-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | call Gitlab::Favicon.status in serializerAlexis Reigel2018-06-0515-42/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the '?' at the end of the favicon url the custom favicon (i.e. the favicons that are served through `UploadController`) are not shown in the browser. It may have something to do with how `#send_file` / `#send_data` set http headers. When serving the same icon file from the public directory everything is fine.
| * | | | | | | | | | | | | | | | | | | | | | | | | | send ico files with inline dispositionAlexis Reigel2018-06-054-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | register ico mime typeAlexis Reigel2018-06-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `#send_file` won't properly set the favicon's content type otherwise.
| * | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-058-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | |