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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove some duplicate tests and fix some typosqa-314-project-tests-cleanup	sliaquat	2018-08-16	4	-114/+6
\|
*	Merge branch 'workhorse-6.0.0' into 'master'	Douwe Maan	2018-08-16	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Use gitlab-workhorse 6.0.0 See merge request gitlab-org/gitlab-ce!21239
\| *	Use gitlab-workhorse 6.0.0workhorse-6.0.0	Jacob Vosmaer	2018-08-16	1	-1/+1
\| \|
* \|	Merge branch '50101-empty-state-component' into 'master'	Phil Hughes	2018-08-16	3	-0/+171
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Creates empty state component for job log view See merge request gitlab-org/gitlab-ce!21195
\| * \|	Creates empty state component for job log view	Filipa Lacerda	2018-08-16	3	-0/+171
\|/ /
* \|	Merge branch 'ide-job-top-bar-ui-polish' into 'master'	Filipa Lacerda	2018-08-16	2	-0/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improved padding of top bar in IDE job trace panel Closes #48059 See merge request gitlab-org/gitlab-ce!21222
\| * \|	Improved padding of top bar in IDE job trace panelide-job-top-bar-ui-polish	Phil Hughes	2018-08-15	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #48059
* \| \|	Merge branch 'docs-processes' into 'master'	Marcia Ramos	2018-08-16	8	-72/+509
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation process at GitLab Closes #46843 See merge request gitlab-org/gitlab-ce!19902
\| * \|	Documentation process at GitLab	Marcia Ramos	2018-08-16	8	-72/+509
\|/ /
* \|	Merge branch 'zj-remove-flags-find-all-brances' into 'master'50326-ocd-pipeline	Sean McGivern	2018-08-16	1	-28/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove feature flag for FindAllRemoteBranches Closes gitaly#1243 See merge request gitlab-org/gitlab-ce!21234
\| * \|	Remove feature flag for FindAllRemoteBranches	Zeger-Jan van de Weg	2018-08-16	1	-28/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Acceptance testing done through: https://gitlab.com/gitlab-org/gitaly/issues/1312 Relatively short AT period, but given its not a hard RPC, nor anything funky is going on, I felt that this was decent enough to remove the feature flag. Closes https://gitlab.com/gitlab-org/gitaly/issues/1243
* \| \|	Merge branch 'ide-delete-new-files-state' into 'master'	Filipa Lacerda	2018-08-16	3	-1/+38
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed deleting new files creating wrong state in IDE Closes #50255 See merge request gitlab-org/gitlab-ce!21225
\| * \| \|	Fixed deleting new files creating wrong state in IDEide-delete-new-files-state	Phil Hughes	2018-08-15	3	-1/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #50255
* \| \| \|	Merge branch 'master' into 'master'	Stan Hu	2018-08-16	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added missing html_safe on text messages. See merge request gitlab-org/gitlab-ce!21232
\| * \| \| \|	Added missing html_safe on text messages.	Alexander Kutelev	2018-08-16	1	-2/+2
\|/ / / /
* \| \| \|	Merge branch 'frozen-string-enable-app-mailers' into 'master'	Stan Hu	2018-08-15	19	-12/+56
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable frozen in app/mailers/*/.rb See merge request gitlab-org/gitlab-ce!21147
\| * \| \| \|	Enable frozen in app/mailers/*/.rb	gfyoung	2018-08-15	19	-12/+56
\|/ / / /
* \| \| \|	Merge branch 'zj-feature-flag' into 'master'50200-change-diagram-in-ha-infrastructure-gitlab-documentation-gitlab-university-high-availability-on-aws	Robert Speicher	2018-08-15	3	-2/+135
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Acceptance testing issue template See merge request gitlab-org/gitlab-ce!21156
\| * \| \| \|	Add Acceptance testing issue template	Zeger-Jan van de Weg	2018-08-15	3	-2/+135
\|/ / / /
* \| \| \|	Merge branch 'backport-5986-license-templates' into 'master'	Robert Speicher	2018-08-15	14	-42/+277
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Core backports from the Premium license templates feature See merge request gitlab-org/gitlab-ce!21212
\| * \| \| \|	Changes /admin/application_settings to support template repository selection ↵	Nick Thomas	2018-08-15	2	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in EE
\| * \| \| \|	Allow the project_select_tag to specify an initial value and for the ↵	Nick Thomas	2018-08-15	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	selection to be clear-able
\| * \| \| \|	Convert the license template API to use the new LicenseTemplateFinder	Nick Thomas	2018-08-15	3	-31/+18
\| \| \| \| \|
\| * \| \| \|	Convert BlobHelper#licenses_for_select to use the new LicenseTemplateFinder	Nick Thomas	2018-08-15	1	-5/+7
\| \| \| \| \|
\| * \| \| \|	Introduce a LicenseTemplate model and LicenseTemplateFinder helper	Nick Thomas	2018-08-15	4	-0/+197
\| \| \| \| \|
\| * \| \| \|	Fix bugs in Gitlab::Template::Finders preventing instances from ↵	Nick Thomas	2018-08-14	3	-6/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BaseTemplate.all from loading content
* \| \| \| \|	Merge branch 'n8rzz/consolidate-specs-testing-emoji-awards' into 'master'	Robert Speicher	2018-08-15	5	-369/+353
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Duplicate specs testing emoji awards on issues Closes #45238 See merge request gitlab-org/gitlab-ce!21126
\| * \| \| \| \|	Combines emoji award spec files into single ↵	Nate Geslin	2018-08-14	5	-369/+353
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	user_interacts_with_awards_in_issue_spec Closes: #45238
* \| \| \| \| \|	Merge branch 'backport-author-link-style' into 'master'	Phil Hughes	2018-08-15	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add author-link style from common.scss in EE See merge request gitlab-org/gitlab-ce!21204
\| * \| \| \| \| \|	Add author-link style from common.scss in EE	Annabel Dunstone Gray	2018-08-14	1	-0/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'ab-49788-reduce-model-instances-in-test' into 'master'	Sean McGivern	2018-08-15	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce number of model instances needed in test. Closes #49788 See merge request gitlab-org/gitlab-ce!21192
\| * \| \| \| \| \| \|	Reduce number of model instances needed in test.	Andreas Brandl	2018-08-15	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #49788.
* \| \| \| \| \| \| \|	Merge branch 'bvl-add-czech' into 'master'	Sean McGivern	2018-08-15	2	-1/+7
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Czech as an available language Closes #43227 See merge request gitlab-org/gitlab-ce!21201
\| * \| \| \| \| \| \|	Add Czech as an available language	Bob Van Landuyt	2018-08-15	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New translations added to `locale/cs_CZ` will automatically be picked up.
* \| \| \| \| \| \| \|	Merge branch 'docs-junit-test-reports' into 'master'	Marcia Ramos	2018-08-15	6	-2/+154
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation for JUnit XML Test Summary In MR widget Closes #49867 See merge request gitlab-org/gitlab-ce!21061
\| * \| \| \| \| \| \| \|	Documentation for JUnit XML Test Summary In MR widget	Shinya Maeda	2018-08-15	6	-2/+154
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'port-i18n-for-mirrors-instructions' into 'master'	Douwe Maan	2018-08-15	2	-4/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port EE changes for mirrors/_instructions.html.haml See merge request gitlab-org/gitlab-ce!21107
\| * \| \| \| \| \| \|	regenerate .pot	Luke Bennett	2018-08-14	1	-3/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into 'port-i18n-for-mirrors-instructions'	Lin Jen-Shin	2018-08-10	133	-853/+2135
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/projects/mirrors/_instructions.html.haml
\| * \| \| \| \| \| \| \|	Update gitlab.pot	Lin Jen-Shin	2018-08-09	1	-0/+12
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Port EE changes	Lin Jen-Shin	2018-08-09	1	-7/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'add-user_show_add_ssh_key_message-application-setting' into ↵	Nick Thomas	2018-08-15	11	-6/+79
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add a "user_show_add_ssh_key_message" application setting for use with SSH certificates Closes #49953 See merge request gitlab-org/gitlab-ce!21027
\| * \| \| \| \| \| \| \| \|	Add ability suppress the global "You won't be able [use] SSH" message	Ævar Arnfjörð Bjarmason	2018-08-08	11	-6/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes gitlab-org/gitlab-ce#49953, as noted in the documentation this feature is intended to be used when SSH certificates are enabled. Then this warning becomes not only pointless, but also misleading. This builds on top of gitlab-org/gitlab-ce!21009 since both need to modify the same documentation, which avoids a merge conflict. See also the gitlab-org/gitlab-ce#49218 issue and associated merge request.
* \| \| \| \| \| \| \| \| \|	Merge branch '6541-custom-favicons-not-being-replicated-by-geo' into 'master'	Nick Thomas	2018-08-15	2	-0/+9
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6860 See merge request gitlab-org/gitlab-ce!21200
\| * \| \| \| \| \| \| \| \|	Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6860	Valery Sizov	2018-08-14	2	-0/+9
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '50101-aritfacts-block' into 'master'50193-enable-auto-devops-instance-wide-on-gitlab-com	Phil Hughes	2018-08-15	4	-0/+241
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creates vue component for artifacts block See merge request gitlab-org/gitlab-ce!21198
\| * \| \| \| \| \| \| \| \| \|	Creates vue component for artifacts block	Filipa Lacerda	2018-08-15	4	-0/+241
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs-update-system-hooks-api' into 'master'	Sean McGivern	2018-08-15	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	chore(docs): add field repository_update_events See merge request gitlab-org/gitlab-ce!21205
\| * \| \| \| \| \| \| \| \| \|	chore(docs): add field repository_update_events	Jens Goldhammer	2018-08-14	1	-1/+4
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- adds the field repository_update_events as json field
* \| \| \| \| \| \| \| \| \|	Merge branch 'mk/bump-rainbow-gem' into 'master'	James Lopez	2018-08-15	6	-12/+17
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix `bin/secpick` rainbow gem error, and security branch prefixing See merge request gitlab-org/gitlab-ce!21210