39 Commits

Author SHA1 Message Date
Ming Deng
9c392a3a09 Fix Sonar Part2 2021-02-01 21:27:02 +08:00
Ming Deng
de5c2c9a27 Merge main & resolve conflict 2021-02-01 00:24:45 +08:00
Ming Deng
41d682d878 Fix Sonart PR1 2021-02-01 00:22:52 +08:00
Anker Jam
0e8c4fc9e2 remove useless script 2021-01-28 22:28:25 +08:00
Anker Jam
8bd70bab96 Merge branch 'develop' into frt/delete-txorm
# Conflicts:
#	.travis.yml
#	CHANGELOG.md
2021-01-28 22:27:53 +08:00
Jihoon Seo
4745adca63 Update CHANGELOG 2021-01-28 19:20:41 +09:00
Anker Jam
e8448a520f Merge branch 'develop' of https://gitclone.com/github.com/beego/beego into frt/delete-txorm
# Conflicts:
#	CHANGELOG.md
2021-01-28 00:01:55 +08:00
Anker Jam
8404edee52 add changelog 2021-01-27 22:28:11 +08:00
Ming Deng
f9146ec488 Merge branch 'develop' of https://github.com/beego/beego into fix-index 2021-01-26 12:11:04 +08:00
Ming Deng
d5df5e470d Fix BUG: /abc.html/aaa match /abc/aaa 2021-01-26 00:18:41 +08:00
Jason li
1d1781339f add change log 2021-01-24 23:16:38 +08:00
Ming Deng
655e9fefa2 Merge dev and resolve conflicts 2021-01-24 19:06:26 +08:00
Ming Deng
3c0dbe2914 Define error code for httplib 2021-01-24 19:03:42 +08:00
Ming Deng
fa39135f0e Merge master 2021-01-23 21:39:40 +08:00
Ming Deng
67495fc14c Merge branch 'master' of https://github.com/beego/beego 2021-01-21 23:35:16 +08:00
Ming Deng
53f01e50ce Fix 4435: panic when controllers package not found 2021-01-21 23:30:23 +08:00
Ming Deng
452d20a187 Fix 4444: panic when 404 not found;
Using sync.Onyc to ensure register prometheus ovserver once
2021-01-19 23:37:29 +08:00
Ming Deng
c8a325efe3 Remove prometheus duration label 2021-01-19 21:20:50 +08:00
Jason li
6464b500f1 add change log 2021-01-14 12:01:55 +08:00
Ming Deng
bd8f4059e4 Merge branch 'develop' of https://github.com/beego/beego into orm-mock 2021-01-12 21:02:57 +08:00
Jason li
8e2cd8f85f refactor code 2021-01-12 11:34:40 +08:00
Ming Deng
be6a204232 Add change log 2021-01-11 23:47:06 +08:00
Jason li
f50476e063 add change log 2021-01-11 10:13:57 +08:00
Penghui Liao
ef227bf467 Deprecate QueryM2MWithCtx and QueryTableWithCtx
- Add methods with `WithCtx` suffix and remove ctx fileld from QueryStter
and QueryM2M.
- Deprecate QueryTableWithCtx and QueryM2MWithCtx.

Signed-off-by: Penghui Liao <liaoishere@gmail.com>
2021-01-10 23:50:29 +08:00
Ming Deng
c603131436
Merge pull request #4404 from jianzhiyao/session-filter
make session easier to be configured
2021-01-10 23:03:15 +08:00
Ming Deng
95e998e36e sonar ignore test 2021-01-10 18:25:01 +08:00
Anker Jam
a93e35244a Merge branch 'develop' of https://github.com/beego/beego into session-filter
# Conflicts:
#	CHANGELOG.md
2021-01-10 14:00:49 +08:00
Anker Jam
89d5b4741f Merge branch 'develop' of https://gitclone.com/github.com/beego/beego into session-filter 2021-01-10 13:55:54 +08:00
Ming Deng
d9dd6d2784 Merge branch 'develop' of https://github.com/beego/beego into sonar-check 2021-01-10 13:13:54 +08:00
Ming Deng
2590fbd5cb Fix sonar check 2021-01-10 13:13:28 +08:00
Ming Deng
0139564cf0
Merge pull request #4294 from jianzhiyao/frt/supports_for_4144
Frt/supports for issue 4144
2021-01-10 12:08:16 +08:00
Anker Jam
1f475585e5 change log level and recover code 2021-01-10 00:33:53 +08:00
Anker Jam
25bf1259c6 add change log 2021-01-09 23:55:18 +08:00
Ming Deng
0cf3b035eb update changelog 2021-01-09 21:17:46 +08:00
Ming Deng
e25f3c0920 fix 4396 2020-12-28 23:11:19 +08:00
Ming Deng
73d81bafd9 Remove duration from prometheus label 2020-12-26 22:16:17 +08:00
Ming Deng
f27358a543 Fix 4383 2020-12-22 22:17:20 +08:00
Ming Deng
c215e37e69 fix 4384 & using commentsRouter as fix name 2020-12-22 20:58:04 +08:00
Ming Deng
8e0b80f09b Add changelog action 2020-12-19 22:01:02 +08:00