summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'increase-kubernetes-ip-address-timeout' into 'master'docs/add-note-on-redis-backup-restoreMark Lapierre2019-01-252-5/+2
|\ | | | | | | | | | | | | Auto DevOps QA: increase IP address timeout, remove quarantine Closes gitlab-qa#369 See merge request gitlab-org/gitlab-ce!24687
| * Auto DevOps QA: increase IP address timeout, remove quarantineDylan Griffith2019-01-252-5/+2
| |
* | Merge branch '53966-refactor-hashed-storage' into 'master'Douglas Barbosa Alexandre2019-01-2526-169/+330
|\ \ | |/ |/| | | | | Refactor Hashed Storage for future Rollback functionality See merge request gitlab-org/gitlab-ce!24402
| * Use Gitlab::AppLogger instead of Rails.loggerGabriel Mazetto2019-01-252-2/+2
| |
| * Sidekiq queue migration for HashedStorage::MigratorWorkerGabriel Mazetto2019-01-253-1/+66
| | | | | | | | | | Migrate jobs from `storage_migrator` to `hashed_storage:hashed_storage_migrator`.
| * Track when MigrateAttachmentsService is skippedGabriel Mazetto2019-01-252-2/+18
| | | | | | | | We need this new state for the Geo event logic in EE
| * Refactor Storage MigrationGabriel Mazetto2019-01-2516-98/+147
| | | | | | | | | | | | | | | | | | Specs were reviewed and improved to better cover the current behavior. There was some standardization done as well to facilitate the implementation of the rollback functionality. StorageMigratorWorker was extracted to HashedStorage namespace were RollbackerWorker will live one as well.
| * Extract BaseRepositoryService from MigrateRepositoryGabriel Mazetto2019-01-252-45/+58
| | | | | | | | This will serve as new base class for both Migrate and Rollback
| * Move MigrationService to HashedStorage moduleGabriel Mazetto2019-01-257-36/+38
| | | | | | | | | | This is part of the refactor to include a RollbackService into HashedStorage module
| * Prepare rake task for storage rollbackGabriel Mazetto2019-01-256-20/+37
| | | | | | | | We are keeping compatibility with existing scheduled jobs.
| * Remove "Experimental" text from Hashed Storage settings pageGabriel Mazetto2019-01-251-1/+0
| |
* | Merge branch 'qa-ml-quarantine-rebase-test' into 'master'56871-error-tracking-does-not-error-when-given-invalid-api-keyMark Lapierre2019-01-251-1/+1
|\ \ | |/ |/| | | | | Quarantine failing test rebase_merge_request_spec.rb See merge request gitlab-org/gitlab-ce!24682
| * Quarantine failing testMark Lapierre2019-01-251-1/+1
| |
* | Merge branch 'dm-copy-suggestion-as-gfm' into 'master'Phil Hughes2019-01-257-4/+94
|\ \ | | | | | | | | | | | | Allow suggestions to be copied and pasted as GFM See merge request gitlab-org/gitlab-ce!24600
| * | Allow suggestions to be copied and pasted as GFMDouwe Maan2019-01-255-3/+91
| | | | | | | | | | | | | | | Supports both suggestions transformed from GFM to HTML and from GFM to HTML to Vue component.
| * | Wrap suggestion note in .note-text.md for consistent styling + behaviorDouwe Maan2019-01-252-1/+3
| | |
* | | Merge branch 'osw-adjusts-suggestions-unable-to-be-applied' into 'master'Phil Hughes2019-01-254-16/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adjusts suggestions unable to be applied Closes #56690 See merge request gitlab-org/gitlab-ce!24603
| * | | Adjusts suggestions unable to be appliedOswaldo Ferreira2019-01-254-16/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Presents the system error message when available, when applying suggestions 2. Adjusts target branch updates affecting MRs pointing to it when there are previously created suggestions in the MR. We just need to compare the HEAD shas from position and MR source branch.
* | | | Merge branch '56860-fix-spec-race-condition-upside-the-head' into 'master'Douglas Barbosa Alexandre2019-01-251-0/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Fix a JS race in a spec Closes #56860 See merge request gitlab-org/gitlab-ce!24684
| * | | Fix a JS race in a specNick Thomas2019-01-251-0/+3
| | | |
* | | | Merge branch 'qa-fix-branches-spec' into 'master'Mark Lapierre2019-01-255-2/+28
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix transient failure in add_list_delete_branches_spec.rb Closes gitlab-org/quality/nightly#62 See merge request gitlab-org/gitlab-ce!24644
| * | | Fix failing E2E testMark Lapierre2019-01-255-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes add_list_delete_branches_spec.rb would not wait after deleting a branch before checking that the branch was done. It would fail when the UI was still processing. This checks that the loading icon is gone before returning from delete_branch. It also makes sure credentials are added properly after recent changes to QA::Git::Repository
* | | | Merge branch 'elasticsearch-via-gitaly-ee' into 'master'Nick Thomas2019-01-252-1/+14
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Add connection_data method to Gitaly client See merge request gitlab-org/gitlab-ce!24669
| * | | Add connection_data method to Gitaly clientValery Sizov2019-01-252-1/+14
| | | | | | | | | | | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7434
* | | | Merge branch 'update-spriteicon-from-icon-on-profile' into 'master'Annabel Dunstone Gray2019-01-253-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update to GitLab SVG icon from Font Awesome in profile for location and work See merge request gitlab-org/gitlab-ce!24671
| * | | | Update to GitLab SVG icon from Font Awesome in profile for location and workYoginth2019-01-253-2/+8
|/ / / /
* | | | Merge branch 'winh-shame-ms-clear' into 'master'Clement Ho2019-01-251-0/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add .ms-no-clear to disable duplicate clear icon in IE / Edge See merge request gitlab-org/gitlab-ce!24640
| * | | | Add .ms-no-clear to disable duplicate clear icon in IE / EdgeWinnie Hellmann2019-01-251-0/+11
| | | | |
* | | | | Merge branch '56843-quarantine-flakey-test' into 'master'Sean McGivern2019-01-251-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Quarantine flakey GFM label test See merge request gitlab-org/gitlab-ce!24675
| * | | | Quarantine flakey GFM label testLukas Eipert2019-01-251-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'docs-fix-table' into 'master'Achilleas Pipinellis2019-01-252-0/+37
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Docs: fix table on ci/variables Closes gitlab-com/gitlab-docs#323 See merge request gitlab-org/gitlab-ce!24632
| * | | Fixes a typoMarcia Ramos2019-01-241-1/+1
| | | |
| * | | Document docs style exceptionsMarcia Ramos2019-01-241-0/+33
| | | |
| * | | Fix table overlapping the ToCMarcia Ramos2019-01-241-0/+4
| | | |
* | | | Merge branch 'container-repository-cleanup-api' into 'master'Grzegorz Bizon2019-01-2528-34/+1071
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Container repository cleanup API Closes #55978 See merge request gitlab-org/gitlab-ce!24303
| * | | | Refactor Container Registry API docsAchilleas Pipinellis2019-01-251-71/+73
| | | | |
| * | | | Add Container Registry APIKamil Trzciński2019-01-2528-34/+1069
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes a set of APIs to manipulate container registry. This includes also an ability to delete tags based on requested criteria, like keep-last-n, matching-name, older-than.
* | | | | Merge branch '54905-milestone-search' into 'master'Sean McGivern2019-01-2521-13/+144
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Milestone search" Closes #54905 See merge request gitlab-org/gitlab-ce!24265
| * | | | | Adds milestone searchJacopo2019-01-2421-13/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds to search ILIKE search for milestones title in: - Milestones dashboard - Group milestones page - Project milestones page
* | | | | | Merge branch 'docs-pages-standalone-deployment' into 'master'Marcia Ramos2019-01-251-0/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds steps for running GitLab Pages on a separate server See merge request gitlab-org/gitlab-ce!24256
| * | | | | | Adds steps for running GitLab Pages on a separate serverAlexander Tanayno2019-01-251-0/+36
|/ / / / / /
* | | | | | Merge branch 'feature/gb/cross-project-pipeline-trigger' into 'master'Douwe Maan2019-01-2522-65/+221
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cross-project pipeline triggers /CE See merge request gitlab-org/gitlab-ce!24664
| * | | | | | Move processables scope into commit status classGrzegorz Bizon2019-01-252-1/+2
| | | | | | |
| * | | | | | Add basic feature specs for cross-project bridgesGrzegorz Bizon2019-01-251-0/+43
| | | | | | |
| * | | | | | Revert removing overridden method from build serviceGrzegorz Bizon2019-01-251-1/+5
| | | | | | |
| * | | | | | Remove bridge presenter since we no longer need itGrzegorz Bizon2019-01-251-23/+0
| | | | | | |
| * | | | | | Make it clear that pipeline can process processablesGrzegorz Bizon2019-01-251-7/+7
| | | | | | |
| * | | | | | Extract common `when` code between CI/CD processablesGrzegorz Bizon2019-01-253-12/+1
| | | | | | |
| * | | | | | Simplify pipeline processing serviceGrzegorz Bizon2019-01-252-9/+1
| | | | | | |
| * | | | | | Add some specs for processable CI/CD entities relationGrzegorz Bizon2019-01-251-0/+23
| | | | | | |
View Lorry Controller Status