summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Add a spec that generates the metadata dynamicallysh-pages-eof-errorStan Hu2018-10-192-0/+78
| | | | | | | | |
| * | | | | | | | Fix EOF detection with CI artifacts metadataStan Hu2018-10-182-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some corner cases where a perfectly correct GZIP stream may not hit the EOF until another read is attempted. We now skip the entry if we don't see any valid data, which allows the EOF check to work properly. Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22479
* | | | | | | | | Merge branch 'patch-31' into 'master'Evan Read2018-10-231-0/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add information about the uid_attribute custom setting in the SAML docs See merge request gitlab-org/gitlab-ce!22500
| * | | | | | | | | Edited uid_attribute information with suggested changesBlair Lunceford2018-10-221-3/+2
| | | | | | | | | |
| * | | | | | | | | Add information about the uid_attribute custom setting in the SAML docsBlair Lunceford2018-10-191-0/+18
| | | | | | | | | |
* | | | | | | | | | Merge branch 'add-new-kubernetes-spec-helpers' into 'master'Dmitriy Zaporozhets2018-10-232-3/+25
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce new Kubernetes spec helpers See merge request gitlab-org/gitlab-ce!22525
| * | | | | | | | | Introduce new kubernetes spec helpersadd-new-kubernetes-spec-helpersMayra Cabrera2018-10-222-3/+25
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add create_role_binding, create_namespace and get_namespace kubernetes spec helpers. This new helpers are going to be used on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22011
* | | | | | | | | Merge branch 'revert-eac645d7' into 'master'Robert Speicher2018-10-222-87/+75
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'refactor-cluster-create-service-spec' into 'master'" See merge request gitlab-org/gitlab-ce!22523
| * | | | | | | | | Revert "Merge branch 'refactor-cluster-create-service-spec' into 'master'"Thong Kuah2018-10-222-87/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !22407
* | | | | | | | | | Merge branch '46884-remove-card-title' into 'master'Annabel Dunstone Gray2018-10-2214-66/+39
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove card-title in card-header Closes #46884 See merge request gitlab-org/gitlab-ce!19335
| * | | | | | | | | Remove .card-title from .card-header for BS4 migrationTakuya Noguchi2018-10-1914-66/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces .card-header > hX.card-title with hX.card-header to remove .card-title. At a occurrence where bold styling is not necessary, div.card-header is used instead. By full removal of .card-title at the moment, all workarounds for BS4's card-title are removed as well. More information: https://getbootstrap.com/docs/4.0/migration/#panels Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | Merge branch 'feature/gb/improve-include-config-errors-reporting' into 'master'Douwe Maan2018-10-2218-204/+384
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve validation errors for external CI/CD configuration Closes #51369 See merge request gitlab-org/gitlab-ce!22394
| * | | | | | | | | | Improve specs for abstract remote `include` filefeature/gb/improve-include-config-errors-reportingGrzegorz Bizon2018-10-221-4/+4
| | | | | | | | | | |
| * | | | | | | | | | Improve error message when `include` is blockedGrzegorz Bizon2018-10-222-5/+12
| | | | | | | | | | |
| * | | | | | | | | | Improve remote CI/CD config file extension validationGrzegorz Bizon2018-10-192-2/+54
| | | | | | | | | | |
| * | | | | | | | | | Extend error message in case of HTTP errors in `include`Grzegorz Bizon2018-10-194-23/+65
| | | | | | | | | | |
| * | | | | | | | | | Add changelog for `include` error reporting improvementsGrzegorz Bizon2018-10-181-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Refactor `include` code and improve error reportingGrzegorz Bizon2018-10-188-43/+103
| | | | | | | | | | |
| * | | | | | | | | | Extract method that fetchesremote CI/CD included configGrzegorz Bizon2018-10-183-13/+12
| | | | | | | | | | |
| * | | | | | | | | | Add IncludeError exception and use it in CI configGrzegorz Bizon2018-10-183-5/+6
| | | | | | | | | | |
| * | | | | | | | | | Move external CI config class into proper namespaceGrzegorz Bizon2018-10-1611-113/+127
| | | | | | | | | | |
| * | | | | | | | | | Move external CI config files into Ci class contextGrzegorz Bizon2018-10-169-0/+0
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '51716-add-kubernetes-namespace-model' into 'master'Andreas Brandl2018-10-2214-24/+287
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Clusters::KubernetesNamespace model See merge request gitlab-org/gitlab-ce!22404
| * | | | | | | | | | | Add Clusters::KubernetesNamespace model51716-add-kubernetes-namespace-modelMayra Cabrera2018-10-2214-24/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This model will be used to persist into database Kubernetes properties, such as namespace, service account name and service account token.
* | | | | | | | | | | | Merge branch 'blackst0ne-bump-mermaid' into 'master'Mike Greiling2018-10-224-40/+122
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump mermaid to 8.0.0-rc.8 Closes #52601, #50105, and #40470 See merge request gitlab-org/gitlab-ce!22509
| * | | | | | | | | | | | Bump mermaid to 8.0.0-rc.8blackst0ne-bump-mermaidblackst0ne2018-10-224-40/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves `mermaid` from blackst0ne-mermaid package to the upstream version. The reason why the fork was used was this bug[1]. The bug has been fixed, so there's no need to maintain my fork anymore. [1]: https://github.com/knsv/mermaid/issues/584
* | | | | | | | | | | | | Merge branch 'change-branch-font-type-in-tag-creation' into 'master'Annabel Dunstone Gray2018-10-223-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change branch font type in tag creation See merge request gitlab-org/gitlab-ce!22454
| * | | | | | | | | | | | | Change branch font type in tag creationGeorge Tsiolis2018-10-223-2/+8
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / / /
View Lorry Controller Status