summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge branch 'refactor-project-rename-repo' into 'master'Robert Speicher2018-10-229-247/+368
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Project#rename_repo to a service class See merge request gitlab-org/gitlab-ce!22419
| * | | | | | | | | | | | | | | Move Project#rename_repo to a service classrefactor-project-rename-repoYorick Peterse2018-10-229-247/+368
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the logic of Project#rename_repo and all methods _only_ used by this method into a new service class: Projects::AfterRenameService. By moving this code into a separate service class we can more easily refactor it, and we also get rid of some RuboCop "disable" statements automatically. During the refactoring of this code, I removed most of the explicit logging using Gitlab::AppLogger. The data that was logged would not be useful when debugging renaming issues, as it does not add any value on top of data provided by users. I also removed a variety of comments that either mentioned something the code does in literal form, or contained various grammatical errors. Instead we now resort to more clearly named methods, removing the need for code comments. This method was chosen based on analysis in https://gitlab.com/gitlab-org/release/framework/issues/28. In this issue we determined this method has seen a total of 293 lines being changed in it. We also noticed that RuboCop determined the ABC size (https://www.softwarerenovation.com/ABCMetric.pdf) was too great.
* | | | | | | | | | | | | | | | Merge branch 'docs-accepting-merge-requests-label-is-the-ssot' into 'master'Mek Stittri2018-10-223-22/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the 'Accepting merge requests' workflow consistent See merge request gitlab-org/gitlab-ce!22467
| * | | | | | | | | | | | | | | | Make the 'Accepting merge requests' workflow consistentdocs-accepting-merge-requests-label-is-the-ssotRémy Coutable2018-10-223-22/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | Merge branch 'mg-update-prettier-script' into 'master'Clement Ho2018-10-225-116/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix/update prettier script See merge request gitlab-org/gitlab-ce!22476
| * | | | | | | | | | | | | | | | | Fix/update prettier scriptMike Greiling2018-10-225-116/+105
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'winh-extract-job-container-item' into 'master'Mike Greiling2018-10-224-47/+149
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract JobContainerItem component See merge request gitlab-org/gitlab-ce!22505
| * | | | | | | | | | | | | | | | | Extract JobContainerItem componentWinnie Hellmann2018-10-224-47/+149
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'backport-ee-import-url-rescue' into 'master'Robert Speicher2018-10-221-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport rescue in Project#import_url from EE See merge request gitlab-org/gitlab-ce!22520
| * | | | | | | | | | | | | | | | Backport rescue in Project#import_url from EEbackport-ee-import-url-rescueYorick Peterse2018-10-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE added a `rescue` to the method Project#import_url, which could cause merge conflicts when changing this method. This commit backports those changes to CE, reducing the chances of running into a merge conflict.
* | | | | | | | | | | | | | | | | Merge branch 'qa-backport-recent-ee-changes' into 'master'Douglas Barbosa Alexandre2018-10-225-57/+115
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [QA] Port recent changes from EE See merge request gitlab-org/gitlab-ce!22391
| * | | | | | | | | | | | | | | | [QA] Port recent changes from EEqa-backport-recent-ee-changesRémy Coutable2018-10-225-57/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | Merge branch 'patch-28' into 'master'Marcia Ramos2018-10-221-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs-Update proofreader.md See merge request gitlab-org/gitlab-ce!22427
| * | | | | | | | | | | | | | | | docs-Update proofreader.mdRay Paik2018-10-221-1/+3
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'docs/refactor-repository-mirroring' into 'master'Marcia Ramos2018-10-2220-254/+297
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update repository mirroring documentation to reflect current state. Closes gitlab-ee#4302 See merge request gitlab-org/gitlab-ce!21792
| * | | | | | | | | | | | | | | Update repository mirroring documentation to reflect current state.Evan Read2018-10-2220-254/+297
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'leipert-danger-fix-moved-files' into 'master'Rémy Coutable2018-10-226-8/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach Danger how to pick up renamed files Closes #52783 See merge request gitlab-org/gitlab-ce!22396
| * | | | | | | | | | | | | | | Create helper to get all changed filesleipert-danger-fix-moved-filesLukas Eipert2018-10-226-8/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Danger apparently has three different objects which could contain files you often want to check: - git.added_files - git.modified_files - git.renamed_files The problem: If a file is renamed, `modified_files` contains the file path before the rename. In some Danger checks we use `added_files` + `modified_files`, which might contain the deleted paths of renamed files, but missing the new paths of renamed files. So we need to consider `renamed_files` as well.
* | | | | | | | | | | | | | | | Merge branch 'patch-30' into 'master'Achilleas Pipinellis2018-10-221-74/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs-Update index.md See merge request gitlab-org/gitlab-ce!22478
| * | | | | | | | | | | | | | | | Update index.mdpatch-30Ray Paik2018-10-181-74/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'patch-29' into 'master'Achilleas Pipinellis2018-10-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs-Update CONTRIBUTING.md See merge request gitlab-org/gitlab-ce!22477
| * | | | | | | | | | | | | | | | Update CONTRIBUTING.mdRay Paik2018-10-181-1/+1
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'abuango-office365-broken-link-fix' into 'master'Achilleas Pipinellis2018-10-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Guide for Microsoft Teams Notification Integration See merge request gitlab-org/gitlab-ce!22423
| * | | | | | | | | | | | | | | | Update Guide for Microsoft Teams Notification IntegrationAbubakar Siddiq Ango2018-10-221-1/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'ce-52112-fix-review-apps-cleanup-ce' into 'master'Nick Thomas2018-10-225-86/+271
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve HelmClient and KubernetesClient See merge request gitlab-org/gitlab-ce!22375
| * | | | | | | | | | | | | | | | Improve automated Review Apps cleanupce-52112-fix-review-apps-cleanup-ceRémy Coutable2018-10-225-86/+271
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | Merge branch 'mk/backport-use-strings-for-context-description-qa' into 'master'Rémy Coutable2018-10-2232-33/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE backport] QA: Use strings for context descriptions See merge request gitlab-org/gitlab-ce!22469
| * | | | | | | | | | | | | | | | Use strings for context descriptionsmk/backport-use-strings-for-context-description-qaMichael Kozono2018-10-1832-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid confusion with tags.
* | | | | | | | | | | | | | | | | Merge branch 'ml-qa-logging' into 'master'Nick Thomas2018-10-2211-13/+287
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA: Log page actions Closes gitlab-qa#142 See merge request gitlab-org/gitlab-ce!22084
| * | | | | | | | | | | | | | | | | Log page actionsml-qa-loggingMark Lapierre2018-10-1911-13/+287
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Override page object methods to log the actions taken by the methods before or after the action, as appropriate. Allow page object action logging to be turned on via a QA_DEBUG env var. Unlike CHROME_HEADLESS (and the soon to arrive VERBOSE), QA_DEBUG is false by default. QA_DEBUG is used instead of just DEBUG because that enables Selenium debug logging. Mask passwords entered into fields with a QA selector with 'password' in the name. Doesn't mask sensitive data entered into any other field.
* | | | | | | | | | | | | | | | | Merge branch 'mr-creation-source-project-filtering' into 'master'Filipa Lacerda2018-10-223-1/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed source projects not filtering Closes #52728 See merge request gitlab-org/gitlab-ce!22515
| * | | | | | | | | | | | | | | | | Fixed source projects not filteringPhil Hughes2018-10-223-1/+31
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filtering source projects in the merge request creation form would show a flash error because it is trying to filter remotely to an undefined URL. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52728
* | | | | | | | | | | | | | | | | Merge branch 'refactor-cluster-create-service-spec' into 'master'Dmitriy Zaporozhets2018-10-222-75/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move shared examples into the only file where used (Clusters::CreateService spec) See merge request gitlab-org/gitlab-ce!22407
| * | | | | | | | | | | | | | | | | Move shared examples into the only file where usedrefactor-cluster-create-service-specThong Kuah2018-10-172-75/+87
| | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier to perform in place adjustments, etc for future MRs involving group clusters.
* | | | | | | | | | | | | | | | | Merge branch 'docs-fix-sbt-version-in-test-scala-application' into 'master'Achilleas Pipinellis2018-10-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update test-scala-application.md to use sbtVersion instead of sbt-version Closes #52957 See merge request gitlab-org/gitlab-ce!22514
| * | | | | | | | | | | | | | | | Update test-scala-application.md to use sbtVersion instead of sbt-versiondocs-fix-sbt-version-in-test-scala-applicationRémy Coutable2018-10-221-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'drop-allow_overflow-option-duration_in_numbers' into 'master'Grzegorz Bizon2018-10-226-39/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop allow overflow option duration in numbers Closes #52284 See merge request gitlab-org/gitlab-ce!22246
| * | | | | | | | | | | | | | | | | Fix specdrop-allow_overflow-option-duration_in_numbersShinya Maeda2018-10-181-2/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Add changelogShinya Maeda2018-10-181-0/+5
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Drop `allow_overflow` option in `TimeHelper.duration_in_numbers`Shinya Maeda2018-10-184-37/+18
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'improve-specs-for-ci-processbuildservice' into 'master'Grzegorz Bizon2018-10-221-155/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve specs for Ci::ProcessBuildService Closes #52279 See merge request gitlab-org/gitlab-ce!22254
| * | | | | | | | | | | | | | | | | | Simplify the specimprove-specs-for-ci-processbuildserviceShinya Maeda2018-10-181-104/+97
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Improve specs for Ci::ProcessBuildServiceShinya Maeda2018-10-181-161/+90
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch '52559-applications-api-get-delete' into 'master'Rémy Coutable2018-10-228-15/+181
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Applications API endpoints for listing and deleting entries. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52559 See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22296
| * | | | | | | | | | | | | | | | | Disable offense on the appropriate line only !22296JB Vasseur2018-10-191-6/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Remove useless braces !22296JB Vasseur2018-10-181-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Code stylingJB Vasseur2018-10-181-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Use ApplicationsFinder !22296JB Vasseur2018-10-181-6/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Source cleaning !22296JB Vasseur2018-10-181-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Test ApplicationsFinder !22296JB Vasseur2018-10-181-0/+22
| | | | | | | | | | | | | | | | | |