diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-07 19:24:14 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-07 19:24:14 +0000 |
| commit | 4c8b666893aa9f5ab94b800489fd9e3240ad4f5e (patch) | |
| tree | 4c499f649a9b3461963d9c084333259aad8a57be /config | |
| parent | 4e2b630df716174ea9b07319a0fd5eda7b60cf8e (diff) | |
| parent | ae5003a35ef47bbdafc51e3e9d0f27039f9d20a2 (diff) | |
| download | gitlab-ce-4c8b666893aa9f5ab94b800489fd9e3240ad4f5e.tar.gz | |
Merge branch 'zj-project-templates' into 'master'
Allow projects to be started from a template
Closes #32420
See merge request !13108
Diffstat (limited to 'config')
| -rw-r--r-- | config/webpack.config.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 1205b90de40..32e57c43bd9 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -60,6 +60,7 @@ var config = { pipelines_details: './pipelines/pipeline_details_bundle.js', pipelines_times: './pipelines/pipelines_times.js', profile: './profile/profile_bundle.js', + project_import_gl: './projects/project_import_gitlab_project.js', project_new: './projects/project_new.js', prometheus_metrics: './prometheus_metrics', protected_branches: './protected_branches', |