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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Unify flay.rake and gettext.rake from EEunify-lib-tasks	Lin Jen-Shin	2018-06-21	2	-2/+2
\|
*	Merge branch 'bvl-errors-in-static-analysis' into 'master'	Sean McGivern	2018-06-20	2	-13/+30
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Updates to the `gettext:updated_check` Closes #48113 See merge request gitlab-org/gitlab-ce!20002
\| *	More verbose errors in static-analysis	Bob Van Landuyt	2018-06-20	2	-13/+30
\| \| \| \| \| \| \| \|	This makes the output in static analysis a bit more verbose.
* \|	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	2	-64/+108
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use gitaly for backup rake task See merge request gitlab-org/gitlab-ce!19742
\| * \|	Move backup custom hooks up a leveluse-backup-custom-hooks-gitaly	Ahmad Hassan	2018-06-20	1	-4/+2
\| \| \|
\| * \|	Output done for wiki and repo	Ahmad Hassan	2018-06-19	1	-14/+3
\| \| \|
\| * \|	Migrate repo backup to gitaly	Ahmad Hassan	2018-06-15	2	-54/+111
\| \| \|
* \| \|	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 'dm-branch-api-can-push' into 'master'	Robert Speicher	2018-06-19	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose whether current user can push into a branch on branches API See merge request gitlab-org/gitlab-ce!19958
\| * \| \| \| \| \|	Expose whether current user can push into a branch on branches APIdm-branch-api-can-push	Douwe Maan	2018-06-18	1	-0/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	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 'more-group-api-sorting-options' into 'master'	Douwe Maan	2018-06-19	1	-2/+4
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix group pagination and add sort by id to groups and subgroups Closes #47409 See merge request gitlab-org/gitlab-ce!19665
\| * \| \| \| \|	Add id as second sort parameter for group sort by name	Marko, Peter	2018-06-18	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding primary key to database query order rule generates deterministic sort result and thus pagination. This is needed because subgroups can have identical names. Signed-off-by: Marko, Peter <peter.marko@siemens.com>
\| * \| \| \| \|	Add id group api sorting option	Marko, Peter	2018-06-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With introduction of subgroups, many groups may have the same name and/or path, thus further sorting options are necessary. Signed-off-by: Marko, Peter <peter.marko@siemens.com>
* \| \| \| \| \|	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	6	-53/+158
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-24/+60
\| \| \| \| \| \|
\| * \| \| \| \|	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 if changed translations are checked in	Bob Van Landuyt	2018-06-15	2	-0/+27
\| \| \| \| \| \|
\| * \| \| \| \|	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-blockquote-trailing-whitespace' into 'master'	Sean McGivern	2018-06-18	1	-6/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow trailing whitespace on blockquote fence lines See merge request gitlab-org/gitlab-ce!19960
\| * \| \| \| \| \|	Allow trailing whitespace on blockquote fence lines	Douwe Maan	2018-06-18	1	-6/+6
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	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
\| \| \| \| \| \| \|