Merge branch 'leipert-update-ie11-warning' into 'master'

Update IE11 deprecation message

See merge request gitlab-org/gitlab!40952

app/views/shared/_outdated_browser.html.haml

@@ -2,14 +2,7 @@
   .gl-alert.gl-alert-danger.outdated-browser{ :role => "alert" }
     = sprite_icon('error', css_class: "gl-alert-icon gl-alert-icon-no-title gl-icon")
     .gl-alert-body
-      - if browser.ie? && browser.version.to_i == 11
-        - feedback_link_url = 'https://gitlab.com/gitlab-org/gitlab/issues/197987'
-        - feedback_link_start = '<a href="%{url}" class="gl-link" target="_blank" rel="noopener noreferrer">'.html_safe % { url: feedback_link_url }
-        = s_('OutdatedBrowser|From May 2020 GitLab no longer supports Internet Explorer 11.')
-        %br
-        = s_('OutdatedBrowser|You can provide feedback %{feedback_link_start}on this issue%{feedback_link_end} or via your usual support channels.').html_safe % { feedback_link_start: feedback_link_start, feedback_link_end: '</a>'.html_safe }
-      - else
-        = s_('OutdatedBrowser|GitLab may not work properly, because you are using an outdated web browser.')
+      = s_('OutdatedBrowser|GitLab may not work properly, because you are using an outdated web browser.')
       %br
       - browser_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('install/requirements', anchor: 'supported-web-browsers') }
       = s_('OutdatedBrowser|Please install a %{browser_link_start}supported web browser%{browser_link_end} for a better experience.').html_safe % { browser_link_start: browser_link_start, browser_link_end: '</a>'.html_safe }

doc/install/requirements.md

@@ -263,8 +263,6 @@ For reference, GitLab.com's [auto-scaling shared runner](../user/gitlab_com/inde
 
 CAUTION: **Caution:**
 With GitLab 13.0 (May 2020) we have removed official support for Internet Explorer 11.
-With the release of GitLab 13.4 (September 2020) we will remove all code that supports Internet Explorer 11.
-You can provide feedback [on this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/197987) or via your usual support channels.
 
 GitLab supports the following web browsers:
 
@@ -276,7 +274,7 @@ GitLab supports the following web browsers:
 
 For the listed web browsers, GitLab supports:
 
-- The current and previous major versions of browsers except Internet Explorer.
+- The current and previous major versions of browsers.
 - The current minor version of a supported major version.
 
 NOTE: **Note:**

locale/gitlab.pot

@@ -17338,18 +17338,12 @@ msgstr ""
 msgid "Outbound requests"
 msgstr ""
 
-msgid "OutdatedBrowser|From May 2020 GitLab no longer supports Internet Explorer 11."
-msgstr ""
-
 msgid "OutdatedBrowser|GitLab may not work properly, because you are using an outdated web browser."
 msgstr ""
 
 msgid "OutdatedBrowser|Please install a %{browser_link_start}supported web browser%{browser_link_end} for a better experience."
 msgstr ""
 
-msgid "OutdatedBrowser|You can provide feedback %{feedback_link_start}on this issue%{feedback_link_end} or via your usual support channels."
-msgstr ""
-
 msgid "Outdent"
 msgstr ""