docs/content/administration/backup-and-restore.en-us.md

@@ -43,10 +43,10 @@ directory. There should be some output similar to the following:
 Inside the `gitea-dump-1482906742.zip` file, will be the following:
 
 - `app.ini` - Optional copy of configuration file if originally stored outside the default `custom/` directory
-- `custom/` - All config or customization files in `custom/`.
+- `custom` - All config or customization files in `custom/`.
-- `data/` - Data directory (APP_DATA_PATH), except sessions if you are using file session. This directory includes `attachments`, `avatars`, `lfs`, `indexers`, SQLite file if you are using SQLite.
+- `data` - Data directory (APP_DATA_PATH), except sessions if you are using file session. This directory includes `attachments`, `avatars`, `lfs`, `indexers`, SQLite file if you are using SQLite.
-- `repos/` - Complete copy of the repository directory.
 - `gitea-db.sql` - SQL dump of database
+- `gitea-repo.zip` - Complete copy of the repository directory.
 - `log/` - Various logs. They are not needed for a recovery or migration.
 
 Intermediate backup files are created in a temporary directory specified either with the
@@ -89,10 +89,10 @@ Example:
 ```sh
 unzip gitea-dump-1610949662.zip
 cd gitea-dump-1610949662
-mv app.ini /etc/gitea/conf/app.ini
+mv data/conf/app.ini /etc/gitea/conf/app.ini
 mv data/* /var/lib/gitea/data/
 mv log/* /var/lib/gitea/log/
-mv repos/* /var/lib/gitea/gitea-repositories/
+mv repos/* /var/lib/gitea/repositories/
 chown -R gitea:gitea /etc/gitea/conf/app.ini /var/lib/gitea
 
 # mysql
@@ -126,7 +126,7 @@ cd gitea-dump-1610949662
 # restore the gitea data
 mv data/* /data/gitea
 # restore the repositories itself
-mv repos/* /data/git/gitea-repositories/
+mv repos/* /data/git/repositories/
 # adjust file permissions
 chown -R git:git /data
 # Regenerate Git Hooks
@@ -150,7 +150,7 @@ mv data/conf/app.ini /etc/gitea/app.ini
 # restore the gitea data
 mv data/* /var/lib/gitea
 # restore the repositories itself
-mv repos/* /var/lib/gitea/git/gitea-repositories
+mv repos/* /var/lib/gitea/git/repositories
 # adjust file permissions
 chown -R git:git /etc/gitea/app.ini /var/lib/gitea
 # Regenerate Git Hooks

options/locale/locale_en-US.ini

@@ -3164,9 +3164,9 @@ monitor.queue.name = Name
 monitor.queue.type = Type
 monitor.queue.exemplar = Exemplar Type
 monitor.queue.numberworkers = Number of Workers
-monitor.queue.activeworkers = Active Workers
 monitor.queue.maxnumberworkers = Max Number of Workers
 monitor.queue.numberinqueue = Number in Queue
+monitor.queue.review = Review Config
 monitor.queue.review_add = Review/Add Workers
 monitor.queue.settings.title = Pool Settings
 monitor.queue.settings.desc = Pools dynamically grow in response to their worker queue blocking.

templates/admin/queue.tmpl

@@ -11,7 +11,6 @@
 				<th>{{.locale.Tr "admin.monitor.queue.type"}}</th>
 				<th>{{.locale.Tr "admin.monitor.queue.exemplar"}}</th>
 				<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
-				<th>{{.locale.Tr "admin.monitor.queue.activeworkers"}}</th>
 				<th>{{.locale.Tr "admin.monitor.queue.numberinqueue"}}</th>
 				<th></th>
 			</tr>
@@ -22,10 +21,9 @@
 				<td>{{$q.GetName}}</td>
 				<td>{{$q.GetType}}</td>
 				<td>{{$q.GetItemTypeName}}</td>
-				<td>{{$q.GetWorkerNumber}}</td>
+				<td>{{$sum := $q.GetWorkerNumber}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
-				<td>{{$q.GetWorkerActiveNumber}}</td>
+				<td>{{$sum = $q.GetQueueItemNumber}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
-				<td>{{$sum := $q.GetQueueItemNumber}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
+				<td><a href="{{$.Link}}/{{$qid}}" class="button">{{if lt $sum 0}}{{$.locale.Tr "admin.monitor.queue.review"}}{{else}}{{$.locale.Tr "admin.monitor.queue.review_add"}}{{end}}</a></td>
-				<td><a href="{{$.Link}}/{{$qid}}" class="button">{{$.locale.Tr "admin.monitor.queue.review_add"}}</a></td>
 			</tr>
 			{{end}}
 			</tbody>

templates/admin/queue_manage.tmpl

@@ -11,7 +11,6 @@
 						<th>{{.locale.Tr "admin.monitor.queue.type"}}</th>
 						<th>{{.locale.Tr "admin.monitor.queue.exemplar"}}</th>
 						<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
-						<th>{{.locale.Tr "admin.monitor.queue.activeworkers"}}</th>
 						<th>{{.locale.Tr "admin.monitor.queue.maxnumberworkers"}}</th>
 						<th>{{.locale.Tr "admin.monitor.queue.numberinqueue"}}</th>
 					</tr>
@@ -21,11 +20,10 @@
 						<td>{{.Queue.GetName}}</td>
 						<td>{{.Queue.GetType}}</td>
 						<td>{{.Queue.GetItemTypeName}}</td>
-						<td>{{.Queue.GetWorkerNumber}}</td>
+						<td>{{$sum := .Queue.GetWorkerNumber}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
-						<td>{{.Queue.GetWorkerActiveNumber}}</td>
+						<td>{{if lt $sum 0}}-{{else}}{{.Queue.GetWorkerMaxNumber}}{{end}}</td>
-						<td>{{.Queue.GetWorkerMaxNumber}}</td>
 						<td>
-							{{$sum := .Queue.GetQueueItemNumber}}
+							{{$sum = .Queue.GetQueueItemNumber}}
 							{{if lt $sum 0}}
 								-
 							{{else}}

templates/devtest/gitea-ui.tmpl

@@ -79,14 +79,6 @@
 		</div>
 	</div>
 
-	<div>
-		<h1>Buttons</h1>
-		<div class="ui buttons"><button class="ui button">1</button><button class="ui button">2</button><button class="ui button">3</button></div>
-		<div class="ui buttons"><button class="ui button active">1</button><button class="ui button">2</button><button class="ui button">3</button></div>
-		<div class="ui buttons"><button class="ui button">1</button><button class="ui button active">2</button><button class="ui button">3</button></div>
-		<div class="ui buttons"><button class="ui button">1</button><button class="ui button">2</button><button class="ui button active">3</button></div>
-	</div>
-
 	<div>
 		<h1>Tooltip</h1>
 		<div><span data-tooltip-content="test tooltip">text with tooltip</span></div>

templates/repo/commit_page.tmpl

@@ -135,7 +135,7 @@
 				{{end}}
 			</div>
 			{{if IsMultilineCommitMessage .Commit.Message}}
-				<pre class="commit-body">{{RenderCommitBody $.Context .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</pre>
+				<pre class="commit-body gt-mt-0">{{RenderCommitBody $.Context .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</pre>
 			{{end}}
 			{{template "repo/commit_load_branches_and_tags" .}}
 		</div>

templates/repo/commits_list.tmpl

@@ -68,7 +68,7 @@
 							{{end}}
 							{{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses "root" $}}
 							{{if IsMultilineCommitMessage .Message}}
-							<pre class="commit-body gt-hidden">{{RenderCommitBody $.Context .Message $commitRepoLink $.Repository.ComposeMetas}}</pre>
+							<pre class="commit-body gt-m-0 gt-hidden">{{RenderCommitBody $.Context .Message $commitRepoLink $.Repository.ComposeMetas}}</pre>
 							{{end}}
 						</td>
 						{{if .Committer}}

templates/repo/view_file.tmpl

@@ -20,7 +20,7 @@
 		</div>
 		<div class="file-header-right file-actions gt-df gt-ac gt-fw">
 			{{if .HasSourceRenderedToggle}}
-				<div class="ui compact icon buttons">
+				<div class="ui compact icon buttons two-toggle-buttons">
 					<a href="{{$.Link}}?display=source" class="ui mini basic button {{if .IsDisplayingSource}}active{{end}}" data-tooltip-content="{{.locale.Tr "repo.file_view_source"}}">{{svg "octicon-code" 15}}</a>
 					<a href="{{$.Link}}" class="ui mini basic button {{if .IsDisplayingRendered}}active{{end}}" data-tooltip-content="{{.locale.Tr "repo.file_view_rendered"}}">{{svg "octicon-file" 15}}</a>
 				</div>

web_src/css/base.css

@@ -485,10 +485,8 @@ a.label,
   border-color: var(--color-primary);
 }
 
-.ui.action.input .ui.ui.button {
+.ui.action.input .button {
   border-color: var(--color-input-border);
-  padding-top: 0; /* the ".action.input" is "flex + stretch", so let the buttons layout themselves */
-  padding-bottom: 0;
 }
 
 /* currently used for search bar dropdowns in repo search and explore code */
@@ -2017,19 +2015,25 @@ a.ui.basic.label:hover {
   border-color: var(--color-secondary);
 }
 
+.ui.attached.header .right .button {
+  padding: 8px 10px;
+  font-weight: var(--font-weight-normal);
+}
+
+/* reduce height of buttons with dropdown icon */
+.ui.attached.header .right .button:has(.dropdown.icon) {
+  padding-top: 7px;
+  padding-bottom: 7px;
+}
+
 /* fix misaligned right buttons on box headers */
-.ui.attached.header > .ui.right {
+.ui.attached.header .right:not(.dropdown) {
   position: absolute;
   right: 0.78571429rem;
   top: 0;
   bottom: 0;
   display: flex;
-}
+  align-items: center;
-
-.ui.attached.header > .ui.right > .button,
-.ui.attached.header > .ui.right > .dropdown > .button {
-  padding: 8px 10px;
-  font-weight: var(--font-weight-normal);
 }
 
 /* if a .top.attached.header is followed by a .segment, add some margin */

web_src/css/modules/button.css

@@ -1,6 +1,5 @@
 /* this contains override styles for buttons and related elements */
 
-/* these styles changed the Fomantic UI's rules, Fomantic UI expects only "basic" buttons have borders */
 .ui.button,
 .ui.button:focus {
   background: var(--color-button);
@@ -53,31 +52,28 @@ a.btn:hover {
   color: inherit;
 }
 
-/* By default, Fomantic UI doesn't support "bordered" buttons group, but Gitea would like to use it.
+/* other button styles */
-And the default buttons always have borders now (not the same as Fomantic UI's default buttons, see above).
-It needs some tricks to tweak the left/right borders with active state */
-
-.ui.buttons .button {
-  border-right: none;
-}
 
 .ui.buttons .button:first-child {
   border-left: 1px solid var(--color-light-border);
 }
 
-.ui.buttons .button:last-child {
+.ui.buttons .button:first-child:has(+ .button.active) {
-  border-right: 1px solid var(--color-light-border);
+  border-right: none !important;
 }
 
-.ui.buttons .button.active {
+.ui.buttons .button + .button:not(.active) {
-  border-left: 1px solid var(--color-light-border);
-  border-right: 1px solid var(--color-light-border);
-}
-
-.ui.buttons .button.active + .button {
   border-left: none;
 }
 
+.two-toggle-buttons .button:not(.active):first-of-type {
+  border-right: none;
+}
+
+.two-toggle-buttons .button.active:last-of-type {
+  border-left: 1px solid var(--color-light-border);
+}
+
 .ui.labeled.button.disabled > .button,
 .ui.basic.buttons .button,
 .ui.basic.button,

web_src/css/repo.css

@@ -437,8 +437,8 @@
   justify-content: center;
 }
 
-.pdf-content .pdf-fallback-button {
+.pdf-content:has(.pdf-fallback-button) {
-  margin: 50px auto;
+  height: 100px;
 }
 
 .repository.file.list .non-diff-file-content .plain-text {
@@ -1054,6 +1054,11 @@
   margin: 0;
 }
 
+/* fix fomantic's border-radius via :first-child with hidden elements */
+.collapsible-comment-box:has(.gt-hidden) {
+  border-radius: var(--border-radius) !important;
+}
+
 .repository.view.issue .comment-list .code-comment .comment-header {
   background: transparent;
   border-bottom: 0 !important;
@@ -1632,10 +1637,14 @@
 }
 
 .repository .diff-box .header:not(.resolved-placeholder) .button {
-  padding: 0 12px;
+  padding: 8px 12px;
   flex: 0 0 auto;
   margin-right: 0;
-  height: 30px;
+}
+
+.repository .diff-box .header:not(.resolved-placeholder) .button:has(svg) {
+  padding-top: 6px;
+  padding-bottom: 6px;
 }
 
 .repository .diff-box .resolved-placeholder {
@@ -2620,14 +2629,13 @@ tbody.commit-list {
 }
 
 .commit-body {
-  margin: 0.25em 0;
   white-space: pre-wrap;
   line-height: initial;
 }
 
 /* PR-comment */
-.repository .timeline-item .commit-body {
+.repository:not(.diff) .timeline-item .commit-body {
-  margin-left: 45px;
+  margin-left: 40px;
 }
 
 .git-notes.top {