Commit d53efb13 authored by Vitaly Slobodin's avatar Vitaly Slobodin

Merge branch '285517-admin-minutes' into 'master'

Display additional minutes in group admin

See merge request gitlab-org/gitlab!59063
parents e57b94e5 8d2eb73b
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
= link_to sprite_icon('question-o'), help_page_path('topics/git/lfs/index') = link_to sprite_icon('question-o'), help_page_path('topics/git/lfs/index')
= render_if_exists 'namespaces/shared_runner_status', namespace: @group = render_if_exists 'namespaces/shared_runner_status', namespace: @group
= render_if_exists 'namespaces/additional_minutes_status', namespace: @group
= render 'shared/custom_attributes', custom_attributes: @group.custom_attributes = render 'shared/custom_attributes', custom_attributes: @group.custom_attributes
......
- return unless Gitlab.com?
- namespace = local_assigns.fetch(:namespace)
- minutes_quota = namespace.ci_minutes_quota
- return unless minutes_quota.enabled?
- if minutes_quota.namespace_eligible?
%li
%span.light= _('Additional minutes:')
%strong
= ci_minutes_report(minutes_quota.purchased_minutes_report)
...@@ -2102,6 +2102,9 @@ msgstr "" ...@@ -2102,6 +2102,9 @@ msgstr ""
msgid "Additional minutes" msgid "Additional minutes"
msgstr "" msgstr ""
msgid "Additional minutes:"
msgstr ""
msgid "Additional text" msgid "Additional text"
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