summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-07-19 13:44:45 +0200
committerTim Zallmann <tzallmann@gitlab.com>2017-07-31 14:46:54 +0200
commit8129acb77bd61ccb1769c2bda38c3f662cf9ba87 (patch)
tree5c124bb9210c3fec4bcc3a2322ce8a902bbf2377
parent0a0e9566126d2585f5d03cf9473e3fd86a3f9904 (diff)
downloadgitlab-ce-8129acb77bd61ccb1769c2bda38c3f662cf9ba87.tar.gz
Moved New Branch Inline JS to dispatcher / left array init
-rw-r--r--app/assets/javascripts/dispatcher.js4
-rw-r--r--app/views/projects/branches/new.html.haml7
2 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index cce94abfeb4..8c02ce36022 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -20,6 +20,7 @@
/* global Admin */
/* global NamespaceSelects */
/* global NewCommitForm */
+/* global NewBranchForm */
/* global Project */
/* global ProjectAvatar */
/* global MergeRequest */
@@ -219,6 +220,9 @@ import GpgBadges from './gpg_badges';
case 'projects:compare:show':
new gl.Diff();
break;
+ case 'projects:branches:new':
+ new NewBranchForm($('.js-create-branch-form'), window.gl.availableRefs);
+ break;
case 'projects:branches:index':
gl.AjaxLoadingSpinner.init();
new DeleteModal();
diff --git a/app/views/projects/branches/new.html.haml b/app/views/projects/branches/new.html.haml
index 03eefcc2b4d..16d7727d2b7 100644
--- a/app/views/projects/branches/new.html.haml
+++ b/app/views/projects/branches/new.html.haml
@@ -28,8 +28,7 @@
.form-actions
= button_tag 'Create branch', class: 'btn btn-create', tabindex: 3
= link_to 'Cancel', project_branches_path(@project), class: 'btn btn-cancel'
-
+-# haml-lint:disable InlineJavaScript
:javascript
- var availableRefs = #{@project.repository.ref_names.to_json};
-
- new NewBranchForm($('.js-create-branch-form'), availableRefs)
+ window.gl = window.gl || { };
+ window.gl.availableRefs = #{@project.repository.ref_names.to_json};