Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 3 insertions, 4 deletions

diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml
index a79bba24edb..5bd7dc18831 100644
--- a/.haml-lint_todo.yml
+++ b/.haml-lint_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `haml-lint --auto-gen-config`
-# on 2020-04-20 07:11:26 +0000 using Haml-Lint version 0.34.0.
+# on 2020-05-21 10:58:59 -0400 using Haml-Lint version 0.34.0.
 # The point is for the user to remove these configuration records
 # one by one as the lints are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -162,7 +162,6 @@ linters:
       - "app/views/projects/_home_panel.html.haml"
       - "app/views/projects/_import_project_pane.html.haml"
       - "app/views/projects/_issuable_by_email.html.haml"
-      - "app/views/projects/_md_preview.html.haml"
       - "app/views/projects/_readme.html.haml"
       - "app/views/projects/artifacts/_artifact.html.haml"
       - "app/views/projects/artifacts/_tree_file.html.haml"
@@ -267,7 +266,6 @@ linters:
       - "app/views/projects/triggers/_index.html.haml"
       - "app/views/projects/triggers/_trigger.html.haml"
       - "app/views/projects/triggers/edit.html.haml"
-      - "app/views/projects/wikis/_pages_wiki_page.html.haml"
       - "app/views/search/results/_issue.html.haml"
       - "app/views/search/results/_note.html.haml"
       - "app/views/search/results/_snippet_blob.html.haml"
@@ -277,6 +275,7 @@ linters:
       - "app/views/shared/_delete_label_modal.html.haml"
       - "app/views/shared/_group_form.html.haml"
       - "app/views/shared/_group_tips.html.haml"
+      - "app/views/shared/_md_preview.html.haml"
       - "app/views/shared/_milestone_expired.html.haml"
       - "app/views/shared/_no_password.html.haml"
       - "app/views/shared/_ping_consent.html.haml"
@@ -313,6 +312,7 @@ linters:
       - "app/views/shared/snippets/_snippet.html.haml"
       - "app/views/shared/web_hooks/_form.html.haml"
       - "app/views/shared/web_hooks/_hook.html.haml"
+      - "app/views/shared/wikis/_pages_wiki_page.html.haml"
       - "app/views/u2f/_authenticate.html.haml"
       - "app/views/u2f/_register.html.haml"
       - "app/views/users/_deletion_guidance.html.haml"
@@ -324,7 +324,6 @@ linters:
       - "ee/app/views/admin/geo/projects/_registry_never.html.haml"
       - "ee/app/views/admin/licenses/_upload_trial_license.html.haml"
       - "ee/app/views/admin/licenses/new.html.haml"
-      - "ee/app/views/admin/licenses/show.html.haml"
       - "ee/app/views/admin/monitoring/ee/_nav.html.haml"
       - "ee/app/views/admin/projects/_shared_runner_status.html.haml"
       - "ee/app/views/admin/users/_auditor_access_level_radio.html.haml"