Skip to content

Commit 6e9e764

Browse files
zeripathzeripath
authored
Merge branch 'main' into fix-17885-close-git-repo-before-transfer
2 parents 6d10abc + 57d0461 commit 6e9e764

File tree

11 files changed

+162
-152
lines changed

11 files changed

+162
-152
lines changed

‎integrations/git_helper_for_declarative_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ func doGitInitTestRepository(dstPath string) func(*testing.T) {
139139
return func(t *testing.T) {
140140
// Init repository in dstPath
141141
assert.NoError(t, git.InitRepository(dstPath, false))
142+
// forcibly set default branch to master
143+
_, err := git.NewCommand("symbolic-ref", "HEAD", git.BranchPrefix+"master").RunInDir(dstPath)
144+
assert.NoError(t, err)
142145
assert.NoError(t, os.WriteFile(filepath.Join(dstPath, "README.md"), []byte(fmt.Sprintf("# Testing Repository\n\nOriginally created in: %s", dstPath)), 0644))
143146
assert.NoError(t, git.AddChanges(dstPath, true))
144147
signature := git.Signature{

‎models/asymkey/ssh_key_verify.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99

1010
"code.gitea.io/gitea/models/db"
1111
"code.gitea.io/gitea/modules/log"
12+
1213
"github.com/42wim/sshsig"
1314
)
1415

‎models/migrations/v204.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ func addSSHKeyIsVerified(x *xorm.Engine) error {
1111
Verified bool `xorm:"NOT NULL DEFAULT false"`
1212
}
1313

14-
return x.Sync(new(PublicKey))
14+
return x.Sync2(new(PublicKey))
1515
}

‎web_src/less/_base.less

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -214,18 +214,12 @@ details summary > * {
214214
background: transparent;
215215
}
216216

217-
.CodeMirror-cursor {
218-
border-color: var(--color-caret) !important;
219-
}
220-
221-
::selection,
222-
.CodeMirror-selected {
217+
::selection {
223218
background: var(--color-primary-light-1) !important;
224219
color: var(--color-white) !important;
225220
}
226221

227222
::placeholder,
228-
.CodeMirror-placeholder,
229223
.ui.dropdown:not(.button) > .default.text,
230224
.ui.default.dropdown:not(.button) > .text {
231225
color: var(--color-placeholder-text) !important;
@@ -280,10 +274,6 @@ a.label,
280274
border-color: var(--color-primary);
281275
}
282276

283-
.CodeMirror-focused {
284-
border-color: var(--color-primary) !important;
285-
}
286-
287277
/* currently used for search bar dropdowns in repo search and explore code */
288278
.ui.action.input:not([class*="left action"]) > .ui.dropdown.selection {
289279
min-width: 10em;

‎web_src/less/_editor.less

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
.EasyMDEContainer .CodeMirror {
2-
color: var(--color-input-text);
3-
background-color: var(--color-input-background);
4-
border-color: var(--color-secondary);
5-
font: 14px var(--fonts-monospace);
6-
7-
&.cm-s-default {
8-
border-radius: 3px;
9-
padding: 0 !important;
10-
}
11-
12-
.cm-comment {
13-
background: inherit !important;
14-
}
15-
}
16-
171
.repository.file.editor .tab[data-tab="write"] {
182
padding: 0 !important;
193
}
@@ -33,6 +17,10 @@
3317
border-color: var(--color-secondary);
3418
}
3519

20+
.editor-toolbar.fullscreen {
21+
background: var(--color-body);
22+
}
23+
3624
.editor-toolbar button {
3725
border: none !important;
3826
color: var(--color-text-light);
@@ -55,6 +43,24 @@
5543
background: var(--color-active);
5644
}
5745

46+
/* hide preview button, we have the preview tab for this */
47+
.editor-toolbar:not(.fullscreen) .preview {
48+
display: none;
49+
}
50+
51+
/* hide revert button in fullscreen, it breaks the page */
52+
.editor-toolbar.fullscreen .revert-to-textarea {
53+
display: none;
54+
}
55+
56+
.editor-preview {
57+
background-color: var(--color-body);
58+
}
59+
60+
.editor-preview-side {
61+
border-color: var(--color-secondary);
62+
}
63+
5864
.editor-statusbar {
5965
color: var(--color-text-light);
6066
}

‎web_src/less/_repository.less

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2040,26 +2040,8 @@
20402040
}
20412041

20422042
&.new {
2043-
.CodeMirror {
2044-
.CodeMirror-code {
2045-
font-family: var(--fonts-monospace);
2046-
2047-
.cm-comment {
2048-
background: inherit;
2049-
}
2050-
}
2051-
}
2052-
2053-
.editor-preview {
2054-
background-color: white;
2055-
}
2056-
20572043
.ui.attached.tabular.menu.previewtabs {
20582044
margin-bottom: 15px;
2059-
2060-
& + .field .editor-toolbar:not(.fullscreen) a.fa-eye {
2061-
display: none;
2062-
}
20632045
}
20642046
}
20652047

‎web_src/less/codemirror/base.less

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
.EasyMDEContainer .CodeMirror {
2+
color: var(--color-input-text);
3+
background-color: var(--color-input-background);
4+
border-color: var(--color-secondary);
5+
font: 14px var(--fonts-monospace);
6+
7+
&.cm-s-default {
8+
border-radius: var(--border-radius);
9+
padding: 0 !important;
10+
}
11+
12+
&.CodeMirror-fullscreen.CodeMirror-focused {
13+
border-right: 1px solid var(--color-primary) !important;
14+
}
15+
}
16+
17+
.CodeMirror-cursor {
18+
border-color: var(--color-caret) !important;
19+
}
20+
21+
.CodeMirror .cm-comment {
22+
background: inherit !important;
23+
}
24+
25+
.CodeMirror .CodeMirror-code {
26+
font: 14px var(--fonts-monospace);
27+
}
28+
29+
.CodeMirror-selected {
30+
background: var(--color-primary-light-1) !important;
31+
color: var(--color-white) !important;
32+
}
33+
34+
.CodeMirror-placeholder {
35+
color: var(--color-placeholder-text) !important;
36+
opacity: 1 !important;
37+
}
38+
39+
.CodeMirror-focused {
40+
border-color: var(--color-primary) !important;
41+
}

‎web_src/less/codemirror/dark.less

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
.CodeMirror {
2+
&.cm-s-default,
3+
&.cm-s-paper {
4+
.cm-property {
5+
color: #a0cc75;
6+
}
7+
8+
.cm-header {
9+
color: #9daccc;
10+
}
11+
12+
.cm-quote {
13+
color: #009900;
14+
}
15+
16+
.cm-keyword {
17+
color: #cc8a61;
18+
}
19+
20+
.cm-atom {
21+
color: #ef5e77;
22+
}
23+
24+
.cm-number {
25+
color: #ff5656;
26+
}
27+
28+
.cm-def {
29+
color: #e4e4e4;
30+
}
31+
32+
.cm-variable-2 {
33+
color: #00bdbf;
34+
}
35+
36+
.cm-variable-3 {
37+
color: #008855;
38+
}
39+
40+
.cm-comment {
41+
color: #8e9ab3;
42+
}
43+
44+
.cm-string {
45+
color: #a77272;
46+
}
47+
48+
.cm-string-2 {
49+
color: #ff5500;
50+
}
51+
52+
.cm-meta,
53+
.cm-qualifier {
54+
color: #ffb176;
55+
}
56+
57+
.cm-builtin {
58+
color: #b7c951;
59+
}
60+
61+
.cm-bracket {
62+
color: #999977;
63+
}
64+
65+
.cm-tag {
66+
color: #f1d273;
67+
}
68+
69+
.cm-attribute {
70+
color: #bfcc70;
71+
}
72+
73+
.cm-hr {
74+
color: #999999;
75+
}
76+
77+
.cm-url {
78+
color: #c5cfd0;
79+
}
80+
81+
.cm-link {
82+
color: #d8c792;
83+
}
84+
85+
.cm-error {
86+
color: #dbdbeb;
87+
}
88+
}
89+
}

‎web_src/less/codemirror/light.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* Placeholder, there is no light theme, it uses CM defaults */

‎web_src/less/index.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
@import "./chroma/base.less";
1818
@import "./chroma/light.less";
19+
@import "./codemirror/base.less";
20+
@import "./codemirror/light.less";
1921

2022
@import "_svg";
2123
@import "_tribute";

0 commit comments

Comments
 (0)