summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use common form.jssnippets-dispatcher-refactorClement Ho2018-01-125-21/+6
|
* Fix eslintClement Ho2018-01-114-4/+4
|
* Merge branch 'master' into snippets-dispatcher-refactorClement Ho2018-01-11230-1467/+2886
|\
| * Merge branch 'docs-move-article-laravel-envoy' into 'master'Achilleas Pipinellis2018-01-1119-682/+687
| |\ | | | | | | | | | | | | Docs: move article "Laravel and Envoy w/ CI/CD" See merge request gitlab-org/gitlab-ce!16359
| | * Docs: move article "Laravel and Envoy w/ CI/CD"Marcia Ramos2018-01-1119-682/+687
| | |
| * | Merge branch 'docs-move-article-openshift' into 'master'Achilleas Pipinellis2018-01-1119-512/+512
| |\ \ | | |/ | |/| | | | | | | Docs: move GitLab/Openshift article to its topic-related dir See merge request gitlab-org/gitlab-ce!16367
| | * move article to its topic-related dir, update linksdocs-move-article-openshiftMarcia Ramos2018-01-1019-512/+512
| | |
| * | Merge branch 'docs/add-aws-reference-diagram' into 'master'Achilleas Pipinellis2018-01-112-0/+4
| |\ \ | | | | | | | | | | | | | | | | Port gitlab-ee MR 3981 to CE See merge request gitlab-org/gitlab-ce!16371
| | * | Port gitlab-ee MR 3981 to CEdocs/add-aws-reference-diagramBrendan O'Leary2018-01-102-0/+4
| | | |
| * | | Merge branch 'docs-fix-api-snippets-docs' into 'master'Achilleas Pipinellis2018-01-111-2/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fix external links in Snippets API documentation See merge request gitlab-org/gitlab-ce!16385
| | * | | Fix external links in Snippets API documentationMark Fletcher2018-01-111-2/+3
| | | | |
| * | | | Merge branch 'docs-update-EFS-HA-note' into 'master'Achilleas Pipinellis2018-01-111-1/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Recommend against the use of EFS See merge request gitlab-org/gitlab-ce!16395
| | * | | | Recommend against the use of EFSdocs-update-EFS-HA-noteCindy Pallares 🦉2018-01-111-1/+3
| | | | | |
| * | | | | Merge branch 'help-profiles-dispatcher-refactor' into 'master'Phil Hughes2018-01-114-11/+24
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Refactored profile:* and help:* imports in dispatcher See merge request gitlab-org/gitlab-ce!16330
| | * | | | Resolved conflicts in dispatcher.jshelp-profiles-dispatcher-refactorConstance Okoghenun2018-01-11384-5752/+8191
| | |\ \ \ \
| | * | | | | Removed experimental feature flag unsed depenecy for profiles/preferencesConstance Okoghenun2018-01-112-9/+3
| | | | | | |
| | * | | | | Refactored profile:* and help:* imports in dispatcherConstance Okoghenun2018-01-095-6/+27
| | | | | | |
| * | | | | | Merge branch '18040-line-breaks-around-conditional-blocks' into 'master'Robert Speicher2018-01-11109-0/+673
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds Rubocop rule for line break around conditionals Closes #18040 See merge request gitlab-org/gitlab-ce!15739
| | * | | | | | Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-11109-0/+673
| |/ / / / / /
| * | | | | | Merge branch 'sh-filter-build-trace-params' into 'master'Robert Speicher2018-01-111-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter out build traces from logged parameters Closes #41906 See merge request gitlab-org/gitlab-ce!16375
| | * | | | | | Filter out build traces from logged parametersStan Hu2018-01-111-0/+2
| |/ / / / / /
| * | | | | | Merge branch 'projects-dispatcher-refactor' into 'master'Phil Hughes2018-01-114-20/+42
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored project:n* imports in dispatcher.js See merge request gitlab-org/gitlab-ce!16382
| | * | | | | | Refactored project:n* imports in dispatcher.jsConstance Okoghenun2018-01-114-20/+42
| | | | | | | |
| * | | | | | | Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-1139-105/+337
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove soft removals related code Closes #37447 See merge request gitlab-org/gitlab-ce!15789
| | * | | | | | Added tests for removing soft removed objectsremove-soft-removalsYorick Peterse2018-01-102-12/+87
| | | | | | | |
| | * | | | | | Remove soft removals related codeYorick Peterse2018-01-0838-105/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes all usage of soft removals except for the "pending delete" system implemented for projects. This in turn simplifies all the query plans of the models that used soft removals. Since we don't really use soft removals for anything useful there's no point in keeping it around. This _does_ mean that hard removals of issues (which only admins can do if I'm not mistaken) can influence the "iid" values, but that code is broken to begin with. More on this (and how to fix it) can be found in https://gitlab.com/gitlab-org/gitlab-ce/issues/31114. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37447
| * | | | | | | Merge branch ↵Annabel Dunstone Gray2018-01-113-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40920-emphasize-irreversibility-in-warning-message-when-promoting-labels-and-milestones' into 'master' Emphasize irreversibility in warning message when promoting labels and milestones Closes #40920 See merge request gitlab-org/gitlab-ce!16333
| | * | | | | | | Changed copy text for promoting the milestone and labels40920-emphasize-irreversibility-in-warning-message-when-promoting-labels-and-milestonesJose Ivan Vargas2018-01-103-3/+3
| | | | | | | | |
| * | | | | | | | Merge branch 'feature/migrate-merged-branch-names-to-gitaly' into 'master'Rémy Coutable2018-01-113-45/+85
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate merged_branch_names to Gitaly Closes gitaly#851 See merge request gitlab-org/gitlab-ce!16157
| | * | | | | | | Migrate merged_branch_names to GitalyAhmad Sherif2018-01-113-45/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#851
| * | | | | | | | Merge branch 'option-disable-archive-cache' into 'master'Sean McGivern2018-01-113-1/+22
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to disable git archive caching in workhorse See merge request gitlab-org/gitlab-ce!16325
| | * | | | | | | | Add option to disable git archive caching in workhorseoption-disable-archive-cacheJacob Vosmaer2018-01-093-1/+22
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'qa/gb/define-project-pages-selectors' into 'master'Rémy Coutable2018-01-116-19/+31
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define QA project pages views / selectors See merge request gitlab-org/gitlab-ce!16391
| | * | | | | | | | Add selectors coupling for QA project show page objectqa/gb/define-project-pages-selectorsGrzegorz Bizon2018-01-113-10/+16
| | | | | | | | | |
| | * | | | | | | | Fix path to QA new project page object viewGrzegorz Bizon2018-01-111-1/+1
| | | | | | | | | |
| | * | | | | | | | Use full QA sandbox group path when creating a projectGrzegorz Bizon2018-01-112-1/+5
| | | | | | | | | |
| | * | | | | | | | Define QA project pages views / selectorsGrzegorz Bizon2018-01-112-9/+11
| | | | | | | | | |
| * | | | | | | | | Merge branch '41608-clipboard-vue-button' into 'master'Phil Hughes2018-01-112-1/+49
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "clipboard-button tooltip is broken" Closes #41608 See merge request gitlab-org/gitlab-ce!16352
| | * | | | | | | | | Adds props to allow tooltip config. Breaks tests into specific cases41608-clipboard-vue-buttonFilipa Lacerda2018-01-112-1/+19
| | | | | | | | | | |
| | * | | | | | | | | Add tooltip missing to clipboard componentFilipa Lacerda2018-01-102-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds tests
| * | | | | | | | | | Merge branch 'feature/qa/gb/populate-qa-factories-with-data' into 'master'Rémy Coutable2018-01-116-51/+102
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to populate QA factory product with a data from a browser See merge request gitlab-org/gitlab-ce!16384
| | * | | | | | | | | | Populate QA project factory product with project namefeature/qa/gb/populate-qa-factories-with-dataGrzegorz Bizon2018-01-112-1/+7
| | | | | | | | | | | |
| | * | | | | | | | | | Populate QA factory product with data from a pageGrzegorz Bizon2018-01-114-31/+37
| | | | | | | | | | | |
| | * | | | | | | | | | Make it possible to define QA factory product attributesGrzegorz Bizon2018-01-113-18/+42
| | | | | | | | | | | |
| | * | | | | | | | | | Add a DSL evaluator to QA base factory classGrzegorz Bizon2018-01-111-7/+22
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'docs/qa/document-qa-page-objects' into 'master'Rémy Coutable2018-01-112-2/+118
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs about QA page objects and pages DSL See merge request gitlab-org/gitlab-ce!16357
| | * | | | | | | | | | | Copy-edit docs about GitLab QA page objectsdocs/qa/document-qa-page-objectsGrzegorz Bizon2018-01-111-13/+13
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add link to QA page objects docs from main READMEGrzegorz Bizon2018-01-111-2/+6
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add docs about QA page objects and pages DSLGrzegorz Bizon2018-01-101-0/+112
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch '39988-hide-new-branch-tag-empty-repo' into 'master'Rémy Coutable2018-01-113-6/+51
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""New branch" and "New tag" actions are pointless on an empty repository" Closes #39988 See merge request gitlab-org/gitlab-ce!16332
View Lorry Controller Status