diff --git a/app/views/ci/lints/_create.html.haml b/app/views/ci/lints/_create.html.haml
index 342259226a2..d5c21c6dffe 100644
--- a/app/views/ci/lints/_create.html.haml
+++ b/app/views/ci/lints/_create.html.haml
@@ -21,13 +21,13 @@
 
                 %br
                 %b Tag list:
-                = build[:tag_list] && build[:tag_list].to_a.join(", ")
+                = build[:tag_list].to_a.join(", ")
                 %br
                 %b Refs only:
-                = @jobs[build[:name].to_sym][:only] && @jobs[build[:name].to_sym][:only].to_a.join(", ")
+                = @jobs[build[:name].to_sym][:only].to_a.join(", ")
                 %br
                 %b Refs except:
-                = @jobs[build[:name].to_sym][:except] && @jobs[build[:name].to_sym][:except].to_a.join(", ")
+                = @jobs[build[:name].to_sym][:except].to_a.join(", ")
                 %br
                 %b Environment:
                 = build[:environment]
diff --git a/spec/views/ci/lints/show.html.haml_spec.rb b/spec/views/ci/lints/show.html.haml_spec.rb
index 620fb0e4821..793b747e7eb 100644
--- a/spec/views/ci/lints/show.html.haml_spec.rb
+++ b/spec/views/ci/lints/show.html.haml_spec.rb
@@ -43,7 +43,7 @@ describe 'ci/lints/show' do
     it 'shows error message' do
       render
 
-      expect(rendered).to have_content('Status: syntax is incorrec')
+      expect(rendered).to have_content('Status: syntax is incorrect')
       expect(rendered).to have_content('Error: Undefined error')
       expect(rendered).not_to have_content('Tag list:')
     end