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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Resolve CE/EE difference in FE dependency filesleipert-resolve-fe-dependency-conflict-ce	Lukas Eipert	2019-04-02	2	-2/+4
\| \| \| \|	This resolved the one conflict we have in CE/EE.
*	Merge branch 'fix-expand-full-file-on-image' into 'master'	Douwe Maan	2019-04-02	2	-1/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixed expand full file button showing on images Closes #59695 See merge request gitlab-org/gitlab-ce!26830
\| *	Fixed expand full file button showing on images	Phil Hughes	2019-04-01	2	-1/+6
\| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59695
* \|	Merge branch 'jprovazn-graphql-prometheus' into 'master'	Dmitriy Zaporozhets	2019-04-02	4	-0/+84
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Monitor GraphQL with Prometheus See merge request gitlab-org/gitlab-ce!26569
\| * \|	Monitor GraphQL with Prometheus	Jan Provaznik	2019-04-02	4	-0/+84
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extends graphql's platform tracing class to observe duration of graphql methods. In graphql 1.8.11 is added prometheus class but it's not very useful for us because it uses prometheus_exporter to export results.
* \|	Merge branch 'design-management-upload-client-ce' into 'master'	Filipa Lacerda	2019-04-02	4	-54/+81
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	CE backport of design-management-upload-client See merge request gitlab-org/gitlab-ce!26766
\| * \|	CE backport of design-management-upload-client	Phil Hughes	2019-04-02	4	-54/+81
\| \| \|
* \| \|	Merge branch 'sh-fix-rugged-tree-entries' into 'master'	Sean McGivern	2019-04-02	3	-9/+18
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid excessive recursive calls with Rugged TreeEntries Closes #59759 See merge request gitlab-org/gitlab-ce!26813
\| * \| \|	Avoid excessive recursive calls with Rugged TreeEntriessh-fix-rugged-tree-entries	Stan Hu	2019-03-31	3	-9/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Rugged implementation was recursively scanning the repository to create `flat_path` because the post-process step was being called from with a loop. For large repositories, this was significantly slowing things down. Break the call to `rugged_populate_flat_path` out of this loop to make this work efficiently. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59759
* \| \| \|	Merge branch ↵	Rémy Coutable	2019-04-02	2	-6/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ce-10828-follow-up-from-ee-port-externalize-strings-in-projects-controllers' into 'master' (CE Port) "Follow-up from "(EE port) Externalize strings in projects controllers"" See merge request gitlab-org/gitlab-ce!26832
\| * \| \| \|	(CE Port) "Follow-up from "(EE port) Externalize strings in projects ↵	Martin Wortschack	2019-04-02	2	-6/+3
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	controllers""
* \| \| \|	Merge branch 'issue_51789_part_1' into 'master'	Sean McGivern	2019-04-02	12	-2/+273
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate issuable states to integer patch 1 of 2 Closes #51789 See merge request gitlab-org/gitlab-ce!25107
\| * \| \| \|	Remove additional loggingissue_51789_part_1	Felipe Artur	2019-04-01	2	-4/+0
\| \| \| \| \|
\| * \| \| \|	Address review comments	Felipe Artur	2019-03-28	3	-23/+14
\| \| \| \| \|
\| * \| \| \|	Merge master	Felipe Artur	2019-03-27	4727	-30866/+92031
\| \|\ \ \ \
\| * \| \| \| \|	Remove auto vacuum logic, decrease batch size and interval	Felipe Artur	2019-03-01	5	-141/+32
\| \| \| \| \| \|
\| * \| \| \| \|	Address review comments	Felipe Artur	2019-02-19	8	-90/+113
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into issue_51789_part_1	Felipe Artur	2019-02-19	760	-36065/+150713
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Add more specs and code improvements	Felipe Artur	2019-02-19	6	-56/+89
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Make migrations reschedulable	Felipe Artur	2019-02-18	5	-27/+92
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix typo	Felipe Artur	2019-02-18	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix rubocop	Felipe Artur	2019-02-18	4	-52/+61
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add Reschedulable module	Felipe Artur	2019-02-15	4	-36/+63
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix specs	Felipe Artur	2019-02-15	2	-2/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix typo	Felipe Artur	2019-02-14	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix broken specs	Felipe Artur	2019-02-14	3	-2/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add specs for issuable states sync	Felipe Artur	2019-02-14	2	-0/+31
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Split background migration for issues and merge requests	Felipe Artur	2019-02-14	8	-50/+81
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Code improvements	Felipe Artur	2019-02-13	4	-25/+18
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Improve batch size	Felipe Artur	2019-02-12	3	-11/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Schedule background migrations and specs	Felipe Artur	2019-02-12	4	-56/+27
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Migrate issuable states to integer patch 1	Felipe Artur	2019-02-11	8	-2/+199
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Patch 1 that migrates issues/merge requests states from integer to string. On this commit we are only adding the state_id column and syncing it with a backgroud migration. On Patch 2 the code to use the new integer column will be deployed and the old column will be removed.
* \| \| \| \| \| \|	Merge branch 'contribute/fix-project-name-members-page' into 'master'	Sean McGivern	2019-04-02	4	-3/+8
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't sanitize project names on project members page Closes #58751 See merge request gitlab-org/gitlab-ce!25946
\| * \| \| \| \| \|	Don't sanitize project names on project members page	Elias Werberich	2019-04-01	4	-3/+8
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'kube_helm_auto_devops_213' into 'master'	Kamil Trzciński	2019-04-02	2	-2/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Kubectl and Helm in Auto-DevOps.gitlab-ci.yml See merge request gitlab-org/gitlab-ce!26534
\| * \| \| \| \| \|	Bump Kubectl and Helm in Auto-DevOps.gitlab-ci.ymlkube_helm_auto_devops_213	Thong Kuah	2019-04-01	2	-2/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'coverage-parsing-examples' into 'master'	Grzegorz Bizon	2019-04-02	1	-3/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tweak coverage parsing examples See merge request gitlab-org/gitlab-ce!26732
\| * \| \| \| \| \| \|	Add Elixir example for built in coverage tool	optikfluffel	2019-03-28	1	-0/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Move NodeJS examples next to each other	optikfluffel	2019-03-28	1	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '56557-add-managed-field-to-cluster' into 'master'	Kamil Trzciński	2019-04-02	3	-1/+24
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds `managed` boolean column to Clusters table Closes #56557 See merge request gitlab-org/gitlab-ce!26675
\| * \| \| \| \| \| \| \|	Add new field to Clusters table	Mayra Cabrera	2019-04-02	3	-1/+24
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds boolean field 'managed' to clusters table. This new column will be used to distinguish those clusters that are automatically managed by gitlab. Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/56557
* \| \| \| \| \| \| \|	Merge branch 'fix-transfer-group-possibilities' into 'master'	James Lopez	2019-04-02	4	-2/+49
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix group transfer selection possibilities Closes #52295 See merge request gitlab-org/gitlab-ce!26123
\| * \| \| \| \| \| \| \|	Fix group transfer selection possibilities	Peter Marko	2019-04-02	4	-2/+49
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '58879-document-local-tiller-docs' into 'master'	Evan Read	2019-04-02	1	-14/+36
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document that local tiller is used for Auto DevOps Closes #58879 See merge request gitlab-org/gitlab-ce!26688
\| * \| \| \| \| \| \| \|	Document that local tiller is used for Auto DevOps	Thong Kuah	2019-04-02	1	-14/+36
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also note that apps will be released into the Kubernetes namespace for the environment, and that GitLab < 11.4 used a dedicated Tiller
* \| \| \| \| \| \| \|	Merge branch 'weimeng-master-patch-83366' into 'master'	Stan Hu	2019-04-02	1	-1/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix attempting to drop views in PostgreSQL See merge request gitlab-org/gitlab-ce!26836
\| * \| \| \| \| \| \| \|	Fix attempting to drop views in PostgreSQLweimeng-master-patch-83366	Wei-Meng Lee	2019-04-02	1	-1/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'docs-anchors-17' into 'master'	Evan Read	2019-04-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Fix anchor to deprecated variables doc See merge request gitlab-org/gitlab-ce!26788
\| * \| \| \| \| \| \| \|	Docs: Fix anchor to deprecated variables doc	Marcel Amirault	2019-04-02	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'docs/restructure-ci-envs-and-deployment' into 'master'	Mike Lewis	2019-04-01	3	-322/+450
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor and restructure environments page See merge request gitlab-org/gitlab-ce!26400