Skip to content

Commit b31418e

Browse files
authored
Fix blame page select range error and some typos (#19503)
Partially back port from #19500 and fix two typos.
1 parent 242f7f1 commit b31418e

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

docs/content/doc/installation/with-docker.fr-fr.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Vous devriez avoir une instance fonctionnelle de Gitea. Pour accèder à l'inter
4343

4444
## Named Volumes
4545

46-
Ce guide aboutira à une installation avec les données Gita et PostgreSQL stockées dans des volumes nommés. Cela permet une sauvegarde, une restauration et des mises à niveau en toute simplicité.
46+
Ce guide aboutira à une installation avec les données Gitea et PostgreSQL stockées dans des volumes nommés. Cela permet une sauvegarde, une restauration et des mises à niveau en toute simplicité.
4747

4848
### The Database
4949

models/migrations/migrations.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ Please try upgrading to a lower version first (suggested v1.6.4), then upgrade t
453453

454454
// Downgrading Gitea's database version not supported
455455
if int(v-minDBVersion) > len(migrations) {
456-
msg := fmt.Sprintf("Your database (migration version: %d) is for a newer Gita, you can not use the newer database for this old Gitea release (%d).", v, minDBVersion+len(migrations))
456+
msg := fmt.Sprintf("Your database (migration version: %d) is for a newer Gitea, you can not use the newer database for this old Gitea release (%d).", v, minDBVersion+len(migrations))
457457
msg += "\nGitea will exit to keep your database safe and unchanged. Please use the correct Gitea release, do not change the migration version manually (incorrect manual operation may lose data)."
458458
if !setting.IsProd {
459459
msg += fmt.Sprintf("\nIf you are in development and really know what you're doing, you can force changing the migration version by executing: UPDATE version SET version=%d WHERE id=1;", minDBVersion+len(migrations))

web_src/js/features/repo-code.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ function selectRange($list, $select, $from) {
1515
const $issue = $('a.ref-in-new-issue');
1616
const $copyPermalink = $('a.copy-line-permalink');
1717

18-
if ($copyPermalink.length === 0) {
19-
return;
20-
}
21-
2218
const updateIssueHref = function (anchor) {
2319
if ($issue.length === 0) {
2420
return;
@@ -29,6 +25,9 @@ function selectRange($list, $select, $from) {
2925
};
3026

3127
const updateCopyPermalinkHref = function(anchor) {
28+
if ($copyPermalink.length === 0) {
29+
return;
30+
}
3231
let link = $copyPermalink.attr('data-clipboard-text');
3332
link = `${link.replace(/#L\d+$|#L\d+-L\d+$/, '')}#${anchor}`;
3433
$copyPermalink.attr('data-clipboard-text', link);

0 commit comments

Comments
 (0)