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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Changes tab VUE refactoring	Felipe Artur	2018-06-21	3	-12/+60
\|
*	Merge branch 'da-usage-ping' into 'master'	Sean McGivern	2018-06-21	1	-8/+8
\|\ \| \| \| \| \| \| \| \|	Add enabled prefix to feature keys to be consistent with other keys See merge request gitlab-org/gitlab-ce!20043
\| *	Add enabled prefix to feature keys to be consistent with other keysda-usage-ping	Douglas Barbosa Alexandre	2018-06-20	1	-8/+8
\| \|
* \|	Raw changes calculation is Gitaly only now	Zeger-Jan van de Weg	2018-06-21	1	-19/+4
\| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/1138
* \|	Merge branch 'mk/fix-n-plus-1-queries-in-uploads-check-rake-task' into 'master'	Stan Hu	2018-06-20	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix N+1 queries in uploads check rake task Closes #47924 See merge request gitlab-org/gitlab-ce!20012
\| * \|	Avoid N+1 queries while processing uploads	Michael Kozono	2018-06-20	1	-1/+1
\| \|/
* \|	Merge branch '47488-remove-unmergeable-notification-for-no-commits' into ↵	Robert Speicher	2018-06-20	1	-2/+5
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	'master' Notify only merge request unmergeable due to conflict See merge request gitlab-org/gitlab-ce!19548
\| *	Fix possiblilty of branch not found47488-remove-unmergeable-notification-for-no-commits	Mark Chao	2018-06-20	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \|	This now can happen because can_be_merged? is called during MR merge_status transition to cannot_be_merged. It is possible branch_name is invalid.
* \|	Merge branch 'limit-metrics-content-type' into 'master'	Stan Hu	2018-06-20	1	-2/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Limit the action suffixes in transaction metrics See merge request gitlab-org/gitlab-ce!20032
\| * \|	Limit the action suffixes in transaction metricslimit-metrics-content-type	Yorick Peterse	2018-06-20	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There seem to be a lot of cases where the suffix of an action (e.g. ".html") is set to bogus data, such as "/" or entire URLs. This can increase cardinality of our metrics, and isn't very useful for monitoring and filtering. To work around this, we enforce a whitelist containing a few suffixes we actually care about. Suffixes not supported will be grouped under the action without a suffix. This means that a request to "FooController#bar.jpeg" will be assigned to "FooController#bar".
* \| \|	Merge branch 'remove-allocations-gem' into 'master'	Stan Hu	2018-06-20	2	-16/+0
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Remove remaining traces of the Allocations Gem See merge request gitlab-org/gitlab-ce!20029
\| * \|	Remove remaining traces of the Allocations Gemremove-allocations-gem	Yorick Peterse	2018-06-20	2	-16/+0
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	In MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15834 we removed use of the data produced by the Allocations Gem. However, we never removed the code that just enables tracking of allocations. In this commit we remove all remaining traces of this Gem.
* \|	Merge branch 'zj-can-be-merged' into 'master'	Douwe Maan	2018-06-20	1	-15/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move mergablility check to Gitaly Closes gitaly#889 See merge request gitlab-org/gitlab-ce!20019
\| * \|	Move mergablility check to Gitalyzj-can-be-merged	Zeger-Jan van de Weg	2018-06-20	1	-15/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/889
* \| \|	Fix: Serve favicon image always from the main GitLab domain to avoid issues ↵	Alexis Reigel	2018-06-20	1	-5/+15
\| \| \| \| \| \| \| \| \| \| \| \|	with CORS
* \| \|	Resolve "Unable to install Prometheus on Clusters: 'Error: Chart ↵	Mayra Cabrera	2018-06-20	1	-3/+8
\| \|/ \|/\| \| \| \| \|	incompatible with Tiller v2.7.0'"
* \|	Merge branch 'use-backup-custom-hooks-gitaly' into 'master'	Douwe Maan	2018-06-20	1	-11/+31
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use gitaly for backup rake task See merge request gitlab-org/gitlab-ce!19742
\| * \|	Migrate repo backup to gitaly	Ahmad Hassan	2018-06-15	1	-11/+31
\| \| \|
* \| \|	More gitaly disk access blocks	Jacob Vosmaer (GitLab)	2018-06-20	2	-0/+2
\| \| \|
* \| \|	Merge branch 'ce-5024-filename-search' into 'master'	Sean McGivern	2018-06-20	3	-5/+90
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement filtering by filename on code search Closes #43627 See merge request gitlab-org/gitlab-ce!19509
\| * \| \|	Implement filtering by filename on code searchce-5024-filename-search	Mario de la Ossa	2018-06-19	3	-5/+90
\| \| \| \|
* \| \| \|	Merge branch '48105-git-version-detection-using-gitaly' into 'master'	Sean McGivern	2018-06-20	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move git version detection to gitaly for usage ping data Closes #48105 and charts/gitlab#530 See merge request gitlab-org/gitlab-ce!19993
\| * \| \| \|	Use gitaly to figure out git version for usage ping48105-git-version-detection-using-gitaly	Balasankar "Balu" C	2018-06-19	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'zj-lfs-pointers' into 'master'	Douwe Maan	2018-06-20	1	-58/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LFS changes are detected by Gitaly Closes gitaly#935 See merge request gitlab-org/gitlab-ce!19995
\| * \| \| \| \|	LFS changes are detected by Gitalyzj-lfs-pointers	Zeger-Jan van de Weg	2018-06-19	1	-58/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/935
* \| \| \| \| \|	Merge branch 'zj-force-push-opt-out' into 'master'	Douwe Maan	2018-06-19	3	-25/+4
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Force push is handled by Gitaly now Closes gitaly#348 See merge request gitlab-org/gitlab-ce!19992
\| * \| \| \| \|	Force push is handled by Gitaly nowzj-force-push-opt-out	Zeger-Jan van de Weg	2018-06-19	3	-25/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitlab-org/gitaly#348
* \| \| \| \| \|	Merge branch 'zj-fork-mandatory' into 'master'	Douwe Maan	2018-06-19	1	-15/+2
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move forking to Gitaly Closes gitaly#817 and gitaly#1236 See merge request gitlab-org/gitlab-ce!19990
\| * \| \| \| \|	Move forking to Gitalyzj-fork-mandatory	Zeger-Jan van de Weg	2018-06-19	1	-15/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/817 Closes https://gitlab.com/gitlab-org/gitaly/issues/1236
* \| \| \| \| \|	Merge branch 'zj-counting-commits' into 'master'	Douwe Maan	2018-06-19	1	-70/+13
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Counting commits is done by Gitaly Closes gitaly#382 See merge request gitlab-org/gitlab-ce!19983
\| * \| \| \| \|	Counting commits is done by Gitalyzj-counting-commits	Zeger-Jan van de Weg	2018-06-19	1	-70/+13
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/382
* \| \| \| \|	Merge branch 'sh-optimize-locks-check-ce' into 'master'	Sean McGivern	2018-06-19	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate N+1 queries in LFS file lock checks during a push See merge request gitlab-org/gitlab-ce!19978
\| * \| \| \|	Eliminate N+1 queries in LFS file locks checks during a pushsh-optimize-locks-check-ce	Stan Hu	2018-06-18	1	-1/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This significantly improves performance when a user pushes many references. project.path_locks.any? doesn't cache the output and runs `SELECT 1 AS one FROM "path_locks" WHERE project_id = N` each time. When there are thousands of refs being pushed, this can time out the unicorn worker. CE port for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6159.
* \| \| \|	Merge branch 'zj-gitaly-squash' into 'master'	Douwe Maan	2018-06-19	1	-27/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rebase and Squash in progress are Gitaly only Closes gitaly#865 and gitaly#1018 See merge request gitlab-org/gitlab-ce!19987
\| * \| \| \|	Rebase and Squash in progress are Gitaly only	Zeger-Jan van de Weg	2018-06-19	1	-27/+4
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/865 Closes https://gitlab.com/gitlab-org/gitaly/issues/1018
* \| \| \|	Merge branch 'zj-info-attributes' into 'master'	Douwe Maan	2018-06-19	1	-15/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move info attributes to mandatory Closes gitaly#1082 See merge request gitlab-org/gitlab-ce!19988
\| * \| \| \|	Move info attributes to mandatory	Zeger-Jan van de Weg	2018-06-19	1	-15/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/1082
* \| \| \|	Merge branch 'zj-commit-count' into 'master'	Douwe Maan	2018-06-19	1	-18/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move count commit to mandatory Closes gitaly#330 See merge request gitlab-org/gitlab-ce!19984
\| * \| \| \|	Move count commit to mandatory	Zeger-Jan van de Weg	2018-06-19	1	-18/+2
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/330
* \| \| \|	License detection happens soley through Gitaly now	Zeger-Jan van de Weg	2018-06-19	1	-12/+2
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migration: https://gitlab.com/gitlab-org/gitaly/issues/1026 Conflicts: lib/gitlab/git/repository.rb
* \| \|	Merge branch 'bvl-i18n-validation' into 'master'	Rémy Coutable	2018-06-18	4	-53/+131
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates to `.po` & `.pot` linting Closes #46096 et #39292 See merge request gitlab-org/gitlab-ce!18779
\| * \| \|	Correctly translate all forms in testsbvl-i18n-validation	Bob Van Landuyt	2018-06-15	3	-20/+56
\| \| \| \|
\| * \| \|	Add Polish as a supported language	Bob Van Landuyt	2018-06-15	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We already had some Polish translations, that were currently not available to users. Adding it here because it helps me debug some issues regarding language with more than one form.
\| * \| \|	Validate PO-variable usage in message ids	Bob Van Landuyt	2018-06-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	That way we can detect incorrect usage before the strings are added to Crowdin for translation
\| * \| \|	Forbids combining named and unnamed variables in `gitlab.pot`	Bob Van Landuyt	2018-06-15	2	-41/+78
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This would break with an argument error when interpolating using `sprintf` in ruby.
* \| \| \|	Merge branch 'dm-favicon-redirect' into 'master'	Sean McGivern	2018-06-18	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redirect favicon.(png\|ico) to actual favicon asset or upload Closes #47840 See merge request gitlab-org/gitlab-ce!19956
\| * \| \| \|	Redirect favicon.(png\|ico) to actual favicon asset or uploaddm-favicon-redirect	Douwe Maan	2018-06-18	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rails5-fix-db-check' into 'master'	Yorick Peterse	2018-06-18	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 fix db check: connection execute returns integer instead of string See merge request gitlab-org/gitlab-ce!19901
\| * \| \| \| \|	Rails5 fix connection execute return integer instead of string	Jasper Maes	2018-06-15	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch ↵	Yorick Peterse	2018-06-18	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'blackst0ne-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-namespace' into 'master' Resolve "[Rails5] Invalid single-table inheritance type: Group is not a subclass of Namespace" Closes #48014 See merge request gitlab-org/gitlab-ce!19918