Commit 87c94281 authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 'feature/visibility-mismatch-warning' into 'master'

Add warning to the branch chooser

See merge request gitlab-org/gitlab!51671
parents ab98b944 b8f81eda
...@@ -6,6 +6,17 @@ ...@@ -6,6 +6,17 @@
- source_title, target_title = format_mr_branch_names(@merge_request) - source_title, target_title = format_mr_branch_names(@merge_request)
- vis010 = _('This merge request is from a private project to an internal project.')
- vis020 = _('This merge request is from a private project to a public project.')
- vis1020 = _('This merge request is from an internal project to a public project.')
- i18n = { '010' => vis010, '020' => vis020, '1020' => vis1020 }
- source_level = @merge_request.source_project.visibility_level
- source_visibility = @merge_request.source_project.visibility
- target_level = @merge_request.target_project.visibility_level
- visibilityMismatchString = i18n["#{source_level}#{target_level}"]
.form-group.row.d-flex.gl-px-5.branch-selector .form-group.row.d-flex.gl-px-5.branch-selector
.align-self-center .align-self-center
%span %span
...@@ -24,4 +35,12 @@ ...@@ -24,4 +35,12 @@
= form.hidden_field(:target_branch, = form.hidden_field(:target_branch,
{ class: 'target_branch js-target-branch-select ref-name mw-xl', { class: 'target_branch js-target-branch-select ref-name mw-xl',
data: { placeholder: _('Select branch'), endpoint: refs_project_path(@project, sort: 'updated_desc', find: 'branches') }}) data: { placeholder: _('Select branch'), endpoint: refs_project_path(@project, sort: 'updated_desc', find: 'branches') }})
- if source_level < target_level
.gl-alert.gl-alert-warning.gl-mt-4
= sprite_icon('warning', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
.gl-alert-body
= visibilityMismatchString
%br
= _('Review the target project before submitting to avoid exposing %{source} changes.') % { source: source_visibility }
%hr %hr
---
title: Add visibility mismatch warning to the branch chooser
merge_request: 51671
author:
type: changed
...@@ -24346,6 +24346,9 @@ msgstr "" ...@@ -24346,6 +24346,9 @@ msgstr ""
msgid "Review the process for configuring service providers in your identity provider — in this case, GitLab is the \"service provider\" or \"relying party\"." msgid "Review the process for configuring service providers in your identity provider — in this case, GitLab is the \"service provider\" or \"relying party\"."
msgstr "" msgstr ""
msgid "Review the target project before submitting to avoid exposing %{source} changes."
msgstr ""
msgid "Review time" msgid "Review time"
msgstr "" msgstr ""
...@@ -29024,6 +29027,15 @@ msgstr "" ...@@ -29024,6 +29027,15 @@ msgstr ""
msgid "This merge request is closed. To apply this suggestion, edit this file directly." msgid "This merge request is closed. To apply this suggestion, edit this file directly."
msgstr "" msgstr ""
msgid "This merge request is from a private project to a public project."
msgstr ""
msgid "This merge request is from a private project to an internal project."
msgstr ""
msgid "This merge request is from an internal project to a public project."
msgstr ""
msgid "This merge request is locked." msgid "This merge request is locked."
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