diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-07-21 12:50:29 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-07-21 12:50:29 +0300 |
| commit | b7d372d9427c11b86b7dda7611860920fe96b3b6 (patch) | |
| tree | ac502435d10a3da19c0d45ef09aa84fd1391e4c4 /config | |
| parent | cfba167694e809c135365d3f3ee710402129c7dc (diff) | |
| parent | fcdcc0d351e07f3838f71f6d617cf2f3d13c663a (diff) | |
Merge branch '31031-convert-protected-branches-es6' into 'master'
Convert Protected Branches feature JS code to ES6
See merge request !12970
Diffstat (limited to 'config')
| -rw-r--r-- | config/webpack.config.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 1113241e402..a7d92bc53b7 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -56,7 +56,7 @@ var config = { pipelines_details: './pipelines/pipeline_details_bundle.js', profile: './profile/profile_bundle.js', prometheus_metrics: './prometheus_metrics', - protected_branches: './protected_branches/protected_branches_bundle.js', + protected_branches: './protected_branches', protected_tags: './protected_tags', sidebar: './sidebar/sidebar_bundle.js', schedule_form: './pipeline_schedules/pipeline_schedule_form_bundle.js', |