summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | 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
| | | | | | | | | | |
| * | | | | | | | | | Add a new relation between a stage and related bridgesGrzegorz Bizon2019-01-253-1/+3
| | | | | | | | | | |
| * | | | | | | | | | Add new pipeline relation to import/export specsGrzegorz Bizon2019-01-251-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Implement default `when` for bridge jobs as `on_success`Grzegorz Bizon2019-01-251-0/+7
| | | | | | | | | | |
| * | | | | | | | | | Add `when` method to be required in case of processablesGrzegorz Bizon2019-01-251-0/+4
| | | | | | | | | | |
| * | | | | | | | | | Make it possible to pass downstream to bridge factoryGrzegorz Bizon2019-01-251-0/+8
| | | | | | | | | | |
| * | | | | | | | | | Use generic commit status as a tmp partial for a bridgeGrzegorz Bizon2019-01-251-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Make CI/CD bridge job a pipeline processable entityGrzegorz Bizon2019-01-253-1/+43
| | | | | | | | | | |
| * | | | | | | | | | Segregate interface require to make CI/CD entity processableGrzegorz Bizon2019-01-254-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit segregates interface that is require to make CI/CD entity processable, like `Ci::Build`. With this change it is not clear and explicit what methods need to be implement to pass an object to pipeline processing service.
| * | | | | | | | | | Use defauly `only` policy defined as a constantGrzegorz Bizon2019-01-252-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We reuse this constant in EE.
| * | | | | | | | | | Connect CI/CD bridge jobs to trigger requests tooGrzegorz Bizon2019-01-251-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Do not assigne unused attributes to CI/CD buildsGrzegorz Bizon2019-01-252-34/+1
| | | | | | | | | | |
| * | | | | | | | | | Refactor pipeline specs and remove raise_error warningGrzegorz Bizon2019-01-251-5/+5
| | | | | | | | | | |
| * | | | | | | | | | Make it possible to fabricate CI/CD bridge jobsGrzegorz Bizon2019-01-255-11/+70
| | | | | | | | | | |
| * | | | | | | | | | Make it possible to override config jobs composition in EEGrzegorz Bizon2019-01-251-1/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'winh-note-actions-vue-test-utils' into 'master'Phil Hughes2019-01-252-19/+43
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert note_actions_spec.js to Vue test utils See merge request gitlab-org/gitlab-ce!24665
| * | | | | | | | | | | Apply suggestion to spec/javascripts/test_bundle.jsWinnie Hellmann2019-01-251-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Convert note_actions_spec.js to Vue test utilsWinnie Hellmann2019-01-251-19/+33
| | | | | | | | | | | |
| * | | | | | | | | | | Add workaround for Vue test utils setPropsWinnie Hellmann2019-01-251-0/+10
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see https://github.com/vuejs/vue-test-utils/issues/631#issuecomment-421108344
* | | | | | | | | | | Merge branch 'docs-import-links' into 'master'Achilleas Pipinellis2019-01-251-0/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linking to backup doc from migration doc, for self-hosted to self-hosted migration Closes #56339 See merge request gitlab-org/gitlab-ce!24592
| * | | | | | | | | | | Linking to backup doc from migration doc, for self-hosted to self-hosted ↵Marcel Amirault2019-01-251-0/+7
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | migration
* | | | | | | | | | | Merge branch 'db-copy-as-gfm-prosemirror' into 'master'Phil Hughes2019-01-2560-475/+1622
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reimplement Copy-as-GFM using the prosemirror document model See merge request gitlab-org/gitlab-ce!22797
| * | | | | | | | | | | Use nodes and marks to power Copy-as-GFMdb-copy-as-gfm-prosemirrorDouwe Maan2019-01-2419-473/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spec needed to be updated because in some cases the resulting Markdown is slightly different, though equally valid.