summaryrefslogtreecommitdiff
path: root/app/controllers/ci
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2015-12-22 09:40:32 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2015-12-22 09:40:32 +0100
commitd74b254d97e253e857a53e0320295966ac27ecff (patch)
treeaa94643443e2dbcd2f322d0f2ab3fa10497820fe /app/controllers/ci
parent2ed7b964fa56c14e4344530a1e6896c69dded58e (diff)
downloadgitlab-ce-d74b254d97e253e857a53e0320295966ac27ecff.tar.gz
Make CI Lint form synchronousfix/ci-lint
This removes `remote: true` from CI Lint form, making it synchronous form. This also removes some complexity related to displaying lint messages. View also has been updated, removed deprecated Bootstrap 2 tags. Improved design. Closes #4206
Diffstat (limited to 'app/controllers/ci')
-rw-r--r--app/controllers/ci/lints_controller.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/ci/lints_controller.rb b/app/controllers/ci/lints_controller.rb
index 7ed78ff8e98..e782a51e7eb 100644
--- a/app/controllers/ci/lints_controller.rb
+++ b/app/controllers/ci/lints_controller.rb
@@ -19,8 +19,10 @@ module Ci
@error = e.message
@status = false
rescue
- @error = "Undefined error"
+ @error = 'Undefined error'
@status = false
+ ensure
+ render :show
end
end
end