Skip to content

Commit de6e584

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Add nix flake for dev shell (go-gitea#30967) [skip ci] Updated translations via Crowdin Fix wrong display of recently pushed notification (go-gitea#25812) use existing oauth grant for public client (go-gitea#31015) Fix automerge will not work because of some events haven't been triggered (go-gitea#30780)
2 parents d07ae65 + de6f048 commit de6e584

35 files changed

Lines changed: 968 additions & 136 deletions

‎flake.lock‎

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

‎flake.nix‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
inputs = {
3+
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
4+
flake-utils.url = "github:numtide/flake-utils";
5+
};
6+
outputs =
7+
{ nixpkgs, flake-utils, ... }:
8+
flake-utils.lib.eachDefaultSystem (
9+
system:
10+
let
11+
pkgs = nixpkgs.legacyPackages.${system};
12+
in
13+
{
14+
devShells.default = pkgs.mkShell {
15+
buildInputs = with pkgs; [
16+
# generic
17+
git
18+
git-lfs
19+
gnumake
20+
gnused
21+
gnutar
22+
gzip
23+
24+
# frontend
25+
nodejs_20
26+
27+
# linting
28+
python312
29+
poetry
30+
31+
# backend
32+
go_1_22
33+
];
34+
};
35+
}
36+
);
37+
}

‎models/fixtures/branch.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,39 @@
4545
is_deleted: false
4646
deleted_by_id: 0
4747
deleted_unix: 0
48+
49+
-
50+
id: 5
51+
repo_id: 10
52+
name: 'master'
53+
commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d'
54+
commit_message: 'Initial commit'
55+
commit_time: 1489927679
56+
pusher_id: 12
57+
is_deleted: false
58+
deleted_by_id: 0
59+
deleted_unix: 0
60+
61+
-
62+
id: 6
63+
repo_id: 10
64+
name: 'outdated-new-branch'
65+
commit_id: 'cb24c347e328d83c1e0c3c908a6b2c0a2fcb8a3d'
66+
commit_message: 'add'
67+
commit_time: 1489927679
68+
pusher_id: 12
69+
is_deleted: false
70+
deleted_by_id: 0
71+
deleted_unix: 0
72+
73+
-
74+
id: 14
75+
repo_id: 11
76+
name: 'master'
77+
commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d'
78+
commit_message: 'Initial commit'
79+
commit_time: 1489927679
80+
pusher_id: 13
81+
is_deleted: false
82+
deleted_by_id: 0
83+
deleted_unix: 0

‎models/fixtures/issue_index.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,35 @@
11
-
22
group_id: 1
33
max_index: 5
4+
45
-
56
group_id: 2
67
max_index: 2
8+
79
-
810
group_id: 3
911
max_index: 2
12+
1013
-
1114
group_id: 10
1215
max_index: 1
16+
1317
-
1418
group_id: 32
1519
max_index: 2
20+
1621
-
1722
group_id: 48
1823
max_index: 1
24+
1925
-
2026
group_id: 42
2127
max_index: 1
28+
2229
-
2330
group_id: 50
2431
max_index: 1
32+
2533
-
2634
group_id: 51
2735
max_index: 1

‎models/fixtures/org_user.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,15 @@
117117
uid: 40
118118
org_id: 41
119119
is_public: true
120+
121+
-
122+
id: 21
123+
uid: 12
124+
org_id: 25
125+
is_public: true
126+
127+
-
128+
id: 22
129+
uid: 2
130+
org_id: 35
131+
is_public: true

‎models/fixtures/repository.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327
is_archived: false
328328
is_mirror: false
329329
status: 0
330-
is_fork: false
330+
is_fork: true
331331
fork_id: 10
332332
is_template: false
333333
template_id: 0

‎models/fixtures/team.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,3 +239,25 @@
239239
num_members: 2
240240
includes_all_repositories: false
241241
can_create_org_repo: false
242+
243+
-
244+
id: 23
245+
org_id: 25
246+
lower_name: owners
247+
name: Owners
248+
authorize: 4 # owner
249+
num_repos: 0
250+
num_members: 1
251+
includes_all_repositories: false
252+
can_create_org_repo: true
253+
254+
-
255+
id: 24
256+
org_id: 35
257+
lower_name: team24
258+
name: team24
259+
authorize: 2 # write
260+
num_repos: 0
261+
num_members: 1
262+
includes_all_repositories: true
263+
can_create_org_repo: false

‎models/fixtures/team_unit.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,3 +322,21 @@
322322
team_id: 22
323323
type: 3
324324
access_mode: 1
325+
326+
-
327+
id: 55
328+
team_id: 18
329+
type: 1 # code
330+
access_mode: 4
331+
332+
-
333+
id: 56
334+
team_id: 23
335+
type: 1 # code
336+
access_mode: 4
337+
338+
-
339+
id: 57
340+
team_id: 24
341+
type: 1 # code
342+
access_mode: 2

‎models/fixtures/team_user.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,3 +147,15 @@
147147
org_id: 41
148148
team_id: 22
149149
uid: 39
150+
151+
-
152+
id: 26
153+
org_id: 25
154+
team_id: 23
155+
uid: 12
156+
157+
-
158+
id: 27
159+
org_id: 35
160+
team_id: 24
161+
uid: 2

‎models/fixtures/user.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -918,8 +918,8 @@
918918
num_following: 0
919919
num_stars: 0
920920
num_repos: 0
921-
num_teams: 1
922-
num_members: 1
921+
num_teams: 2
922+
num_members: 2
923923
visibility: 0
924924
repo_admin_change_team_access: false
925925
theme: ""
@@ -1289,8 +1289,8 @@
12891289
num_following: 0
12901290
num_stars: 0
12911291
num_repos: 0
1292-
num_teams: 1
1293-
num_members: 1
1292+
num_teams: 2
1293+
num_members: 2
12941294
visibility: 2
12951295
repo_admin_change_team_access: false
12961296
theme: ""

0 commit comments

Comments
 (0)