diff options
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/mirrors/_branch_filter.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/mirrors/_mirror_repos_push.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/network/show.html.haml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/projects/mirrors/_branch_filter.html.haml b/app/views/projects/mirrors/_branch_filter.html.haml index 49b0f8c39c8..7d90906bfe8 100644 --- a/app/views/projects/mirrors/_branch_filter.html.haml +++ b/app/views/projects/mirrors/_branch_filter.html.haml @@ -2,8 +2,8 @@ = render Pajamas::CheckboxTagComponent.new(name: :only_protected_branches, checkbox_options: { class: 'js-mirror-protected' }, label_options: { class: 'gl-mb-0!' }) do |c| - = c.label do + - c.with_label do = _('Mirror only protected branches') - = c.help_text do + - c.with_help_text do = _('If enabled, only protected branches will be mirrored.') = link_to _('Learn more.'), help_page_path('user/project/repository/mirror/index.md', anchor: 'mirror-only-protected-branches'), target: '_blank', rel: 'noopener noreferrer' diff --git a/app/views/projects/mirrors/_mirror_repos_push.html.haml b/app/views/projects/mirrors/_mirror_repos_push.html.haml index 0947359a753..5b02d650989 100644 --- a/app/views/projects/mirrors/_mirror_repos_push.html.haml +++ b/app/views/projects/mirrors/_mirror_repos_push.html.haml @@ -12,8 +12,8 @@ = render Pajamas::CheckboxTagComponent.new(name: :keep_divergent_refs, checkbox_options: { class: 'js-mirror-keep-divergent-refs' }, label_options: { class: 'gl-mb-0!' }) do |c| - = c.label do + - c.with_label do = _('Keep divergent refs') - = c.help_text do + - c.with_help_text do - link_opening_tag = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe = html_escape(_('Do not force push over diverged refs. After the mirror is created, this setting can only be modified using the API. %{mirroring_docs_link_start}Learn more about this option%{link_closing_tag} and %{mirroring_api_docs_link_start}the API.%{link_closing_tag}')) % { mirroring_docs_link_start: link_opening_tag % {url: help_page_path('user/project/repository/mirror/push.md', anchor: 'keep-divergent-refs')}, mirroring_api_docs_link_start: link_opening_tag % {url: help_page_path('api/remote_mirrors')}, link_closing_tag: '</a>'.html_safe } diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml index b31e8919832..c4630eec168 100644 --- a/app/views/projects/network/show.html.haml +++ b/app/views/projects/network/show.html.haml @@ -10,7 +10,7 @@ = render Pajamas::ButtonComponent.new(type: :submit, variant: :confirm, icon: 'search') .form-group{ class: 'gl-ml-5 gl-mb-n3!' } = render Pajamas::CheckboxTagComponent.new(name: :filter_ref, checked: @options[:filter_ref]) do |c| - = c.label do + - c.with_label do = _("Begin with the selected commit") - if @commit |