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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move generic k8s services out of GCP namespace46686-move-k8s-services-out-of-gcp-namespace	Tiger	2019-08-28	16	-267/+259
\| \| \| \| \|	These services aren't specific to GCP, and will be used for AWS as part of https://gitlab.com/gitlab-org/gitlab-ce/issues/46686
*	Merge branch 'docs-gitlab-basics-followup' into 'master'	Evan Read	2019-08-28	3	-4/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolving minor formatting issues in gitlab-basics Closes #65307 See merge request gitlab-org/gitlab-ce!32194
\| *	Resolving minor formatting issues in gitlab-basics	Marcel Amirault	2019-08-28	3	-4/+2
\|/
*	Merge branch 'ce-refactor-dev-org-com-helper' into 'master'	Ash McKenzie	2019-08-28	2	-1/+28
\|\ \| \| \| \| \| \| \| \|	Rename dev, org, com helper See merge request gitlab-org/gitlab-ce!32115
\| *	Rename dev, org, com helper	Doug Stull	2019-08-28	2	-1/+28
\|/
*	Merge branch '10688-group-maintainers-edit-epic-comments-permissions-docs' ↵	Evan Read	2019-08-28	1	-18/+20
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Update group permissions table documentation See merge request gitlab-org/gitlab-ce!32020
\| *	Update group permissions table documentation	Eugenia Grieff	2019-08-28	1	-18/+20
\|/
*	Merge branch 'docs/66091-change-mattermost-version-reference' into 'master'	Evan Read	2019-08-28	1	-2/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66091 Closes #66091 See merge request gitlab-org/gitlab-ce!32188
\| *	Change reference to Mattermost versions.	Russell Dickenson	2019-08-28	1	-2/+7
\|/ \| \| \| \|	Changed reference to Mattermost versions, so that it's clear which menu navigation path applies.
*	Merge branch 'load-balancing-prometheus' into 'master'	Evan Read	2019-08-27	1	-1/+10
\|\ \| \| \| \| \| \| \| \|	Add docs for db_load_balancing metrics See merge request gitlab-org/gitlab-ce!32044
\| *	Add docs for db_load_balancing metricsload-balancing-prometheus	Thong Kuah	2019-08-27	1	-1/+10
\| \|
* \|	Merge branch 'sh-rate-limits-qa' into 'master'	Mark Lapierre	2019-08-27	9	-7/+109
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add QA specs for using IP rate limits See merge request gitlab-org/gitlab-ce!32177
\| * \|	Add QA specs for using IP rate limitssh-rate-limits-qa	Stan Hu	2019-08-26	9	-7/+109
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will help prevent issues such as https://gitlab.com/gitlab-org/gitlab-ce/issues/66449.
* \| \|	Merge branch 'sh-document-qa-admin-account-docs' into 'master'	Mark Lapierre	2019-08-27	1	-0/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document setting admin credentials in QA tests See merge request gitlab-org/gitlab-ce!32271
\| * \| \|	Document setting admin credentials in QA testssh-document-qa-admin-account-docs	Stan Hu	2019-08-27	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it possible to test against a real instance that has different admin credentials than the default.
* \| \| \|	Merge branch '13353-DesignType-notes_count-ce' into 'master'	Mayra Cabrera	2019-08-27	6	-54/+84
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport for gitlab-org/gitlab-ee!15433 (Expose DesignType#notes_count in GraphQL) See merge request gitlab-org/gitlab-ce!32037
\| * \| \| \|	CE-specific changes for designs `user_notes_count`	Luke Duncalfe	2019-08-27	6	-54/+84
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notes call `#after_note_created` and `#after_note_destroyed` on their noteable in callbacks, so the noteable can perform tasks particular to them, like cache expiry. This is in preparation of the EE-specific class `DesignManagement::Design` clearing its `user_notes_count` cache when its note are created or destroyed. Refactoring Rspec behaviour testing of a counter caching service into a shared example. https://gitlab.com/gitlab-org/gitlab-ee/issues/13353
* \| \| \|	Merge branch 'sh-fix-docs-lint-snippets-docs' into 'master'	Mayra Cabrera	2019-08-27	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove trailing whitespace from project snippets API docs Closes #66677 See merge request gitlab-org/gitlab-ce!32298
\| * \| \| \|	Remove trailing whitespace from project snippets API docssh-fix-docs-lint-snippets	Stan Hu	2019-08-27	1	-2/+2
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66677
* \| \| \|	Merge branch ↵	Clement Ho	2019-08-27	2	-0/+33
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'60141-mr-resolve-conflicts-file-headers-bad-positioning-on-scroll' into 'master' Resolve "MR resolve conflicts file headers bad positioning on scroll" Closes #60141 See merge request gitlab-org/gitlab-ce!31991
\| * \| \| \|	Round the file title; Add top border to conflict diffs	Thomas Randolph	2019-08-27	2	-0/+33
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The file title sometimes overflows its container, which has the same border-radius. By always rounding the file title, the overflow never happens, so the corners always look correct. Everywhere else there are file diffs, there is a top border to complete the full border around the file.
* \| \| \|	Merge branch 'fix-nil-error-in-gitlab-danger-teammate' into 'master'	Lin Jen-Shin	2019-08-27	2	-2/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a nil error in Gitlab::Danger::Teammate See merge request gitlab-org/gitlab-ce!32284
\| * \| \| \|	Fix a nil error in Gitlab::Danger::Teammate	Rémy Coutable	2019-08-27	2	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'docs/update-api-snippets' into 'master'	Achilleas Pipinellis	2019-08-27	1	-0/+58
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add example requests for snippets API See merge request gitlab-org/gitlab-ce!31964
\| * \| \| \|	Add example requests for snippets API	Rainer Kern	2019-08-27	1	-0/+58
\|/ / / /
* \| \| \|	Merge branch 'qa-autodevops-smoke-check' into 'master'	Dan Davison	2019-08-27	4	-12/+36
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure autodevops is enabled before running Smoke test See merge request gitlab-org/gitlab-ce!31867
\| * \| \| \|	Ensure autodevops is enabled before running Smoke testqa-autodevops-smoke-check	ddavison	2019-08-15	4	-12/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract #enable_autodevops to new page object Change Smoke test naming to only running pipeline Generate AutoDevOps project with SecureRandom suffix
* \| \| \| \|	Merge branch 'docs-document-category-labels' into 'master'	Achilleas Pipinellis	2019-08-27	4	-134/+195
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve documentation of stage, group, category, feature labels See merge request gitlab-org/gitlab-ce!32053
\| * \| \| \| \|	Introduce facet labelsdocs-document-category-labels	Rémy Coutable	2019-08-27	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Improve documentation of stage, group, category, feature labels	Rémy Coutable	2019-08-27	4	-138/+181
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'ashmckenzie/remove-mdl-gem' into 'master'	Achilleas Pipinellis	2019-08-27	2	-11/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the mdl gem as it's no longer in use See merge request gitlab-org/gitlab-ce!32253
\| * \| \| \| \| \|	Remove the mdl gem as it's no longer in useashmckenzie/remove-mdl-gem	Ash McKenzie	2019-08-27	2	-11/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'qa/issue-boards-navigation' into 'master'	Sanad Liaquat	2019-08-27	2	-1/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update view for testability and update page object See merge request gitlab-org/gitlab-ce!32224
\| * \| \| \| \| \| \|	Update issues submenuqa/issue-boards-navigation	Walmyr Lima	2019-08-26	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With a new element and a new method to go to issue boards.
\| * \| \| \| \| \| \|	Update view to add testability	Walmyr Lima	2019-08-26	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'remove-docker-tag-for-reports-jobs' into 'master'	Nick Thomas	2019-08-27	1	-3/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't set tags for the reports jobs See merge request gitlab-org/gitlab-ce!32276
\| * \| \| \| \| \| \| \|	Don't set tags for the reports jobsremove-docker-tag-for-reports-jobs	Rémy Coutable	2019-08-27	1	-3/+0
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'winh-prepend-entity' into 'master'	Yorick Peterse	2019-08-27	2	-2/+27
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace prepend_entity with prepend_if_ee helper Closes gitlab-ee#13639 See merge request gitlab-org/gitlab-ce!32214
\| * \| \| \| \| \| \| \|	Replace prepend_entity with prepend_if_ee	Winnie Hellmann	2019-08-27	2	-2/+27
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 897a9d308db46b620b738b98f2b0e5630ac7d2dd)
* \| \| \| \| \| \| \|	Merge branch 'ce-ealcantara-eks-move-gke-dropdown-directory' into 'master'	Mike Greiling	2019-08-27	23	-17/+17
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE-backport: Move create cluster Vue apps to create_cluster directory. See merge request gitlab-org/gitlab-ce!32220
\| * \| \| \| \| \| \|	Move gke_cluster_dropdowns to create_cluster dir	Enrique Alcantara	2019-08-27	23	-17/+17
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit creates a create_cluster directory to collect all Vue applications related to creating kubernetes applications using gitlab. It also moves the gke_cluster_dropdowns collection of apps to the create_cluster directory. gke_cluster_dropdowns contains dropdown components used to select configuration options to create a Kubernetes cluster in Google Cloud.
* \| \| \| \| \| \|	Merge branch ↵	Lin Jen-Shin	2019-08-27	2	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'65312-use-group-labels-instead-of-legacy-team-labels-for-danger-picking-test-reviewers' into 'master' Detect the new stage labels in `Gitlab::Danger::Teammate` Closes #65312 See merge request gitlab-org/gitlab-ce!32261
\| * \| \| \| \| \| \|	Detect the new stage labels in Gitlab::Danger::Teammate65312-use-group-labels-instead-of-legacy-team-labels-for-danger-picking-test-reviewers	Rémy Coutable	2019-08-27	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch ↵	Jan Provaznik	2019-08-27	3	-16/+24
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'66641-broken-master-real-http-connections-are-disabled-unregistered-request' into 'master' Use `stub_full_request` to fix spec failure Closes #66641 See merge request gitlab-org/gitlab-ce!32259
\| * \| \| \| \| \| \| \|	Use `stub_full_request` to fix spec failure66641-broken-master-real-http-connections-are-disabled-unregistered-request	Heinrich Lee Yu	2019-08-27	3	-16/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also change test URL sequest to .test TLD
* \| \| \| \| \| \| \| \|	Merge branch 'docs/fix-linting-problems' into 'master'	Kushal Pandya	2019-08-27	1	-5/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes trailing whitespace to fix linting See merge request gitlab-org/gitlab-ce!32265
\| * \| \| \| \| \| \| \| \|	Removes trailing whitespace to fix linting	Evan Read	2019-08-27	1	-5/+5
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '13806-fix' into 'master'	Lin Jen-Shin	2019-08-27	2	-2/+13
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add nil check for Gitlab.config.prometheus Closes #13806 See merge request gitlab-org/gitlab-ce!32201
\| * \| \| \| \| \| \| \| \|	Add nil check for Gitlab.config.prometheus13806-fix	rpereira2	2019-08-26	2	-2/+13
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs-update-needs-example' into 'master'	Kamil Trzciński	2019-08-27	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update the syntax of DAG example See merge request gitlab-org/gitlab-ce!32137