diff options
| author | Phil Hughes <me@iamphill.com> | 2019-07-08 07:45:12 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-07-08 07:45:12 +0000 |
| commit | 37deb5d087e19072e29b571c89a27fcdb01861cb (patch) | |
| tree | d1c9639e6d584820079a184eef15ec044334699d | |
| parent | 008aa6af4fa6a874bc893e214907a0ea1afb17f5 (diff) | |
| parent | 88a7e93caa958ae1b42f46ca1eae312e4338564d (diff) | |
| download | gitlab-ce-37deb5d087e19072e29b571c89a27fcdb01861cb.tar.gz | |
Merge branch '12533-shared-runners-warning' into 'master'
Removes EE differences for app/views/admin/users/show.html.haml
Closes gitlab-ee#12533
See merge request gitlab-org/gitlab-ce!30407
| -rw-r--r-- | app/views/admin/users/show.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/12533-shared-runners-warning.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 5c6131db37d..a988f746ced 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -139,7 +139,7 @@ %strong = link_to @user.created_by.name, [:admin, @user.created_by] - = render_if_exists partial: "namespaces/shared_runner_status", locals: { namespace: @user.namespace } + = render_if_exists 'namespaces/shared_runner_status', namespace: @user.namespace .col-md-6 - unless @user == current_user diff --git a/changelogs/unreleased/12533-shared-runners-warning.yml b/changelogs/unreleased/12533-shared-runners-warning.yml new file mode 100644 index 00000000000..b2b526cc2e4 --- /dev/null +++ b/changelogs/unreleased/12533-shared-runners-warning.yml @@ -0,0 +1,5 @@ +--- +title: Removes EE differences for app/views/admin/users/show.html.haml +merge_request: +author: +type: other |