Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d6b6769f
Commit
d6b6769f
authored
May 22, 2019
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve CE/EE diffs in import form
Part of single codebase changes.
parent
221f0060
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
19 deletions
+27
-19
app/views/shared/_import_form.html.haml
app/views/shared/_import_form.html.haml
+2
-7
ee/app/views/shared/_ci_cd_only_link.html.haml
ee/app/views/shared/_ci_cd_only_link.html.haml
+7
-0
ee/app/views/shared/ee/_import_form.html.haml
ee/app/views/shared/ee/_import_form.html.haml
+11
-11
locale/gitlab.pot
locale/gitlab.pot
+7
-1
No files found.
app/views/shared/_import_form.html.haml
View file @
d6b6769f
...
...
@@ -18,11 +18,6 @@
=
import_will_timeout_message
(
ci_cd_only
)
%li
=
import_svn_message
(
ci_cd_only
)
-
unless
ci_cd_only
%li
-
ssh_link
=
link_to
_
(
'here'
),
help_page_path
(
'/workflow/repository_mirroring.md'
,
anchor:
'ssh-authentication'
)
=
_
(
'Once imported, repositories can be mirrored over SSH. Read more %{ssh_link}'
).
html_safe
%
{
ssh_link:
ssh_link
}
=
render_if_exists
'shared/ci_cd_only_link'
,
ci_cd_only:
ci_cd_only
-# EE-specific start
=
render
'shared/ee/import_form'
,
f:
f
unless
ci_cd_only
-# EE-specific end
=
render_if_exists
'shared/ee/import_form'
,
f:
f
,
ci_cd_only:
ci_cd_only
ee/app/views/shared/_ci_cd_only_link.html.haml
0 → 100644
View file @
d6b6769f
-
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
}
ee/app/views/shared/ee/_import_form.html.haml
View file @
d6b6769f
-
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.'
)
locale/gitlab.pot
View file @
d6b6769f
...
...
@@ -1641,6 +1641,9 @@ msgstr ""
msgid "Automatically resolved"
msgstr ""
msgid "Automatically update this project's branches and tags from the upstream repository every hour."
msgstr ""
msgid "Autosave|Note"
msgstr ""
...
...
@@ -8072,6 +8075,9 @@ msgstr ""
msgid "Mirroring was successfully disabled."
msgstr ""
msgid "Mirroring will only be available if the feature is included in the plan of the selected group or user."
msgstr ""
msgid "Missing commit signatures endpoint!"
msgstr ""
...
...
@@ -8632,7 +8638,7 @@ msgstr ""
msgid "Onboarding"
msgstr ""
msgid "Once imported, repositories can be mirrored over SSH. Read more %{
ssh_link}
"
msgid "Once imported, repositories can be mirrored over SSH. Read more %{
link_start}here%{link_end}.
"
msgstr ""
msgid "Once removed, the fork relationship cannot be restored and you will no longer be able to send merge requests to the source."
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment