Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 12 deletions

diff --git a/app/views/devise/shared/_omniauth_box.html.haml b/app/views/devise/shared/_omniauth_box.html.haml
index d67669352a6..d4f34a1cb3f 100644
--- a/app/views/devise/shared/_omniauth_box.html.haml
+++ b/app/views/devise/shared/_omniauth_box.html.haml
@@ -1,19 +1,20 @@
 - hide_remember_me = local_assigns.fetch(:hide_remember_me, false)
-%div{ class: Feature.enabled?(:restyle_login_page, @project) ? 'omniauth-container gl-mt-5 gl-p-5 gl-text-center gl-w-90p gl-ml-auto gl-mr-auto' : 'omniauth-container gl-mt-5 gl-p-5' }
-  %label{ class: Feature.enabled?(:restyle_login_page, @project) ? 'gl-font-weight-normal' : 'gl-font-weight-bold' }
+- restyle_login_page_enabled = Feature.enabled?(:restyle_login_page, @project)
+%div{ class: restyle_login_page_enabled ? 'omniauth-container gl-mt-5 gl-p-5 gl-text-center gl-w-90p gl-ml-auto gl-mr-auto' : 'omniauth-container gl-mt-5 gl-p-5' }
+  %label{ class: restyle_login_page_enabled ? 'gl-font-weight-normal' : 'gl-font-weight-bold' }
     = _('Sign in with')
   - providers = enabled_button_based_providers
-  .gl-display-flex.gl-justify-content-between.gl-flex-wrap
+  .gl-display-flex.gl-flex-wrap{ class: restyle_login_page_enabled ? 'gl-justify-content-center' : 'gl-justify-content-between' }
     - providers.each do |provider|
       - has_icon = provider_has_icon?(provider)
-      = button_to omniauth_authorize_path(:user, provider), id: "oauth-login-#{provider}", class: "btn gl-button btn-default gl-ml-2 gl-mr-2 gl-mb-2 js-oauth-login #{qa_class_for_provider(provider)} #{'gl-w-full' if Feature.disabled?(:restyle_login_page, @project)}", form: { class: 'gl-w-full gl-mb-3' } do
+      = button_to omniauth_authorize_path(:user, provider), id: "oauth-login-#{provider}", class: "btn gl-button btn-default gl-ml-2 gl-mr-2 gl-mb-2 js-oauth-login #{qa_class_for_provider(provider)} #{'gl-w-full' unless restyle_login_page_enabled}", form: { class: restyle_login_page_enabled ? 'gl-mb-3' : 'gl-w-full gl-mb-3' } do
         - if has_icon
           = provider_image_tag(provider)
         %span.gl-button-text
           = label_for_provider(provider)
   - unless hide_remember_me
     %fieldset
-      %label{ class: Feature.enabled?(:restyle_login_page, @project) ? 'gl-font-weight-normal' : '' }
+      %label{ class: restyle_login_page_enabled ? 'gl-font-weight-normal' : '' }
         = check_box_tag :remember_me, nil, false
         %span
           = _('Remember me')
diff --git a/app/views/notify/import_issues_csv_email.html.haml b/app/views/notify/import_issues_csv_email.html.haml
index f30d2b5f078..0008085025b 100644
--- a/app/views/notify/import_issues_csv_email.html.haml
+++ b/app/views/notify/import_issues_csv_email.html.haml
@@ -1,18 +1,18 @@
 - text_style = 'font-size:16px; text-align:center;  line-height:30px;'
 
 %p{ style: text_style }
-  Your CSV import for project
-  %a{ href: project_url(@project), style: "color:#3777b0; text-decoration:none;" }
-    = @project.full_name
-  has been completed.
+  - project_link = link_to(@project.full_name, project_url(@project), style: "color:#3777b0; text-decoration:none;")
+  = s_('Notify|Your CSV import for project %{project_link} has been completed.').html_safe % { project_link: project_link }
 
 %p{ style: text_style }
-  #{pluralize(@results[:success], 'issue')} imported.
+  - issues = n_('%d issue', '%d issues', @results[:success]) % @results[:success]
+  = s_('Notify|%{issues} imported.') % { issues: issues }
 
 - if @results[:error_lines].present?
   %p{ style: text_style }
-    Errors found on line #{'number'.pluralize(@results[:error_lines].size)}: #{@results[:error_lines].join(', ')}. Please check if these lines have an issue title.
+    = s_('Notify|Errors found on %{singular_or_plural_line}: %{error_lines}. Please check if these lines have an issue title.') % { singular_or_plural_line: n_('line', 'lines', @results[:error_lines].size),
+      error_lines: @results[:error_lines].join(', ') }
 
 - if @results[:parse_error]
   %p{ style: text_style }
-    Error parsing CSV file. Please make sure it has the correct format: a delimited text file that uses a comma to separate values.
+    = s_('Notify|Error parsing CSV file. Please make sure it has the correct format: a delimited text file that uses a comma to separate values.')