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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Force push is handled by Gitaly nowzj-force-push-opt-out	Zeger-Jan van de Weg	2018-06-19	5	-46/+11
\| \| \| \|	Closes gitlab-org/gitaly#348
*	Merge branch '45487-slack-tag-push-notifs' into 'master'	Sean McGivern	2018-06-19	3	-17/+70
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Slack Tag push notifications are not send (only default branch option)" Closes #45487 See merge request gitlab-org/gitlab-ce!19864
\| *	ChatNotificationService - fix sending tag notifications when "only default ↵45487-slack-tag-push-notifs	Mario de la Ossa	2018-06-14	3	-17/+70
\| \| \| \| \| \| \| \|	branch" enabled
* \|	Merge branch 'sh-optimize-locks-check-ce' into 'master'	Sean McGivern	2018-06-19	5	-1/+44
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-1/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-8/+60
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-2/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
\| * \| \|	Ensure ordering for group sorting tests	Marko, Peter	2018-06-15	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of manually creating list to compare the test result, use system sort to assure no errors are introduced. Signed-off-by: Marko, Peter <peter.marko@siemens.com>
\| * \| \|	Add id group api sorting option	Marko, Peter	2018-06-12	4	-7/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'extra-ee-specific-lines-from-discussion-views' into 'master'	Rémy Coutable	2018-06-19	7	-1/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract EE-specific lines from discussion views See merge request gitlab-org/gitlab-ce!19831
\| * \| \| \|	Remove EE-specific code from new MR emailextra-ee-specific-lines-from-discussion-views	Sean McGivern	2018-06-18	2	-1/+3
\| \| \| \| \|
\| * \| \| \|	Remove EE-specific code from rejection mailer	Sean McGivern	2018-06-18	2	-0/+2
\| \| \| \| \|
\| * \| \| \|	Remove EE-specific code from logs tree dropdown	Sean McGivern	2018-06-18	1	-0/+2
\| \| \| \| \|
\| * \| \| \|	Remove EE-specific code from project milestone page	Sean McGivern	2018-06-18	1	-0/+2
\| \| \| \| \|
\| * \| \| \|	Remove EE-specific code from blob header	Sean McGivern	2018-06-18	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs/contributing-md-labels' into 'master'	Rémy Coutable	2018-06-19	1	-34/+48
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove label examples from headings See merge request gitlab-org/gitlab-ce!19982
\| * \| \| \| \|	Remove label examples from headings	Achilleas Pipinellis	2018-06-19	1	-34/+48
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Better make it clearer under each section what the labels are rather than listing a subset of them in the section title
* \| \| \| \|	Merge branch 'zj-linguist-gitaly-mandatory' into 'master'	Douwe Maan	2018-06-19	1	-27/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move language detection to mandatory Closes gitaly#732 and gitaly#360 See merge request gitlab-org/gitlab-ce!19985
\| * \| \| \| \|	Move language detection to mandatory	Zeger-Jan van de Weg	2018-06-19	1	-27/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/732 Closes https://gitlab.com/gitlab-org/gitaly/issues/360
* \| \| \| \| \|	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
* \| \| \| \| \| \| \|	Merge branch 'zj-gitaly-license-detection' into 'master'	Douwe Maan	2018-06-19	2	-31/+11
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	License detection happens solely through Gitaly now Closes gitaly#1026 See merge request gitlab-org/gitlab-ce!19986
\| * \| \| \| \| \| \| \|	License detection happens soley through Gitaly now	Zeger-Jan van de Weg	2018-06-19	2	-31/+11
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migration: https://gitlab.com/gitlab-org/gitaly/issues/1026 Conflicts: lib/gitlab/git/repository.rb
* \| \| \| \| \| \| \|	Merge branch 'replace-omniauth.org-sedo-doc' into 'master'	Rémy Coutable	2018-06-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix omniauth link, site has moved. See merge request gitlab-org/gitlab-ce!19957
\| * \| \| \| \| \| \| \|	Fix omniauth link, site has moved.	julianladisch	2018-06-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'patch-28' into 'master'	Rémy Coutable	2018-06-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it explicit where is the gitlab.rb file See merge request gitlab-org/gitlab-ce!19963
\| * \| \| \| \| \| \| \| \|	Make it explicit where is the gitlab.rb file	Mike Weilgart	2018-06-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Save people an extra Google search if this is the first doc they're reading.
* \| \| \| \| \| \| \| \| \|	Merge branch 'jr-45820-xcode-docs' into 'master'	Douwe Maan	2018-06-19	1	-0/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Open in Xcode docs See merge request gitlab-org/gitlab-ce!19872
\| * \| \| \| \| \| \| \| \| \|	Fix typosjr-45820-xcode-docs	James Ramsay	2018-06-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add Open in Xcode docs	James Ramsay	2018-06-14	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '48093-fix-flakey-notes-background-process-specs' into 'master'	Rémy Coutable	2018-06-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix flakey time-sensitive notes creation specs that rely on background Sidekiq jobs Closes #48093 See merge request gitlab-org/gitlab-ce!19979
\| * \| \| \| \| \| \| \| \| \| \|	Fix flakey time-sensitive specs that rely on notes background Sidekiq jobs48093-fix-flakey-notes-background-process-specs	Eric Eastwood	2018-06-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/48093 We use `perform_enqueued_jobs` because it is "adapter-agnostic so it's better to use it over Sidekiq::Testing.inline!." -- https://gitlab.com/gitlab-org/gitlab-ce/issues/22991
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rails5-fix-46276' into 'master'	Rémy Coutable	2018-06-19	2	-0/+18
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 fix format in uploads actions Closes #46276 See merge request gitlab-org/gitlab-ce!19907
\| * \| \| \| \| \| \| \| \| \| \| \|	Rails5 fix format in uploads actions	Jasper Maes	2018-06-18	2	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-soft-removed-objects-spec-parity' into 'master'	Rémy Coutable	2018-06-19	1	-7/+29
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring CE-EE parity to migrations/remove_soft_removed_objects_spec.rb See merge request gitlab-org/gitlab-ce!19966
\| * \| \| \| \| \| \| \| \| \| \| \|	Bring CE-EE parity to migrations/remove_soft_removed_objects_spec.rbrs-soft-removed-objects-spec-parity	Robert Speicher	2018-06-18	1	-7/+29
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-spec-lib-gitlab-ci-parity' into 'master'	Rémy Coutable	2018-06-19	4	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract EE specific files/lines for spec/lib/gitlab/ci See merge request gitlab-org/gitlab-ce!19971
\| * \| \| \| \| \| \| \| \| \| \| \|	Correct CE-EE parity in two CI-related specsrs-spec-lib-gitlab-ci-parity	Robert Speicher	2018-06-18	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	CE-EE parity to spec/lib/gitlab/ci/config_spec.rb	Robert Speicher	2018-06-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	CE-EE parity to spec/lib/gitlab/ci/yaml_processor_spec.rb	Robert Speicher	2018-06-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	CE-EE parity for spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb	Robert Speicher	2018-06-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rails5-nil-formats' into 'master'	Rémy Coutable	2018-06-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix nil formats test Closes #47833 See merge request gitlab-org/gitlab-ce!19941
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix nil formats testrails5-nil-formats	Jan Provaznik	2018-06-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	One of the spec files sets `nil` value for env varialbe `action_dispatch.request.formats`. Rather than setting `nil` value, we can delete the `action_dispatch.request.formats` key from `env` (which should be closer to real use case anyway). The reason is that in Rails 5, `formats` method does not set default array of formats if the env key is already set (even if set to `nil`).
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/fix-yaml-indentation' into 'master'	Achilleas Pipinellis	2018-06-19	1	-44/+44
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix indentation in CI yaml See merge request gitlab-org/gitlab-ce!19737
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix indentation in CI yaml	pityonline	2018-06-14	1	-44/+44
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jivl-fix-checkbox-top-margin' into 'master'	Annabel Gray	2018-06-18	1	-7/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove top margin from checkboxes in integrations page See merge request gitlab-org/gitlab-ce!19976