Skip to content

Commit 2afea36

Browse files
wxiaoguangwxiaoguang
committed
Merge branch 'main' into issue-content-history
# Conflicts: # models/db/engine.go # models/issue.go
2 parents d52c9cd + f2e7d54 commit 2afea36

File tree

471 files changed

+5677
-4126
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

471 files changed

+5677
-4126
lines changed

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,27 @@ This changelog goes through all the changes that have been made in each release
44
without substantial changes to our git log; to see the highlights of what has
55
been added to each release, please refer to the [blog](https://blog.gitea.io).
66

7+
## [1.15.3](https://github.com/go-gitea/gitea/releases/tag/v1.15.3) - 2021-09-19
8+
9+
* ENHANCEMENTS
10+
* Add fluid to ui container class to remove margin (#16396) (#16976)
11+
* Add caller to cat-file batch calls (#17082) (#17089)
12+
* BUGFIXES
13+
* Render full plain readme. (#17083) (#17090)
14+
* Upgrade xorm to v1.2.4 (#17059)
15+
* Fix bug of migrate comments which only fetch one page (#17055) (#17058)
16+
* Do not show issue context popup on external issues (#17050) (#17054)
17+
* Decrement Fork Num when converting from Fork (#17035) (#17046)
18+
* Correctly rollback in ForkRepository (#17034) (#17045)
19+
* Fix missing close in WalkGitLog (#17008) (#17009)
20+
* Add prefix to SVG id/class attributes (#16997) (#17000)
21+
* Fix bug of migrated repository not index (#16991) (#16996)
22+
* Skip AllowedUserVisibilityModes validation on update user if it is an organisation (#16988) (#16990)
23+
* Fix storage Iterate bug and Add storage doctor to delete garbage attachments (#16971) (#16977)
24+
* Fix issue with issue default mail template (#16956) (#16975)
25+
* Ensure that rebase conflicts are handled in updates (#16952) (#16960)
26+
* Prevent panic on diff generation (#16950) (#16951)
27+
728
## [1.15.2](https://github.com/go-gitea/gitea/releases/tag/v1.15.2) - 2021-09-03
829

930
* BUGFIXES

‎build/generate-bindata.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"bytes"
1212
"crypto/sha1"
1313
"fmt"
14-
"io/ioutil"
1514
"log"
1615
"net/http"
1716
"os"
@@ -28,7 +27,7 @@ func needsUpdate(dir string, filename string) (bool, []byte) {
2827
needRegen = true
2928
}
3029

31-
oldHash, err := ioutil.ReadFile(filename + ".hash")
30+
oldHash, err := os.ReadFile(filename + ".hash")
3231
if err != nil {
3332
oldHash = []byte{}
3433
}
@@ -83,5 +82,5 @@ func main() {
8382
if err != nil {
8483
log.Fatalf("%v\n", err)
8584
}
86-
_ = ioutil.WriteFile(filename+".hash", newHash, 0666)
85+
_ = os.WriteFile(filename+".hash", newHash, 0666)
8786
}

‎build/generate-emoji.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ import (
1212
"flag"
1313
"fmt"
1414
"go/format"
15-
"io/ioutil"
15+
"io"
1616
"log"
1717
"net/http"
18+
"os"
1819
"regexp"
1920
"sort"
2021
"strconv"
@@ -67,7 +68,7 @@ func main() {
6768
}
6869

6970
// write
70-
err = ioutil.WriteFile(*flagOut, buf, 0644)
71+
err = os.WriteFile(*flagOut, buf, 0644)
7172
if err != nil {
7273
log.Fatal(err)
7374
}
@@ -96,7 +97,7 @@ func generate() ([]byte, error) {
9697
defer res.Body.Close()
9798

9899
// read all
99-
body, err := ioutil.ReadAll(res.Body)
100+
body, err := io.ReadAll(res.Body)
100101
if err != nil {
101102
return nil, err
102103
}
@@ -157,7 +158,7 @@ func generate() ([]byte, error) {
157158

158159
// write a JSON file to use with tribute (write before adding skin tones since we can't support them there yet)
159160
file, _ := json.Marshal(data)
160-
_ = ioutil.WriteFile("assets/emoji.json", file, 0644)
161+
_ = os.WriteFile("assets/emoji.json", file, 0644)
161162

162163
// Add skin tones to emoji that support it
163164
var (

‎build/generate-gitignores.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"flag"
1010
"fmt"
1111
"io"
12-
"io/ioutil"
1312
"log"
1413
"net/http"
1514
"os"
@@ -34,7 +33,7 @@ func main() {
3433
flag.StringVar(&githubApiToken, "token", "", "github api token")
3534
flag.Parse()
3635

37-
file, err := ioutil.TempFile(os.TempDir(), prefix)
36+
file, err := os.CreateTemp(os.TempDir(), prefix)
3837

3938
if err != nil {
4039
log.Fatalf("Failed to create temp file. %s", err)
@@ -114,13 +113,13 @@ func main() {
114113
for dst, src := range filesToCopy {
115114
// Read all content of src to data
116115
src = path.Join(destination, src)
117-
data, err := ioutil.ReadFile(src)
116+
data, err := os.ReadFile(src)
118117
if err != nil {
119118
log.Fatalf("Failed to read src file. %s", err)
120119
}
121120
// Write data to dst
122121
dst = path.Join(destination, dst)
123-
err = ioutil.WriteFile(dst, data, 0644)
122+
err = os.WriteFile(dst, data, 0644)
124123
if err != nil {
125124
log.Fatalf("Failed to write new file. %s", err)
126125
}

‎build/generate-licenses.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"flag"
1010
"fmt"
1111
"io"
12-
"io/ioutil"
1312
"log"
1413
"net/http"
1514
"os"
@@ -34,7 +33,7 @@ func main() {
3433
flag.StringVar(&githubApiToken, "token", "", "github api token")
3534
flag.Parse()
3635

37-
file, err := ioutil.TempFile(os.TempDir(), prefix)
36+
file, err := os.CreateTemp(os.TempDir(), prefix)
3837

3938
if err != nil {
4039
log.Fatalf("Failed to create temp file. %s", err)

‎cmd/cmd.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"strings"
1616
"syscall"
1717

18-
"code.gitea.io/gitea/models"
18+
"code.gitea.io/gitea/models/db"
1919
"code.gitea.io/gitea/modules/setting"
2020
"code.gitea.io/gitea/modules/util"
2121

@@ -65,7 +65,7 @@ func initDBDisableConsole(disableConsole bool) error {
6565
setting.InitDBConfig()
6666

6767
setting.NewXORMLogService(disableConsole)
68-
if err := models.SetEngine(); err != nil {
68+
if err := db.SetEngine(); err != nil {
6969
return fmt.Errorf("models.SetEngine: %v", err)
7070
}
7171
return nil

‎cmd/convert.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package cmd
77
import (
88
"fmt"
99

10-
"code.gitea.io/gitea/models"
10+
"code.gitea.io/gitea/models/db"
1111
"code.gitea.io/gitea/modules/log"
1212
"code.gitea.io/gitea/modules/setting"
1313

@@ -39,7 +39,7 @@ func runConvert(ctx *cli.Context) error {
3939
return nil
4040
}
4141

42-
if err := models.ConvertUtf8ToUtf8mb4(); err != nil {
42+
if err := db.ConvertUtf8ToUtf8mb4(); err != nil {
4343
log.Fatal("Failed to convert database from utf8 to utf8mb4: %v", err)
4444
return err
4545
}

‎cmd/doctor.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"strings"
1313
"text/tabwriter"
1414

15-
"code.gitea.io/gitea/models"
15+
"code.gitea.io/gitea/models/db"
1616
"code.gitea.io/gitea/models/migrations"
1717
"code.gitea.io/gitea/modules/doctor"
1818
"code.gitea.io/gitea/modules/log"
@@ -96,7 +96,7 @@ func runRecreateTable(ctx *cli.Context) error {
9696
setting.Cfg.Section("log").Key("XORM").SetValue(",")
9797

9898
setting.NewXORMLogService(!ctx.Bool("debug"))
99-
if err := models.SetEngine(); err != nil {
99+
if err := db.SetEngine(); err != nil {
100100
fmt.Println(err)
101101
fmt.Println("Check if you are using the right config file. You can use a --config directive to specify one.")
102102
return nil
@@ -108,13 +108,13 @@ func runRecreateTable(ctx *cli.Context) error {
108108
names = append(names, args.Get(i))
109109
}
110110

111-
beans, err := models.NamesToBean(names...)
111+
beans, err := db.NamesToBean(names...)
112112
if err != nil {
113113
return err
114114
}
115115
recreateTables := migrations.RecreateTables(beans...)
116116

117-
return models.NewEngine(context.Background(), func(x *xorm.Engine) error {
117+
return db.NewEngine(context.Background(), func(x *xorm.Engine) error {
118118
if err := migrations.EnsureUpToDate(x); err != nil {
119119
return err
120120
}

‎cmd/dump.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ package cmd
77

88
import (
99
"fmt"
10-
"io/ioutil"
1110
"os"
1211
"path"
1312
"path/filepath"
1413
"strings"
1514
"time"
1615

17-
"code.gitea.io/gitea/models"
16+
"code.gitea.io/gitea/models/db"
1817
"code.gitea.io/gitea/modules/json"
1918
"code.gitea.io/gitea/modules/log"
2019
"code.gitea.io/gitea/modules/setting"
@@ -174,7 +173,7 @@ func runDump(ctx *cli.Context) error {
174173
}
175174
setting.NewServices() // cannot access session settings otherwise
176175

177-
err := models.SetEngine()
176+
err := db.SetEngine()
178177
if err != nil {
179178
return err
180179
}
@@ -247,7 +246,7 @@ func runDump(ctx *cli.Context) error {
247246
fatal("Path does not exist: %s", tmpDir)
248247
}
249248

250-
dbDump, err := ioutil.TempFile(tmpDir, "gitea-db.sql")
249+
dbDump, err := os.CreateTemp(tmpDir, "gitea-db.sql")
251250
if err != nil {
252251
fatal("Failed to create tmp file: %v", err)
253252
}
@@ -264,7 +263,7 @@ func runDump(ctx *cli.Context) error {
264263
log.Info("Dumping database...")
265264
}
266265

267-
if err := models.DumpDatabase(dbDump.Name(), targetDBType); err != nil {
266+
if err := db.DumpDatabase(dbDump.Name(), targetDBType); err != nil {
268267
fatal("Failed to dump database: %v", err)
269268
}
270269

‎cmd/migrate.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package cmd
77
import (
88
"context"
99

10-
"code.gitea.io/gitea/models"
10+
"code.gitea.io/gitea/models/db"
1111
"code.gitea.io/gitea/models/migrations"
1212
"code.gitea.io/gitea/modules/log"
1313
"code.gitea.io/gitea/modules/setting"
@@ -35,7 +35,7 @@ func runMigrate(ctx *cli.Context) error {
3535
log.Info("Configuration file: %s", setting.CustomConf)
3636
setting.InitDBConfig()
3737

38-
if err := models.NewEngine(context.Background(), migrations.Migrate); err != nil {
38+
if err := db.NewEngine(context.Background(), migrations.Migrate); err != nil {
3939
log.Fatal("Failed to initialize ORM engine: %v", err)
4040
return err
4141
}

0 commit comments

Comments
 (0)