diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-02-16 13:01:07 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-02-16 13:01:07 -0600 |
| commit | dc9b2a8fb2a282aefa946246b0fbaf15562fb4a5 (patch) | |
| tree | ef39f5eaa7aa27a9c1bc0fcfa8b515727a70cf05 | |
| parent | fab0f24c67833a6640830febdd1b705395a13484 (diff) | |
| download | gitlab-ce-dc9b2a8fb2a282aefa946246b0fbaf15562fb4a5.tar.gz | |
correct for missing break statement in dispatcher.js
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/pages/projects/merge_requests/creations/index.js (renamed from app/assets/javascripts/pages/projects/merge_requests/creations/diffs/index.js) | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 089ffa77677..b6754689466 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -48,6 +48,7 @@ var Dispatcher; case 'projects:issues:show': case 'projects:issues:new': case 'projects:issues:edit': + case 'projects:merge_requests:creations:new': case 'projects:merge_requests:creations:diffs': case 'projects:merge_requests:edit': shortcut_handler = true; diff --git a/app/assets/javascripts/pages/projects/merge_requests/creations/diffs/index.js b/app/assets/javascripts/pages/projects/merge_requests/creations/index.js index febfecebbd2..febfecebbd2 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/creations/diffs/index.js +++ b/app/assets/javascripts/pages/projects/merge_requests/creations/index.js |