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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove duplicate clusterable presenter methodinstance_level_clusters	James Fargher	2019-05-07	5	-26/+0
\|
*	Convert instance level clusters enabled to class method	James Fargher	2019-05-07	3	-7/+3
\|
*	Change specs to match gitlab code standards	James Fargher	2019-05-07	3	-19/+23
\|
*	Stop using `go` function in clusters controller specs	James Fargher	2019-05-07	1	-54/+54
\|
*	Check instance cluster feature at policy level	James Fargher	2019-05-07	10	-36/+107
\| \| \| \|	Try to simplify feature flag checks by using policies
*	Allow projects to use instance level clusters	James Fargher	2019-05-07	7	-11/+66
\| \| \| \| \| \|	There are two cluster hierarchies one for the deployment platform and one for controllers. The main difference is that deployment platforms do not check user permissions and only return the first match.
*	Instance level kubernetes clusters admin	James Fargher	2019-05-07	27	-5/+969
\| \| \| \| \|	Instance level clusters were already mostly supported, this change adds admin area controllers for cluster CRUD
*	Merge branch 'add-spec-for-optimistic-locking-error' into 'master'	Mayra Cabrera	2019-05-06	3	-0/+65
\|\ \| \| \| \| \| \| \| \|	Fix editing issues and MRs with NULL lock_version See merge request gitlab-org/gitlab-ce!28145
\| *	Fix editing issues and MRs with NULL lock_version	Sean McGivern	2019-05-06	3	-0/+65
\|/
*	Merge branch 'upgrade-gitlab-ui' into 'master'	Clement Ho	2019-05-06	2	-5/+5
\|\ \| \| \| \| \| \| \| \|	Upgrade GitLab UI to 3.10.0 See merge request gitlab-org/gitlab-ce!28140
\| *	Upgrade GitLab UI to 3.10.0upgrade-gitlab-ui	Lukas Eipert	2019-05-06	2	-5/+5
\| \|
* \|	Merge branch 'issue_57906_fix_github_import' into 'master'	Sean McGivern	2019-05-06	11	-1/+169
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issuables state_id nil when importing projects from GitHub Closes #57906 See merge request gitlab-org/gitlab-ce!28027
\| * \|	Fix issuables state_id nil when importing projects from GitHub	Felipe Artur	2019-05-06	11	-1/+169
\|/ / \| \| \| \| \| \| \| \| \| \|	Issues and merge requests imported from GitHub are having state_id set to null. This fixes the GitHub project importer and schedule migrations to fix state_id.
* \|	Merge branch 'ce-11194-fix-approvals-groups-all-available' into 'master'	Fatih Acet	2019-05-06	1	-0/+4
\|\ \ \| \|/ \|/\| \| \| \| \|	Add close_select2 method to select2_helper See merge request gitlab-org/gitlab-ce!27981
\| *	Add close_select2 method to select2_helperce-11194-fix-approvals-groups-all-available	Paul Slaughter	2019-05-01	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Why? This is needed to create a feature test for: https://gitlab.com/gitlab-org/gitlab-ee/issues/11194
* \|	Merge branch 'add-mayra-cabrera-to-codeowners' into 'master'	Sean McGivern	2019-05-06	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add Mayra Cabrera to .gitlab/codeowners See merge request gitlab-org/gitlab-ce!28131
\| * \|	Add Mayra Cabrera to codeowners	Mayra Cabrera	2019-05-06	1	-2/+2
\|/ / \| \| \| \| \| \| \| \|	Per the second step of: https://gitlab.com/gitlab-com/www-gitlab-com/issues/3351
* \|	Merge branch 'renovate/gitlab-svgs-1.x' into 'master'	Clement Ho	2019-05-06	2	-5/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update dependency @gitlab/svgs to ^1.60.0 See merge request gitlab-org/gitlab-ce!27842
\| * \|	Update dependency @gitlab/svgs to ^1.60.0	Lukas 'Eipi' Eipert	2019-05-06	2	-5/+5
\| \| \|
* \| \|	Merge branch '61469-align-play-icon' into 'master'	Kushal Pandya	2019-05-06	3	-1/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Aligns the play button for stages Closes #61469 See merge request gitlab-org/gitlab-ce!28124
\| * \| \|	Aligns the play button for stages61469-align-play-icon	Filipa Lacerda	2019-05-06	3	-1/+11
\| \| \| \|
* \| \| \|	Merge branch '51963-support-prometheus-for-group-level-clusters-backend' ↵	Bob Van Landuyt	2019-05-06	10	-12/+32
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Support Prometheus for group-level clusters (backend) See merge request gitlab-org/gitlab-ce!27995
\| * \| \|	Show health graphs on group-level	Peter Leitzen	2019-05-06	10	-12/+32
\|/ / / \| \| \| \| \| \| \| \| \|	Tweak cluster helper and refactor its specs.
* \| \|	Merge branch '61431-move-build-qa-image-to-test-stage' into 'master'	Stan Hu	2019-05-06	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move the build-qa-image to the test stage See merge request gitlab-org/gitlab-ce!28122
\| * \| \|	Move the build-qa-image to the test stage	Rémy Coutable	2019-05-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'its-simple-just-destroy-the-mirrors' into 'master'	Nick Thomas	2019-05-06	9	-149/+29
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE destroy repo mirrors Closes #54574 See merge request gitlab-org/gitlab-ce!27087
\| * \| \| \|	Destroy repo mirrors instead of disabling them	Luke Bennett	2019-05-06	9	-149/+29
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It is important to destroy data related to repo mirrors when they are disabled. Use `_destroy` nested attribute instead of `enabled` for push mirrors. Call `remove_import_data` after saving a project if its pull mirror is disabled.
* \| \| \|	Merge branch '46806-typed-ci-variables' into 'master'	Lin Jen-Shin	2019-05-06	37	-49/+237
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CI variables of type file Closes #46806 See merge request gitlab-org/gitlab-ce!27112
\| * \| \| \|	Implement support for CI variables of type file	Krasimir Angelov	2019-05-06	37	-49/+237
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add env_var and file as supported types for CI variables. Variables of type file expose to users existing gitlab-runner behaviour - save variable value into a temp file and set the path to this file in an ENV var named after the variable key. Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/46806.
* \| \| \|	Merge branch '61203-fix-lfs-ui-upload' into 'master'	Nick Thomas	2019-05-06	3	-1/+32
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix uploading of LFS tracked file through UI Closes #61203 See merge request gitlab-org/gitlab-ce!28052
\| * \| \|	Fix uploading of LFS tracked file through UI	Patrick Bajao	2019-05-06	3	-1/+32
\|/ / /
* \| \|	Merge branch 'qa-escape-netrc-regex' into 'master'	Sanad Liaquat	2019-05-06	2	-1/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[QA] Escape arg used as regex Closes gitlab-org/quality/performance#2 See merge request gitlab-org/gitlab-ce!28104
\| * \| \|	Swap brackets to avoid false positiveqa-escape-netrc-regex	Mark Lapierre	2019-05-06	1	-1/+1
\| \| \| \|
\| * \| \|	Escape arg used in regex	Mark Lapierre	2019-05-06	2	-1/+10
\| \| \| \|
* \| \| \|	Merge branch '61222-reporters-can-create-labels-in-projects-groups' into ↵	Achilleas Pipinellis	2019-05-06	1	-2/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Reporters can create labels in projects/groups" Closes #61222 See merge request gitlab-org/gitlab-ce!27991
\| * \| \|	Correct label permissions documentation61222-reporters-can-create-labels-in-projects-groups	Sean McGivern	2019-05-02	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Reporters can manage labels; you don't need to be a Developer.
* \| \| \|	Merge branch ↵	Filipa Lacerda	2019-05-06	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'10090-move-ee-differences-for-app-assets-javascripts-pages-projects-issues-index-index-js' into 'master' Resolved EE differences for issues page index Closes gitlab-ee#10090 See merge request gitlab-org/gitlab-ce!28031
\| * \| \| \|	Resolved EE differences for issues page index	Constance Okoghenun	2019-05-06	1	-1/+1
\|/ / / /
* \| \| \|	Merge branch '30093-apply-bfg-object-map-to-database' into 'master'	Douwe Maan	2019-05-06	14	-123/+302
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove cleaned up OIDs from database and cache Closes #30093 See merge request gitlab-org/gitlab-ce!26555
\| * \| \| \|	Remove cleaned up OIDs from database and cache	Nick Thomas	2019-05-06	14	-123/+302
\| \| \| \| \|
* \| \| \| \|	Merge branch 'create-merge-request-pipeline-on-chained-merge-ref-ce' into ↵	Andreas Brandl	2019-05-06	2	-0/+32
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' CE Backport: Create ActiveRecordModel and table for Merge Train feature See merge request gitlab-org/gitlab-ce!27879
\| * \| \| \| \|	Create ActiveRecordModel and table for Merge Train feature	Shinya Maeda	2019-05-06	2	-0/+32
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This database table and AR model is going to be used for the merge train feature.
* \| \| \| \|	Merge branch ↵	Filipa Lacerda	2019-05-06	9	-65/+118
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'58105-pipeline-author-and-commit-author-too-close-together-in-pipeline-list' into 'master' Improve pipelines table spacing, add triggerer column Closes #38802 and #58105 See merge request gitlab-org/gitlab-ce!26136
\| * \| \| \| \|	Add localization for 'API' in triggerer column58105-pipeline-author-and-commit-author-too-close-together-in-pipeline-list	mfluharty	2019-05-03	2	-1/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Separate tests for triggerer component	mfluharty	2019-05-03	3	-50/+56
\| \| \| \| \| \|
\| * \| \| \| \|	Add pipeline triggerer column, adjust columns	mfluharty	2019-05-03	6	-15/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move pipeline triggerer avatar to its own column Adjust the widths of other columns to accommodate new column Add wrap class to commit column to prevent overlap
* \| \| \| \| \|	Merge branch 'jc-disconnect-git-alternates-client' into 'master'	Stan Hu	2019-05-06	5	-3/+86
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add client methods for DisconnectGitAlternates rpc See merge request gitlab-org/gitlab-ce!27938
\| * \| \| \| \| \|	Add client methods for DisconnectGitAlternates rpcjc-disconnect-git-alternates-client	John Cai	2019-05-03	5	-3/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DisconnectGitAlternates is a Gitaly RPC that will delete a repository's objects/info/alternates file. This commit adds client support for that RPC.
* \| \| \| \| \| \|	Merge branch 'fix-merge-request-pipeline-exist-method' into 'master'	Bob Van Landuyt	2019-05-06	11	-33/+34
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix duplicate merge request pipelines created by Sidekiq worker retry See merge request gitlab-org/gitlab-ce!26643
\| * \| \| \| \| \|	Fix merge request pipeline exist methodfix-merge-request-pipeline-exist-method	Shinya Maeda	2019-05-06	11	-33/+34
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor