Skip to content

Commit 353d88a

Browse files
lunnytechknowlogick
lunny
and
techknowlogick
authored
Migrating wiki don't require token, so we should move it out of the require form (#17645) (#18104)
* Migrating wiki don't require token, so we should move it out of the require form * Fix lint Co-authored-by: techknowlogick <[email protected]>
1 parent a17fce3 commit 353d88a

File tree

5 files changed

+62
-49
lines changed

5 files changed

+62
-49
lines changed

‎templates/repo/migrate/gitea.tmpl‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,16 @@
2626

2727
{{template "repo/migrate/options" .}}
2828

29-
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
30-
<div id="migrate_items">
31-
<div class="inline field">
32-
<label>{{.i18n.Tr "repo.migrate_items"}}</label>
33-
<div class="ui checkbox">
34-
<input name="wiki" type="checkbox" {{if .wiki}} checked{{end}}>
35-
<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
36-
</div>
37-
<div class="ui checkbox">
38-
<input name="milestones" type="checkbox" {{if .milestones}} checked{{end}}>
39-
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
40-
</div>
29+
<div class="inline field">
30+
<label>{{.i18n.Tr "repo.migrate_items"}}</label>
31+
<div class="ui checkbox">
32+
<input name="wiki" type="checkbox" {{if .wiki}} checked{{end}}>
33+
<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
4134
</div>
35+
</div>
36+
37+
<div id="migrate_items">
38+
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
4239
<div class="inline field">
4340
<label></label>
4441
<div class="ui checkbox">
@@ -61,6 +58,13 @@
6158
<label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label>
6259
</div>
6360
</div>
61+
<div class="inline field">
62+
<label></label>
63+
<div class="ui checkbox">
64+
<input name="milestones" type="checkbox" {{if .milestones}} checked{{end}}>
65+
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
66+
</div>
67+
</div>
6468
</div>
6569

6670
<div class="ui divider"></div>

‎templates/repo/migrate/github.tmpl‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,15 @@
2626

2727
{{template "repo/migrate/options" .}}
2828

29-
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
30-
<div id="migrate_items">
31-
<div class="inline field">
32-
<label>{{.i18n.Tr "repo.migrate_items"}}</label>
33-
<div class="ui checkbox">
34-
<input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}>
35-
<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
36-
</div>
37-
<div class="ui checkbox">
38-
<input name="milestones" type="checkbox" {{if .milestones}}checked{{end}}>
39-
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
40-
</div>
29+
<div class="inline field">
30+
<label>{{.i18n.Tr "repo.migrate_items"}}</label>
31+
<div class="ui checkbox">
32+
<input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}>
33+
<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
4134
</div>
35+
</div>
36+
<div id="migrate_items">
37+
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
4238
<div class="inline field">
4339
<label></label>
4440
<div class="ui checkbox">
@@ -61,6 +57,13 @@
6157
<label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label>
6258
</div>
6359
</div>
60+
<div class="inline field">
61+
<label></label>
62+
<div class="ui checkbox">
63+
<input name="milestones" type="checkbox" {{if .milestones}}checked{{end}}>
64+
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
65+
</div>
66+
</div>
6467
</div>
6568

6669
<div class="ui divider"></div>

‎templates/repo/migrate/gitlab.tmpl‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,15 @@
2626

2727
{{template "repo/migrate/options" .}}
2828

29-
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
30-
<div id="migrate_items">
31-
<div class="inline field">
32-
<label>{{.i18n.Tr "repo.migrate_items"}}</label>
33-
<div class="ui checkbox">
34-
<input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}>
35-
<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
36-
</div>
37-
<div class="ui checkbox">
38-
<input name="milestones" type="checkbox" {{if .milestones}}checked{{end}}>
39-
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
40-
</div>
29+
<div class="inline field">
30+
<label>{{.i18n.Tr "repo.migrate_items"}}</label>
31+
<div class="ui checkbox">
32+
<input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}>
33+
<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
4134
</div>
35+
</div>
36+
<div id="migrate_items">
37+
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
4238
<div class="inline field">
4339
<label></label>
4440
<div class="ui checkbox">
@@ -61,6 +57,13 @@
6157
<label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label>
6258
</div>
6359
</div>
60+
<div class="inline field">
61+
<label></label>
62+
<div class="ui checkbox">
63+
<input name="milestones" type="checkbox" {{if .milestones}}checked{{end}}>
64+
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
65+
</div>
66+
</div>
6467
</div>
6568

6669
<div class="ui divider"></div>

‎templates/repo/migrate/gogs.tmpl‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,16 @@
2626

2727
{{template "repo/migrate/options" .}}
2828

29-
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
30-
<div id="migrate_items">
31-
<div class="inline field">
32-
<label>{{.i18n.Tr "repo.migrate_items"}}</label>
33-
<div class="ui checkbox">
34-
<input name="wiki" type="checkbox" {{if .wiki}} checked{{end}}>
35-
<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
36-
</div>
37-
<div class="ui checkbox">
38-
<input name="milestones" type="checkbox" {{if .milestones}} checked{{end}}>
39-
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
40-
</div>
29+
<div class="inline field">
30+
<label>{{.i18n.Tr "repo.migrate_items"}}</label>
31+
<div class="ui checkbox">
32+
<input name="wiki" type="checkbox" {{if .wiki}} checked{{end}}>
33+
<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
4134
</div>
35+
</div>
36+
37+
<div id="migrate_items">
38+
<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
4239
<div class="inline field">
4340
<label></label>
4441
<div class="ui checkbox">
@@ -50,6 +47,13 @@
5047
<label>{{.i18n.Tr "repo.migrate_items_issues" | Safe}}</label>
5148
</div>
5249
</div>
50+
<div class="inline field">
51+
<label></label>
52+
<div class="ui checkbox">
53+
<input name="milestones" type="checkbox" {{if .milestones}} checked{{end}}>
54+
<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
55+
</div>
56+
</div>
5357
<!-- Gogs do not support it
5458
<div class="inline field">
5559
<label></label>

‎web_src/less/_form.less‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ textarea:focus,
135135
.form {
136136
.help {
137137
color: #999999;
138-
padding-top: .6em;
139138
padding-bottom: .6em;
140139
display: inline-block;
141140
}

0 commit comments

Comments
 (0)