summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-02-07 13:09:56 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-02-07 13:09:56 +0000
commitead97c55eac773444dee547a934112aa282c2e2e (patch)
treeb172b648743d3b22af5d2177bf373bd11ddcb098 /app/controllers
parent2122d7225012b48bad8121e617bc1dbb06f67cf3 (diff)
parent1c36766f93180620e4ba4b50bea6908817d01631 (diff)
downloadgitlab-ce-ead97c55eac773444dee547a934112aa282c2e2e.tar.gz
Merge branch '41209-ci-linter-fails-on-gitlab-ci-blob-viewer' into 'master'
Resolve "CI linter fails to work" Closes #41209 See merge request gitlab-org/gitlab-ce!16922
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/ci/lints_controller.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/app/controllers/ci/lints_controller.rb b/app/controllers/ci/lints_controller.rb
index be667687c18..e9bd1689a1e 100644
--- a/app/controllers/ci/lints_controller.rb
+++ b/app/controllers/ci/lints_controller.rb
@@ -16,10 +16,7 @@ module Ci
@builds = @config_processor.builds
@jobs = @config_processor.jobs
end
- rescue
- @error = 'Undefined error'
- @status = false
- ensure
+
render :show
end
end