Automatic merge of gitlab-org/gitlab-ce master

88efa803 · GitLab Bot · 0110bde1 · f139ce9d · 88efa803 · 88efa803
Commit 88efa803 authored May 29, 2019 by GitLab Bot
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

app/views/import/bitbucket_server/status.html.haml app/views/import/bitbucket_server/status.html.haml +1 -1

locale/gitlab.pot locale/gitlab.pot +0 -3

No files found.
--- a/app/views/import/bitbucket_server/status.html.haml
+++ b/app/views/import/bitbucket_server/status.html.haml
@@ -29,7 +29,7 @@
      %tr
        %th= _('From Bitbucket Server')
        %th= _('To GitLab')
-        %th= _(' Status')
+        %th= _('Status')
    %tbody
      - @already_added_projects.each do |project|
        %tr{ id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}" }

--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -19,9 +19,6 @@ msgstr ""
 msgid " Please sign in."
 msgstr ""
-msgid " Status"
-msgstr ""
 msgid " Try to %{action} this file again."
 msgstr ""