forked from gitlabhq/gitlabhq
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'import-form-scb' into 'master'
Resolve CE/EE diffs in import form Closes gitlabhq#10492 See merge request gitlab-org/gitlab-ee!13119
- Loading branch information
Showing
4 changed files
with
27 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
- return if ci_cd_only | ||
|
||
- docs_link = help_page_path('/workflow/repository_mirroring.md', anchor: 'ssh-authentication') | ||
- link_start = "<a href='#{docs_link}' rel='noopener noreferrer' target='_blank'>".html_safe | ||
|
||
%li | ||
= _('Once imported, repositories can be mirrored over SSH. Read more %{link_start}here%{link_end}.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
- if License.feature_available?(:repository_mirrors) | ||
.form-group | ||
= f.label :mirror, class: 'label-bold' do | ||
= f.check_box :mirror, disabled: true | ||
%strong | ||
Mirror repository | ||
- return if ci_cd_only | ||
- return unless License.feature_available?(:repository_mirrors) | ||
|
||
.form-group | ||
= f.label :mirror, class: 'label-bold' do | ||
= f.check_box :mirror, disabled: true | ||
%strong= _('Mirror repository') | ||
.form-text.text-muted | ||
= _("Automatically update this project's branches and tags from the upstream repository every hour.") | ||
- if Gitlab::CurrentSettings.should_check_namespace_plan? | ||
.form-text.text-muted | ||
Automatically update this project's branches and tags from the upstream | ||
repository every hour. | ||
- if Gitlab::CurrentSettings.should_check_namespace_plan? | ||
.form-text.text-muted | ||
Mirroring will only be available if the feature is included in the plan of the selected group or user. | ||
= _('Mirroring will only be available if the feature is included in the plan of the selected group or user.') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters