diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-11 16:08:45 +0000 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-06-12 11:40:00 +0200 |
| commit | a73f71db0ffd0742ed6236e2ab76f8b93cec6b0d (patch) | |
| tree | 7d30c2c9fd81dd30570f1ad2f1f95a50afa4265a | |
| parent | 5151bd6e46fccbdae434290d8f71a5dd928785a6 (diff) | |
| download | gitlab-ce-a73f71db0ffd0742ed6236e2ab76f8b93cec6b0d.tar.gz | |
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
| -rw-r--r-- | app/views/admin/gitaly_servers/index.html.haml | 4 | ||||
| -rw-r--r-- | 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 "" |