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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Apply suggestion to ↵pages-refactor-ssl-documentation	Marcia Ramos	2019-07-12	1	-1/+1
\| \| \| \|	doc/user/project/pages/custom_domains_ssl_tls_certification/index.md
*	Apply suggestion to ↵	Marcia Ramos	2019-07-12	1	-1/+1
\| \| \| \|	doc/user/project/pages/custom_domains_ssl_tls_certification/index.md
*	Apply suggestion to ↵	Marcia Ramos	2019-07-12	1	-1/+1
\| \| \| \|	doc/user/project/pages/custom_domains_ssl_tls_certification/index.md
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Marcia Ramos	2019-07-12	1379	-12085/+23435
\|\ \| \| \| \| \| \|	pages-refactor-ssl-documentation
\| *	Merge branch 'bvl-rename-routes-after-user-rename' into 'master'	Jan Provaznik	2019-07-12	19	-60/+431
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Set the name of a user-namespace to the user name See merge request gitlab-org/gitlab-ce!23272
\| \| *	Fix incorrect namespaces & route for user-routes	Bob Van Landuyt	2019-07-09	5	-0/+356
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes the `Namespace#name` and `Route#name` for all user namespaces and their personal projects in case they don't match the user name anymore. More info info in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23272
\| \| *	Lesser Namespace#name validations	Bob Van Landuyt	2019-07-09	3	-22/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we use `Namespace#path` to build routes and URLs we can lessen the restrictions on `Namespace#name` so it can accomodate a user's name.
\| \| *	Use namespace#path for building urls in specs	Bob Van Landuyt	2019-07-09	7	-18/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some of the specs were using namespace names instead of paths for building URLS. This would fail since we now build a namespace with a user's name instead of a user's username.
\| \| *	Set the name of a user-namespace to the user name	Bob Van Landuyt	2019-07-09	4	-20/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of setting the name of the namespace to the user's username, set it to the user's name. This is more consistent with how we name the routes: The route-name of a namespace is the human name of the routable. In the case of a user-namespace, this is the owner's name. When we change a user's name (both on create and update), we now also update the namespace-name to the user's name. This will make sure that if we also correctly update all the nested routes.
\| * \|	Merge branch 'upgrade-rails-5-2-ce' into 'master'	Bob Van Landuyt	2019-07-12	53	-238/+225
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Upgrade to Rails 5.2 See merge request gitlab-org/gitlab-ce!30052
\| \| * \|	Upgrade to Rails 5.2upgrade-rails-5-2-ce	Heinrich Lee Yu	2019-07-12	53	-238/+225
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates changed method names and fixes spec failures
\| * \| \|	Merge branch 'fe-delete-old-boardservice-on-component-modal-footer' into ↵	Kushal Pandya	2019-07-12	2	-1/+7
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' change the use of boardService in favor of boardsStore on footer for the board component See merge request gitlab-org/gitlab-ce!30616
\| \| * \| \|	change the use of boardService in favor of boardsStore on footer for the ↵	Eduardo Mejía	2019-07-12	2	-1/+7
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	board component
\| * \| \|	Merge branch 'prepare-cycle-analytics-to-run-concurrently-ce' into 'master'	Kushal Pandya	2019-07-12	1	-2/+8
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent errors when CA has no data See merge request gitlab-org/gitlab-ce!30556
\| \| * \| \|	Prevent errors when CA has no data	Brandon Labuschagne	2019-07-12	1	-2/+8
\| \|/ / /
\| * \| \|	Merge branch 'rename-gitlab-docs-repo' into 'master'	Marcia Ramos	2019-07-12	8	-25/+25
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move the gitlab-docs project under gitlab-org See merge request gitlab-org/gitlab-ce!30620
\| \| * \| \|	Move the gitlab-docs project under gitlab-orgrename-gitlab-docs-repo	Achilleas Pipinellis	2019-07-11	8	-25/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Search and replace gitlab-com/gitlab-docs with gitlab-org/gitlab-docs. For https://gitlab.com/gitlab-com/gitlab-docs/issues/310
\| * \| \| \|	Merge branch '11445-fix-promoted-epic-inherited-discussions-ce' into 'master'	Jan Provaznik	2019-07-12	2	-1/+18
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port EE: Fix reply to discussion on promoted epic See merge request gitlab-org/gitlab-ce!30411
\| \| * \| \| \|	Fix reply to discussion on promoted epic11445-fix-promoted-epic-inherited-discussions-ce	Alexandru Croitor	2019-07-12	2	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Regenerate discussion_id for notes that are being copied over to the epic when issue is promoted to epic. https://gitlab.com/gitlab-org/gitlab-ee/issues/11445
\| * \| \| \| \|	Merge branch '60798-follow-up-simplify-sort-direction-logic' into 'master'	Sean McGivern	2019-07-12	2	-50/+181
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Follow up: Simplify sort direction logic" Closes #60798 See merge request gitlab-org/gitlab-ce!30443
\| \| * \| \| \| \|	Minor review cleanup60798-follow-up-simplify-sort-direction-logic	Ezekiel Kigbo	2019-07-12	2	-62/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor refactor specs
\| \| * \| \| \| \|	Added tests for sort icon current	Ezekiel Kigbo	2019-07-12	2	-89/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor sort direction icon
\| \| * \| \| \| \|	Added test for admin/projects	Ezekiel Kigbo	2019-07-12	2	-61/+129
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added tests with project_list_filter_bar set to off Added tests for projects_sort_option_titles Refactor project sort options hash
\| \| * \| \| \| \|	Added tests for current behaviour	Ezekiel Kigbo	2019-07-12	2	-10/+119
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch '62747-gather-ci-tests-memory-usage-data' into 'master'	Kamil Trzciński	2019-07-12	5	-0/+86
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gather memory usage data during tests See merge request gitlab-org/gitlab-ce!30292
\| \| * \| \| \| \|	Gather memory usage data in tests	Aleksei Lipniagov	2019-07-12	5	-0/+86
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Log memory stats after running each spec file and compile the report.
\| * \| \| \| \|	Merge branch '55623-group-cluster-apis' into 'master'	Grzegorz Bizon	2019-07-12	15	-54/+919
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "API support for group-level clusters" Closes #55623 See merge request gitlab-org/gitlab-ce!30213
\| \| * \| \| \| \|	Add API for CRUD group clusters55623-group-cluster-apis	Dylan Griffith	2019-07-11	6	-0/+882
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is basically a copy of the API for project clusters.
\| \| * \| \| \| \|	Refactor: model errors for multi cluster validation	Dylan Griffith	2019-07-11	9	-54/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The current approach requires catching exceptions to handle these errors and callers are already handling model validations so it seems more appropriate. Also it seemed to convoluted to add this logic directly to the model since the model needs to check too many possible associations to determine whether or not there are more than one cluster since the model doesn't know what it's being created on. Additionally we only wanted to validate during create to avoid the risk of existing models becoming invalid by many different edge cases.
\| * \| \| \| \| \|	Merge branch 'issue-63298-asciidoc-sanitization' into 'master'	Douwe Maan	2019-07-12	9	-113/+326
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent excessive sanitization of AsciiDoc ouptut Closes #63298 See merge request gitlab-org/gitlab-ce!30290
\| \| * \| \| \| \| \|	Prevent excessive sanitization of AsciiDoc ouptut	Guillaume Grossetie	2019-07-12	9	-113/+326
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'graphql-include-authorization-for-mutations' into 'master'	Jan Provaznik	2019-07-12	5	-11/+3
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include AuthorizeResource module for all mutations See merge request gitlab-org/gitlab-ce!30243
\| \| * \| \| \| \| \| \|	Include AuthorizeResource module for all mutationsgraphql-include-authorization-for-mutations	Luke Duncalfe	2019-07-11	5	-11/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes our authorization calls available to all GraphQL mutations without the additional step of including the module first.
\| * \| \| \| \| \| \| \|	Merge branch 'docs-trailing-spaces' into 'master'	Achilleas Pipinellis	2019-07-12	23	-142/+136
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove trailing whitespace in docs (part 1) See merge request gitlab-org/gitlab-ce!30648
\| \| * \| \| \| \| \| \| \|	Remove trailing whitespace in docs	Marcel Amirault	2019-07-12	23	-142/+136
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unneeded trailing whitespace in lines in /development /ci /api and /administration docs.
\| * \| \| \| \| \| \| \|	Merge branch 'docs-code-block-fences' into 'master'	Achilleas Pipinellis	2019-07-12	21	-62/+99
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add blank lines around code blocks See merge request gitlab-org/gitlab-ce!30651
\| \| * \| \| \| \| \| \| \|	Add blank lines around code blocks	Marcel Amirault	2019-07-12	21	-62/+99
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All code blocks should be surrounded by blank lines
\| * \| \| \| \| \| \| \|	Merge branch 'docs/fix-plantuml-topic' into 'master'	Achilleas Pipinellis	2019-07-12	1	-24/+25
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove <pre> tag and other fixes See merge request gitlab-org/gitlab-ce!30652
\| \| * \| \| \| \| \| \| \|	Remove <pre> tag and other fixes	Evan Read	2019-07-12	1	-24/+25
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch '56020-reduce-cyclomatic-complexity' into 'master'	Dmitriy Zaporozhets	2019-07-12	2	-35/+61
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce cyclomatic complexity of UrlBlocker.validate! See merge request gitlab-org/gitlab-ce!30557
\| \| * \| \| \| \| \| \| \|	Don't use bang method when there is no safe method	Reuben Pereira	2019-07-12	2	-35/+61
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/rubocop-hq/ruby-style-guide#dangerous-method-bang
\| * \| \| \| \| \| \| \|	Merge branch 'winh-boards-helper' into 'master'	Jan Provaznik	2019-07-12	5	-3/+46
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move current issue board serialization to core (CE-backport) See merge request gitlab-org/gitlab-ce!30507
\| \| * \| \| \| \| \| \| \|	Split and prepend CurrentBoardEntity	Winnie Hellmann	2019-07-12	5	-3/+46
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 1e8bdd01bff96122fe80c51fa8f024f18675b58b)
\| * \| \| \| \| \| \| \|	Merge branch 'sh-audit-event-json-log-format-from-and-to' into 'master'	James Lopez	2019-07-12	3	-5/+38
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Format `from` and `to` fields in JSON audit log See merge request gitlab-org/gitlab-ce!30333
\| \| * \| \| \| \| \| \| \|	Format `from` and `to` fields in JSON audit logsh-audit-event-json-log-format-from-and-to	Stan Hu	2019-07-11	3	-5/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To make it possible to index the `from` and `to` fields with Elasticsearch and other tools, we need the types to be the same. Currently they are a mix of boolean and string values. Part of https://gitlab.com/gitlab-org/gitlab-ee/issues/12599
\| * \| \| \| \| \| \| \| \|	Merge branch 'group-analytics-frame' into 'master'	Lin Jen-Shin	2019-07-12	1	-0/+13
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port EE analytics route See merge request gitlab-org/gitlab-ce!30586
\| \| * \| \| \| \| \| \| \| \|	Port EE analytics routegroup-analytics-frame	Luke Bennett	2019-07-11	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch ↵	Lin Jen-Shin	2019-07-12	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'9768-allow-a-template-in-a-namespace-which-is-out-of-the-hierarchy-of-the-group-owning-the-template-ce-doc' into 'master' Doc for "Allow a template in a namespace which is out of the hierarchy of the Group owning the template" See merge request gitlab-org/gitlab-ce!30601
\| \| * \| \| \| \| \| \| \| \| \|	Doc Allow subgroups to use their parent group's custom project templates	Manoj MJ	2019-07-12	1	-1/+1
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc for "Allow a template in a namespace which is out of the hierarchy of the Group owning the template"
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'qa-dd-data-qa-selector-replacement' into 'master'	Mark Lapierre	2019-07-12	8	-15/+26
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce data-qa-selector to supplant .qa-class See merge request gitlab-org/gitlab-ce!28906