diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2019-07-08 16:11:16 +0300 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2019-07-08 16:11:16 +0300 |
| commit | aafc9ebf1f0963fe8962a3cef67fe06ffbee63b2 (patch) | |
| tree | 9b089b40fbd1e969727a60b13226703f21e8703e | |
| parent | 886521c7e563e04574fd803a22476f1158961fad (diff) | |
Revert "Merge branch '12533-shared-runners-warning' into 'master'"revert-37deb5d0
This reverts merge request !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, 1 insertions, 6 deletions
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index a988f746ced..5c6131db37d 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 'namespaces/shared_runner_status', namespace: @user.namespace + = render_if_exists partial: "namespaces/shared_runner_status", locals: { 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 deleted file mode 100644 index b2b526cc2e4..00000000000 --- a/changelogs/unreleased/12533-shared-runners-warning.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Removes EE differences for app/views/admin/users/show.html.haml -merge_request: -author: -type: other |