diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-01-29 23:35:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-29 16:35:30 +0100 |
| commit | 0cd87d64ff8bb40520877d3a217363de299f4531 (patch) | |
| tree | d2ec167aea8f5b2ff673b13ba8be98a275d942ab /integrations | |
| parent | 25b6255b924c30a2bab066c0465d146a34021245 (diff) | |
| download | gitea-0cd87d64ff8bb40520877d3a217363de299f4531.tar.gz gitea-0cd87d64ff8bb40520877d3a217363de299f4531.zip | |
Update docs and comments to remove macaron (#14491)
Diffstat (limited to 'integrations')
| -rw-r--r-- | integrations/mssql.ini.tmpl | 2 | ||||
| -rw-r--r-- | integrations/mysql.ini.tmpl | 2 | ||||
| -rw-r--r-- | integrations/mysql8.ini.tmpl | 2 | ||||
| -rw-r--r-- | integrations/oauth_test.go | 2 | ||||
| -rw-r--r-- | integrations/pgsql.ini.tmpl | 2 | ||||
| -rw-r--r-- | integrations/sqlite.ini.tmpl | 2 |
6 files changed, 1 insertions, 11 deletions
diff --git a/integrations/mssql.ini.tmpl b/integrations/mssql.ini.tmpl index 44c0a7eed9..a9a934c568 100644 --- a/integrations/mssql.ini.tmpl +++ b/integrations/mssql.ini.tmpl @@ -78,9 +78,7 @@ PROVIDER_CONFIG = integrations/gitea-integration-mssql/data/sessions [log] MODE = test,file ROOT_PATH = mssql-log -REDIRECT_MACARON_LOG = true ROUTER = , -MACARON = , XORM = file [log.test] diff --git a/integrations/mysql.ini.tmpl b/integrations/mysql.ini.tmpl index 2b044498eb..f8abd3ffeb 100644 --- a/integrations/mysql.ini.tmpl +++ b/integrations/mysql.ini.tmpl @@ -97,9 +97,7 @@ PROVIDER_CONFIG = integrations/gitea-integration-mysql/data/sessions [log] MODE = test,file ROOT_PATH = mysql-log -REDIRECT_MACARON_LOG = true ROUTER = , -MACARON = , XORM = file [log.test] diff --git a/integrations/mysql8.ini.tmpl b/integrations/mysql8.ini.tmpl index 798ab7852a..cccede5b20 100644 --- a/integrations/mysql8.ini.tmpl +++ b/integrations/mysql8.ini.tmpl @@ -70,9 +70,7 @@ PROVIDER_CONFIG = data/sessions-mysql8 [log] MODE = test,file ROOT_PATH = mysql8-log -REDIRECT_MACARON_LOG = true ROUTER = , -MACARON = , XORM = file [log.test] diff --git a/integrations/oauth_test.go b/integrations/oauth_test.go index a9e48b061f..e74ff28cad 100644 --- a/integrations/oauth_test.go +++ b/integrations/oauth_test.go @@ -235,7 +235,7 @@ func TestRefreshTokenInvalidation(t *testing.T) { "redirect_uri": "a", "refresh_token": parsed.RefreshToken, }) - // tip: Why this changed, because macaron will set req.Body back when consume the req but chi will not. + bs, err := ioutil.ReadAll(refreshReq.Body) assert.NoError(t, err) diff --git a/integrations/pgsql.ini.tmpl b/integrations/pgsql.ini.tmpl index 5f082f04e1..a8742268db 100644 --- a/integrations/pgsql.ini.tmpl +++ b/integrations/pgsql.ini.tmpl @@ -79,9 +79,7 @@ PROVIDER_CONFIG = integrations/gitea-integration-pgsql/data/sessions [log] MODE = test,file ROOT_PATH = pgsql-log -REDIRECT_MACARON_LOG = true ROUTER = , -MACARON = , XORM = file [log.test] diff --git a/integrations/sqlite.ini.tmpl b/integrations/sqlite.ini.tmpl index 5ed096b0a3..9d78d0c56b 100644 --- a/integrations/sqlite.ini.tmpl +++ b/integrations/sqlite.ini.tmpl @@ -75,9 +75,7 @@ PROVIDER_CONFIG = integrations/gitea-integration-sqlite/data/sessions [log] MODE = test,file ROOT_PATH = sqlite-log -REDIRECT_MACARON_LOG = true ROUTER = , -MACARON = , XORM = file [log.test] |