From a73f71db0ffd0742ed6236e2ab76f8b93cec6b0d Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Mon, 11 Jun 2018 16:08:45 +0000 Subject: Merge branch 'sh-admin-gitaly-server-fix' into 'master' Revert extra CSS causing Gitaly Servers table to be misalgined Closes #47648 See merge request gitlab-org/gitlab-ce!19623 --- app/views/admin/gitaly_servers/index.html.haml | 4 ++-- locale/gitlab.pot | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/admin/gitaly_servers/index.html.haml b/app/views/admin/gitaly_servers/index.html.haml index d0cf5761726..9b24f411a75 100644 --- a/app/views/admin/gitaly_servers/index.html.haml +++ b/app/views/admin/gitaly_servers/index.html.haml @@ -6,10 +6,10 @@ - if @gitaly_servers.any? .table-holder %table.table.responsive-table - %thead.d-none.d-sm-none.d-md-block + %thead %tr %th= _("Storage") - %th= n_("Gitaly|Address") + %th= s_("Gitaly|Address") %th= _("Server version") %th= _("Git version") %th= _("Up to date") diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 43afb140051..bf0214401ef 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -2204,6 +2204,9 @@ msgstr "" msgid "Gitaly" msgstr "" +msgid "Gitaly|Address" +msgstr "" + msgid "Gitaly Servers" msgstr "" -- cgit v1.2.1