diff --git a/app/views/ci/lints/_create.html.haml b/app/views/ci/lints/_create.html.haml
index f7875e68b7e..59be8bbad81 100644
--- a/app/views/ci/lints/_create.html.haml
+++ b/app/views/ci/lints/_create.html.haml
@@ -21,7 +21,7 @@
 
                 %br
                 %b Tag list:
-                = build[:tags]
+                = build[:tag_list]
                 %br
                 %b Refs only:
                 = build[:only] && build[:only].join(", ")
@@ -29,6 +29,9 @@
                 %b Refs except:
                 = build[:except] && build[:except].join(", ")
                 %br
+                %b Environment:
+                = build[:environment]
+                %br
                 %b When:
                 = build[:when]
                 - if build[:allow_failure]
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 0369e80312a..b61388d6ea7 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -59,6 +59,8 @@ module Ci
         tag_list: job[:tags] || [],
         name: job[:name].to_s,
         allow_failure: job[:allow_failure] || false,
+        only: job[:only],
+        except: job[:except],
         when: job[:when] || 'on_success',
         environment: job[:environment_name],
         yaml_variables: yaml_variables(name),