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
This commit is contained in:
Clement Ho 2018-06-11 16:08:45 +00:00
commit 87eb2b6e51
2 changed files with 5 additions and 2 deletions

View File

@ -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")

View File

@ -2249,6 +2249,9 @@ msgstr ""
msgid "Gitaly"
msgstr ""
msgid "Gitaly|Address"
msgstr ""
msgid "Gitaly Servers"
msgstr ""