Commit 5766bfc4 authored by GitLab Bot's avatar GitLab Bot

Add latest changes from gitlab-org/gitlab@13-3-stable-ee

parent 6e4e1050
......@@ -132,11 +132,11 @@ ul.content-list {
a {
color: $gl-text-color;
}
&.inline-link {
.member-group-link {
color: $blue-600;
}
}
.description {
@include str-truncated;
......
......@@ -180,6 +180,10 @@
word-break: break-all;
}
.member-group-link {
display: inline-block;
}
.form-control {
width: inherit;
}
......
......@@ -33,7 +33,7 @@
- if source.instance_of?(Group) && source != @group
·
= link_to source.full_name, source, class: "gl-display-inline-block inline-link"
= link_to source.full_name, source, class: "member-group-link"
.cgray
- if member.request?
......
......@@ -12587,9 +12587,6 @@ msgstr ""
msgid "How many users will be evaluating the trial?"
msgstr ""
msgid "How to upgrade"
msgstr ""
msgid "However, you are already a member of this %{member_source}. Sign in using a different account to accept the invitation."
msgstr ""
......
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment