Compare commits

..

No commits in common. "5f82011b7cfbefa17a74b1630108f8a400c3945e" and "b1094ff28c3412b27d572dff6f19997c8f155f87" have entirely different histories.

14 changed files with 44 additions and 46 deletions

View File

@ -145,7 +145,7 @@ func EditHook(ctx *context.APIContext) {
// DeleteHook delete a system hook
func DeleteHook(ctx *context.APIContext) {
// swagger:operation DELETE /admin/hooks/{id} admin adminDeleteHook
// swagger:operation DELETE /amdin/hooks/{id} admin adminDeleteHook
// ---
// summary: Delete a hook
// produces:

View File

@ -963,7 +963,7 @@ func SignInOAuthCallback(ctx *context.Context) {
}
overwriteDefault := &user_model.CreateUserOverwriteOptions{
IsActive: util.OptionalBoolOf(!setting.OAuth2Client.RegisterEmailConfirm && !setting.Service.RegisterManualConfirm),
IsActive: util.OptionalBoolOf(!setting.OAuth2Client.RegisterEmailConfirm),
}
source := authSource.Cfg.(*oauth2.Source)

View File

@ -169,7 +169,7 @@
{{range .PushMirrors}}
<tr>
{{$address := MirrorRemoteAddress $.Context $.Repository .GetRemoteName true}}
<td class="gt-word-break">{{$address.Address}}</td>
<td>{{$address.Address}}</td>
<td>{{$.locale.Tr "repo.settings.mirror_settings.direction.push"}}</td>
<td>{{if .LastUpdateUnix}}<time data-format="date-time" datetime="{{.LastUpdateUnix.FormatLong}}">{{.LastUpdateUnix.AsTime}}</time>{{else}}{{$.locale.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label tooltip" data-content="{{.LastError}}">{{$.locale.Tr "error"}}</div>{{end}}</td>
<td class="right aligned">

View File

@ -223,31 +223,6 @@
}
}
},
"delete": {
"produces": [
"application/json"
],
"tags": [
"admin"
],
"summary": "Delete a hook",
"operationId": "adminDeleteHook",
"parameters": [
{
"type": "integer",
"format": "int64",
"description": "id of the hook to delete",
"name": "id",
"in": "path",
"required": true
}
],
"responses": {
"204": {
"$ref": "#/responses/empty"
}
}
},
"patch": {
"consumes": [
"application/json"
@ -756,6 +731,33 @@
}
}
},
"/amdin/hooks/{id}": {
"delete": {
"produces": [
"application/json"
],
"tags": [
"admin"
],
"summary": "Delete a hook",
"operationId": "adminDeleteHook",
"parameters": [
{
"type": "integer",
"format": "int64",
"description": "id of the hook to delete",
"name": "id",
"in": "path",
"required": true
}
],
"responses": {
"204": {
"$ref": "#/responses/empty"
}
}
}
},
"/markdown": {
"post": {
"consumes": [

View File

@ -59,7 +59,7 @@
}
.admin dl.admin-dl-horizontal dt {
font-weight: var(--font-weight-bold);
font-weight: 600;
float: left;
width: 285px;
clear: left;

View File

@ -3,10 +3,6 @@
--fonts-proportional: -apple-system, "Segoe UI", system-ui, "Roboto", "Helvetica Neue", "Arial";
--fonts-monospace: "SFMono-Regular", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New", monospace, var(--fonts-emoji);
--fonts-emoji: "Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", "Twemoji Mozilla";
/* "font-weight: bold" starts from 700, some fonts do not provide "bolding" for weight 600. */
/* But some users consider "700" is too heavy, so use 601, which is when Segoe UI on Linux */
/* starts bolding. */
--font-weight-bold: 601;
/* backgrounds */
--checkbox-mask-checked: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-1 -1 18 18" width="16" height="16"><path fill-rule="evenodd" d="M13.78 4.22a.75.75 0 010 1.06l-7.25 7.25a.75.75 0 01-1.06 0L2.22 9.28a.75.75 0 011.06-1.06L6 10.94l6.72-6.72a.75.75 0 011.06 0z"></path></svg>');
--checkbox-mask-indeterminate: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M2 7.75A.75.75 0 012.75 7h10a.75.75 0 010 1.5h-10A.75.75 0 012 7.75z"></path></svg>');
@ -215,7 +211,7 @@ h3,
h4,
h5,
h6 {
font-weight: var(--font-weight-bold);
font-weight: 600;
}
body {
@ -1796,7 +1792,7 @@ img.ui.avatar,
}
.scrolling.menu .item.selected {
font-weight: var(--font-weight-bold) !important;
font-weight: 600 !important;
}
.ui.dropdown .scrolling.menu {
@ -2791,7 +2787,7 @@ table th[data-sortt-desc] .svg {
.ellipsis-button {
padding: 0 5px 8px !important;
display: inline-block !important;
font-weight: var(--font-weight-bold) !important;
font-weight: 600 !important;
line-height: 6px !important;
vertical-align: middle !important;
}

View File

@ -41,7 +41,7 @@
/* GenericStrong */
.chroma .gs {
font-weight: var(--font-weight-bold);
font-weight: 600;
}
/* GenericUnderline */

View File

@ -26,7 +26,7 @@
}
.image-diff-container .diff-side-by-side .side .side-header {
font-weight: var(--font-weight-bold);
font-weight: bold;
}
.image-diff-container .diff-swipe {

View File

@ -29,7 +29,7 @@
font-size: .9em !important; /* compensate for monospace fonts being usually slightly larger */
}
.gt-bold { font-weight: var(--font-weight-bold) !important; }
.gt-bold { font-weight: 600 !important; }
.gt-word-break {
word-wrap: break-word !important;

View File

@ -55,7 +55,7 @@
margin: 20px auto;
color: var(--color-red);
text-align: left;
font-weight: var(--font-weight-bold);
font-weight: bold;
}
.page-content.install .ui .reinstall-confirm {

View File

@ -78,7 +78,7 @@
.markup h6 {
margin-top: 24px;
margin-bottom: 16px;
font-weight: var(--font-weight-bold);
font-weight: 600;
line-height: 1.25;
}
@ -256,7 +256,7 @@
margin-top: 16px;
font-size: 1em;
font-style: italic;
font-weight: var(--font-weight-bold);
font-weight: 600;
}
.markup dl dd {
@ -288,7 +288,7 @@
}
.markup table th {
font-weight: var(--font-weight-bold);
font-weight: 600;
}
.markup table th,

View File

@ -1566,7 +1566,7 @@
}
.repository .data-table th {
font-weight: var(--font-weight-bold);
font-weight: 600;
background: var(--color-box-header);
border-top: 0;
}

View File

@ -37,7 +37,7 @@
color: var(--color-text);
font-size: 16px;
min-width: 0;
font-weight: var(--font-weight-bold);
font-weight: 600;
}
.issue.list > .item .issue-item-top-row a.index {

View File

@ -1,6 +1,6 @@
.user.profile .ui.card .header {
display: block;
font-weight: var(--font-weight-bold);
font-weight: 600;
font-size: 1.3rem;
margin-top: -0.2rem;
line-height: 1.3rem;