4 commits

Author	SHA1	Message	Date
GitLab Bot	0ebbf19f2d	Add latest changes from gitlab-org/gitlab@master	2021-06-08 15:10:00 +00:00
GitLab Bot	4c5468b408	Add latest changes from gitlab-org/gitlab@master	2020-06-24 15:08:50 +00:00
Hordur Freyr Yngvason	d3c5ff7b72	Squash project templates on update ... As per https://gitlab.com/gitlab-org/gitlab-ce/issues/46043, project templates should be squashed before updating, so that repositories created from these templates don't include the full history of the backing repository.	2019-08-15 20:20:08 +00:00
Hordur Freyr Yngvason	012fe3141e	Fix broken update_project_templates rake task ... This rake task had been broken for a while. This fixes the breakages, adds a test to help avoid future breakages, and adds a few ergonomic improvements to the task itself.	2019-07-30 13:52:28 +00:00