diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-11 16:08:45 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-11 16:08:45 +0000 |
| commit | 87eb2b6e510af44ec905c183d9b886a46d223815 (patch) | |
| tree | 232121618c05425aba7704405467c826a6a07430 | |
| parent | 1c28b624d670e7c764f14e30d409a1b1ab1a8c9d (diff) | |
| parent | 9a19d8982fdd624af3dbf64ce10d8cedcddb6392 (diff) | |
| download | gitlab-ce-87eb2b6e510af44ec905c183d9b886a46d223815.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 946669068cd..058a02833b1 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -2249,6 +2249,9 @@ msgstr "" msgid "Gitaly" msgstr "" +msgid "Gitaly|Address" +msgstr "" + msgid "Gitaly Servers" msgstr "" |