diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-11 17:09:11 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-11 17:09:11 +0100 |
commit | 7f5703484b957718d4f9f576cf8ac22acc45c8de (patch) | |
tree | 387db45c36add940497578f8bf8643088a1070c0 /app | |
parent | a9a1512448ed91e92450495c86c2d7c19b67b70d (diff) | |
parent | 87eb2b6e510af44ec905c183d9b886a46d223815 (diff) | |
download | gitlab-ce-7f5703484b957718d4f9f576cf8ac22acc45c8de.tar.gz |
Merge branch 'master' into fl-eslint-vue-house-keeping
* master:
Don't use Rails.root.join for upload fixture paths
Fix translation placeholder for Gitaly address
Revert extra CSS causing Gitaly Servers table to be misalgined
Fix conversion of integer into string in board spec
Diffstat (limited to 'app')
-rw-r--r-- | app/views/admin/gitaly_servers/index.html.haml | 4 |
1 files changed, 2 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") |