Skip to content

Commit c9ac184

Browse files
authored
Merge branch 'main' into lunny/fix_pull-commit
2 parents 2ac3e8b + 5050976 commit c9ac184

File tree

16 files changed

+1142
-896
lines changed

16 files changed

+1142
-896
lines changed

options/locale/locale_en-US.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ path = Path
269269
sqlite_helper = File path for the SQLite3 database.<br>Enter an absolute path if you run Gitea as a service.
270270
reinstall_error = You are trying to install into an existing Gitea database
271271
reinstall_confirm_message = Re-installing with an existing Gitea database can cause multiple problems. In most cases, you should use your existing "app.ini" to run Gitea. If you know what you are doing, confirm the following:
272-
reinstall_confirm_check_1 = The data encrypted by the SECRET_KEY in app.ini may be lost: users may not be able to log in with 2FA/OTP and mirrors may not function correctly. By checking this box, you confirm that the current app.ini file contains the correct the SECRET_KEY.
272+
reinstall_confirm_check_1 = The data encrypted by the SECRET_KEY in app.ini may be lost: users may not be able to log in with 2FA/OTP and mirrors may not function correctly. By checking this box, you confirm that the current app.ini file contains the correct SECRET_KEY.
273273
reinstall_confirm_check_2 = The repositories and settings may need to be resynchronized. By checking this box, you confirm that you will resynchronize the hooks for the repositories and authorized_keys file manually. You confirm that you will ensure that repository and mirror settings are correct.
274274
reinstall_confirm_check_3 = You confirm that you are absolutely sure that this Gitea is running with the correct app.ini location and that you are sure that you have to re-install. You confirm that you acknowledge the above risks.
275275
err_empty_db_path = The SQLite3 database path cannot be empty.
@@ -3253,7 +3253,7 @@ auths.oauth2_required_claim_name_helper = Set this name to restrict login from t
32533253
auths.oauth2_required_claim_value = Required Claim Value
32543254
auths.oauth2_required_claim_value_helper = Set this value to restrict login from this source to users with a claim with this name and value
32553255
auths.oauth2_group_claim_name = Claim name providing group names for this source. (Optional)
3256-
auths.oauth2_full_name_claim_name = Full Name Claim Name. (Optional; if set, the user's full name will always be synchronized with this claim)
3256+
auths.oauth2_full_name_claim_name = Full Name Claim Name. (Optional if set, the user's full name will always be synchronized with this claim)
32573257
auths.oauth2_ssh_public_key_claim_name = SSH Public Key Claim Name
32583258
auths.oauth2_admin_group = Group Claim value for administrator users. (Optional — requires claim name above)
32593259
auths.oauth2_restricted_group = Group Claim value for restricted users. (Optional — requires claim name above)

options/locale/locale_fr-FR.ini

Lines changed: 186 additions & 2 deletions
Large diffs are not rendered by default.

options/locale/locale_ga-IE.ini

Lines changed: 50 additions & 1 deletion
Large diffs are not rendered by default.

options/locale/locale_ja-JP.ini

Lines changed: 65 additions & 3 deletions
Large diffs are not rendered by default.

package-lock.json

Lines changed: 738 additions & 800 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@github/relative-time-element": "4.4.8",
1313
"@github/text-expander-element": "2.9.2",
1414
"@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
15-
"@primer/octicons": "19.15.3",
15+
"@primer/octicons": "19.15.5",
1616
"@silverwind/vue3-calendar-heatmap": "2.0.6",
1717
"add-asset-webpack-plugin": "3.0.0",
1818
"ansi_up": "6.0.6",
@@ -33,7 +33,7 @@
3333
"jquery": "3.7.1",
3434
"katex": "0.16.22",
3535
"license-checker-webpack-plugin": "0.2.1",
36-
"mermaid": "11.8.0",
36+
"mermaid": "11.9.0",
3737
"mini-css-extract-plugin": "2.9.2",
3838
"minimatch": "10.0.3",
3939
"monaco-editor": "0.52.2",
@@ -45,7 +45,7 @@
4545
"postcss-loader": "8.1.1",
4646
"postcss-nesting": "13.0.2",
4747
"sortablejs": "1.15.6",
48-
"swagger-ui-dist": "5.26.0",
48+
"swagger-ui-dist": "5.27.0",
4949
"tailwindcss": "3.4.17",
5050
"throttle-debounce": "5.0.2",
5151
"tinycolor2": "1.6.0",
@@ -55,20 +55,20 @@
5555
"typescript": "5.8.3",
5656
"uint8-to-base64": "0.2.1",
5757
"vanilla-colorful": "0.7.2",
58-
"vue": "3.5.17",
58+
"vue": "3.5.18",
5959
"vue-bar-graph": "2.2.0",
6060
"vue-chartjs": "5.3.2",
6161
"vue-loader": "17.4.2",
62-
"webpack": "5.99.9",
62+
"webpack": "5.101.0",
6363
"webpack-cli": "6.0.1",
6464
"wrap-ansi": "9.0.0"
6565
},
6666
"devDependencies": {
6767
"@eslint-community/eslint-plugin-eslint-comments": "4.5.0",
68-
"@playwright/test": "1.53.2",
68+
"@playwright/test": "1.54.1",
6969
"@stoplight/spectral-cli": "6.15.0",
7070
"@stylistic/eslint-plugin-js": "3.1.0",
71-
"@stylistic/stylelint-plugin": "3.1.3",
71+
"@stylistic/stylelint-plugin": "4.0.0",
7272
"@types/dropzone": "5.7.9",
7373
"@types/jquery": "3.5.32",
7474
"@types/katex": "0.16.7",
@@ -79,9 +79,9 @@
7979
"@types/throttle-debounce": "5.0.2",
8080
"@types/tinycolor2": "1.4.6",
8181
"@types/toastify-js": "1.12.4",
82-
"@typescript-eslint/eslint-plugin": "8.35.1",
83-
"@typescript-eslint/parser": "8.35.1",
84-
"@vitejs/plugin-vue": "6.0.0",
82+
"@typescript-eslint/eslint-plugin": "8.38.0",
83+
"@typescript-eslint/parser": "8.38.0",
84+
"@vitejs/plugin-vue": "6.0.1",
8585
"@vitest/eslint-plugin": "1.3.4",
8686
"eslint": "8.57.0",
8787
"eslint-import-resolver-typescript": "4.4.4",
@@ -90,30 +90,30 @@
9090
"eslint-plugin-import-x": "4.16.1",
9191
"eslint-plugin-no-jquery": "3.1.1",
9292
"eslint-plugin-no-use-extend-native": "0.5.0",
93-
"eslint-plugin-playwright": "2.2.0",
93+
"eslint-plugin-playwright": "2.2.2",
9494
"eslint-plugin-regexp": "2.9.0",
9595
"eslint-plugin-sonarjs": "3.0.4",
9696
"eslint-plugin-unicorn": "56.0.1",
97-
"eslint-plugin-vue": "10.3.0",
97+
"eslint-plugin-vue": "10.4.0",
9898
"eslint-plugin-vue-scoped-css": "2.11.0",
9999
"eslint-plugin-wc": "3.0.1",
100100
"happy-dom": "18.0.1",
101101
"markdownlint-cli": "0.45.0",
102102
"material-icon-theme": "5.24.0",
103103
"nolyfill": "1.0.44",
104104
"postcss-html": "1.8.0",
105-
"stylelint": "16.21.1",
106-
"stylelint-config-recommended": "16.0.0",
105+
"stylelint": "16.23.0",
106+
"stylelint-config-recommended": "17.0.0",
107107
"stylelint-declaration-block-no-ignored-properties": "2.8.0",
108108
"stylelint-declaration-strict-value": "1.10.11",
109-
"stylelint-define-config": "16.21.0",
109+
"stylelint-define-config": "16.22.0",
110110
"stylelint-value-no-unknown-custom-properties": "6.0.1",
111111
"svgo": "4.0.0",
112112
"type-fest": "4.41.0",
113-
"updates": "16.4.2",
114-
"vite-string-plugin": "1.4.4",
113+
"updates": "16.5.2",
114+
"vite-string-plugin": "1.4.6",
115115
"vitest": "3.2.4",
116-
"vue-tsc": "3.0.1"
116+
"vue-tsc": "3.0.4"
117117
},
118118
"browserslist": [
119119
"defaults"

public/assets/img/svg/octicon-agent.svg

Lines changed: 1 addition & 0 deletions
Loading

public/assets/img/svg/octicon-loop.svg

Lines changed: 1 addition & 0 deletions
Loading

public/assets/img/svg/octicon-mention.svg

Lines changed: 1 addition & 1 deletion
Loading

public/assets/img/svg/octicon-space.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)