summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Increase jest timeout to 1000msee-increase-jest-timeout-to-1000Luke Bennett2019-03-011-1/+1
| | | | | 300ms timeout is now causing flaky tests in CI envrionments.
* Merge branch '9903-geo-selective-sync-by-namespace-is-broken' into 'master'Stan Hu2019-03-012-2/+42
|\ | | | | | | | | Fix GitLab::JsonCache when reading a persisted entry back from the cache See merge request gitlab-org/gitlab-ce!25587
| * Mark cached value as persisted when is an instance of ActiveRecord::BaseDouglas Barbosa Alexandre2019-02-282-2/+42
| |
* | Merge branch '53966-make-hashed-storage-migration-safer-and-more-inviting' ↵Douglas Barbosa Alexandre2019-03-0131-129/+922
|\ \ | | | | | | | | | | | | | | | | | | into 'master' Hashed Storage rollback mechanism See merge request gitlab-org/gitlab-ce!23955
| * | Improve migration/rollback logic for attachmentsGabriel Mazetto2019-03-012-6/+14
| | |
| * | Migrate sidekiq queue to the new :hashed_storage namespaceGabriel Mazetto2019-03-012-1/+18
| | | | | | | | | | | | | | | `project_migrate_hashed_storage` is now `hashed_storage:hashed_storage_project_migrate`
| * | Extract duplicated code into BaseAttachmentServiceGabriel Mazetto2019-03-015-97/+59
| | | | | | | | | | | | Exceptions were also simplified from 2 to 1.
| * | Extract and simplify more code into BaseRepositoryService`Gabriel Mazetto2019-03-015-31/+14
| | | | | | | | | | | | | | | `try_to_set_repository_read_only!` is now on the Base class. Simplified Exception classes from 2 to 1 with a more descriptive name.
| * | Extract common logic to HashedStorage::BaseWorkerGabriel Mazetto2019-03-014-55/+35
| | | | | | | | | | | | | | | New class contains the ExclusiveLease specifics that is shared among both the Migration and Rollback workers.
| * | Edge case: upgrade/downgrade when repository doesn't existGabriel Mazetto2019-03-013-1/+22
| | | | | | | | | | | | | | | | | | This change takes the case where repository doesn't exist on disk and make it ignore but succeed the step, increasing or decreasing the version depending on the operation.
| * | Added Rollbacker workers and support on the rake taskGabriel Mazetto2019-03-0116-25/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-03-0110-107/+117
| | | | | | | | | | | | | | | Moved to HashedStorage namespace, and added them to the `:hashed_storage` queue namespace
| * | Adds Rollback functionality to HashedStorage migrationGabriel Mazetto2019-03-0114-1/+501
| | | | | | | | | | | | | | | | | | | | | 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-03-011-0/+45
| | |
* | | Merge branch 'docs-serverless-updates' into 'master'Marcia Ramos2019-03-013-13/+34
|\ \ \ | | | | | | | | | | | | | | | | Update Serverless docs with livestream feedback See merge request gitlab-org/gitlab-ce!25616
| * | | Update Serverless docs with livestream feedbackDaniel Gruesso2019-03-013-13/+34
|/ / /
* | | Merge branch 'refactor-merge-request-between-pipeline-and-build' into 'master'Kamil Trzciński2019-03-0125-62/+85
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add suffix (`_event`) to merge request source Closes gitlab-ee#9893 See merge request gitlab-org/gitlab-ce!25508
| * | | Add suffix for merge request eventShinya Maeda2019-03-0125-62/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ok Add spec Fix ok Fix Add changelog Fix Add memoization a fix
* | | | Merge branch 'docs-create-ssh-ui-fix' into 'master'Marcia Ramos2019-03-011-6/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Minor grammar and accuracy fixes See merge request gitlab-org/gitlab-ce!25665
| * | | | Minor grammar and accuracy fixesChristie Lenneville2019-03-011-6/+5
|/ / / /
* | | | Merge branch '55199-operations-settings-update' into 'master'Sean McGivern2019-03-0136-86/+1742
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Add Sentry project dropdown to error tracking settings form See merge request gitlab-org/gitlab-ce!24701
| * | | Refactor model and specReuben Pereira2019-03-0136-86/+1742
|/ / / | | | | | | | | | | | | | | | - Move some specs into contexts - Let get_slugs method take a parameter and return a specific slug. - Add rescues when using Addressable::URI.
* | | Merge branch '10097-number-utils' into 'master'Phil Hughes2019-03-013-0/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Moves EE differences out of number_utils.js Closes gitlab-ee#10097 See merge request gitlab-org/gitlab-ce!25680
| * | | Moves utility function into CEFilipa Lacerda2019-03-013-0/+35
| | | |
* | | | Merge branch ↵Phil Hughes2019-03-014-37/+189
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '57991-frontend-pagination-needs-to-handle-cases-where-the-x-total-pages-header-isn-t-present' into 'master' Improve the JS pagination to handle the case when the `X-Total` and `X-Total-Pages` headers aren't present Closes #57991 See merge request gitlab-org/gitlab-ce!25601
| * | | | Make JS pagination handle missing 'X-Total-Pages' headerRémy Coutable2019-02-284-37/+189
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '54924-clean-up-data' into 'master'Douwe Maan2019-03-013-1/+68
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up `noteable_id` for notes on commits Closes #54924 See merge request gitlab-org/gitlab-ce!25639
| * | | | | Clean up `noteable_id` for notes on commitsHeinrich Lee Yu2019-03-013-1/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was incorrectly set by a bug in: https://gitlab.com/gitlab-org/gitlab-ce/issues/54924
* | | | | | Merge branch '_acet-ce-related-mrs' into 'master'Kushal Pandya2019-03-014-0/+576
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move related issues shared components from EE See merge request gitlab-org/gitlab-ce!25613
| * | | | | | Move related issues shared components from EEFatih Acet2019-03-014-0/+576
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We will rewrite Related MRs widget in CE with Vue. It’s pretty much the same with Related Issues in EE. I made EE only components reusable and this is the CE backward compatability commit. Links: Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/57662 MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9730
* | | | | | | Merge branch 'ce-7714-view-recent-boards' into 'master'Sean McGivern2019-03-018-26/+65
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE-port for 7714-view-recent-boards See merge request gitlab-org/gitlab-ce!25602
| * | | | | | | CE-port for 7714-view-recent-boardsHeinrich Lee Yu2019-03-018-26/+65
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Adds additional count param to Boards::Visits::LatestService
* | | | | | | Merge branch 'qa-raise-error-when-repository-command-fail' into 'master'Mark Lapierre2019-03-013-8/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [QA] Fail early if a Git command fails Closes #54653 See merge request gitlab-org/gitlab-ce!23450
| * | | | | | | [QA] Fail early if a Git command failsRémy Coutable2019-02-283-8/+8
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '40396-fix-sig-stp' into 'master'Douwe Maan2019-03-012-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SIGSTP should be SIGTSTP Closes #40396 See merge request gitlab-org/gitlab-ce!25682
| * | | | | | SIGSTP should be SIGTSTPNick Thomas2019-03-012-2/+2
| | | | | | |
* | | | | | | Merge branch '58274-folder-icon-in-tags-page' into 'master'Tim Zallmann2019-03-012-1/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `folder-open` from sprite icons for Browse Files button in Tag page Closes #58274 See merge request gitlab-org/gitlab-ce!25635
| * | | | | | Add changelog entryKushal Pandya2019-02-281-0/+5
| | | | | | |
| * | | | | | Use `folder-open` from sprite icons for Browse Files buttonKushal Pandya2019-02-281-1/+1
| | | | | | |
* | | | | | | Merge branch 'docs-fe-single-repo' into 'master'Phil Hughes2019-03-011-1/+70
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Adds documentation for frontend single repo move See merge request gitlab-org/gitlab-ce!25650
| * | | | | | Adds documentation for frontend single repo moveFilipa Lacerda2019-03-011-1/+70
|/ / / / / /
* | | | | | Merge branch 'note-header-ee-differences' into 'master'Filipa Lacerda2019-03-014-8/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move EE differences in CE diff files into CE Closes gitlab-ee#9969, gitlab-ee#9973, and gitlab-ee#9974 See merge request gitlab-org/gitlab-ce!25678
| * | | | | | Move EE differences in CE diff files into CEPhil Hughes2019-03-014-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9974, https://gitlab.com/gitlab-org/gitlab-ee/issues/9973, https://gitlab.com/gitlab-org/gitlab-ee/issues/9969
* | | | | | | Merge branch 'sh-bump-fog-gem' into 'master'Sean McGivern2019-03-015-30/+90
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Bump fog-aws to 3.3.0 and associated dependencies See merge request gitlab-org/gitlab-ce!21788
| * | | | | | Fix double space before commentSean McGivern2019-03-011-1/+1
| | | | | | |
| * | | | | | Mark Fog initializer with frozen_string_literal: trueStan Hu2019-03-011-0/+2
| | | | | | |
| * | | | | | Add CHANGELOG.md for Fog gem changesStan Hu2019-02-281-0/+5
| | | | | | |
| * | | | | | Bump fog-aliyun to 0.3.3Stan Hu2019-02-281-1/+1
| | | | | | |
| * | | | | | Add a monkey patch that will squelch warnings for legacy Fog gemsStan Hu2019-02-283-2/+54
| | | | | | |
| * | | | | | Bump fog-aws to 3.3.0 and associated dependenciesStan Hu2019-02-283-30/+31
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes issue with AWS V4 signatures not working with Ceph S3: https://github.com/fog/fog-aws/issues/462
View Lorry Controller Status