Merge branch 'leipert-ie11-deprecation' into 'master'

Add IE11 deprecation message

See merge request gitlab-org/gitlab!26222

.haml-lint_todo.yml

@@ -305,7 +305,6 @@ linters:
       - 'app/views/shared/_milestone_expired.html.haml'
       - 'app/views/shared/_no_password.html.haml'
       - 'app/views/shared/_no_ssh.html.haml'
-      - 'app/views/shared/_outdated_browser.html.haml'
       - 'app/views/shared/_ping_consent.html.haml'
       - 'app/views/shared/_project_limit.html.haml'
       - 'app/views/shared/boards/components/_board.html.haml'

app/helpers/application_helper.rb

@@ -227,7 +227,7 @@ module ApplicationHelper
   end
 
   def outdated_browser?
-    browser.ie? && browser.version.to_i < 10
+    browser.ie?
   end
 
   def path_to_key(key, admin = false)

app/views/layouts/_page.html.haml

@@ -2,9 +2,9 @@
   - if defined?(nav) && nav
     = render "layouts/nav/sidebar/#{nav}"
   .content-wrapper{ class: "#{@content_wrapper_class}" }
-    = render 'shared/outdated_browser'
     .mobile-overlay
     .alert-wrapper
+      = render 'shared/outdated_browser'
       = render_if_exists "layouts/header/ee_license_banner"
       = render "layouts/broadcast"
       = render "layouts/header/read_only_banner"

app/views/layouts/fullscreen.html.haml

@@ -5,9 +5,9 @@
     = render 'peek/bar'
     = header_message
     = render partial: "layouts/header/default", locals: { project: @project, group: @group }
-    = render 'shared/outdated_browser'
     .mobile-overlay
     .alert-wrapper
+      = render 'shared/outdated_browser'
       = render "layouts/broadcast"
       = yield :flash_message
       = render "layouts/flash"

app/views/shared/_outdated_browser.html.haml

 - if outdated_browser?
-  .flash-container
-    .flash-alert.text-center
-      GitLab may not work properly because you are using an outdated web browser.
+  .gl-alert.gl-alert-danger.outdated-browser{ :role => "alert" }
+    = sprite_icon('error', size: 16, 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.')
       %br
-      Please install a
-      = link_to 'supported web browser', help_page_path('install/requirements', anchor: 'supported-web-browsers')
-      for a better experience.
+      - 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

@@ -236,18 +236,21 @@ For reference, GitLab.com's [auto-scaling shared runner](../user/gitlab_com/inde
 
 ## Supported web browsers
 
+CAUTION: **Caution:** With GitLab 13.0 (May 2020) we are removing 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:
 
 - Firefox
 - Chrome/Chromium
 - Safari
 - Microsoft Edge
-- Internet Explorer 11
+- Internet Explorer 11 (until May 2020)
 
 For the listed web browsers, GitLab supports:
 
 - The current and previous major versions of browsers except Internet Explorer.
-- Only version 11 of Internet Explorer.
 - The current minor version of a supported major version.
 
 NOTE: **Note:** We do not support running GitLab with JavaScript disabled in the browser and have no plans of supporting that

locale/gitlab.pot

@@ -13697,6 +13697,18 @@ 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 "Overview"
 msgstr ""