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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Improve variables supportimprove-variables-support	Kamil Trzciński	2018-11-19	2	-2/+6
\| \| \| \| \| \|	This ensures that variables accept only string, alongside also improves kubernetes_namespace, improving validation and default value being set.
*	Merge branch 'osw-fallback-on-blank-refs' into 'master'	Grzegorz Bizon	2018-11-15	1	-1/+9
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Avoid Gitaly RPC errors when fetching diff stats Closes gitaly#1393 See merge request gitlab-org/gitlab-ce!22995
\| *	Avoid Gitaly RPC errors when fetching diff statsosw-fallback-on-blank-refs	Oswaldo Ferreira	2018-11-14	1	-1/+9
\| \|
* \|	Merge branch 'auto_devops_kubernetes_active' into 'master'	Grzegorz Bizon	2018-11-15	1	-10/+16
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Switch kubernetes:active with checking $KUBECONFIG Closes gitlab-ee#8311 See merge request gitlab-org/gitlab-ce!22929
\| * \|	Use except:variables to fix multiple variable jobsauto_devops_kubernetes_active	Thong Kuah	2018-11-09	1	-20/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As `only:variables` has the effect of being satisfied by any one of variable expression - this will create a situation where e.g. the dast job will be active even if there's no cluster. So use `except:variables which requires each and every variable expression to be satisfied.
\| * \|	Switch kubernetes:active with checking $KUBECONFIG	Thong Kuah	2018-11-09	1	-10/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have found an issue with `kubernetes:active` where it doesn't work with multiple clusters. Switch with the similar $KUBECONFIG variable check but this check actually gets the variable from the cluster matching the environment name. Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/8311
* \| \|	Track Kubernetes errors using Sentry	Dylan Griffith	2018-11-14	1	-3/+11
\| \| \|
* \| \|	Merge branch 'patch-31' into 'master'	Rémy Coutable	2018-11-14	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update comment in Auto-DevOps.gitlab-ci.yml See merge request gitlab-org/gitlab-ce!23013
\| * \| \|	Update Auto-DevOps.gitlab-ci.yml	Tripple Moon	2018-11-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Typo in comment INCREMENTAL_ROLLOUT_TYPE => INCREMENTAL_ROLLOUT_MODE
* \| \| \|	Show HTTP response code for Kubernetes errors	Thong Kuah	2018-11-13	2	-16/+6
\| \| \| \|
* \| \| \|	Merge branch 'zj-remove-broken-storage' into 'master'	Douwe Maan	2018-11-13	1	-37/+0
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Remove obsolete gitlab_shell checks See merge request gitlab-org/gitlab-ce!22417
\| * \| \|	Migrate storage checks to Gitaly	Zeger-Jan van de Weg	2018-11-09	1	-37/+0
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Most of these checks are not valuable in the current setup, thus removed and replaced by Gitaly checking if its read and writeable. Depends on: 1. https://gitlab.com/gitlab-org/gitaly/merge_requests/675
* \| \|	Merge branch 'ashmckenzie/hmac-token-decode-and-tests' into 'master'	Stan Hu	2018-11-13	2	-2/+35
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Relocate JSONWebToken::HMACToken from EE See merge request gitlab-org/gitlab-ce!22906
\| * \| \|	Relocate JSONWebToken::HMACToken from EEashmckenzie/hmac-token-decode-and-tests	Ash McKenzie	2018-11-13	2	-2/+35
\| \| \| \|
* \| \| \|	Merge branch 'ce-3777-promote-to-epic' into 'master'	Rémy Coutable	2018-11-12	4	-19/+30
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactoring Issues::MoveService (port of promote epics) See merge request gitlab-org/gitlab-ce!22766
\| * \| \| \|	Extract code from Issues::MoveServicece-3777-promote-to-epic	Jarka Košanová	2018-11-12	4	-19/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract code to make it easier reusable - introduce AttributesRewriter and ContentRewriter - support group entites when rewriting content - make Uploader copy_to working for Namespaces
* \| \| \| \|	Merge branch 'sh-53180-append-path' into 'master'	Rémy Coutable	2018-11-12	5	-22/+10
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure there's only one slash as path separator Closes #53180 See merge request gitlab-org/gitlab-ce!22954
\| * \| \| \|	Make sure there's only one slash as path separatorsh-53180-append-path	Stan Hu	2018-11-09	5	-22/+10
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In Ruby 2.4, `URI.join("http://test//", "a").to_s` will remove the double slash, however it's not the case in Ruby 2.5. Using chomp should work better for the intention, as we're not trying to allow things like ../ or / paths resolution. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53180
* \| \| \|	Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'	Douwe Maan	2018-11-12	4	-4/+275
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Comment on any expanded diff line on MRs (with feature-flag) Closes #13950 See merge request gitlab-org/gitlab-ce!22914
\| * \| \| \|	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
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'patch-31' into 'master'	Stan Hu	2018-11-12	1	-1/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set an empty entrypoint for license_management job Closes #53786 See merge request gitlab-org/gitlab-ce!22955
\| * \| \| \|	Set an empty entrypoint for license_management job	Philippe Lafoucrière	2018-11-10	1	-1/+3
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'blackst0ne-add-discord-service' into 'master'	Sean McGivern	2018-11-12	1	-0/+9
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Discord integration Closes #21635 See merge request gitlab-org/gitlab-ce!22684
\| * \| \|	Add Discord integration	blackst0ne	2018-10-30	1	-0/+9
\| \| \| \|
* \| \| \|	Remove circular dependency on Redactable in migration	Stan Hu	2018-11-09	2	-17/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitlab::BackgroundMigration::RedactLinks was prepending EE::Gitlab::BackgroundMigration::RedactLinks, while EE::Gitlab::BackgroundMigration::RedactLinks was trying to include Gitlab::BackgroundMigration::RedactLinks::Redactable. Ruby 2.5.3 failed with an uninitialized constant (https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/118388511).
* \| \| \|	Merge branch 'rs-cherry-pick-api' into 'master'	Nick Thomas	2018-11-09	1	-3/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve possible cherry pick API race condition Closes #53773 See merge request gitlab-org/gitlab-ce!22946
\| * \| \| \|	Resolve possible cherry pick API race conditionrs-cherry-pick-api	Robert Speicher	2018-11-09	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, we just fetched the latest commit for the given branch when presenting the resulting commit, but because something could have been committed to that branch between the time we cherry-picked and the time we render the result, the wrong commit could have been presented. Now, we fetch the commit object with the commit SHA returned by the commit change service, which should always be the correct commit. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53773
* \| \| \| \|	Merge branch 'frozen-string-lib-gitlab-more' into 'master'	Rémy Coutable	2018-11-09	101	-5/+209
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable even more frozen string in lib/gitlab See merge request gitlab-org/gitlab-ce!22863
\| * \| \| \| \|	Enable even more frozen string in lib/gitlab	gfyoung	2018-11-06	101	-5/+209
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enables frozens string for the following: * lib/gitlab/conflict/*/.rb * lib/gitlab/cross_project_access/*/.rb * lib/gitlab/cycle_analytics/*/.rb * lib/gitlab/data_builder/*/.rb * lib/gitlab/database/*/.rb * lib/gitlab/dependency_linker/*/.rb * lib/gitlab/diff/*/.rb * lib/gitlab/downtime_check/*/.rb * lib/gitlab/email/*/.rb * lib/gitlab/etag_caching/*/.rb Partially addresses gitlab-org/gitlab-ce#47424.
* \| \| \| \| \|	Merge branch 'rs-revert-api' into 'master'	Nick Thomas	2018-11-09	1	-0/+34
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add revert to commits API Closes gitlab-org/release/framework#48 See merge request gitlab-org/gitlab-ce!22919
\| * \| \| \| \|	Add revert to commits API	Robert Speicher	2018-11-09	1	-0/+34
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Improve Debugging Capabilities For Helm Application Installs	Dylan Griffith	2018-11-09	4	-7/+7
\|/ / / /
* \| \| \|	Limit parallel to 100limit-parallel-to-100	Kamil Trzciński	2018-11-08	1	-1/+2
\| \|_\|/ \|/\| \| \| \| \| \| \| \|	This prevents some of the abusive behaviors, of someone putting 100000 and creating out of memory condition easily
* \| \|	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.