Skip to content

G
gitlab-ce
Commit b22e90b7 authored by Fatih Acet's avatar Fatih Acet
Browse files
Options

Fix bad merge conflict resolution.

parent 2a6e52f2
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
app/assets/javascripts/dispatcher.js
View file @ b22e90b7
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
new IssuableForm($('.issue-form')); new IssuableForm($('.issue-form'));
new LabelsSelect(); new LabelsSelect();
new MilestoneSelect(); new MilestoneSelect();
new IssuableTemplateSelectors();
new gl.IssuableTemplateSelectors(); new gl.IssuableTemplateSelectors();
break; break;
case 'projects:merge_requests:new': case 'projects:merge_requests:new':
...@@ -72,7 +71,6 @@ ...@@ -72,7 +71,6 @@
new IssuableForm($('.merge-request-form')); new IssuableForm($('.merge-request-form'));
new LabelsSelect(); new LabelsSelect();
new MilestoneSelect(); new MilestoneSelect();
new IssuableTemplateSelectors();
new gl.IssuableTemplateSelectors(); new gl.IssuableTemplateSelectors();
break; break;
case 'projects:tags:new': case 'projects:tags:new':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7