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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'deploy-keys-ext' into 'master'	Filipa Lacerda	2019-03-08	5	-19/+58
\|\ \| \| \| \| \| \| \| \|	Externalize admin deploy keys strings See merge request gitlab-org/gitlab-ce!24712
\| *	Externalize admin deploy keys strings	Luke Bennett	2019-03-08	5	-19/+58
\| \| \| \| \| \| \| \| \| \| \| \|	Externalizes most strings in the deploy key settings of the admin area.
* \|	Merge branch 'ce-billings-gold-trial-callout-fe-dashboard' into 'master'	Sean McGivern	2019-03-08	11	-11/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	CE FE Refactor dashboard gold trial callouts See merge request gitlab-org/gitlab-ce!25483
\| * \|	Refactor dashboard gold trial callouts	Luke Bennett	2019-03-06	11	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uses new gold trial helper method to render a gold trial callout on user dashboards.
* \| \|	Merge branch '56864-reopen-locked-mr' into 'master'	Sean McGivern	2019-03-08	9	-6/+68
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disallow reopening of locked merge request Closes #56864 See merge request gitlab-org/gitlab-ce!24882
\| * \| \|	Disallow reopening of locked merge requests	Jan Beckmann	2019-03-08	9	-6/+68
\|/ / / \| \| \| \| \| \| \| \| \|	Fixes #56864
* \| \|	Merge branch '4925-open-issues-based-on-prometheus-alerts-controller-ce' ↵	Kamil Trzciński	2019-03-08	1	-5/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Remove unnecessary license check in operations controller See merge request gitlab-org/gitlab-ce!25728
\| * \| \|	Remove unnecessary license check in operations controller	Reuben Pereira	2019-03-08	1	-5/+0
\|/ / /
* \| \|	Merge branch '58649-project-template-for-android' into 'master'	Sean McGivern	2019-03-08	6	-0/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Project template for Android" Closes #58649 See merge request gitlab-org/gitlab-ce!25870
\| * \| \|	Reorder localized strings	Jason Lenny	2019-03-07	1	-2/+2
\| \| \| \|
\| * \| \|	Merge branch '58649-project-template-for-android' of ↵	Jason Lenny	2019-03-07	0	-0/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce into 58649-project-template-for-android
\| \| * \ \	Merge branch '58649-project-template-for-android' of ↵	Jason Lenny	2019-03-07	0	-0/+0
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce into 58649-project-template-for-android
\| \| \| * \| \|	Add Android template	Jason Lenny	2019-03-07	6	-0/+14
\| \| \| \| \| \|
\| \| * \| \| \|	Add Android template	Jason Lenny	2019-03-07	6	-0/+14
\| \| \| \| \| \|
\| * \| \| \| \|	Add Android template	Jason Lenny	2019-03-07	6	-0/+14
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'skip-visual-master' into 'master'	Kushal Pandya	2019-03-08	1	-0/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip visual test in master branch See merge request gitlab-org/gitlab-ce!25907
\| * \| \| \| \|	Skip visual test in master branch	Clement Ho	2019-03-08	1	-0/+2
\|/ / / / /
* \| \| \| \|	Merge branch 'remove-select2-rails' into 'master'	Mike Greiling	2019-03-08	3	-4/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove select2-rails (select2 is now installed via yarn) Closes #36711 See merge request gitlab-org/gitlab-ce!17871
\| * \| \| \| \|	remove select2-rails (select2 is now installed via yarn)	Praveen Arimbrathodiyil	2019-03-08	3	-4/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'ingress-hostnames' into 'master'	Mike Greiling	2019-03-08	30	-154/+234
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for ingress hostnames Closes #58244, #56158, and #46691 See merge request gitlab-org/gitlab-ce!25181
\| * \| \| \| \|	Add support for ingress hostnamesingress-hostnames	walkafwalka	2019-03-07	30	-154/+234
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs/minor-ci-landing-restructure' into 'master'	Mike Lewis	2019-03-08	1	-59/+45
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor CI/CD landing page from feedback See merge request gitlab-org/gitlab-ce!25905
\| * \| \| \| \| \|	Refactor CI/CD landing page from feedback	Evan Read	2019-03-08	1	-59/+45
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'vzagorodny-follow-up-sec-products-vendored-templates-ce' into ↵	Stan Hu	2019-03-08	5	-3/+178
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Vendored templates for security products EE (follow-up after Dependency Scanning template) See merge request gitlab-org/gitlab-ce!25888
\| * \| \| \| \| \|	Use vendored templates for Sec Products	Victor Zagorodny	2019-03-08	5	-3/+178
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Dependency Scanning and add other templates
* \| \| \| \| \|	Merge branch 'docs/add-new-ci-resources' into 'master'	Mike Lewis	2019-03-08	9	-128/+113
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add and restructure external resources and examples Closes #58041 See merge request gitlab-org/gitlab-ce!25588
\| * \| \| \| \| \|	Adds new resources for CI to the documentation suite	Evan Read	2019-03-08	9	-128/+113
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also refactors and combines resources and examples.
* \| \| \| \| \|	Merge branch 'sh-clarify-rugged-feature-flag-docs' into 'master'	Evan Read	2019-03-08	1	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify Rugged direct access only available in GitLab 11.9 See merge request gitlab-org/gitlab-ce!25887
\| * \| \| \| \| \|	Clarify Rugged direct access only available in GitLab 11.9	Stan Hu	2019-03-07	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Until we solve https://gitlab.com/gitlab-com/gitlab-docs/issues/347, let's just be explicit to avoid confusion.
* \| \| \| \| \| \|	Merge branch '9224-create-mr-from-vulnerabilty-feedback-fe' into 'master'	Luke Bennett	2019-03-08	1	-2/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes split button styling in modal footers (CE port) See merge request gitlab-org/gitlab-ce!25869
\| * \| \| \| \| \| \|	Fixes split button styling in modal footers	samdbeckham	2019-03-07	1	-2/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'adriel-add-ci-visual-skip-trigger' into 'master'	Clement Ho	2019-03-08	1	-0/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow skip trigger for gitlab:ui:visual Closes gitlab-ui#198 See merge request gitlab-org/gitlab-ce!25894
\| * \| \| \| \| \| \| \|	Allow skip trigger for gitlab:ui:visual	Adriel Santiago	2019-03-08	1	-0/+3
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By adding [skip visual] to the commit message the gitlab:ui:visual test can be skipped. This is needed to avoid deadlock situations as exhibited in https://gitlab.com/gitlab-org/gitlab-ui/issues/198
* \| \| \| \| \| \| \|	Merge branch 'docs/add-missing-keywords' into 'master'	Mike Lewis	2019-03-08	2	-196/+309
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing keywords Closes #51675 See merge request gitlab-org/gitlab-ce!25444
\| * \| \| \| \| \| \| \|	Add missing keywords	Evan Read	2019-03-08	2	-196/+309
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also refactors structure of the page to make the first section more useful.
* \| \| \| \| \| \| \|	Merge branch 'id-1951-filter-merge-requests-by-approvers' into 'master'	Mike Greiling	2019-03-07	16	-600/+713
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide ee backports related to approver filtering See merge request gitlab-org/gitlab-ce!25876
\| * \| \| \| \| \| \| \|	Provide EE backports for filtering by approver feature	Igor	2019-03-07	16	-600/+713
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds custom validator for ArrayNoneAny param Extracts some logic in js into separate files
* \| \| \| \| \| \| \|	Merge branch 'docs-ci-getting-started' into 'master'	Mike Lewis	2019-03-07	7	-31/+216
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Introduction to continuous methods and GitLab CI/CD Closes #58394 See merge request gitlab-org/gitlab-ce!25611
\| * \| \| \| \| \| \| \|	Add up-to-date illustations	Marcia Ramos	2019-03-07	7	-31/+216
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Pipeline status - Job running - Rollback button
* \| \| \| \| \| \| \|	Merge branch 'revert-1c706c68' into 'master'	Stan Hu	2019-03-07	3	-7/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'sh-show-pre-receive-error-merge' into 'master'" See merge request gitlab-org/gitlab-ce!25895
\| * \| \| \| \| \| \| \|	Revert "Merge branch 'sh-show-pre-receive-error-merge' into 'master'"	Luke Duncalfe	2019-03-08	3	-7/+3
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !25708
* \| \| \| \| \| \| \|	Merge branch 'gitaly-version-v1.26.0' into 'master'	Stan Hu	2019-03-07	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Gitaly to v1.26.0 See merge request gitlab-org/gitlab-ce!25890
\| * \| \| \| \| \| \|	Upgrade Gitaly to v1.26.0	GitalyBot	2019-03-07	2	-1/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch ↵	Fatih Acet	2019-03-07	1	-1/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'58304-extend-the-snowplow-event-tracking-documentation-with-a-testing-section' into 'master' Resolve "Extend the "Snowplow event tracking" documentation with a "testing" section" See merge request gitlab-org/gitlab-ce!25612
\| * \| \| \| \| \| \|	Resolve "Extend the "Snowplow event tracking" documentation with a "testing" ↵	Martin Wortschack	2019-03-07	1	-1/+18
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	section"
* \| \| \| \| \| \|	Merge branch 'reply-to-comment-documentation' into 'master'	Mike Lewis	2019-03-07	1	-18/+21
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Created documentation for replying to comments See merge request gitlab-org/gitlab-ce!25633
\| * \ \ \ \ \ \	Merge branch 'master' into 'reply-to-comment-documentation'reply-to-comment-documentation	Mike Lewis	2019-03-07	2922	-11938/+55015
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # doc/user/discussions/index.md
\| * \| \| \| \| \| \|	Clarifications to email section in intro	Mike Lewis	2019-03-07	1	-4/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rephrase resolvable comments section	Mike Lewis	2019-03-07	1	-7/+9
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Standardize further on standard comments	Mike Lewis	2019-03-07	1	-2/+2
\| \| \| \| \| \| \| \|