summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* favicon uploader generating ci status faviconsAlexis Reigel2018-06-0514-0/+85
|
* Merge branch 'docs/add-configuration-team-to-the-list' into 'master'Rémy Coutable2018-06-051-1/+1
|\ | | | | | | | | Add Configuration team to the list See merge request gitlab-org/gitlab-ce!19416
| * Add Configuration team to the listdocs/add-configuration-team-to-the-listFabio Busatto2018-06-051-1/+1
| |
* | Merge branch 'write-config-not-found' into 'master'Sean McGivern2018-06-052-0/+17
|\ \ | | | | | | | | | | | | | | | | | | Prevent Gitaly WriteConfig log noise Closes gitaly#1221 See merge request gitlab-org/gitlab-ce!19375
| * | Prevent Gitaly WriteConfig log noiseJacob Vosmaer (GitLab)2018-06-052-0/+17
|/ /
* | Merge branch 'add-background-migrations-for-not-archived-traces' into 'master'Kamil Trzciński2018-06-059-4/+202
|\ \ | | | | | | | | | | | | | | | | | | Add background migrations to archive legacy job traces Closes #46642 See merge request gitlab-org/gitlab-ce!19194
| * | Fix typo in spec. Add a test for the case of when trace is stored in databaseadd-background-migrations-for-not-archived-tracesShinya Maeda2018-06-042-4/+26
| | |
| * | Revise comments in ArchiveLegacyTracesShinya Maeda2018-06-041-3/+3
| | |
| * | Add type_build to ScheduleToArchiveLegacyTraces::BuildShinya Maeda2018-06-041-1/+3
| | |
| * | Fix specs. Rename migration file name which was conflicted with background ↵Shinya Maeda2018-06-045-74/+78
| | | | | | | | | | | | migration's.
| * | Directly refer application code from migration codeShinya Maeda2018-06-045-85/+22
| | |
| * | Add changelogShinya Maeda2018-06-041-0/+5
| | |
| * | Add background migrations to arhive legacy tracesShinya Maeda2018-06-045-1/+229
| | |
* | | Merge branch 'override-consider-extend' into 'master'Nick Thomas2018-06-052-65/+121
|\ \ \ | | | | | | | | | | | | | | | | Also verify if extending would override a class method See merge request gitlab-org/gitlab-ce!19377
| * | | Also verify if extending would override a class methodoverride-consider-extendLin Jen-Shin2018-06-052-65/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since extending a class means including on the singleton class of the class, this should now complain this: ``` ruby module M extend Gitlab::Utils::Override override :f def f super.succ end end class C extend M def self.f 0 end end ``` It should complain because `C.f` wasn't calling `M#f`. This should pass verification: ``` ruby module M extend Gitlab::Utils::Override override :f def f super.succ end end class B def self.f 0 end end class C < B extend M end ``` Because `C.f` would now call `M#f`, and `M#f` does override something.
* | | | Merge branch ↵Kamil Trzciński2018-06-053-1/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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 CHANGELOG entry46452-nomethoderror-undefined-method-previous_changes-for-nil-nilclassMatija Čupić2018-05-281-0/+5
| | | | |
| * | | | Add check for nil auto_devops in Projects::UpdateServiceMatija Čupić2018-05-282-1/+5
| | | | |
* | | | | Merge branch 'gh-importer-transactions' into 'master'Nick Thomas2018-06-054-29/+121
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Perform pull request IO work outside a transaction See merge request gitlab-org/gitlab-ce!19372
| * | | | | Perform pull request IO work outside a transactiongh-importer-transactionsYorick Peterse2018-06-044-29/+121
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When importing a GitHub pull request we would perform all work in a single database transaction. This is less than ideal, because we perform various slow Git operations when creating a merge request. This in turn can lead to many DB connections being used, while just waiting for an IO operation to complete. To work around this, we now move most of the heavy lifting out of the database transaction. Some extra error handling is added to ensure we can resume importing a partially imported pull request, instead of just throwing an error. This commit also changes the specs for IssueImporter so they don't rely on deprecated RSpec methods.
* | | | | Merge branch 'docs-gitlab-ee-6184_update_security_products_job_name' into ↵Achilleas Pipinellis2018-06-051-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update security products job and artifact names in documentation. See merge request gitlab-org/gitlab-ce!19315
| * | | | | Update security products job and artifact names in documentation. Refs ↵docs-gitlab-ee-6184_update_security_products_job_nameOlivier Gonzalez2018-06-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | gitlab-org/gitlab-ee#6184
* | | | | | Merge branch 'rails5-fix-46236' into 'master'Yorick Peterse2018-06-056-14/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support rails5 in postgres indexes function and fix some migrations Closes #46236 See merge request gitlab-org/gitlab-ce!19400
| * | | | | | Support rails5 in postgres indexes function and fix some migrationsJasper Maes2018-06-056-14/+26
| | | | | | |
* | | | | | | Merge branch 'backstage/gb/fix-rubocop-offense-in-build-specs' into 'master'Grzegorz Bizon2018-06-051-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Rubocop offense in build specs See merge request gitlab-org/gitlab-ce!19419
| * | | | | | | Fix Rubocop offense in build specsbackstage/gb/fix-rubocop-offense-in-build-specsGrzegorz Bizon2018-06-051-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'optimise-pages-service-calling' into 'master'Grzegorz Bizon2018-06-058-78/+88
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimise pages service calling See merge request gitlab-org/gitlab-ce!19388