delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix ee-compat-check by not modifying frozen strings53030-ee-compat-check-frozen-literal	Mario de la Ossa	2018-10-23	1	-4/+6
\|
*	Merge branch 'revert-eac645d7' into 'master'	Robert Speicher	2018-10-22	2	-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 Kuah	2018-10-22	2	-87/+75
\| \| \| \| \| \|	This reverts merge request !22407
* \|	Merge branch '46884-remove-card-title' into 'master'	Annabel Dunstone Gray	2018-10-22	14	-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 migration	Takuya Noguchi	2018-10-19	14	-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 Maan	2018-10-22	18	-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-reporting	Grzegorz Bizon	2018-10-22	1	-4/+4
\| \| \|
\| * \|	Improve error message when `include` is blocked	Grzegorz Bizon	2018-10-22	2	-5/+12
\| \| \|
\| * \|	Improve remote CI/CD config file extension validation	Grzegorz Bizon	2018-10-19	2	-2/+54
\| \| \|
\| * \|	Extend error message in case of HTTP errors in `include`	Grzegorz Bizon	2018-10-19	4	-23/+65
\| \| \|
\| * \|	Add changelog for `include` error reporting improvements	Grzegorz Bizon	2018-10-18	1	-0/+5
\| \| \|
\| * \|	Refactor `include` code and improve error reporting	Grzegorz Bizon	2018-10-18	8	-43/+103
\| \| \|
\| * \|	Extract method that fetchesremote CI/CD included config	Grzegorz Bizon	2018-10-18	3	-13/+12
\| \| \|
\| * \|	Add IncludeError exception and use it in CI config	Grzegorz Bizon	2018-10-18	3	-5/+6
\| \| \|
\| * \|	Move external CI config class into proper namespace	Grzegorz Bizon	2018-10-16	11	-113/+127
\| \| \|
\| * \|	Move external CI config files into Ci class context	Grzegorz Bizon	2018-10-16	9	-0/+0
\| \| \|
* \| \|	Merge branch '51716-add-kubernetes-namespace-model' into 'master'	Andreas Brandl	2018-10-22	14	-24/+287
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Clusters::KubernetesNamespace model See merge request gitlab-org/gitlab-ce!22404
\| * \| \|	Add Clusters::KubernetesNamespace model51716-add-kubernetes-namespace-model	Mayra Cabrera	2018-10-22	14	-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 Greiling	2018-10-22	4	-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-mermaid	blackst0ne	2018-10-22	4	-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 Gray	2018-10-22	3	-2/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change branch font type in tag creation See merge request gitlab-org/gitlab-ce!22454
\| * \| \| \| \|	Change branch font type in tag creation	George Tsiolis	2018-10-22	3	-2/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'refactor-project-rename-repo' into 'master'	Robert Speicher	2018-10-22	9	-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-repo	Yorick Peterse	2018-10-22	9	-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 Stittri	2018-10-22	3	-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-ssot	Rémy Coutable	2018-10-22	3	-22/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'mg-update-prettier-script' into 'master'	Clement Ho	2018-10-22	5	-116/+105
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix/update prettier script See merge request gitlab-org/gitlab-ce!22476
\| * \| \| \| \| \| \| \|	Fix/update prettier script	Mike Greiling	2018-10-22	5	-116/+105
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'winh-extract-job-container-item' into 'master'	Mike Greiling	2018-10-22	4	-47/+149
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract JobContainerItem component See merge request gitlab-org/gitlab-ce!22505
\| * \| \| \| \| \| \| \|	Extract JobContainerItem component	Winnie Hellmann	2018-10-22	4	-47/+149
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'backport-ee-import-url-rescue' into 'master'	Robert Speicher	2018-10-22	1	-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-rescue	Yorick Peterse	2018-10-22	1	-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 Alexandre	2018-10-22	5	-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-changes	Rémy Coutable	2018-10-22	5	-57/+115
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'patch-28' into 'master'	Marcia Ramos	2018-10-22	1	-1/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs-Update proofreader.md See merge request gitlab-org/gitlab-ce!22427
\| * \| \| \| \| \| \| \| \|	docs-Update proofreader.md	Ray Paik	2018-10-22	1	-1/+3
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'docs/refactor-repository-mirroring' into 'master'	Marcia Ramos	2018-10-22	20	-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 Read	2018-10-22	20	-254/+297
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'leipert-danger-fix-moved-files' into 'master'	Rémy Coutable	2018-10-22	6	-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-files	Lukas Eipert	2018-10-22	6	-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 Pipinellis	2018-10-22	1	-74/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs-Update index.md See merge request gitlab-org/gitlab-ce!22478
\| * \| \| \| \| \| \| \| \|	Update index.mdpatch-30	Ray Paik	2018-10-18	1	-74/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'patch-29' into 'master'	Achilleas Pipinellis	2018-10-22	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs-Update CONTRIBUTING.md See merge request gitlab-org/gitlab-ce!22477
\| * \| \| \| \| \| \| \| \|	Update CONTRIBUTING.md	Ray Paik	2018-10-18	1	-1/+1
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'abuango-office365-broken-link-fix' into 'master'	Achilleas Pipinellis	2018-10-22	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Guide for Microsoft Teams Notification Integration See merge request gitlab-org/gitlab-ce!22423
\| * \| \| \| \| \| \| \| \|	Update Guide for Microsoft Teams Notification Integration	Abubakar Siddiq Ango	2018-10-22	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'ce-52112-fix-review-apps-cleanup-ce' into 'master'	Nick Thomas	2018-10-22	5	-86/+271
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve HelmClient and KubernetesClient See merge request gitlab-org/gitlab-ce!22375
\| * \| \| \| \| \| \| \| \|	Improve automated Review Apps cleanupce-52112-fix-review-apps-cleanup-ce	Rémy Coutable	2018-10-22	5	-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 Coutable	2018-10-22	32	-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-qa	Michael Kozono	2018-10-18	32	-33/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To avoid confusion with tags.