dynamic imports for projects:e/f/i (!4077) · Merge requests · GitLab.org / GitLab · GitLab

Snippets Groups Projects

Merged Simon Knox requested to merge ee-dispatcher-projects-efi into master 7 years ago

EE for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16417

https://gitlab.com/gitlab-org/gitlab-ce/issues/41341

Activity

Simon Knox added 1 commit 7 years ago
added 1 commit

d97309ae - fix tests - add missing WeightSelect

Compare with previous version
Simon Knox added 15 commits 7 years ago
added 15 commits

d97309ae...c8bd4405 - 13 commits from branch master

56e57355 - dedupe form

9a2a47c9 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ee-dispatcher-projects-efi

Compare with previous version
Phil Hughes approved this merge request 7 years ago

approved this merge request
Phil Hughes merged 7 years ago

merged
Phil Hughes mentioned in commit b11f1ba1 7 years ago

mentioned in commit b11f1ba1
Luke Bennett @lbennett started a thread on commit 80005e96 7 years ago

app/assets/javascripts/pages/projects/edit/index.js 0 → 100644

	1	/* eslint-disable no-new */
	2	import initSettingsPanels from '~/settings_panels';
Luke Bennett @lbennett · 7 years ago Contributor @psimyn Could you backport this to CE? Causing conflicts in CE to EE merges. https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4085 Simon Knox @psimyn · 7 years ago Author Maintainer @lbennett looks like you sorted this? None of these should need to be backported (the file contents are different for EE) Luke Bennett @lbennett · 7 years ago Contributor @psimyn I sorted the conflicts yeah. Ahh okay, in that case can you open an issue for moving these to an ee namespace? Simon Knox @psimyn · 7 years ago Author Maintainer created https://gitlab.com/gitlab-org/gitlab-ee/issues/4610 thanks for spotting this @lbennett Please register or sign in to reply

🤖 GitLab Bot 🤖 added label 5 years ago

added Enterprise Edition label

Please register or sign in to reply