diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-14 15:08:58 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-14 15:08:58 +0000 |
| commit | 6157dad9ffec84682f01929987c97d5e790aa023 (patch) | |
| tree | f9da2dd2dc735c4ddc14b028fa711de54fd04a34 /app | |
| parent | bf7932bd06e45f82c7aa80373aa3aa1bf52d4d88 (diff) | |
| parent | bf2db3ec03913d3aaba2ff02f00e03e9e0974265 (diff) | |
| download | gitlab-ce-6157dad9ffec84682f01929987c97d5e790aa023.tar.gz | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/import/base/create.js.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/import/base/create.js.haml b/app/views/import/base/create.js.haml index 8d10722628f..90a6f5f9d2d 100644 --- 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}") |