diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-15 21:10:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-15 21:10:04 +0300 |
commit | 5ff1f808adf841bca979cb2fac6bdfa9c449d028 (patch) | |
tree | c95cfbbcb400684b2bc89fee4fc7b614315ba909 /app/views/projects/branches | |
parent | f8a5275c45ed2276daf843764113476749e680d2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/branches')
-rw-r--r-- | app/views/projects/branches/_branch_rules_info.haml | 4 | ||||
-rw-r--r-- | app/views/projects/branches/new.html.haml | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/views/projects/branches/_branch_rules_info.haml b/app/views/projects/branches/_branch_rules_info.haml index 15bee31c596..451d0f9928c 100644 --- a/app/views/projects/branches/_branch_rules_info.haml +++ b/app/views/projects/branches/_branch_rules_info.haml @@ -2,10 +2,10 @@ = render Pajamas::AlertComponent.new(variant: :info, title: s_("Branches|See all branch-related settings together with branch rules"), alert_options: { class: 'js-branch-rules-info-callout gl-mb-6 gl-mt-4', data: { feature_id: Users::CalloutsHelper::BRANCH_RULES_INFO_CALLOUT, dismiss_endpoint: callouts_path, defer_links: 'true' } }) do |c| - = c.body do + - c.with_body do = s_("Branches|You can now find an overview of settings for protected branches, merge request approvals, status checks, and security approvals conveniently in one spot.") - = c.actions do + - c.with_actions do = render Pajamas::ButtonComponent.new(variant: :confirm, href: project_settings_repository_path(@project, anchor: 'js-branch-rules'), button_options: { class: 'deferred-link gl-alert-action' }) do = s_("Branches|View branch rules") = render Pajamas::ButtonComponent.new(button_options: { class: 'js-close'}) do diff --git a/app/views/projects/branches/new.html.haml b/app/views/projects/branches/new.html.haml index 86bed956bc4..9fd9943fd26 100644 --- a/app/views/projects/branches/new.html.haml +++ b/app/views/projects/branches/new.html.haml @@ -3,7 +3,7 @@ - if @error = render Pajamas::AlertComponent.new(variant: :danger) do |c| - = c.body do + - c.with_body do = @error %h1.page-title.gl-font-size-h-display = _('New Branch') @@ -21,4 +21,3 @@ = render Pajamas::ButtonComponent.new(variant: :confirm, button_options: { type: 'submit', class: 'gl-mr-3' }) do = _('Create branch') = link_to _('Cancel'), project_branches_path(@project), class: 'gl-button btn btn-default btn-cancel' - |