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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
87e19af2
Commit
87e19af2
authored
Apr 24, 2019
by
Matti R
Committed by
Phil Hughes
Apr 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Gitea logo for importer
parent
714f7209
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
5 deletions
+11
-5
app/views/import/gitea/new.html.haml
app/views/import/gitea/new.html.haml
+3
-3
app/views/import/gitea/status.html.haml
app/views/import/gitea/status.html.haml
+1
-1
app/views/projects/_import_project_pane.html.haml
app/views/projects/_import_project_pane.html.haml
+1
-1
app/views/shared/icons/_gitea_logo.svg.erb
app/views/shared/icons/_gitea_logo.svg.erb
+1
-0
changelogs/unreleased/27424-tklk-gitea-logo.yml
changelogs/unreleased/27424-tklk-gitea-logo.yml
+5
-0
No files found.
app/views/import/gitea/new.html.haml
View file @
87e19af2
...
...
@@ -2,18 +2,18 @@
-
header_title
_
(
"Projects"
),
root_path
%h3
.page-title
=
custom_icon
(
'g
o
_logo'
)
=
custom_icon
(
'g
itea
_logo'
)
=
_
(
'Import Projects from Gitea'
)
%p
-
link_to_personal_token
=
link_to
(
_
(
'Personal Access Token'
),
'https://
github.com/gogits/go-gogs-client/wiki#access-token
'
)
-
link_to_personal_token
=
link_to
(
_
(
'Personal Access Token'
),
'https://
docs.gitea.io/en-us/api-usage/#authentication-via-the-api
'
)
=
_
(
'To get started, please enter your Gitea Host URL and a %{link_to_personal_token}.'
).
html_safe
%
{
link_to_personal_token:
link_to_personal_token
}
=
form_tag
personal_access_token_import_gitea_path
do
.form-group.row
=
label_tag
:gitea_host_url
,
_
(
'Gitea Host URL'
),
class:
'col-form-label col-sm-2'
.col-sm-4
=
text_field_tag
:gitea_host_url
,
nil
,
placeholder:
'https://
try.gitea.io
'
,
class:
'form-control'
=
text_field_tag
:gitea_host_url
,
nil
,
placeholder:
'https://
gitea.com
'
,
class:
'form-control'
.form-group.row
=
label_tag
:personal_access_token
,
_
(
'Personal Access Token'
),
class:
'col-form-label col-sm-2'
.col-sm-4
...
...
app/views/import/gitea/status.html.haml
View file @
87e19af2
-
page_title
_
(
"Gitea Import"
)
-
header_title
_
(
"Projects"
),
root_path
%h3
.page-title
=
custom_icon
(
'g
o
_logo'
)
=
custom_icon
(
'g
itea
_logo'
)
=
_
(
'Import Projects from Gitea'
)
=
render
'import/githubish_status'
,
provider:
'gitea'
app/views/projects/_import_project_pane.html.haml
View file @
87e19af2
...
...
@@ -50,7 +50,7 @@
-
if
gitea_import_enabled?
%div
=
link_to
new_import_gitea_path
,
class:
'btn import_gitea'
,
data:
{
track_label:
"
#{
track_label
}
"
,
track_event:
"click_button"
,
track_property:
"gitea"
}
do
=
custom_icon
(
'g
o
_logo'
)
=
custom_icon
(
'g
itea
_logo'
)
Gitea
-
if
git_import_enabled?
...
...
app/views/shared/icons/_gitea_logo.svg.erb
0 → 100644
View file @
87e19af2
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc=
"http://purl.org/dc/elements/1.1/"
xmlns:cc=
"http://creativecommons.org/ns#"
xmlns:rdf=
"http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg=
"http://www.w3.org/2000/svg"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:sodipodi=
"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape=
"http://www.inkscape.org/namespaces/inkscape"
width=
"
<%=
size
%>
"
height=
"
<%=
size
%>
"
viewBox=
"0 0 135.46667 135.46667"
version=
"1.1"
id=
"svg8"
sodipodi:docname=
"logo.svg"
inkscape:version=
"0.92.1 r15371"
inkscape:export-filename=
""
inkscape:export-xdpi=
"48.000004"
inkscape:export-ydpi=
"48.000004"
style=
"zoom: 1;"
><defs
id=
"defs2"
></defs><sodipodi:namedview
id=
"base"
pagecolor=
"#ffffff"
bordercolor=
"#666666"
borderopacity=
"1.0"
inkscape:pageopacity=
"0"
inkscape:pageshadow=
"2"
inkscape:zoom=
"0.70710678"
inkscape:cx=
"418.13805"
inkscape:cy=
"177.57445"
inkscape:document-units=
"mm"
inkscape:current-layer=
"layer2"
showgrid=
"false"
units=
"px"
width=
"256px"
showguides=
"false"
inkscape:window-width=
"1920"
inkscape:window-height=
"1137"
inkscape:window-x=
"1912"
inkscape:window-y=
"-8"
inkscape:window-maximized=
"1"
inkscape:pagecheckerboard=
"false"
inkscape:measure-start=
"283.373,243.952"
inkscape:measure-end=
"290.267,236.527"
><sodipodi:guide
position=
"0,0"
orientation=
"0,512"
id=
"guide3699"
inkscape:locked=
"false"
></sodipodi:guide><sodipodi:guide
position=
"135.46667,0"
orientation=
"-512,0"
id=
"guide3701"
inkscape:locked=
"false"
></sodipodi:guide><sodipodi:guide
position=
"135.46667,135.46667"
orientation=
"0,-512"
id=
"guide3703"
inkscape:locked=
"false"
></sodipodi:guide><sodipodi:guide
position=
"0,135.46667"
orientation=
"512,0"
id=
"guide3705"
inkscape:locked=
"false"
></sodipodi:guide></sodipodi:namedview><metadata
id=
"metadata5"
><rdf:RDF><cc:Work
rdf:about=
""
><dc:format>
image/svg+xml
</dc:format><dc:type
rdf:resource=
"http://purl.org/dc/dcmitype/StillImage"
></dc:type><dc:title></dc:title></cc:Work></rdf:RDF></metadata><g
inkscape:label=
"Layer 1"
inkscape:groupmode=
"layer"
id=
"layer1"
transform=
"translate(0,-161.53334)"
style=
"display:inline"
><path
d=
"M27.709937,195.15095 c-9.546573,-0.0272 -22.3392732,6.79805 -21.6317552,23.90397 c1.105534,26.72889 25.4565952,29.20839 35.1916502,29.42301 c1.068023,5.01357 12.521798,22.30563 21.001818,23.21667 h37.15277 c22.27763,-1.66785 38.9607,-75.75671 26.59321,-76.03825 c-46.781583,2.47691 -49.995146,2.13838 -88.599758,0 c-2.495053,-0.0266 -5.972321,-0.49474 -9.707935,-0.5054 z m2.491319,9.45886 c1.351378,13.69267 3.555849,21.70359 8.018216,33.94345 c-11.382872,-1.50473 -21.069822,-5.22443 -22.851515,-19.10984 c-0.950962,-7.4112 2.390428,-15.16769 14.833299,-14.83361 z "
id=
"path3722"
sodipodi:nodetypes=
"sscccccsccsc"
inkscape:connector-curvature=
"0"
style=
"fill:#000;fill-opacity:1;stroke:#000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
></path></g><g
inkscape:groupmode=
"layer"
id=
"layer2"
inkscape:label=
"Layer 2"
style=
"display:inline"
><rect
style=
"display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.24757317;stroke-opacity:1"
id=
"rect4599"
width=
"34.762054"
height=
"34.762054"
x=
"87.508659"
y=
"18.291576"
transform=
"rotate(25.914715)"
ry=
"5.4825778"
></rect><path
style=
"display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26644793px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d=
"m 79.804947,57.359056 3.241146,1.609954 V 35.255731 h -3.262698 z"
id=
"path4525"
inkscape:connector-curvature=
"0"
sodipodi:nodetypes=
"ccccc"
></path></g><g
inkscape:groupmode=
"layer"
id=
"layer3"
inkscape:label=
"Layer 3"
style=
"display:inline"
><g
style=
"display:inline"
id=
"g4539"
><circle
style=
"fill:#000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"
id=
"path4606"
cy=
"90.077766"
r=
"3.4745038"
cx=
"49.064713"
transform=
"rotate(-19.796137)"
></circle><circle
style=
"fill:#000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"
id=
"path4606-3"
cy=
"102.1049"
r=
"3.4745038"
cx=
"36.810425"
transform=
"rotate(-19.796137)"
></circle><circle
style=
"fill:#000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"
id=
"path4606-1"
cy=
"111.43928"
r=
"3.4745038"
cx=
"46.484283"
transform=
"rotate(-19.796137)"
></circle><rect
height=
"27.261492"
style=
"fill:#000;fill-opacity:1;stroke:none;stroke-width:0.27444693;stroke-opacity:1"
x=
"97.333458"
y=
"18.061695"
id=
"rect4629-8"
width=
"2.6726954"
transform=
"rotate(26.024158)"
></rect><path
d=
"M76.558096,68.116343 c12.97589,6.395378 13.012989,4.101862 4.890858,20.907244 "
id=
"path4514"
sodipodi:nodetypes=
"cc"
inkscape:connector-curvature=
"0"
style=
"fill:none;stroke:#000;stroke-width:2.68000007;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
></path></g></g></svg>
\ No newline at end of file
changelogs/unreleased/27424-tklk-gitea-logo.yml
0 → 100644
View file @
87e19af2
---
title
:
"
Use
official
Gitea
logo
in
importer"
merge_request
:
27424
author
:
Matti Ranta (@techknowlogick)
type
:
added
\ No newline at end of file
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