Merge branch 'master' into 'master'

Fix error message This merge request fixes issue when somebody try to import repository (to which that user can't add deploy keys) and has no feedback. See merge request !518

Merge branch 'master' into 'master'
6157dad9 · Douwe Maan · bf7932bd · bf2db3ec · 6157dad9
Commit 6157dad9 authored Apr 14, 2015 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

create.js.haml app/views/import/base/create.js.haml +1 -1

No files found.
--- a/app/views/import/base/create.js.haml
+++ b/app/views/import/base/create.js.haml
@@ -13,7 +13,7 @@
 - elsif @access_denied
  :plain
    job = $("tr#repo_#{@repo_id}")
-    job.find(".import-actions").html("<p class='alert alert-danger'>Access denied! Please verify you can add deploy keys to this repository.</p>"")
+    job.find(".import-actions").html("<p class='alert alert-danger'>Access denied! Please verify you can add deploy keys to this repository.</p>")
 - else
  :plain
    job = $("tr#repo_#{@repo_id}")