diff options
Diffstat (limited to 'app/views/groups/settings/repository')
-rw-r--r-- | app/views/groups/settings/repository/_default_branch.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/settings/repository/show.html.haml | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app/views/groups/settings/repository/_default_branch.html.haml b/app/views/groups/settings/repository/_default_branch.html.haml index cae33820a05..844a5f890a4 100644 --- a/app/views/groups/settings/repository/_default_branch.html.haml +++ b/app/views/groups/settings/repository/_default_branch.html.haml @@ -8,7 +8,7 @@ = s_('GroupSettings|Set the initial name and protections for the default branch of new repositories created in the group.') .settings-content = gitlab_ui_form_for @group, url: group_path(@group, anchor: 'js-default-branch-name'), html: { class: 'fieldset-form' } do |f| - = form_errors(@group, pajamas_alert: true) + = form_errors(@group) - fallback_branch_name = "<code>#{Gitlab::DefaultBranch.value(object: @group)}</code>" %fieldset diff --git a/app/views/groups/settings/repository/show.html.haml b/app/views/groups/settings/repository/show.html.haml index d3b9117c05b..a15652b3179 100644 --- a/app/views/groups/settings/repository/show.html.haml +++ b/app/views/groups/settings/repository/show.html.haml @@ -2,7 +2,11 @@ - page_title _('Repository') - @content_class = "limit-container-width" unless fluid_layout -- deploy_token_description = s_('DeployTokens|Group deploy tokens allow access to the packages, repositories, and registry images within the group.') +- if can?(current_user, :admin_group, @group) + - deploy_token_description = s_('DeployTokens|Group deploy tokens allow access to the packages, repositories, and registry images within the group.') -= render "shared/deploy_tokens/index", group_or_project: @group, description: deploy_token_description -= render "default_branch", group: @group + = render "shared/deploy_tokens/index", group_or_project: @group, description: deploy_token_description + = render "default_branch", group: @group + +- if can?(current_user, :change_push_rules, @group) + = render "push_rules" |