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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Document workaround for SAST failuresdocs/sast-ds-docker-version	Achilleas Pipinellis	2019-09-06	2	-18/+20
\| \| \| \| \| \|	There's an error that occurs when the Docker version used to run the SAST job is 19.03.00, and the job will fail. Advise the users what to do in case they bump into this.
*	Merge branch 'fix-style-lint-errors-pipeline-ce' into 'master'	Filipa Lacerda	2019-09-06	4	-4/+16
\|\ \| \| \| \| \| \| \| \|	Adds backport change for pipeline.scss See merge request gitlab-org/gitlab-ce!32670
\| *	Adds backport change for pipeline.scssfix-style-lint-errors-pipeline-ce	pburdette	2019-09-04	4	-4/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds the necessary backport changes for pipeline.scss. This commit is neccessary from the changes made in MR 16135 Revert schema.rb which was automatically added will investigate
* \|	Merge branch ↵	Marcia Ramos	2019-09-06	2	-0/+19
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'66616-follow-up-documentation-for-merge-trains-cancel-when-running' into 'master' Follow up documentation for Merge Trains cancel when running Closes #66616 See merge request gitlab-org/gitlab-ce!32218
\| * \|	Follow up documentation for Merge Trains cancel when running	Sean Carroll	2019-09-06	2	-0/+19
\|/ /
* \|	Merge branch '13353-GraphQL-DesignType-event-ce' into 'master'	Jan Provaznik	2019-09-06	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	CE backport for gitlab-org/gitlab-ee!15561 (Expose new GraphQL `event` field for `DesignType`) See merge request gitlab-org/gitlab-ce!32249
\| * \|	CE-specific changes for GraphQL DesignType `event`13353-GraphQL-DesignType-event-ce	Luke Duncalfe	2019-09-06	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15561 https://gitlab.com/gitlab-org/gitlab-ee/issues/12705 https://gitlab.com/gitlab-org/gitlab-ee/issues/13353
* \| \|	Merge branch 'use_default_external_auth_label_empty' into 'master'	Thong Kuah	2019-09-06	3	-1/+32
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent empty external authorization classification labels from overriding default label Closes #66617 See merge request gitlab-org/gitlab-ce!32517
\| * \| \|	Stop empty external auth classification labels overriding default labels	Will Chandler	2019-09-06	3	-1/+32
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Most of the project templates bundled with GitLab have an empty string set for `external_authorization_classification_label` in their `project.json`. When imported this overrides the default label set on the instance, causing the label to appear empty. This change sets empty labels to nil during import, allowing the default label to override it and be applied to the project.
* \| \|	Merge branch 'revert-351d72cb' into 'master'	Lin Jen-Shin	2019-09-06	14	-280/+73
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '66596-allow-danger-to-be-run-locally' into 'master'" See merge request gitlab-org/gitlab-ce!32741
\| * \| \|	Revert "Merge branch '66596-allow-danger-to-be-run-locally' into 'master'"revert-351d72cb	Ash McKenzie	2019-09-06	14	-280/+73
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !32196
* \| \| \|	Merge branch 'winh-fix-flaky-dashboard_spec' into 'master'	Kushal Pandya	2019-09-06	3	-194/+190
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move monitoring dashboard_spec to Jest Closes #66922 See merge request gitlab-org/gitlab-ce!32571
\| * \| \| \|	Move monitoring dashboard_spec to Jest	Winnie Hellmann	2019-09-06	3	-194/+190
\|/ / / /
* \| \| \|	Merge branch ↵	Jan Provaznik	2019-09-06	5	-0/+79
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'59729-estimate-quick-action-does-not-produce-correct-time-for-1mo' into 'master' Resolve "estimate quick action does not produce correct time for 1mo" See merge request gitlab-org/gitlab-ce!32165
\| * \| \| \|	Fix time tracking parsing of months59729-estimate-quick-action-does-not-produce-correct-time-for-1mo	Heinrich Lee Yu	2019-09-05	5	-0/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Patches ChronicDuration to use our custom conversions when parsing months
* \| \| \| \|	Merge branch 'add-docs-for-srv-handling' into 'master'	Thong Kuah	2019-09-06	1	-1/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port: Document SRV handling for DB load balancing See merge request gitlab-org/gitlab-ce!32539
\| * \| \| \| \|	Document DB load balancing SRV records handlingadd-docs-for-srv-handling	Ahmad Sherif	2019-09-05	1	-1/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'update-docs-spotbugs-java-11' into 'master'	Achilleas Pipinellis	2019-09-06	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document Spotbugs Java version See merge request gitlab-org/gitlab-ce!32627
\| * \| \| \| \| \|	Document Spotbugs Java version	Cameron Swords	2019-09-06	1	-0/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs-merge-examples-with-features' into 'master'	Achilleas Pipinellis	2019-09-06	3	-167/+165
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge browser performance testing docs together See merge request gitlab-org/gitlab-ce!32693
\| * \| \| \| \|	Merge browser performance testing docs together	Marcel Amirault	2019-09-06	3	-167/+165
\|/ / / / /
* \| \| \| \|	Merge branch '66596-allow-danger-to-be-run-locally' into 'master'	Lin Jen-Shin	2019-09-06	14	-73/+280
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Break up Danger rules into local or CI only See merge request gitlab-org/gitlab-ce!32196
\| * \| \| \| \|	Update some Danger rules to not rely upon CI66596-allow-danger-to-be-run-locally	Ash McKenzie	2019-09-06	7	-55/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert a bunch of Danger rules so they can run locally.
\| * \| \| \| \|	Add new danger_local Rake task	Ash McKenzie	2019-09-06	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The benefit of running the danger_local Rake task is that it displays some informational messages for clarity and also exits with 1 if there's any output.
\| * \| \| \| \|	Use GitlabDanger class when determining rules	Ash McKenzie	2019-09-06	1	-17/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Include danger gem in development group	Ash McKenzie	2019-09-06	2	-0/+34
\| \| \| \| \| \|
\| * \| \| \| \|	Add new GitlabDanger class	Ash McKenzie	2019-09-06	2	-0/+130
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This class encapsulates our use of the Danger gem.
\| * \| \| \| \|	Allow Danger to detect if running local	Ash McKenzie	2019-09-06	1	-1/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs-graphql-enums' into 'master'	Evan Read	2019-09-06	1	-0/+45
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document our GraphQL Enum standards See merge request gitlab-org/gitlab-ce!32678
\| * \| \| \| \| \|	Document our GraphQL Enum standards	Luke Duncalfe	2019-09-06	1	-0/+45
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/67012
* \| \| \| \| \|	Merge branch 'docs/add-introduced-version' into 'master'	Evan Read	2019-09-06	1	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs required version for mirroring status See merge request gitlab-org/gitlab-ce!32691
\| * \| \| \| \| \|	Add docs required version for mirroring status	Steve Azzopardi	2019-09-06	1	-0/+2
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs-followup-66309' into 'master'	Evan Read	2019-09-06	2	-6/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change introduced style for better rendering Closes #66309 See merge request gitlab-org/gitlab-ce!32690
\| * \| \| \| \| \|	Change introduced style for better rendering	Marcel Amirault	2019-09-06	2	-6/+9
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'dblessing-update-arch-diag' into 'master'	Evan Read	2019-09-06	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Sidekiq in architecture diagram See merge request gitlab-org/gitlab-ce!32673
\| * \| \| \| \| \|	Update Sidekiq in architecture diagramdblessing-update-arch-diag	Drew Blessing	2019-09-04	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-markdownlint-error' into 'master'	Evan Read	2019-09-06	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove trailing whitespace from applications.md See merge request gitlab-org/gitlab-ce!32726
\| * \| \| \| \| \| \|	Remove trailing whitespace from applications.md	Paul Gascou-Vaillancourt	2019-09-05	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'add-label-push-opts' into 'master'	Ash McKenzie	2019-09-06	9	-16/+234
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support adding and removing labels w/ push opts Closes #5942 See merge request gitlab-org/gitlab-ce!31831
\| * \| \| \| \| \| \|	Simplify filter_labels method in IssuableBaseServiceadd-label-push-opts	Christian Couder	2019-09-04	1	-15/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	IssuableBaseService::filter_labels() has been refactored to call a new `label_ids_to_filter` method.
\| * \| \| \| \| \| \|	Avoid creating labels when removing them	Christian Couder	2019-09-04	3	-6/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	IssuableBaseService has been updated so that labels are not created when push options to remove them are received.
\| * \| \| \| \| \| \|	Support adding and removing labels w/ push opts	Christian Couder	2019-09-04	8	-8/+230
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MergeRequests::PushOptionsHandlerService has been updated to allow adding and removing labels to a merge request using git push options. To create a new merge request and add 2 labels to it: git push -u origin -o merge_request.create \ -o merge_request.label="My label 1" \ -o merge_request.label="My label 2" To update an existing merge request and remove a label while adding a different label: git push -u origin -o merge_request.label="My added label" \ -o merge_request.unlabel="My removed label" Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64320
* \| \| \| \| \| \| \|	Merge branch 'docs-cluster-apps-jetstack-cert-manager' into 'master'	Evan Read	2019-09-06	1	-2/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docs for cluster apps cert-manager See merge request gitlab-org/gitlab-ce!32628
\| * \| \| \| \| \| \| \|	Update docs for cert-managerdocs-cluster-apps-jetstack-cert-manager	Thong Kuah	2019-09-04	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since 5142bd738e7d, we are using the official chart now.
* \| \| \| \| \| \| \| \|	Merge branch 'TheToddLuci0-master-patch-38747' into 'master'67087-backfill-graphql-type-field-descriptions	Evan Read	2019-09-06	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update to use -e to pass environment See merge request gitlab-org/gitlab-ce!32495
\| * \| \| \| \| \| \| \|	Update to use -e as passing as	TheToddLuci0	2019-08-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"DEPRECATION WARNING: Passing the environment's name as a regular argument is deprecated and will be removed in the next Rails version. Please, use the -e option instead."
* \| \| \| \| \| \| \| \|	Merge branch 'mc-fixes-pot-failure' into 'master'	Stan Hu	2019-09-06	2	-4/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes pot failure See merge request gitlab-org/gitlab-ce!32721
\| * \| \| \| \| \| \| \|	Fixes pot failure	Mayra Cabrera	2019-09-06	2	-4/+1
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also fixes duplicated entry
* \| \| \| \| \| \| \|	Merge branch 'doc-update-database-load-balancing-log-docs' into 'master'	Evan Read	2019-09-05	2	-18/+15
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docs for database load balancing logs See merge request gitlab-org/gitlab-ce!32535
\| * \| \| \| \| \| \| \|	Update docs for database load balancing logs	Hordur Freyr Yngvason	2019-09-05	2	-18/+15
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The database load balancing docs had some mention of the logs that needed to be updated, and the logs doc had an absolute link to gitlab.com instead of a relative link to a markdown file.