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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert "Merge branch 'reorganize-tests-jobs-by-level' into 'master'"revert-04c3c6dd	Kamil Trzciński	2019-05-22	17	-286/+47
\| \| \|	This reverts merge request !27514
*	Merge branch 'docs-issue-workflow-group-labels' into 'master'	Rémy Coutable	2019-05-22	1	-0/+21
\|\ \| \| \| \| \| \| \| \|	Add group label docs to Issue Workflow See merge request gitlab-org/gitlab-ce!28591
\| *	Add group label docs to Issue Workflow	Mark Fletcher	2019-05-22	1	-0/+21
\| \|
* \|	Update VERSION to 11.12.0-prev11.12.0.pre	GitLab Release Tools Bot	2019-05-22	1	-1/+1
\| \|
* \|	Update CHANGELOG.md for 11.11.0	GitLab Release Tools Bot	2019-05-22	166	-832/+185
\| \| \| \| \| \|	[ci skip]
* \|	Merge branch ↵	Nick Thomas	2019-05-22	15	-106/+94
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'61935-remove-code-left-over-from-when-clusters-were-always-project-specific' into 'master' remove `Clusters::Platforms::Kubernetes#actual_namespace` Closes #61935 See merge request gitlab-org/gitlab-ce!28391
\| * \|	Remove legacy Kubernetes #actual_namespace61935-remove-code-left-over-from-when-clusters-were-always-project-specific	Tiger	2019-05-21	15	-106/+94
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When Kubernetes clusters were originally built they could only exist at the project level, and so there was logic included that assumed there would only ever be a single Kubernetes namespace per cluster. We now support clusters at the group and instance level, which allows multiple namespaces. This change consolidates various project-specific fallbacks to generate namespaces, and hands all responsibility to the Clusters::KubernetesNamespace model. There is now no concept of a single namespace for a Clusters::Platforms::Kubernetes; to retrieve a namespace a project must now be supplied in all cases. This simplifies upcoming work to use a separate Kubernetes namespace per project environment (instead of a namespace per project).
* \| \|	Merge branch 'jc-git-deduplication-service' into 'master'	Nick Thomas	2019-05-22	3	-1/+157
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add GitDeduplicationService Closes #60871 See merge request gitlab-org/gitlab-ce!28144
\| * \|	Add GitDeduplicationService for deduplication housekeepingjc-git-deduplication-service	John Cai	2019-05-21	3	-1/+157
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitDeduplicationService performs idempotent operations on deduplicated projects.
* \| \|	Merge branch 'js-i18n-s' into 'master'	Filipa Lacerda	2019-05-22	4	-4/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n JS files starting with s See merge request gitlab-org/gitlab-ce!28169
\| * \| \|	I18N JS files starting with sjs-i18n-s	Brandon Labuschagne	2019-05-21	4	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* \| \| \|	Merge branch 'docs/minor-improvement-on-resources-doc' into 'master'	Rémy Coutable	2019-05-22	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor improvement on resources doc See merge request gitlab-org/gitlab-ce!28589
\| * \| \| \|	Minor improvement on resources doc	Walmyr Lima	2019-05-22	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs/make-qa-tests-easy-part-2' into 'master'	Rémy Coutable	2019-05-22	1	-3/+105
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Second iteration of documentation for writing end-to-end tests See merge request gitlab-org/gitlab-ce!28473
\| * \| \| \| \|	Update writing e2e tests doc	Walmyr	2019-05-22	1	-3/+105
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a second iteration to address the Resources section. In a third iteration the Page Object section will be addressed.
* \| \| \| \|	Merge branch 'reorganize-tests-jobs-by-level' into 'master'	Kamil Trzciński	2019-05-22	17	-47/+286
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reorganize test jobs by level See merge request gitlab-org/gitlab-ce!27514
\| * \| \| \|	Reorganize test jobs by levelreorganize-tests-jobs-by-level	Rémy Coutable	2019-05-20	15	-41/+280
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Update simplecov to avoid invalid UTF-8 crashes	Rémy Coutable	2019-05-20	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'repo-list-row-component' into 'master'	Filipa Lacerda	2019-05-22	9	-5/+343
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added tree list row component See merge request gitlab-org/gitlab-ce!28542
\| * \| \| \| \|	Added tree list row component	Phil Hughes	2019-05-21	9	-5/+343
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch ↵	Ash McKenzie	2019-05-22	3	-117/+28
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'8723-geo-remove-gitlab-lfstoken-legacyredisdevisetoken-implementation-and-usage-geo' into 'master' Geo: Remove Gitlab::LfsToken::LegacyRedisDeviseToken implementation Closes gitlab-ee#8723 See merge request gitlab-org/gitlab-ce!28546
\| * \| \| \| \| \|	Geo: Remove Gitlab::LfsToken::LegacyRedisDeviseToken implementation	Valery Sizov	2019-05-22	3	-117/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We kept it for smooth update only
* \| \| \| \| \| \|	Merge branch '61441' into 'master'	James Lopez	2019-05-22	3	-4/+24
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#61441 Allow user to set email ID before setting up 2FA See merge request gitlab-org/gitlab-ce!28097
\| * \| \| \| \| \| \|	#61441 Allow user to set email ID before setting up 2FA	Kartikey Tanna	2019-05-22	3	-4/+24
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'import-form-scb' into 'master'	Phil Hughes	2019-05-22	1	-0/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in import form Closes gitlab-ee#10492 See merge request gitlab-org/gitlab-ce!28575
\| * \| \| \| \| \| \|	Resolve CE/EE diffs in import form	Luke Bennett	2019-05-22	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.
* \| \| \| \| \| \| \|	Merge branch 'dropdown-user-scb' into 'master'	Phil Hughes	2019-05-22	1	-0/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in dropdown_user Closes gitlab-ee#10494 See merge request gitlab-org/gitlab-ce!28577
\| * \| \| \| \| \| \| \|	Resolve CE/EE diffs in dropdown_user	Luke Bennett	2019-05-22	1	-0/+14
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.
* \| \| \| \| \| \| \|	Merge branch 'api-spec-scb' into 'master'	Phil Hughes	2019-05-22	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in api_spec Closes gitlab-ee#6611 See merge request gitlab-org/gitlab-ce!28576
\| * \| \| \| \| \| \| \|	Resolve CE/EE diffs in api_spec	Luke Bennett	2019-05-22	1	-1/+1
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.
* \| \| \| \| \| \| \|	Merge branch 'label-row-scb' into 'master'	Phil Hughes	2019-05-22	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in label row Closes gitlab-ee#10493 See merge request gitlab-org/gitlab-ce!28551
\| * \| \| \| \| \| \| \|	Resolve CE/EE diffs in label rowlabel-row-scb	Luke Bennett	2019-05-21	1	-0/+1
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.
* \| \| \| \| \| \| \|	Merge branch 'signin-box-scb' into 'master'	Phil Hughes	2019-05-22	1	-2/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in signin box Closes gitlab-ee#10495 See merge request gitlab-org/gitlab-ce!28553
\| * \| \| \| \| \| \| \|	Resolve CE/EE diffs in signin boxsignin-box-scb	Luke Bennett	2019-05-21	1	-2/+6
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.
* \| \| \| \| \| \| \|	Merge branch 'admin-users-form-scb' into 'master'	Phil Hughes	2019-05-22	1	-0/+6
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in admin users form Closes gitlab-ee#10508 See merge request gitlab-org/gitlab-ce!28520
\| * \| \| \| \| \| \|	Resolve CE/EE diffs in admin users formadmin-users-form-scb	Luke Bennett	2019-05-21	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.
* \| \| \| \| \| \| \|	Merge branch 'sh-fix-linter-registry-haml-try2' into 'master'	Ash McKenzie	2019-05-22	5	-4/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix uninitialized constant with HamlLint::LinterRegistry Closes #62125 See merge request gitlab-org/gitlab-ce!28578
\| * \| \| \| \| \| \| \|	Move files from lib/haml_lint to haml_lintsh-fix-linter-registry-haml	Stan Hu	2019-05-21	5	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Files in lib will be eager loaded and hence will require haml_lint to be loaded. Since this is only a development dependency, we can't assume this gem will be available in production, so it should never be loaded in production.
\| * \| \| \| \| \| \| \|	Fix uninitialized constant with HamlLint::LinterRegistry	Stan Hu	2019-05-21	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The migration pod for the GitLab Helm Chart was failing because of the NameError: uninitialized constant HamlLint::Linter::NoPlainNodes::LinterRegistry We now explicitly specify ::HamlLint::LinterRegistry to avoid resolution errors. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62125
* \| \| \| \| \| \| \| \|	Merge branch 'qa-contain-chrome-vars' into 'master'	Mark Lapierre	2019-05-22	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move Chrome variables under conditional See merge request gitlab-org/gitlab-ce!28505
\| * \| \| \| \| \| \| \| \|	Move Chrome variables under conditionalqa-contain-chrome-vars	ddavison	2019-05-20	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dont specify disable-dev-shm-usage for non-chrome browsers
* \| \| \| \| \| \| \| \| \|	Merge branch 'dz-scope-project-routes' into 'master'	Stan Hu	2019-05-22	8	-39/+84
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move some project routes under /-/ scope See merge request gitlab-org/gitlab-ce!28435
\| * \| \| \| \| \| \| \| \| \|	Add network and graphs to legacy routes toodz-scope-project-routes	Dmitriy Zaporozhets	2019-05-21	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Add legacy routes for modified project path	Dmitriy Zaporozhets	2019-05-21	3	-0/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For settings, branches and tags Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Fix specs to match route changes	Dmitriy Zaporozhets	2019-05-20	4	-24/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Move project settings under /-/ scope	Dmitriy Zaporozhets	2019-05-20	1	-14/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Move some project routes under /-/ scope	Dmitriy Zaporozhets	2019-05-20	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'qa-quarantine-object-storage-test' into 'master'	Mark Lapierre	2019-05-21	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine failing test See merge request gitlab-org/gitlab-ce!28517
\| * \| \| \| \| \| \| \| \| \|	Quarantine failing testqa-quarantine-object-storage-test	Mark Lapierre	2019-05-21	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'dd-qa-api-delegation-project-cicd-vars' into 'master'	Sanad Liaquat	2019-05-21	3	-2/+40
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delegate CiVariable fabrication to API See merge request gitlab-org/gitlab-ce!27924