summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | | | Hide new branch and tag links for projects with an empty repoMark Fletcher2018-01-093-6/+51
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-use-of-append-in-mr-api-spec' into 'master'Grzegorz Bizon2018-01-111-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove call to ProjectTeam#<< in MR API spec See merge request gitlab-org/gitlab-ce!16388
| * | | | | | | | | Remove call to ProjectTeam#<< in MR API specSean McGivern2018-01-111-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch '38068-commits-count' into 'master'Yorick Peterse2018-01-1110-5/+137
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Store the number of merge request commits in merge_request_diffs.commits_count" Closes #38068 See merge request gitlab-org/gitlab-ce!16164
| * | | | | | | | Denormalize commits count for merge request diffs38068-commits-countJan Provaznik2018-01-1010-5/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For each MR diff an extra 'SELECT COUNT()' is executed to get number of commits for the diff. Overall time to get counts for all MR diffs may be quite expensive. To speed up loading of MR info, information about number of commits is stored in a MR diff's extra column. Closes #38068
* | | | | | | | | Merge branch '41613-fix-redundant-modal' into 'master'Filipa Lacerda2018-01-115-111/+134
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make modal dialog common for Groups tree app Closes #41613 See merge request gitlab-org/gitlab-ce!16311
| * | | | | | | | | Add changelog entryKushal Pandya2018-01-111-0/+5
| | | | | | | | | |
| * | | | | | | | | Update tests to cover modal dialogKushal Pandya2018-01-111-12/+54
| | | | | | | | | |
| * | | | | | | | | Add modal dialog for leave group actionKushal Pandya2018-01-111-11/+37
| | | | | | | | | |
| * | | | | | | | | Update tests for modal changesKushal Pandya2018-01-111-33/+7
| | | | | | | | | |
| * | | | | | | | | Move modal dialog to app root componentKushal Pandya2018-01-111-55/+31
| | | | | | | | | |
* | | | | | | | | | Merge branch 'patch-28' into 'master'Grzegorz Bizon2018-01-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed tiny typo in end_to_end_tests.md See merge request gitlab-org/gitlab-ce!16386
| * | | | | | | | | | Update end_to_end_tests.mdAndrew Newdigate2018-01-111-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' ↵Grzegorz Bizon2018-01-113-8/+31
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Incorrect default merge request title when Jira activated" Closes #36669 See merge request gitlab-org/gitlab-ce!16356
| * | | | | | | | | | Give appropriate credit to Ben305 in the changelogBen305/gitlab-ce-36669-default-mr-title-with-external-issuesSean McGivern2018-01-101-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Never set special MR titles for external issuesSean McGivern2018-01-102-6/+24
| | | | | | | | | | |
| * | | | | | | | | | Fix incorrect default merge request title when external issue tracker is ↵Benedikt Huss2018-01-093-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activated
* | | | | | | | | | | Merge branch 'patch-28' into 'master'Sean McGivern2018-01-111-2/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apply documentation changes from EE to CE See merge request gitlab-org/gitlab-ce!16381
| * | | | | | | | | | | apply documentation changes from EE to CESascha Szott2018-01-111-2/+10
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '4020-rebase-message' into 'master'Sean McGivern2018-01-113-10/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve 'Rebase fails with "something went wrong" and huge ugly conflict error.' Closes #41820 See merge request gitlab-org/gitlab-ce!16326
| * | | | | | | | | | | | Store only generic message if rebase fails4020-rebase-messageJan Provaznik2018-01-093-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of storing detailed rebase error, only a generic message is stored with MR. The reason is that this message is exposed and displayed to end user and there is no reason to expose detailed backend information. Error message is still logged so detailed information can be found in logfile by admin if needed. Related #41820
* | | | | | | | | | | | | Merge branch '39214__pipeline_api' into 'master'Sean McGivern2018-01-115-0/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `pipelines` endpoint to merge requests API Closes #39214 See merge request gitlab-org/gitlab-ce!15454
| * | | | | | | | | | | | | Fix styleTony Rom2018-01-103-4/+9
| | | | | | | | | | | | | |
View Lorry Controller Status