summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix the rake task to actually run and schedule the jobs for rollback53966-make-hashed-storage-migration-safer-and-more-invitingGabriel Mazetto2019-02-062-3/+14
|
* Added Rollbacker workers and support on the rake taskGabriel Mazetto2019-02-0612-17/+273
| | | | | | | | | Rollback is done similar to Migration for the Hashed Storage. It also shares the same ExclusiveLease key to prevent both happening at the same time. All Hashed Storage related workers now share the same queue namespace which allows for assigning dedicated workers easily.
* Refactor ProjectMigrate and ProjectRollback workersGabriel Mazetto2019-02-0610-107/+117
| | | | | Moved to HashedStorage namespace, and added them to the `:hashed_storage` queue namespace
* Adds Rollback functionality to HashedStorage migrationGabriel Mazetto2019-02-0613-1/+496
| | | | | | | We are adding sidekiq workers and service classes to allow to rollback a hashed storage migration. There are some refactoring involved as well as part of the code can be reused by both the migration and the rollback logic.
* Rake task for storage rollbackGabriel Mazetto2019-02-061-0/+45
|
* Merge branch '54544-update-project-topics-styling-to-use-badges-design' into ↵Fatih Acet2019-02-054-4/+25
|\ | | | | | | | | | | | | | | | | 'master' Resolve "Update project topics styling to use badges design" Closes #54544 See merge request gitlab-org/gitlab-ce!24415
| * Resolve "Update project topics styling to use badges design"Brandon Labuschagne2019-02-054-4/+25
|/
* Merge branch 'patch-29' into 'master'Evan Read2019-02-051-3/+3
|\ | | | | | | | | docs: improve OpenSSH installation on Windows options See merge request gitlab-org/gitlab-ce!24206
| * docs: improve OpenSSH installation on Windows optionsBen Bodenmiller2019-02-051-3/+3
|/
* Merge branch ↵Stan Hu2019-02-0511-0/+154
|\ | | | | | | | | | | | | | | | | 'rd-update-last_activity_on-on-logins-and-browsing-activity-54947' into 'master' Update User's last_activity_on for any GET request on projects Closes #54947 See merge request gitlab-org/gitlab-ce!24642
| * Remove comment about needing cookie supportStan Hu2019-02-051-2/+1
| | | | | | | | Cookies are no longer needed for this feature to work.
| * Update last_activity_on for Users on some main GET endpointsRubén Dávila2019-02-0511-0/+155
| | | | | | | | | | | | | | In order to have an accurate date about the last activity of a User we need to update the last_activity_on field when the User is visiting some basic pages of GitLab like pages related to Dashboards, Projects, Issues and Merge Requests
* | Merge branch 'use-deployment-relation-to-fetch-environment-ce' into 'master'Stan Hu2019-02-053-2/+37
|\ \ | | | | | | | | | | | | Backport: Optimize slow pipelines.js response See merge request gitlab-org/gitlab-ce!24890
| * | Backport: Optimize slow pipelines.js responseShinya Maeda2019-02-053-2/+37
| | | | | | | | | | | | Add changelog
* | | Merge branch 'adriel-use-svg-icon-for-deployment-series' into 'master'Phil Hughes2019-02-053-0/+99
|\ \ \ | | | | | | | | | | | | | | | | Use SVG icon for deployment series See merge request gitlab-org/gitlab-ce!24652
| * | | Use svg icon for deployment seriesAdriel Santiago2019-02-053-0/+99
| | | | | | | | | | | | | | | | Use the rocket GitLab SVG to show deployment data
* | | | Merge branch 'jej/avoid-csrf-check-on-saml-failure' into 'master'Rémy Coutable2019-02-053-1/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip CSRF check on SAML failure endpoint Closes #56574 See merge request gitlab-org/gitlab-ce!24509
| * | | | Avoid CSRF check on SAML failure endpointJames Edwards-Jones2019-02-043-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SAML and OAuth failures should cause a message to be presented, as well as logging that an attempt was made. These were incorrectly prevented by the CSRF check on POST endpoints such as SAML. In addition we were using a NullSession forgery protection, which made testing more difficult and could have allowed account linking to take place if a CSRF was ever needed but not present.
* | | | | Merge branch 'ce-reduce-diff-in-groups-update_service' into 'master'Nick Thomas2019-02-051-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reduce diff with EE in Groups::UpdateService See merge request gitlab-org/gitlab-ce!24912
| * | | | | Reduce diff with EE in Groups::UpdateServiceRémy Coutable2019-02-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'ce-reduce-diff-in-ci-create_pipeline_service' into 'master'Nick Thomas2019-02-054-3/+72
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the diff with EE in Ci::CreatePipelineService See merge request gitlab-org/gitlab-ce!24831
| * | | | | | Reduce the diff with EE in Ci::CreatePipelineServiceRémy Coutable2019-02-044-3/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'docs-operations-index' into 'master'Achilleas Pipinellis2019-02-051-0/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: add index for project operations Closes #56115 See merge request gitlab-org/gitlab-ce!24565
| * | | | | | | Docs: add index for project operationsMarcia Ramos2019-02-051-0/+11
|/ / / / / / /
* | | | | | | Merge branch 'ce-reduce-diff-in-search-global_service' into 'master'Douglas Barbosa Alexandre2019-02-051-4/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce diff with EE in Search::GlobalService See merge request gitlab-org/gitlab-ce!24914
| * | | | | | | Reduce diff with EE in Search::GlobalServiceRémy Coutable2019-02-051-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'mj/security-mr-template' into 'master'Yorick Peterse2019-02-051-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author is Developer in sec. release MR template See merge request gitlab-org/gitlab-ce!24934
| * | | | | | | | Author is Developer in sec. release MR templateMarin Jankovski2019-02-051-2/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'diff-file-finder' into 'master'Filipa Lacerda2019-02-0522-304/+404
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added fuzzy file finder to merge requests Closes #53304 See merge request gitlab-org/gitlab-ce!24434
| * | | | | | | | | Added fuzzy file finder to merge requestsPhil Hughes2019-02-0522-304/+404
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53304
* | | | | | | | | | Merge branch 'jlenny-DocPagesTemplates' into 'master'Marcia Ramos2019-02-052-4/+18
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instructions on how to use Pages templates Closes #56991 See merge request gitlab-org/gitlab-ce!24796
| * | | | | | | | | | Instructions on how to use Pages templatesJason Lenny2019-02-052-4/+18
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'bvl-codeowner-rules-model-ce' into 'master'Sean McGivern2019-02-053-27/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds helper for `find_or_create_by` in transaction See merge request gitlab-org/gitlab-ce!24913
| * | | | | | | | | | Adds helper for `find_or_create_by` in transactionBob Van Landuyt2019-02-053-27/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to call `find_or_create_by` on all models and scopes.
* | | | | | | | | | | Merge branch 'speedup-gitlab-assets-compile' into 'master'Sean McGivern2019-02-059-16/+72
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache assets in gitlab:assets:compile Closes #56691 See merge request gitlab-org/gitlab-ce!24542
| * | | | | | | | | | Add cache to the 'compile-assets' and 'gitlab:assets:compile' jobsRémy Coutable2019-02-057-16/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | Monkey-patch Sprockets to prevent cache ballooningRémy Coutable2019-02-052-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch 'sh-encode-content-disposition' into 'master'Sean McGivern2019-02-0513-24/+129
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encode Content-Disposition filenames Closes #47673 See merge request gitlab-org/gitlab-ce!24919
| * | | | | | | | | | | Add Rails 6 deprecation error messageStan Hu2019-02-051-0/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Encode Content-Disposition filenamesStan Hu2019-02-0413-24/+122
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users downloading non-ASCII attachments would see garbled characters. When used with object storage, AWS S3 would return an InvalidArgument error: Header value cannot be represented using ISO-8859-1. Per RFC 5987 and RFC 6266, Content-Disposition should be encoded properly. This commit takes the Rails 6 implementation of ActiveSuppport::Http::ContentDisposition (https://github.com/rails/rails/pull/33829) and ports it here. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47673
* | | | | | | | | | | Merge branch 'jprovazn-remove-redcarpet' into 'master'Grzegorz Bizon2019-02-0558-699/+148
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Redcarpet markdown engine Closes #51374 See merge request gitlab-org/gitlab-ce!24819
| * | | | | | | | | | Remove Redcarpet markdown engineJan Provaznik2019-02-0458-699/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This engine was replaced with CommonMarker in 11.4, it was deprecated since then.
* | | | | | | | | | | Merge branch 'not-run-pipeline-on-empty-merge-request' into 'master'Grzegorz Bizon2019-02-054-2/+30
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create new pipeline for merge requests with no commits See merge request gitlab-org/gitlab-ce!24503
| * | | | | | | | | | Fix false-positive specHiroyuki Sato2019-02-051-18/+18
| | | | | | | | | | |
| * | | | | | | | | | Move validation logic to service layerHiroyuki Sato2019-01-287-30/+26
| | | | | | | | | | |
| * | | | | | | | | | Make presence_of_commits_in_merge_request private methodHiroyuki Sato2019-01-251-6/+6
| | | | | | | | | | |
| * | | | | | | | | | Don't create merge request pipeline without commitsHiroyuki Sato2019-01-206-6/+38
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix_jira_integration_VCS1019' into 'master'Sean McGivern2019-02-053-1/+16
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix comparing equality between `ActionController::Parameters` and a `Hash`.... Closes #57221 See merge request gitlab-org/gitlab-ce!24896
| * | | | | | | | | | Fix comparing equality between `ActionController::Parameters` and a `Hash`....Daniel Juarez2019-02-053-1/+16
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'pl-serialize-ac-parameters' into 'master'Sean McGivern2019-02-053-6/+79
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make `ActionContorller::Parameters` serializable for sidekiq jobs See merge request gitlab-org/gitlab-ce!24864
View Lorry Controller Status