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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Comment why forks get default_git_depth of 0 instead nil62418-project-default-git-depth	Krasimir Angelov	2019-06-07	2	-3/+4
\| \| \| \|	and simplify ProjectCiCdSetting#set_default_git_depth
*	Fix migration specs using factories	Krasimir Angelov	2019-06-07	3	-3/+3
\| \| \| \| \| \|	We need to stub default_git_depth and default_git_depth= because some old migrations specs try to create a record using schema before that column was introduced.
*	Reformat ProjectCiCdSetting validations specs	Krasimir Angelov	2019-06-06	1	-1/+7
\|
*	Forks get default_git_depth 0 if the origin is nil	Krasimir Angelov	2019-06-06	4	-12/+27
\| \| \| \| \|	If the origin project has no default_git_depth set (i.e. nil) set the fork's default_git_depth to 0
*	Add project level git depth setting	Krasimir Angelov	2019-06-06	19	-42/+198
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce default_git_depth in project's CI/CD settings and set it to 50. Use it if there is no GIT_DEPTH variable specified. Apply this default only to newly created projects and keep it nil for old ones in order to not break pipelines that rely on non-shallow clones. default_git_depth can be updated from CI/CD Settings in the UI, must be either nil or integer between 0 and 1000 (incl). Inherit default_git_depth from the origin project when forking projects. MR pipelines are run on a MR ref (refs/merge-requests/:iid/merge) and it contains unique commit (i.e. merge commit) which doesn't exist in the other branch/tags refs. We need to add it cause otherwise it may break pipelines for old projects that have already enabled Pipelines for merge results and have git depth 0. Document new default_git_depth project CI/CD setting
*	Merge branch 'simplify-pipeline-notification-check' into 'master'	Sean McGivern	2019-06-06	2	-13/+4
\|\ \| \| \| \| \| \| \| \|	Simplify notification check for participating See merge request gitlab-org/gitlab-ce!29188
\| *	Simplify notification check for participatingsimplify-pipeline-notification-check	Heinrich Lee Yu	2019-06-06	2	-13/+4
\| \|
* \|	Merge branch 'ce-10854-elasticsearch_avoid_db' into 'master'	Sean McGivern	2019-06-06	8	-4/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Backport of 10854-elasticsearch_avoid_db See merge request gitlab-org/gitlab-ce!28579
\| * \|	Backport of 10854-elasticsearch_avoid_dbce-10854-elasticsearch_avoid_db	Mario de la Ossa	2019-06-05	8	-4/+15
\| \| \|
* \| \|	Merge branch 'docs/ssot_saml_sso' into 'master'	Achilleas Pipinellis	2019-06-06	1	-7/+23
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edit "SAML SSO" for SSOT See merge request gitlab-org/gitlab-ce!29248
\| * \| \|	Edit "SAML SSO" for SSOT	Russell Dickenson	2019-06-06	1	-7/+23
\|/ / /
* \| \|	Merge branch 'docs/ssot_roadmap' into 'master'	Achilleas Pipinellis	2019-06-06	1	-2/+25
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edit Group's "Roadmap" for SSOT See merge request gitlab-org/gitlab-ce!29245
\| * \| \|	Edit Group's "Roadmap" for SSOT	Russell Dickenson	2019-06-06	1	-2/+25
\|/ / /
* \| \|	Merge branch '60323-inline-validation-for-users-name-and-username-length' ↵	Kushal Pandya	2019-06-06	9	-44/+138
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Inline validation for user's name and username length" Closes #60323 See merge request gitlab-org/gitlab-ce!28095
\| * \| \|	Resolve "Inline validation for user's name and username length"	Jiaan	2019-06-06	9	-44/+138
\|/ / /
* \| \|	Merge branch 'docs/fix-bullet-list-ha' into 'master'	Achilleas Pipinellis	2019-06-06	1	-53/+48
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix markdown for HA topic See merge request gitlab-org/gitlab-ce!29244
\| * \| \|	Fix markdown for HA topic	Evan Read	2019-06-06	1	-53/+48
\|/ / /
* \| \|	Merge branch '60034-default-web-ide-s-merge-request-checkbox-to-true' into ↵	Phil Hughes	2019-06-06	17	-112/+377
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Default Web IDE's merge request checkbox to true" Closes #60034 See merge request gitlab-org/gitlab-ce!28665
\| * \| \|	Default MR checkbox to true in most cases60034-default-web-ide-s-merge-request-checkbox-to-true	Sam Bigelow	2019-06-06	17	-112/+377
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Pull the new MR option out into it's own component - Default MR checkbox to true when creating a new MR and committing to a branch that does not have an MR - Still change the MR checkbox to false when a user is on a branch that already has an MR - Hide MR option when on a branch that already has an MR and committing to current branch - Don't default to true when committing directly to master
* \| \| \|	Merge branch 'create-merge-request-create-pipeline-service' into 'master'	Bob Van Landuyt	2019-06-06	3	-25/+109
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce service for merge request pipeline creation See merge request gitlab-org/gitlab-ce!28781
\| * \| \| \|	Introduce service for merge request pipeline creationcreate-merge-request-create-pipeline-service	Shinya Maeda	2019-06-06	3	-25/+109
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't have a way to create MR pipeline today, this is one of the headaches for users. This change is a preliminary work for the capability.
* \| \| \| \|	Merge branch 'ce-10795-add-epic-tree' into 'master'	Phil Hughes	2019-06-06	4	-4/+242
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Backport: Show tree within Epic containing child Epics and Issues See merge request gitlab-org/gitlab-ce!28787
\| * \| \| \| \|	CE Backport: Show tree within Epic containing child Epics and Issues	Kushal Pandya	2019-06-06	4	-4/+242
\|/ / / / /
* \| \| \| \|	Merge branch 'docs/ssot_insights' into 'master'	Achilleas Pipinellis	2019-06-06	1	-0/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edit "Insights" content to meet SSOT guidelines See merge request gitlab-org/gitlab-ce!29238
\| * \| \| \| \|	Edit "Insights" content to meet SSOT guidelines	Russell Dickenson	2019-06-06	1	-0/+16
\|/ / / / /
* \| \| \| \|	Merge branch 'docs/ssot_epics' into 'master'	Achilleas Pipinellis	2019-06-06	1	-0/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edited "Epics" to comply with SSOT See merge request gitlab-org/gitlab-ce!29236
\| * \| \| \| \|	Edited "Epics" to comply with SSOT	Russell Dickenson	2019-06-06	1	-0/+16
\|/ / / / /
* \| \| \| \|	Merge branch 'docs/ssot_custom_project_templates' into 'master'	Achilleas Pipinellis	2019-06-06	1	-0/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edited "Custom group-level project templates" for SSOT See merge request gitlab-org/gitlab-ce!29235
\| * \| \| \| \|	Edited "Custom group-level project templates" for SSOT	Russell Dickenson	2019-06-06	1	-0/+16
\|/ / / / /
* \| \| \| \|	Merge branch 'fix-time-window-default' into 'master'	Phil Hughes	2019-06-06	3	-20/+57
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the selected time window for metrics dashboard See merge request gitlab-org/gitlab-ce!29152
\| * \| \| \| \|	Use the selected time window for metrics dashboard	Sarah Yasonik	2019-06-06	3	-20/+57
\|/ / / / /
* \| \| \| \|	Merge branch '11213-add-docs-on-dast-weekly-update-ce' into 'master'	Achilleas Pipinellis	2019-06-06	1	-0/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note on weekly updates of dast Docker image See merge request gitlab-org/gitlab-ce!29126
\| * \| \| \| \|	Add note on weekly updates of dast Docker image	Victor Zagorodny	2019-06-06	1	-0/+2
\|/ / / / /
* \| \| \| \|	Merge branch 'ashmckenzie/enable-better-errors-repl' into 'master'	Bob Van Landuyt	2019-06-06	1	-0/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow BetterErrors REPL to be enabled See merge request gitlab-org/gitlab-ce!29034
\| * \| \| \| \|	Allow BetterErrors REPL to be enabledashmckenzie/enable-better-errors-repl	Ash McKenzie	2019-06-05	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows the BetterErrors REPL to be available when your GitLab instance is listening on something _other_ than localhost.
* \| \| \| \| \|	Merge branch 'docs/ssot-git-topics' into 'master'	Achilleas Pipinellis	2019-06-06	4	-89/+157
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SSoT audit fixes for some topics in git section Closes #61512 See merge request gitlab-org/gitlab-ce!28966
\| * \| \| \| \| \|	SSoT audit fixes	Evan Read	2019-06-06	4	-89/+157
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implements part of the single source of truth audit fixes for the topics/git section.
* \| \| \| \| \|	Merge branch 'patch-18' into 'master'	Achilleas Pipinellis	2019-06-06	1	-0/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doc: add git mr command promotion See merge request gitlab-org/gitlab-ce!28860
\| * \| \| \| \| \|	doc: add git mr command promotion	Elan Ruusamäe	2019-05-29	1	-0/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'update-psd-doc' into 'master'	Achilleas Pipinellis	2019-06-06	2	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update project security dashboard documentation See merge request gitlab-org/gitlab-ce!28681
\| * \| \| \| \| \| \|	Update project security dashboard documentation	Paul Gascou-Vaillancourt	2019-06-06	2	-0/+5
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'ce-jej/fix-git-http-with-sso-enforcement' into 'master'	Jan Provaznik	2019-06-06	4	-0/+42
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid setting Gitlab::Session on sessionless requests and Git HTTP See merge request gitlab-org/gitlab-ce!29146
\| * \| \| \| \| \| \|	Avoid setting Gitlab::Session on Git HTTP requestsce-jej/fix-git-http-with-sso-enforcement	James Edwards-Jones	2019-06-05	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Avoid setting Gitlab::Session on sessionless requests	James Edwards-Jones	2019-06-05	3	-0/+41
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '9490-store-designs-in-lfs-ce' into 'master'	Thong Kuah	2019-06-06	3	-60/+60
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport for gitlab-ee!13389 (Support storing design blobs using LFS) See merge request gitlab-org/gitlab-ce!29101
\| * \| \| \| \| \| \| \|	CE backport for changes in EE MR 133899490-store-designs-in-lfs-ce	Luke Duncalfe	2019-06-06	3	-60/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This backports to ce a refactor of the shared example 'a controller that can serve LFS files'. The ee MR that contains the original refactor is https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13389 The reason for the refactor was mostly the removal of the outer context as it didn't need to be there, and prevented let(:lfs_oid) from being overwritten. The shared example was also renamed to be more descriptive.
* \| \| \| \| \| \| \| \|	Merge branch 'docs-hackathon-3' into 'master'	Evan Read	2019-06-06	3	-14/+17
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Tweak the wording regarding artifact completion Closes #56470 See merge request gitlab-org/gitlab-ce!28880
\| * \| \| \| \| \| \| \| \|	Docs: Tweak the wording regarding artifact completion	Marcel Amirault	2019-06-06	3	-14/+17
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'qa-ml-retry-first-login-validation' into 'master'	Mark Lapierre	2019-06-06	1	-0/+9
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Retry the first login page validation Closes gitlab-org/quality/nightly#103 See merge request gitlab-org/gitlab-ce!29100
\| * \| \| \| \| \| \| \|	Retry the first login page validation	Mark Lapierre	2019-06-06	1	-0/+9
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It can take longer that 60 seconds for the server to be ready to respond. Retry the login page validation twice (i.e., 3 attempts to validate the login page)