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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flag	Oswaldo Ferreira	2018-11-09	4	-4/+275
\|
*	Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"osw-revert-comment-in-any-diff-line	Oswaldo Ferreira	2018-11-07	4	-275/+4
\| \| \| \| \|	This reverts commit a82a595728d54bdc12e51dfcfb22e9eddc449143, reversing changes made to e7df959b8f99875edd246c7ac7779c3203e8755e.
*	Merge branch 'sh-paginate-bitbucket-server-imports' into 'master'	Douglas Barbosa Alexandre	2018-11-07	3	-10/+49
\|\ \| \| \| \| \| \| \| \|	Paginate Bitbucket Server importer projects See merge request gitlab-org/gitlab-ce!22825
\| *	Paginate Bitbucket Server importer projects	Stan Hu	2018-11-07	3	-10/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	To prevent delays in loading the page and reduce memory usage, limit the number of projects shown at 25 per page. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/50021
* \|	Merge branch 'jira-ping-differentiate-cloud' into 'master'	Sean McGivern	2018-11-07	1	-1/+17
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Usage ping - Differentiate Jira Server and Cloud Closes #51043 See merge request gitlab-org/gitlab-ce!22791
\| * \|	Usage ping - Differentiate Jira Server and Cloudjira-ping-differentiate-cloud	Mario de la Ossa	2018-11-07	1	-1/+17
\| \| \|
* \| \|	Allow limiting quick actions to execute	Bob Van Landuyt	2018-11-07	1	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sometimes we don't want to trigger any quick actions that cause side effects. For example when building a record to validate. This allows listing the quick actions that need to be performed.
* \| \|	Apply patches when creating MR via email	Bob Van Landuyt	2018-11-07	6	-2/+155
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows users to add patches as attachments to merge request created via email. When an email to create a merge request is sent, all the attachments ending in `.patch` will be applied to the branch specified in the subject of the email. If the branch did not exist, it will be created from the HEAD of the repository. When the patches could not be applied, the error message will be replied to the user. The patches can have a maximum combined size of 2MB for now.
* \| \|	Merge branch 'fj-41213-api-update-submodule-commit' into 'master'	Sean McGivern	2018-11-07	4	-0/+88
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add endpoint to update a git submodule reference Closes #41213 See merge request gitlab-org/gitlab-ce!20949
\| * \| \|	Add submodule update API endpoint	Francisco Javier López	2018-11-07	4	-0/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This new endpoint allow users to update a submodule's reference. The MR involves adding a new operation RPC operation in gitaly-proto (see gitlab-org/gitaly-proto!233) and change Gitaly to use this new version (see gitlab-org/gitaly!936). See gitlab-org/gitlab-ce!20949
* \| \| \|	Merge branch 'max_retries_when' into 'master'	Grzegorz Bizon	2018-11-07	3	-8/+115
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to configure when to retry builds Closes gitlab-runner#3515 See merge request gitlab-org/gitlab-ce!21758
\| * \| \| \|	use Ci::Build instead of CommitStatus as per feedback	Markus Doits	2018-11-07	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	small fixes to doc and remove on whitespace noise	Markus Doits	2018-11-07	1	-2/+0
\| \| \| \| \|
\| * \| \| \|	refactoring after latest feedback	Markus Doits	2018-11-07	1	-1/+15
\| \| \| \| \|
\| * \| \| \|	remove now unneeded validation	Markus Doits	2018-11-07	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	fix wrong retry error messages	Markus Doits	2018-11-07	1	-0/+12
\| \| \| \| \|
\| * \| \| \|	refactor validations to a Entry::Retry class	Markus Doits	2018-11-07	3	-64/+78
\| \| \| \| \|
\| * \| \| \|	one more try to reduce cognitive overhead	Markus Doits	2018-11-07	1	-9/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	before: - Method `validate_retry_max` has a Cognitive Complexity of 9 (exceeds 5 allowed). Consider refactoring. - Method `validate_retry_when` has a Cognitive Complexity of 6 (exceeds 5 allowed). Consider refactoring.
\| * \| \| \|	refactor for hopefully lower cognitive complexity	Markus Doits	2018-11-07	1	-35/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	before: - Method `validate_retry` has a Cognitive Complexity of 7 (exceeds 5 allowed). Consider refactoring. - Method `validate_retry_max` has a Cognitive Complexity of 9 (exceeds 5 allowed). Consider refactoring. - Method `validate_retry_when` has a Cognitive Complexity of 14 (exceeds 5 allowed). Consider refactoring.
\| * \| \| \|	fix allowed keys validator to use correct attribute as error base?	Markus Doits	2018-11-07	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	update job config validator to validate new retry syntax	Markus Doits	2018-11-07	2	-6/+61
\| \| \| \| \|
* \| \| \| \|	Merge branch 'triggermesh-phase1-knative' into 'master'	Grzegorz Bizon	2018-11-07	2	-4/+22
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to install Knative as cluster application See merge request gitlab-org/gitlab-ce!22593
\| * \| \| \| \|	Fix double-negation	Chris Baumbauer	2018-11-06	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Refactor preinstall/postinstall methods in the helm installer	Chris Baumbauer	2018-11-06	1	-6/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Fix issue with missing knative cluster role binding, and cleanup tests	Chris Baumbauer	2018-11-05	1	-8/+16
\| \| \| \| \| \|
\| * \| \| \| \|	Resolve issues raised by Kamil	Chris Baumbauer	2018-11-03	1	-16/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into triggermesh-phase1-knative	Chris Baumbauer	2018-11-03	7	-24/+19
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into triggermesh-phase1-knative	Chris Baumbauer	2018-11-02	158	-274/+1027
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Remove comments from migration script and add usage data	Chris Baumbauer	2018-11-01	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Revert Helm version bump	Chris Baumbauer	2018-10-29	3	-5/+21
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Knative support	Chris Baumbauer	2018-10-24	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update helm version 1.7.2 -> 2.11.0	Chris Baumbauer	2018-10-24	3	-5/+22
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'dm-api-merge-requests-index-merged-at' into 'master'	Sean McGivern	2018-11-07	3	-18/+18
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose {closed,merged}_{at,by} in merge requests API index Closes #52031 See merge request gitlab-org/gitlab-ce!22806
\| * \| \| \| \| \| \| \|	Expose {closed,merged}_{at,by} in merge requests API index	Douwe Maan	2018-11-05	3	-18/+18
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '43521-keep-personal-emails-private' into 'master'	Douwe Maan	2018-11-07	1	-0/+28
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds option to override commit email Closes #43521 See merge request gitlab-org/gitlab-ce!22560
\| * \| \| \| \| \| \| \| \|	User can keep their commit email private43521-keep-personal-emails-private	Tiago Botelho	2018-11-07	1	-0/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The private commit email is automatically generated in the format: id-username@noreply.HOSTNAME GitLab instance admins are able to change the HOSTNAME portion, that defaults to Gitlab's hostname, to whatever they prefer.
* \| \| \| \| \| \| \| \| \|	Merge branch 'touchup-ci-normalizer' into 'master'	Grzegorz Bizon	2018-11-07	1	-3/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Touchup Normalizer implementation See merge request gitlab-org/gitlab-ce!22872
\| * \| \| \| \| \| \| \| \| \|	Move extracting job names outside the looptouchup-ci-normalizer	Matija Čupić	2018-11-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Return untouched hash if no job is parallelized	Matija Čupić	2018-11-07	1	-2/+4
\| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'refactor-snippets-finder' into 'master'	Douwe Maan	2018-11-07	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rewrite SnippetsFinder to improve performance Closes #52639 See merge request gitlab-org/gitlab-ce!22606
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into 'refactor-snippets-finder'refactor-snippets-finder	Douwe Maan	2018-11-06	61	-176/+265
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # spec/models/project_spec.rb
\| * \| \| \| \| \| \| \| \| \|	Rewrite SnippetsFinder to improve performance	Yorick Peterse	2018-11-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This completely rewrites the SnippetsFinder class from the ground up in order to improve its performance. The old code was beyond salvaging. It was complex, included various Rails 5 workarounds, comments that shouldn't be necessary, and most important of all: it produced a really poorly performing database query. As a result, I opted for rewriting the finder from scratch, instead of trying to patch the existing code. Instead of trying to reuse as many existing methods as possible, I opted for defining new methods specifically meant for the SnippetsFinder. This requires some extra code here and there, but allows us to have much more control over the resulting SQL queries. It is these changes that then allow us to produce a _much_ more efficient query. To illustrate how bad the old query was, we will use my own snippets as an example. Currently I have 52 snippets, most of which are global ones. To retrieve these, you would run the following Ruby code: user = User.find_by(username: 'yorickpeterse') SnippetsFinder.new(user, author: user).execute On GitLab.com the resulting query will take between 10 and 15 seconds to run, producing the query plan found at https://explain.depesz.com/s/Y5IX. Apart from the long execution time, the total number of buffers (the sum of all shared hits) is around 185 GB, though the real number is probably (hopefully) much lower as I doubt simply summing these numbers produces the true total number of buffers used. The new query's plan can be found at https://explain.depesz.com/s/wHdN, and this query takes between 10 and 100-ish milliseconds to run. The total number of buffers used is only about 30 MB. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/52639
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'	Douwe Maan	2018-11-07	4	-4/+275
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Comment on any expanded diff line on MRs See merge request gitlab-org/gitlab-ce!22398
\| * \| \| \| \| \| \| \| \| \|	Apply additional guard-clauses for unfold_required?	Oswaldo Ferreira	2018-11-06	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Comment on any expanded diff line on MRs	Oswaldo Ferreira	2018-11-06	4	-4/+274
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '21480-parallel-job-keyword-mvc' into 'master'	Grzegorz Bizon	2018-11-07	3	-6/+75
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "`parallel` job keyword MVC" Closes #21480 See merge request gitlab-org/gitlab-ce!22631
\| * \| \| \| \| \| \| \| \| \| \|	Avoid creating intersection if there's no array	Matija Čupić	2018-11-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Use instance based approach for Normalizer	Matija Čupić	2018-11-06	2	-38/+40
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Refactor Normalizer specs	Matija Čupić	2018-11-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Refactor Gitlab::Ci::Config::Normalizer	Matija Čupić	2018-11-05	2	-43/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Hash#each_with_object to manipulate job hashes.