Commit b16c87ff authored by Stan Hu's avatar Stan Hu

Merge branch 'feat/admin-pages-show-custom-attributes' into 'master'

Show custom attributes within Admin Pages

Closes #23652

See merge request gitlab-org/gitlab!34017
parents a13dc340 8aea75ef
...@@ -59,6 +59,8 @@ ...@@ -59,6 +59,8 @@
= render_if_exists 'namespaces/shared_runner_status', namespace: @group = render_if_exists 'namespaces/shared_runner_status', namespace: @group
= render 'shared/custom_attributes', custom_attributes: @group.custom_attributes
= render_if_exists 'ldap_group_links/ldap_group_links_show', group: @group = render_if_exists 'ldap_group_links/ldap_group_links_show', group: @group
.card .card
......
...@@ -108,6 +108,8 @@ ...@@ -108,6 +108,8 @@
= visibility_level_icon(@project.visibility_level) = visibility_level_icon(@project.visibility_level)
= visibility_level_label(@project.visibility_level) = visibility_level_label(@project.visibility_level)
= render 'shared/custom_attributes', custom_attributes: @project.custom_attributes
= render_if_exists 'admin/projects/geo_status_widget', locals: { project: @project } = render_if_exists 'admin/projects/geo_status_widget', locals: { project: @project }
.card .card
......
...@@ -141,6 +141,8 @@ ...@@ -141,6 +141,8 @@
= render_if_exists 'namespaces/shared_runner_status', namespace: @user.namespace = render_if_exists 'namespaces/shared_runner_status', namespace: @user.namespace
= render 'shared/custom_attributes', custom_attributes: @user.custom_attributes
.col-md-6 .col-md-6
- unless @user == current_user - unless @user == current_user
- unless @user.confirmed? - unless @user.confirmed?
......
- return unless custom_attributes.present?
.card
.card-header
= link_to(_('Custom Attributes'), help_page_path('api/custom_attributes.md'))
%ul.content-list
- custom_attributes.each do |custom_attribute|
%li
%span.light
= custom_attribute.key
%strong
= custom_attribute.value
---
title: Show custom attributes within Admin Pages
merge_request: 34017
author: Roger Meier
type: added
...@@ -6684,6 +6684,9 @@ msgstr "" ...@@ -6684,6 +6684,9 @@ msgstr ""
msgid "CurrentUser|Upgrade" msgid "CurrentUser|Upgrade"
msgstr "" msgstr ""
msgid "Custom Attributes"
msgstr ""
msgid "Custom CI configuration path" msgid "Custom CI configuration path"
msgstr "" msgstr ""
......
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