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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'bw-fix-checking-disabled-services' into 'master'51761-create-new-project-auto-populate-project-slug-string-to-project-name-if-name-is-empty 34758-split-create-gcp-controller	Stan Hu	2018-10-06	2	-11/+31
\|\ \| \| \| \| \| \| \| \|	Check disabled_services when finding a service See merge request gitlab-org/gitlab-ce!22172
\| *	Check disabled_services when finding a service	Brett Walker	2018-10-06	2	-11/+31
\| \|
* \|	Merge branch '52242-ui-ux-bug-in-change-group-path' into 'master'	Douglas Barbosa Alexandre	2018-10-06	3	-2/+23
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix invalid parent path on group settings page Closes #52242 See merge request gitlab-org/gitlab-ce!22142
\| * \|	Fix invalid parent path on group settings page	Dmitriy Zaporozhets	2018-10-06	3	-2/+23
\|/ /
* \|	Merge branch 'ce-1984-frontend-for-batch-comments' into 'master'	Tim Zallmann	2018-10-06	15	-50/+123
\|\ \ \| \|/ \|/\| \| \| \| \|	Backport CE changes for: [Frontend only] Batch comments on merge requests See merge request gitlab-org/gitlab-ce!22158
\| *	Backport CE changes for: [Frontend only] Batch comments on merge requests	André Luís	2018-10-06	15	-50/+123
\|/
*	Merge branch 'add-button-to-insert-table-in-markdown' into 'master'	Clement Ho	2018-10-06	5	-2/+40
\|\ \| \| \| \| \| \| \| \|	Add button to insert table in markdown editor See merge request gitlab-org/gitlab-ce!18480
\| *	Add button to insert table in markdown editor	George Tsiolis	2018-10-06	5	-2/+40
\|/
*	Merge branch 'gitaly-0.125.0' into 'master'	Stan Hu	2018-10-06	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Bump Gitaly to v0.125.0 See merge request gitlab-org/gitlab-ce!22168
\| *	Update GITALY_SERVER_VERSION	James Lopez	2018-10-06	1	-1/+1
\| \|
* \|	Merge branch 'backport-ce-to-ee-merge' into 'master'	Stan Hu	2018-10-06	2	-6/+7
\|\ \ \| \|/ \|/\| \| \| \| \|	Backport of CE upstream - 2018-10-05 12:21 UTC See merge request gitlab-org/gitlab-ce!22154
\| *	Fix CE to EE merge (backport)	Kamil Trzciński	2018-10-05	2	-6/+7
\| \|
* \|	Merge branch 'update-operations-metrics-empty-state' into 'master'	Mike Greiling	2018-10-06	2	-9/+14
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update operations metrics empty state See merge request gitlab-org/gitlab-ce!21974
\| * \|	Update operations metrics empty state	George Tsiolis	2018-10-06	2	-9/+14
\|/ /
* \|	Merge branch 'osw-fix-lfs-images-not-rendering' into 'master'	Douglas Barbosa Alexandre	2018-10-05	10	-7/+56
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix LFS uploaded images not being rendered Closes #50617 See merge request gitlab-org/gitlab-ce!22092
\| * \|	Fix LFS uploaded images not being rendered	Oswaldo Ferreira	2018-10-05	10	-7/+56
\|/ /
* \|	Merge branch 'ee-7126-admin-projects-geo-status' into 'master'	Douglas Barbosa Alexandre	2018-10-05	2	-0/+13
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	EE Backport: enable Geo Status widget in admin/projects See merge request gitlab-org/gitlab-ce!22161
\| * \|	Prepare admin/projects/show view to allow EE specific feature	Gabriel Mazetto	2018-10-05	2	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In EE it will render a Geo Status widget when Geo is enabled and it is in a secondary node. Also added minimal specs to that action.
* \| \|	Merge branch 'autodevops-timed-incremental-rollout' into 'master'	Kamil Trzciński	2018-10-05	8	-68/+162
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add timed incremental rollout to Auto DevOps Closes gitlab-ee#7545 See merge request gitlab-org/gitlab-ce!22023
\| * \|	Add timed incremental rollout to Auto DevOps	Alessio Caiazza	2018-10-05	8	-68/+162
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Auto DevOps deployment strategies now supports timed incremental rollout. We are deprecating the usage of INCREMENTAL_ROLLOUT_ENABLED environment variable in Auto DevOps template. The new behavior will be driven by the INCREMENTAL_ROLLOUT_MODE variable that can either be manual (same as INCREMENTAL_ROLLOUT_ENABLED) or timed. Rollout deployments will be executed using a 5 minute delay between each job.
* \|	Merge branch 'fix-flacky-test-jobs-spec' into 'master'	Kamil Trzciński	2018-10-05	1	-4/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	[broken master] Fix time dependent jobs spec See merge request gitlab-org/gitlab-ce!22159
\| * \|	Fix time dependent jobs spec	Alessio Caiazza	2018-10-05	1	-4/+0
\| \| \|
* \| \|	Merge branch ↵	Sean McGivern	2018-10-05	4	-29/+52
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'43109-ci_environments_status-json-executes-more-than-100-queries' into 'master' Resolve "Controller Projects::MergeRequestsController#ci_environments_status.json executes more than 100 SQL queries" Closes #43109 See merge request gitlab-org/gitlab-ce!21996
\| * \| \|	Update spec comment to point to correct issue	Brett Walker	2018-10-05	1	-1/+1
\| \| \| \|
\| * \| \|	Don't build project services unneccesarily	Brett Walker	2018-10-04	4	-29/+52
\| \| \| \|
* \| \| \|	Merge branch 'docs/variables-doc' into 'master'	Achilleas Pipinellis	2018-10-05	1	-9/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix documentation for variables Closes #51814 See merge request gitlab-org/gitlab-ce!21943
\| * \| \| \|	Fix documentation for variables	Evan Read	2018-10-05	1	-9/+11
\|/ / / /
* \| \| \|	Merge branch ↵	Achilleas Pipinellis	2018-10-05	1	-1/+8
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'7453_document_security_and_licence_management_features_permissions-docs' into 'master' Document Security and Licence Management features permissions See merge request gitlab-org/gitlab-ce!22042
\| * \| \|	Document Security and Licence Management features permissions	Gilbert Roulot	2018-10-05	1	-1/+8
\|/ / /
* \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Bob Van Landuyt	2018-10-05	16	-39/+194
\|\ \ \
\| * \ \	Merge branch 'security-bw-confidential-titles-through-markdown-api' into ↵	Bob Van Landuyt	2018-10-05	5	-5/+62
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' [master] Confidential issue/private snippet titles can be read by unauthenticated user through GFM markdown API Closes #2706 See merge request gitlab/gitlabhq!2507
\| \| * \| \|	post_process markdown redered by API	Brett Walker	2018-09-29	5	-5/+62
\| \| \| \| \|
\| * \| \| \|	Merge branch 'security-fix-leaking-private-project-namespace' into 'master'	Bob Van Landuyt	2018-10-05	6	-33/+80
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Fix leaking private project namespace Closes #2708 See merge request gitlab/gitlabhq!2529
\| \| * \| \| \|	Filter system notes with public and private cross references	Brett Walker	2018-10-02	6	-33/+80
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'security-osw-user-info-leak-discussions' into 'master'	Bob Van Landuyt	2018-10-05	4	-1/+34
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[security - master] Filter user sensitive data from discussions JSON See merge request gitlab/gitlabhq!2536
\| \| * \| \| \| \|	Add changelog	Oswaldo Ferreira	2018-10-01	1	-0/+5
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Filter user sensitive data from discussions JSON	Oswaldo Ferreira	2018-10-01	3	-1/+29
\| \| \| \|/ / / \| \| \|/\| \| \|
\| * \| \| \| \|	Update CHANGELOG.md for 11.2.5	GitLab Release Tools Bot	2018-10-05	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \|	Update CHANGELOG.md for 11.1.8	GitLab Release Tools Bot	2018-10-05	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch ↵	Sean McGivern	2018-10-05	4	-10/+113
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'50359-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master' Resolve "ActiveRecord::StatementInvalid: PG::QueryCanceled: ERROR: canceling statement due to statement timeout" Closes #50359 See merge request gitlab-org/gitlab-ce!21893
\| * \| \| \| \| \|	Use a CTE to remove the query timeout	Brett Walker	2018-10-05	4	-10/+113
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'issue_43097' into 'master'	Sean McGivern	2018-10-05	5	-58/+66
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move related branches to service Closes #43097 See merge request gitlab-org/gitlab-ce!22094
\| * \| \| \| \| \| \|	Move issue related_branches to service	Felipe Artur	2018-10-04	5	-58/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves the related_branches method from Issue model to RelatedBranchesService
* \| \| \| \| \| \| \|	Merge branch 'ce-5987-project-templates-api' into 'master'	Robert Speicher	2018-10-05	33	-705/+756
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a new project-specific templates API endpoint See merge request gitlab-org/gitlab-ce!22118
\| * \| \| \| \| \| \| \|	Backport project template API to CE	Nick Thomas	2018-10-05	33	-705/+756
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'rails5-fix-artifacts-controller-spec' into 'master'	Kamil Trzciński	2018-10-05	2	-6/+14
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5: fix artifacts controller download spec See merge request gitlab-org/gitlab-ce!22123
\| * \| \| \| \| \| \| \| \|	Rails5: fix artifacts controller download spec	Jasper Maes	2018-10-04	2	-6/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 has params[:file_type] as '' if file_type is included as nil in the request
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-revert-broken-deploy-key-change' into 'master'	Robert Speicher	2018-10-05	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'deploy-tokens' into 'master'" Closes #52228 See merge request gitlab-org/gitlab-ce!22149
\| * \| \| \| \| \| \| \| \|	Revert "Merge branch 'deploy-tokens' into 'master'"	Stan Hu	2018-10-05	1	-2/+2
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 3df32ac1290160680473248b48d1b12c96458bf7, reversing changes made to dd1295a30f28eeb3c7058b1899e00db7943f3e54.
* \| \| \| \| \| \| \| \|	Merge branch 'scheduled-manual-jobs' into 'master'	Kamil Trzciński	2018-10-05	89	-189/+2159
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delayed jobs Closes #51352 See merge request gitlab-org/gitlab-ce!21767