From 2d52ac03f582f7a21f7694e253b51c0d4e56348b Mon Sep 17 00:00:00 2001
From: mfluharty <mfluharty@gitlab.com>
Date: Thu, 4 Jul 2019 12:36:49 -0600
Subject: Remove callout icons, update spec and localization

Remove the x icon from the incorrect syntax callout
To account for the removal of "Error:"
- Update page spec
- Update gitlab.pot
Add changelog entry
---
 app/views/projects/ci/lints/_create.html.haml        | 2 --
 changelogs/unreleased/better-errors-from-extends.yml | 5 +++++
 locale/gitlab.pot                                    | 3 ---
 spec/views/projects/ci/lints/show.html.haml_spec.rb  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/unreleased/better-errors-from-extends.yml

diff --git a/app/views/projects/ci/lints/_create.html.haml b/app/views/projects/ci/lints/_create.html.haml
index 6e974f14523..e98668e2ee2 100644
--- a/app/views/projects/ci/lints/_create.html.haml
+++ b/app/views/projects/ci/lints/_create.html.haml
@@ -3,7 +3,6 @@
     %p
       %b= _("Status:")
       = _("syntax is correct")
-      %i.fa.fa-ok.correct-syntax
 
   .table-holder
     %table.table.table-bordered
@@ -45,6 +44,5 @@
     %p
       %b= _("Status:")
       = _("syntax is incorrect")
-      %i.fa.fa-remove.incorrect-syntax
   %pre
     = @error
diff --git a/changelogs/unreleased/better-errors-from-extends.yml b/changelogs/unreleased/better-errors-from-extends.yml
new file mode 100644
index 00000000000..5eede9b2d6b
--- /dev/null
+++ b/changelogs/unreleased/better-errors-from-extends.yml
@@ -0,0 +1,5 @@
+---
+title: Add JSON error context to extends error in CI lint
+merge_request: 30066
+author:
+type: changed
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 01bf4949213..f11b7e87d92 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -4309,9 +4309,6 @@ msgstr ""
 msgid "Error with Akismet. Please check the logs for more info."
 msgstr ""
 
-msgid "Error:"
-msgstr ""
-
 msgid "ErrorTracking|Active"
 msgstr ""
 
diff --git a/spec/views/projects/ci/lints/show.html.haml_spec.rb b/spec/views/projects/ci/lints/show.html.haml_spec.rb
index 2f0cd38c14a..1643399701b 100644
--- a/spec/views/projects/ci/lints/show.html.haml_spec.rb
+++ b/spec/views/projects/ci/lints/show.html.haml_spec.rb
@@ -92,7 +92,7 @@ describe 'projects/ci/lints/show' do
       render
 
       expect(rendered).to have_content('Status: syntax is incorrect')
-      expect(rendered).to have_content('Error: Undefined error')
+      expect(rendered).to have_content('Undefined error')
       expect(rendered).not_to have_content('Tag list:')
     end
   end
-- 
cgit v1.2.1