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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Make RelativePositioning reusablemake-relative-positioning-module-reusable	Adam Hegyi	2019-07-24	5	-261/+300
\| \| \| \| \| \| \| \|	RelativePositioning module was heavily dependent on the Issue model. This changes makes it easier to reuse the functionality provided by RelativePositioning in other models. Needed by: https://gitlab.com/gitlab-org/gitlab-ee/issues/12196
*	Merge branch '12250-mvc-security-navigation-section-group' into 'master'	Fatih Acet	2019-07-24	1	-2/+2
\|\ \| \| \| \| \| \| \| \|	Add "security" top-level item to group sidebar See merge request gitlab-org/gitlab-ce!30604
\| *	Add "security" top-nevel item to group sidebar12250-mvc-security-navigation-section-group	Dave Pisek	2019-07-24	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commits moves the second-level navigation item 'Security Dashboard' into a top-level item. The rendering of the actual item is EE specific.
* \|	Merge branch '12250-mvc-security-navigation-section-project' into 'master'	Fatih Acet	2019-07-24	1	-4/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add "Security & Compliance" as top-level item to the project sidebar See merge request gitlab-org/gitlab-ce!30564
\| * \|	Add "security" as nav-item to project sidebar12250-mvc-security-navigation-section-project	Dave Pisek	2019-07-24	1	-4/+2
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves the security dashboard and dependency list into it's own top-level navigation item named 'Securty & Compliance', within the project's sidebar. This should only affect EE, since the template changes only touch partials that get conditionally rendered and only exist in EE.
* \|	Merge branch '11090-export-design-management-lfs-data' into 'master'	James Lopez	2019-07-24	9	-36/+231
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add support for exporting repository type data for LFS objects See merge request gitlab-org/gitlab-ce!30830
\| * \|	LFS export records repository_type data	Luke Duncalfe	2019-07-24	9	-36/+231
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A project can have the same `LfsObject` linked with up to three `LfsObjectsProject` records. Each of these records would be for a different repository, recorded in the `repository_type` property. The different repositories at time of writing are "project", "wiki", and "design". See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894 This change exports the list of `repository_type`s as a JSON mapping of oid => repository_types, which are imported to recreate the correct `LfsObjectsProject` records. https://gitlab.com/gitlab-org/gitlab-ee/issues/11090
* \|	Merge branch 'alhashash1-12-1-stable-patch-67177' into 'master'	Stan Hu	2019-07-24	1	-4/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix incorrect web server selection parameter in init.d script Closes #64802 and #65008 See merge request gitlab-org/gitlab-ce!31076
\| * \|	Fix incorrect web server parameter in init.d script	Mohammad Alhashash	2019-07-24	1	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Environment variable USE_WEB_SERVER should have the value of the selected webserver when calling bin/web startup script. Fixes #65008
* \| \|	Merge branch 'bw-enable-default-manual-sorting' into 'master'	Sean McGivern	2019-07-24	3	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default manual_sorting feature flag to on See merge request gitlab-org/gitlab-ce!30788
\| * \| \|	Default manual_sorting feature flag to onbw-enable-default-manual-sorting	Brett Walker	2019-07-16	3	-3/+3
\| \| \| \|
* \| \| \|	Merge branch 'qa-ml-knapsack-package-and-qa' into 'master'	Rémy Coutable	2019-07-24	1	-0/+46
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use knapsack to parallelize E2E tests run via package-and-qa See merge request gitlab-org/gitlab-ce!30886
\| * \| \| \|	Use a single knapsack file	Mark Lapierre	2019-07-24	1	-0/+46
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There should be no difference between jobs in package-and-qa. Review apps should also be similar but there might be differences if the runners have different resources.
* \| \| \|	Update CHANGELOG.md for 12.1.1	GitLab Release Tools Bot	2019-07-24	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'qa-staging-61-fix-ee-project-templates-spec-ce' into 'master'	Sanad Liaquat	2019-07-24	1	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port of EE branch qa-staging-61-fix-ee-project-templates-spec See merge request gitlab-org/gitlab-ce!30835
\| * \| \| \|	CE port of EE branch qa-staging-61-fix-ee-project-templates-specqa-staging-61-fix-ee-project-templates-spec-ce	Sanad Liaquat	2019-07-17	1	-0/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch ↵	Kushal Pandya	2019-07-24	4	-26/+22
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'11639-improve-discovery-and-navigation-for-gitlab-package-features-ce' into 'master' Improving packages navigation in project sidebar [CE Backport] See merge request gitlab-org/gitlab-ce!30256
\| * \| \| \| \|	Improving packages navigation in project sidebar11639-improve-discovery-and-navigation-for-gitlab-package-features-ce	Nick Kipling	2019-07-23	4	-26/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed Registry from sidebar Created new Packages top level item Added Container Registry into packages Updated tests to support new layout
* \| \| \| \| \|	Merge branch '64996-fix-review-app-debugging' into 'master'	Lin Jen-Shin	2019-07-24	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Review App debugging sometimes fail because multiple Unicorn pods exist" Closes #64996 See merge request gitlab-org/gitlab-ce!31058
\| * \| \| \| \|	Fix Review App debugging64996-fix-review-app-debugging	Rémy Coutable	2019-07-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'pl-spec_flat_map-ce' into 'master'	Grzegorz Bizon	2019-07-24	10	-20/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prefer `flat_map` over `map` + `flatten` in specs See merge request gitlab-org/gitlab-ce!31052
\| * \| \| \| \| \|	Prefer `flat_map` over `map` + `flatten` in specs	Peter Leitzen	2019-07-24	10	-20/+19
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Although `flat_map` is equivalent to `map` + `flatten(1)` (note the level 1) we can apply this same refactoring to all cases.
* \| \| \| \| \|	Merge branch 'ce-xanf-add-admin-area-links' into 'master'	Ash McKenzie	2019-07-24	5	-43/+85
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add interactive links in the Admin Area overview" See merge request gitlab-org/gitlab-ce!29306
\| * \| \| \| \| \|	Add links in admin area overviewce-xanf-add-admin-area-links	Illya Klymov	2019-07-24	5	-43/+85
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduces new `feature_entry` helper for dashboard. This helper reduces code duplication when listing available features and relevant links to configuration sections
* \| \| \| \| \|	Merge branch 'renovate/gitlab-ui-5.x' into 'master'	Kushal Pandya	2019-07-24	2	-5/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dependency @gitlab/ui to ^5.7.1 See merge request gitlab-org/gitlab-ce!31026
\| * \| \| \| \| \|	Update dependency @gitlab/ui to ^5.7.1	Lukas Eipert	2019-07-22	2	-5/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs-correct-omitted-word' into 'master'	Evan Read	2019-07-24	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct an omitted word See merge request gitlab-org/gitlab-ce!31083
\| * \| \| \| \| \| \|	Correct omitted word	otuhs_d	2019-07-24	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'docs-set-service-variables-tip' into 'master'	Evan Read	2019-07-24	2	-0/+13
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add notes to the docs about setting service variables for users wanting to do so from the UI See merge request gitlab-org/gitlab-ce!30863
\| * \| \| \| \| \| \| \|	Add notes to the docs about setting service variables for users wanting to ↵	Elliot Rushton	2019-07-24	2	-0/+13
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	do so from the UI
* \| \| \| \| \| \| \|	Merge branch 'fix-danger-gemfile-warning' into 'master'	Thong Kuah	2019-07-24	1	-2/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix duplicated suggestion in Danger gem warning See merge request gitlab-org/gitlab-ce!31088
\| * \| \| \| \| \| \| \|	Fix duplicated suggestion in Danger gem warningfix-danger-gemfile-warning	Tiger	2019-07-24	1	-2/+1
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'docs-group-instance-clusters-ga' into 'master'	Evan Read	2019-07-24	2	-2/+0
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove beta from group and instance clusters See merge request gitlab-org/gitlab-ce!31059
\| * \| \| \| \| \| \|	Remove beta from group and instance clusters	Daniel Gruesso	2019-07-24	2	-2/+0
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'jivanvl-add-chart-empty-state' into 'master'	Clement Ho	2019-07-24	8	-8/+144
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add empty chart component Closes #60947 See merge request gitlab-org/gitlab-ce!30682
\| * \| \| \| \| \| \|	Add empty chart component	Jose Ivan Vargas	2019-07-24	8	-8/+144
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This merge request adds an empty chart component which will load in case of queries not having data to display, this will override the current logic, which hides all the graphs that have no data to show
* \| \| \| \| \| \|	Merge branch '64016-unix-shell-scripting-style-guide' into 'master'	Evan Read	2019-07-24	2	-0/+118
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add GitLab Unix shell scripting style guide to docs See merge request gitlab-org/gitlab-ce!30271
\| * \| \| \| \| \| \|	Add GitLab Unix shell scripting style guide to docs	Victor Zagorodny	2019-07-24	2	-0/+118
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '65019-job-templates-dind-tls-fix' into 'master'	Thong Kuah	2019-07-24	6	-0/+12
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set DOCKER_TLS_CERTDIR in CI job templates See merge request gitlab-org/gitlab-ce!31080
\| * \| \| \| \| \| \|	Set DOCKER_TLS_CERTDIR in CI job templates65019-job-templates-dind-tls-fix	Tiger	2019-07-24	6	-0/+12
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/65019
* \| \| \| \| \| \|	Merge branch '65019-auto-devops-dind-tls-fix' into 'master'	Thong Kuah	2019-07-24	2	-0/+7
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set DOCKER_TLS_CERTDIR in Auto Dev-Ops CI template See merge request gitlab-org/gitlab-ce!31078
\| * \| \| \| \| \|	Set DOCKER_TLS_CERTDIR in Auto Dev-Ops CI template65019-auto-devops-dind-tls-fix	Tiger	2019-07-24	2	-0/+7
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/65019
* \| \| \| \| \|	Merge branch 'allow-all-users-to-see-history' into 'master'	Mayra Cabrera	2019-07-23	4	-1/+166
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #29528, by allowing all users to view history Closes #29528 See merge request gitlab-org/gitlab-ce!30470
\| * \| \| \| \| \|	Allowing all users to view history	Alex Kalderimis	2019-07-23	4	-1/+166
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes the create_wiki permission check from the history controller, allowing show and history to have the same level of permissions. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29528
* \| \| \| \| \|	Merge branch '63894-encapsulate-file-view-modes-with-constants' into 'master'	Paul Slaughter	2019-07-23	5	-15/+27
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Encapsulate file view modes with constants Closes #63894 See merge request gitlab-org/gitlab-ce!30737
\| * \| \| \| \| \|	Encapsulate file view modes with constants	Chris Toynbee	2019-07-23	5	-15/+27
\|/ / / / / /
* \| \| \| \| \|	Merge branch '52442-initial-mysql-support-removal' into 'master'	Robert Speicher	2019-07-23	63	-1695/+352
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove dead mysql code Closes #63191 See merge request gitlab-org/gitlab-ce!29608
\| * \| \| \| \| \|	Remove dead MySQL code	Nick Thomas	2019-07-23	63	-1695/+352
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	None of this code can be reached any more, so it can all be removed
* \| \| \| \| \|	Merge branch 'sh-update-mermaid' into 'master'	Tim Zallmann	2019-07-23	5	-300/+1506
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Mermaid to v8.2.3 Closes #64601 See merge request gitlab-org/gitlab-ce!30985
\| * \| \| \| \| \|	Update Mermaid to v8.2.3sh-update-mermaid	Stan Hu	2019-07-23	5	-300/+1506
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes fill colors not working with Mermaid and pulls in a number of other fixes. * https://github.com/knsv/mermaid/blob/master/CHANGELOG.md * https://github.com/knsv/mermaid/#special-note-regarding-version-82 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64601