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
ac806c93
Commit
ac806c93
authored
Jul 06, 2020
by
Tim Zallmann
Committed by
Natalia Tepluhina
Jul 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replaced GitLab Fontawesome Icons with Tanuki Icon
Updated Page title on import to flex Updated Import Strings
parent
c77e1b29
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
app/views/import/gitlab_projects/new.html.haml
app/views/import/gitlab_projects/new.html.haml
+3
-2
app/views/projects/_import_project_pane.html.haml
app/views/projects/_import_project_pane.html.haml
+4
-2
locale/gitlab.pot
locale/gitlab.pot
+6
-0
No files found.
app/views/import/gitlab_projects/new.html.haml
View file @
ac806c93
-
page_title
_
(
"GitLab Import"
)
-
header_title
_
(
"Projects"
),
root_path
%h3
.page-title
=
icon
(
'gitlab'
)
%h3
.page-title.d-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
=
sprite_icon
(
'tanuki'
,
size:
16
,
css_class:
'gl-mr-2'
)
=
_
(
'Import an exported GitLab project'
)
%hr
...
...
app/views/projects/_import_project_pane.html.haml
View file @
ac806c93
...
...
@@ -9,7 +9,8 @@
-
if
gitlab_project_import_enabled?
.import_gitlab_project.has-tooltip
{
data:
{
container:
'body'
}
}
=
link_to
new_import_gitlab_project_path
,
class:
'btn btn_import_gitlab_project project-submit'
,
**
tracking_attrs
(
track_label
,
'click_button'
,
'gitlab_export'
)
do
=
icon
(
'gitlab'
,
text:
'GitLab export'
)
=
sprite_icon
(
'tanuki'
)
=
_
(
"GitLab export"
)
-
if
github_import_enabled?
%div
...
...
@@ -32,7 +33,8 @@
%div
=
link_to
status_import_gitlab_path
,
class:
"btn import_gitlab
#{
'how_to_import_link'
unless
gitlab_import_configured?
}
"
,
**
tracking_attrs
(
track_label
,
'click_button'
,
'gitlab_com'
)
do
=
icon
(
'gitlab'
,
text:
'GitLab.com'
)
=
sprite_icon
(
'tanuki'
)
=
_
(
"GitLab.com"
)
-
unless
gitlab_import_configured?
=
render
'projects/gitlab_import_modal'
...
...
locale/gitlab.pot
View file @
ac806c93
...
...
@@ -10822,6 +10822,9 @@ msgstr ""
msgid "GitLab commit"
msgstr ""
msgid "GitLab export"
msgstr ""
msgid "GitLab for Slack"
msgstr ""
...
...
@@ -10855,6 +10858,9 @@ msgstr ""
msgid "GitLab will run a background job that will produce pseudonymized CSVs of the GitLab database that will be uploaded to your configured object storage directory."
msgstr ""
msgid "GitLab.com"
msgstr ""
msgid "GitLab.com import"
msgstr ""
...
...
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