summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-09-30 16:51:47 +0000
committerRémy Coutable <remy@rymai.me>2016-09-30 16:51:47 +0000
commit7a5156d6955437e544716e51942ac5ab1645582b (patch)
treed99ab606d5e87df624e76876147f8b2cf732140b /app/controllers
parent9a79c9e98079ab21428289af9ec5dd3f0583c375 (diff)
parente26ea861575d575f5b1daf051c3864831bbcba97 (diff)
downloadgitlab-ce-7a5156d6955437e544716e51942ac5ab1645582b.tar.gz
Merge branch '21744-fix-missing-values-in-linter' into 'master'
Add missing values to linter (`only`, `except`) and add new one `Environment` Closes #21744 See merge request !6276
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/ci/lints_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/ci/lints_controller.rb b/app/controllers/ci/lints_controller.rb
index e06d12cfce1..78012960252 100644
--- a/app/controllers/ci/lints_controller.rb
+++ b/app/controllers/ci/lints_controller.rb
@@ -14,6 +14,7 @@ module Ci
@config_processor = Ci::GitlabCiYamlProcessor.new(@content)
@stages = @config_processor.stages
@builds = @config_processor.builds
+ @jobs = @config_processor.jobs
end
rescue
@error = 'Undefined error'