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

	Commit message (Collapse)	Author	Age	Files	Lines
*	add inline badges to auto devops feature listdocs-add-inline-badges-autodevops	Marcia Ramos	2018-06-22	1	-6/+6
\|
*	Merge branch 'docs-squash-merge-heading' into 'master'	Marcia Ramos	2018-06-22	1	-3/+3
\|\ \| \| \| \| \| \| \| \|	Update squash_and_merge.md to fix link and description See merge request gitlab-org/gitlab-ce!20093
\| *	Update squash_and_merge.md to fix link and description	Marcel Amirault	2018-06-22	1	-3/+3
\|/ \| \|	(cherry picked from commit b5ea33397eb8d2c874662026b0e36aed7c41dbbc)
*	Merge branch 'docs/api-runners-ip' into 'master'	Marcia Ramos	2018-06-22	1	-0/+12
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add ip_address to json examples in Runner API docs Closes #47973 See merge request gitlab-org/gitlab-ce!20092
\| *	Add ip_address to json examples in Runner API docs	Achilleas Pipinellis	2018-06-22	1	-0/+12
\| \|
* \|	Merge branch 'zj-ls-files-mandatory' into 'master'	Douwe Maan	2018-06-22	1	-34/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Git ls files is Gitaly only now Closes #47893 and gitaly#327 See merge request gitlab-org/gitlab-ce!20088
\| *	Git ls files is Gitaly only now	Zeger-Jan van de Weg	2018-06-22	1	-34/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved to the front on the line through: https://gitlab.com/gitlab-org/gitlab-ce/issues/47893 Closes: https://gitlab.com/gitlab-org/gitlab-ce/issues/47893 Closes: https://gitlab.com/gitlab-org/gitaly/issues/327
* \|	Merge branch 'unify-redis_shared_examples.rb' into 'master'	Sean McGivern	2018-06-22	1	-1/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Unify spec/support/redis/redis_shared_examples.rb See merge request gitlab-org/gitlab-ce!20074
\| * \|	Bring changes from EEunify-redis_shared_examples.rb	Lin Jen-Shin	2018-06-21	1	-1/+8
\| \| \|
* \| \|	Merge branch 'docs/autodevops-k8s' into 'master'	Marcia Ramos	2018-06-22	30	-159/+308
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document end to end flow for Kubernetes and Auto DevOps Closes #44455 See merge request gitlab-org/gitlab-ce!19699
\| * \|	Add paragraph for self-hosted instancesdocs/autodevops-k8s	Achilleas Pipinellis	2018-06-22	1	-1/+6
\| \| \|
\| * \|	Edits to quick_start_guide.md	Mike Lewis	2018-06-21	1	-61/+51
\| \| \|
\| * \|	Document end to end flow for Kubernetes and Auto DevOps	Achilleas Pipinellis	2018-06-21	30	-159/+313
\| \| \|
* \| \|	Merge branch 'blackst0ne-fix-protect-from-forgery-in-application-controller' ↵	Douwe Maan	2018-06-22	6	-5/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' [Rails5] Force the `protect_from_forgery` callback run first Closes #48204 See merge request gitlab-org/gitlab-ce!20055
\| * \| \|	[Rails5] Force the `protect_from_forgery` callback run firstblackst0ne-fix-protect-from-forgery-in-application-controller	blackst0ne	2018-06-21	6	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since Rails 5.0 the `protect_from_forgery` callback doesn't run first by default anymore. [1] Instead it gets inserted into callbacks chain where callbacks get called in order. This commit forces the callback to run first. [1]: https://github.com/rails/rails/commit/39794037817703575c35a75f1961b01b83791191
* \| \| \|	Merge branch 'unify-object_storage_spec.rb' into 'master'	Douwe Maan	2018-06-22	1	-0/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify object_storage_spec.rb with EE See merge request gitlab-org/gitlab-ce!20069
\| * \| \| \|	Bring this test from EEunify-object_storage_spec.rb	Lin Jen-Shin	2018-06-21	1	-0/+12
\| \| \| \| \|
* \| \| \| \|	Merge branch 'unify-container_registry_authentication_service_spec.rb' into ↵	Grzegorz Bizon	2018-06-22	1	-0/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Unify spec/services/auth/container_registry_authentication_service_spec.rb See merge request gitlab-org/gitlab-ce!20071
\| * \| \| \| \|	Bring changes from EEunify-container_registry_authentication_service_spec.rb	Lin Jen-Shin	2018-06-21	1	-0/+13
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'unify-destroy_service_spec.rb' into 'master'	Robert Speicher	2018-06-21	1	-2/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use expect_next_instance_of to replace expect_any_instance_of See merge request gitlab-org/gitlab-ce!20072
\| * \| \| \| \| \|	Use expect_next_instance_of to replace expect_any_instance_ofunify-destroy_service_spec.rb	Lin Jen-Shin	2018-06-21	1	-2/+6
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-add-recaptcha-all-logins' into 'master'	Robert Speicher	2018-06-21	5	-6/+88
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show a reCAPTCHA on signin page if custom header is set Closes #48184 See merge request gitlab-org/gitlab-ce!20076
\| * \| \| \| \| \|	Show a reCAPTCHA on signin page if custom header is set	Stan Hu	2018-06-21	5	-6/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will only be displayed if `X-GitLab-Show-Login-Captcha` is set as an HTTP header.
* \| \| \| \| \| \|	Merge branch 'retroactive-changelogs' into 'master'	Clement Ho	2018-06-21	2	-0/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Retroactively add changelogs See merge request gitlab-org/gitlab-ce!20079
\| * \| \| \| \| \| \|	Retroactively add changelogs	gfyoung	2018-06-21	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For community contributions, changelogs should be added to the MR.
* \| \| \| \| \| \| \|	Merge branch 'fix-webpack-node-env' into 'master'	Clement Ho	2018-06-21	2	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable webpack nodeEnv optimization See merge request gitlab-org/gitlab-ce!20075
\| * \| \| \| \| \| \|	disable nodeEnv within karma configfix-webpack-node-env fix-foo-test	Mike Greiling	2018-06-21	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	enable accidentally-disabled nodeEnv optimization	Mike Greiling	2018-06-21	1	-1/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-diff-comment-alignment' into 'master'	Mike Greiling	2018-06-21	2	-5/+4
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix diff comment alignment for parallel code additions Closes #47861 See merge request gitlab-org/gitlab-ce!20006
\| * \| \| \| \| \| \|	fix z-index and vertically centerfix-diff-comment-alignment	Simon Knox	2018-06-20	1	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix add diff comment icon position	Simon Knox	2018-06-20	2	-8/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix diff comment alignment for parallel code additions	Clement Ho	2018-06-19	1	-0/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'move-boards-modal-empty-state-vue-component' into 'master'	Filipa Lacerda	2018-06-21	4	-32/+41
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move boards modal EmptyState vue component See merge request gitlab-org/gitlab-ce!20068
\| * \| \| \| \| \| \| \|	Move boards modal EmptyState vue component	George Tsiolis	2018-06-21	4	-32/+41
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-login-active-tabs' into 'master'	Clement Ho	2018-06-21	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix multiple active tabs when Crowd or LDAP is in use Closes #48192 See merge request gitlab-org/gitlab-ce!20049
\| * \| \| \| \| \| \| \| \|	Fix multiple active tabs when Crowd or LDAP is in use	Stan Hu	2018-06-21	1	-2/+2
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'unify-project_features_apply_to_issuables_shared_examples.rb' ↵	Robert Speicher	2018-06-21	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Unify spec/support/shared_examples/features/project_features_apply_to_issuables_shared_examples.rb See merge request gitlab-org/gitlab-ce!20073
\| * \| \| \| \| \| \| \| \|	Bring changes from EE	Lin Jen-Shin	2018-06-21	1	-1/+1
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-raspi-issues' into 'master'	Clement Ho	2018-06-21	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow omnibus to disable sourcemaps in memory constrained environments See merge request gitlab-org/gitlab-ce!20053
\| * \| \| \| \| \| \| \| \|	Allow omnibus to disable sourcemaps in memory constrained environments	Mike Greiling	2018-06-21	1	-1/+4
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'jl-helm-docs' into 'master'	Marcia Ramos	2018-06-21	8	-32/+395
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `gitlab` chart documentation See merge request gitlab-org/gitlab-ce!20056
\| * \| \| \| \| \| \| \|	Add `gitlab` chart documentation	Joshua Lambert	2018-06-21	8	-32/+395
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'ce-6436-6149-unify-project_creator_spec' into 'master'	Robert Speicher	2018-06-21	8	-11/+78
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Resolve "Extract EE specific files/lines for project_creator_spec" See merge request gitlab-org/gitlab-ce!19850
\| * \| \| \| \| \| \| \|	Add docs around expect_next_instance_ofce-6436-6149-unify-project_creator_spec	Lin Jen-Shin	2018-06-21	1	-0/+48
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Implement `expect_next_instance_of` and use it	Lin Jen-Shin	2018-06-21	7	-11/+30
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need this because `expect_any_instance_of` doesn't work on prepended models. Now we could use the same code between CE/EE
* \| \| \| \| \| \| \|	Merge branch 'no-multi-assign-follow-up' into 'master'	Clement Ho	2018-06-21	6	-18/+17
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow-up to !19808: Split up for-loop initializations See merge request gitlab-org/gitlab-ce!19915
\| * \| \| \| \| \| \|	Follow-up to !19808: Split up for-loop initializations	gfyoung	2018-06-21	6	-18/+17
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'restore-custom-hooks-wiki' into 'master'	Douwe Maan	2018-06-21	1	-0/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore custom hooks for wiki See merge request gitlab-org/gitlab-ce!20065
\| * \| \| \| \| \| \|	Restore custom hooks for wikirestore-custom-hooks-wiki	Ahmad Hassan	2018-06-21	1	-0/+2
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'changes_tab_vue_refactoring' into 'master'	Tim Zallmann	2018-06-21	221	-2282/+8933
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes tab VUE refactoring Closes #42882 See merge request gitlab-org/gitlab-ce!17011