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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove unneeded changelogport-ee-issue-12996	Sean Carroll	2019-08-30	1	-5/+0
\|
*	Port EE issue 12996	Sean Carroll	2019-08-30	3	-3/+9
\|
*	Merge branch '12846-update-security-dashboard-docs' into 'master'	Achilleas Pipinellis	2019-08-30	3	-7/+7
\|\ \| \| \| \| \| \| \| \|	Update documentation for security dashboard See merge request gitlab-org/gitlab-ce!32205
\| *	Update documentation for security dashboard	Dave Pisek	2019-08-30	3	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \|	This commit updates a screenshot and the description of the documentation of the group security dashboard to it is in sync with the latest version of the dashboard.
* \|	Merge branch 'docs-es-web-indexing' into 'master'	Achilleas Pipinellis	2019-08-30	1	-123/+176
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Document ES web indexing See merge request gitlab-org/gitlab-ce!31972
\| * \|	Document ES web indexing	Markus Koller	2019-08-30	1	-123/+176
\|/ /
* \|	Merge branch 'tr-embed-grafana-image-docs' into 'master'	Achilleas Pipinellis	2019-08-30	2	-0/+21
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation for embedding Grafana live charts as images Closes #66662 See merge request gitlab-org/gitlab-ce!32342
\| * \|	Remove changelog file again	Tristan Read	2019-08-30	2	-0/+21
\|/ / \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/66684
* \|	Merge branch 'cert_manager_v0_9' into 'master'	Kamil Trzciński	2019-08-30	3	-11/+54
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Install cert-manager v0.9.1 See merge request gitlab-org/gitlab-ce!32243
\| * \|	Install cert-manager v0.9.1	James Fargher	2019-08-30	3	-11/+54
\|/ / \| \| \| \| \| \|	This does not support upgrading from earlier versions
* \|	Merge branch 'ab-routable-two-step-search' into 'master'	Jan Provaznik	2019-08-30	2	-3/+41
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Perform two-step Routable lookup by path See merge request gitlab-org/gitlab-ce!32272
\| * \|	Add another counter to calculate method call ratioab-routable-two-step-search	Andreas Brandl	2019-08-30	1	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We should see the ratio drop down when enabling the Feature. Recommendation by @andrewn
\| * \|	Add method call count instrumentation	Andreas Brandl	2019-08-30	1	-0/+11
\| \| \|
\| * \|	Perform two-step Routable lookup by path	Andreas Brandl	2019-08-30	2	-3/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In order to lookup a Project or Namespace by path, we prefer an exact match (case-sensitive) but in absence of that, we'd also take a case-insensitive match. The case-insensitive matching with preference for the exact match is a bit more involved in SQL as the exact lookup. Yet, the majority of cases will be an exact match. The thinking here is that we can optimize the lookup by performing an exact match first and only if there is no result, we perform the case-insensitive lookup. Data for GitLab.com: * We have about 15M records in routes table * About 2,500 routes exist where there's more than one record with the same `lower(path)` It is possible for a user to craft requests that would always trigger the 2-step search (e.g. we have a route for `/foo/bar`, the request is always for `/FOO/bar`). In this case, the change at hand is not beneficial as it would run an additional query. However, based on the data, it is highly likely that the vast majority of requests can be satisfied with an exact match only. The context for this change is https://gitlab.com/gitlab-org/gitlab-ce/issues/64590#note_208156463.
* \| \|	Merge branch 'ce-issue_10770' into 'master'	Andreas Brandl	2019-08-30	5	-2/+41
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Rename epic column state to state_id See merge request gitlab-org/gitlab-ce!32270
\| * \|	Rename epic column state to state_id	Felipe Artur	2019-08-30	5	-2/+41
\|/ / \| \| \| \| \| \| \| \|	Rename epic column state to state_id to be consistent with issues and merge requests
* \|	Merge branch 'docs/add-github-oauth-note' into 'master'	Achilleas Pipinellis	2019-08-30	2	-38/+13
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add note about GitHub OAuth See merge request gitlab-org/gitlab-ce!32041
\| * \|	Add note about GitHub OAuth	Evan Read	2019-08-30	2	-38/+13
\|/ /
* \|	Merge branch 'doc_api_settings' into 'master'	Achilleas Pipinellis	2019-08-30	1	-32/+39
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Settings API: Sync documentation with implemented features See merge request gitlab-org/gitlab-ce!30909
\| * \	Merge branch 'master' into 'doc_api_settings'	Achilleas Pipinellis	2019-08-30	324	-1482/+4739
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # doc/api/settings.md
\| * \| \|	Apply suggestion to doc/api/settings.md	Achilleas Pipinellis	2019-08-29	1	-1/+1
\| \| \| \|
\| * \| \|	Settings API: External authentication moved to core	Mathieu Parent	2019-08-29	1	-15/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See #57131.
\| * \| \|	Settings API: Remove sentry settings	Mathieu Parent	2019-08-29	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See !28447
\| * \| \|	Settings API: Document undocumented settings	Mathieu Parent	2019-08-29	1	-1/+12
\| \| \| \|
\| * \| \|	Settings API: Document the missing import_sources	Mathieu Parent	2019-08-29	1	-1/+2
\| \| \| \|
\| * \| \|	Settings API: Sort settings	Mathieu Parent	2019-08-29	1	-17/+18
\| \| \| \|
* \| \| \|	Merge branch '36383-improve-search-result-labels' into 'master'	Lin Jen-Shin	2019-08-30	22	-184/+308
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Improve search result labels See merge request gitlab-org/gitlab-ce!32101
\| * \| \|	Improve search result labels	Markus Koller	2019-08-30	22	-184/+308
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Use "results" instead of "blobs", "wiki blobs", "snippet blobs" - Use "comments" instead of "notes" - Use correct pluralization - Don't add "1 - 10 of" if there's only one page
* \| \|	Merge branch '66715-delete-search-animation' into 'master'	Paul Slaughter	2019-08-30	2	-2/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	delete animation width on global search input Closes #66715 See merge request gitlab-org/gitlab-ce!32399
\| * \| \|	Delete animation width on global search input	Maneschi Romain	2019-08-30	2	-2/+6
\|/ / /
* \| \|	Merge branch 'remove-vue-resource-from-remove-issue' into 'master'	Kushal Pandya	2019-08-30	2	-4/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove vue resource from remove issue See merge request gitlab-org/gitlab-ce!32425
\| * \| \|	Revert "DB change, migratoin and changelog"	Lee Tickett	2019-08-30	2	-4/+9
\|/ / / \| \| \| \| \| \| \| \| \|	This reverts commit af5242ecb682189c5d8276e1ab1ffe5ce844f2e5.
* \| \|	Merge branch 'renovate/gitlab-packages' into 'master'	Kushal Pandya	2019-08-30	2	-10/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GitLab Packages See merge request gitlab-org/gitlab-ce!32419
\| * \| \|	Update GitLab Packages	Lukas Eipert	2019-08-29	2	-10/+10
\| \| \| \|
* \| \| \|	Merge branch 'nfriend-add-anchor-tag-to-release-block' into 'master'	Kushal Pandya	2019-08-30	2	-1/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `id` attribute to release blocks See merge request gitlab-org/gitlab-ce!32360
\| * \| \| \|	Add id to release blocknfriend-add-anchor-tag-to-release-block	Nathan Friend	2019-08-28	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds an id attribute to release blocks to allow them to be targeted as anchor links.
* \| \| \| \|	Merge branch 'ce-13479-rename-atmtwps-to-mtwps' into 'master'	Paul Slaughter	2019-08-30	3	-11/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport for gitlab-org/gitlab-ee!15535: Resolve "Rename `ATMTWPS` to `MTWPS` in code" See merge request gitlab-org/gitlab-ce!32112
\| * \| \| \| \|	Rename ATMTWPS to MTWPS (CE)ce-13479-rename-atmtwps-to-mtwps	Nathan Friend	2019-08-22	3	-11/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit does a find-and-replace from ATMTWPS -> MTWPS.
* \| \| \| \| \|	Merge branch 'docs_api_commits' into 'master'	Evan Read	2019-08-30	1	-5/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update doc/api/deploy_keys.md See merge request gitlab-org/gitlab-ce!32069
\| * \| \| \| \| \|	Update doc/api/deploy_keys.md	Alexis Sánchez	2019-08-30	1	-5/+8
\|/ / / / / /
* \| \| \| \| \|	Merge branch '66264-moved-issue-reference' into 'master'	Jan Provaznik	2019-08-30	5	-2/+23
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Use "moved" instead of "closed" in issue references" Closes #66264 See merge request gitlab-org/gitlab-ce!32277
\| * \| \| \| \|	Resolve "Use "moved" instead of "closed" in issue references"	Juliette de Rancourt	2019-08-30	5	-2/+23
\|/ / / / /
* \| \| \| \|	Merge branch 'patch-76' into 'master'	Evan Read	2019-08-30	1	-4/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed grammar and inconsistencies with capitalization See merge request gitlab-org/gitlab-ce!32337
\| * \| \| \| \|	Fixed grammar and inconsistencies with capitalization	Shan	2019-08-30	1	-4/+4
\|/ / / / /
* \| \| \| \|	Merge branch ↵	Ash McKenzie	2019-08-30	3	-1/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'65251-default-clusters-namespace_per_environment-column-to-true' into 'master' Default clusters namespace_per_environment to true See merge request gitlab-org/gitlab-ce!32139
\| * \| \| \| \|	Default clusters namespace_per_environment to true	Tiger	2019-08-30	3	-1/+18
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '62055-find-file-links-encoding' into 'master'	Paul Slaughter	2019-08-30	3	-1/+83
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "Find Files Links Not URL Encoded" Closes #62055 See merge request gitlab-org/gitlab-ce!31311
\| * \| \| \| \| \|	URL-encode file links in find file	Jan Beckmann	2019-08-30	3	-1/+83
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/62055
* \| \| \| \| \|	Merge branch '65742-make-be_url-stricter' into 'master'	Thong Kuah	2019-08-30	3	-11/+42
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `be_http_url` matcher Closes #65742 See merge request gitlab-org/gitlab-ce!32054
\| * \| \| \| \| \|	Allow be_url to specify the type	Alex Kalderimis	2019-08-30	3	-11/+42
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows the be_url matcher to be more specific. By default, it only matches HTTP and HTTPS URIs.