Merge branch 'fix-master' into 'master'

Fix NewBranchForm spec cc @vsizov See merge request !2204

Merge branch 'fix-master' into 'master'
0869d84c · Douwe Maan · aa712e2b · 93b5ea6f · 0869d84c
Commit 0869d84c authored Dec 24, 2015 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

new_branch_spec.js.coffee spec/javascripts/new_branch_spec.js.coffee +1 -1

No files found.
--- a/spec/javascripts/new_branch_spec.js.coffee
+++ b/spec/javascripts/new_branch_spec.js.coffee
-#= require jquery.ui.all
+#= require jquery-ui
 #= require new_branch_form

 describe 'Branch', ->