diff --git a/app/views/ci/lints/_create.html.haml b/app/views/ci/lints/_create.html.haml
index 59be8bbad81e67c7837383b96a8d0ac4b4c4d3e8..733c5d0b7fe6b2266bde582592171caa843eed52 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[:tag_list]
+                = build[:tag_list] && build[:tag_list].join(", ")
                 %br
                 %b Refs only:
                 = build[:only] && build[:only].join(", ")
diff --git a/spec/views/ci/lints/show.html.haml_spec.rb b/spec/views/ci/lints/show.html.haml_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..f1d91eab3565f2e34bbc7e9052f95d5ad544fb3f
--- /dev/null
+++ b/spec/views/ci/lints/show.html.haml_spec.rb
@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe 'ci/lints/show' do
+  let(:content) do
+    { build_template: {
+        script: './build.sh',
+        tags: ['dotnet'],
+        only: ['test@dude/repo'],
+        except: ['deploy'],
+        environment: 'testing'
+      }
+    }
+  end
+  let(:config_processor) { Ci::GitlabCiYamlProcessor.new(YAML.dump(content)) }
+
+  context 'when content is valid' do
+    before do
+      assign(:status, true)
+      assign(:builds, config_processor.builds)
+      assign(:stages, config_processor.stages)
+    end
+
+    it 'shows correct values' do
+      render
+
+      expect(rendered).to have_content('Tag list: dotnet')
+      expect(rendered).to have_content('Refs only: test@dude/repo')
+      expect(rendered).to have_content('Refs except: deploy')
+      expect(rendered).to have_content('Environment: testing')
+      expect(rendered).to have_content('When: on_success')
+    end
+  end
+end