diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:52:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:52:33 +0000 |
| commit | 5766bfc446ebf1134b2f2caff14144c74547db7c (patch) | |
| tree | 453d541fc7b70cfe14d865eaf15c982840ec2efa | |
| parent | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (diff) | |
| download | gitlab-ce-5766bfc446ebf1134b2f2caff14144c74547db7c.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
| -rw-r--r-- | app/assets/stylesheets/framework/lists.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/members.scss | 4 | ||||
| -rw-r--r-- | app/views/shared/members/_member.html.haml | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | vendor/gitignore/Java.gitignore | 0 |
6 files changed, 8 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index 9d67b175294..738150dbd2e 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -132,10 +132,10 @@ ul.content-list { a { color: $gl-text-color; + } - &.inline-link { - color: $blue-600; - } + .member-group-link { + color: $blue-600; } .description { diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss index 2d9a9f3029f..54bca80194f 100644 --- a/app/assets/stylesheets/pages/members.scss +++ b/app/assets/stylesheets/pages/members.scss @@ -180,6 +180,10 @@ word-break: break-all; } + .member-group-link { + display: inline-block; + } + .form-control { width: inherit; } diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index fa71f4dc9b9..20473b47484 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -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? diff --git a/locale/gitlab.pot b/locale/gitlab.pot index a80a35e3f7b..050b08dc32f 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -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 "" diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore index 259148fa18f..259148fa18f 100644..100755 --- a/vendor/gitignore/C++.gitignore +++ b/vendor/gitignore/C++.gitignore diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore index a1c2a238a96..a1c2a238a96 100644..100755 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore |