Ming Deng
|
5bc8d90d7f
|
Merge pull request #4150 from jianzhiyao/frt/fix_3830
fix:return error after inserting data when primary key is string
|
2020-08-11 21:22:17 +08:00 |
|
jianzhiyao
|
2d1c02e1c1
|
Merge branch 'develop-2.0' of https://github.com/astaxie/beego into frt/fix_3830
# Conflicts:
# pkg/orm/orm_test.go
|
2020-08-11 17:37:24 +08:00 |
|
jianzhiyao
|
9ca9535c48
|
fix:return error after inserting data when primary key is string
|
2020-08-11 16:53:31 +08:00 |
|
Ming Deng
|
d326d74c34
|
Merge pull request #4148 from flycash/fix/end2end
Fix prometheus and opentracing bug found in end2end tests
|
2020-08-11 16:33:54 +08:00 |
|
Ming Deng
|
82178a487b
|
Merge develop-2.0 and resolve conflict
|
2020-08-11 08:16:04 +00:00 |
|
Ming Deng
|
a1b7fd3c93
|
Merge pull request #4147 from jianzhiyao/frt/specify_index_2
specify index
|
2020-08-11 16:13:13 +08:00 |
|
jianzhiyao
|
ce698aacf6
|
rm some methods
|
2020-08-11 12:06:02 +08:00 |
|
Ming Deng
|
c22af4c611
|
Fix Tracing and prometheus bug
|
2020-08-11 03:23:38 +00:00 |
|
Anker Jam
|
f8c0e6fec5
|
fix UT
|
2020-08-11 00:06:36 +08:00 |
|
Anker Jam
|
882f1273c8
|
add UT for specifying indexes
|
2020-08-10 23:27:03 +08:00 |
|
jianzhiyao
|
5a1fa4e1ec
|
specify index
|
2020-08-10 18:46:16 +08:00 |
|
Ming Deng
|
d05460237c
|
Merge pull request #4145 from flycash/ftr/ormTracing
Support prometheus and opentracing for ORM and httplib module
|
2020-08-10 13:53:23 +08:00 |
|
Ming Deng
|
75107f735e
|
Support opentracing filter
|
2020-08-09 14:59:41 +00:00 |
|
Ming Deng
|
2e891152dd
|
deprecated httplib and then support prometheus for httplib
|
2020-08-09 14:59:41 +00:00 |
|
Ming Deng
|
dec98f004c
|
Support opentracing filter for Orm
|
2020-08-09 14:59:41 +00:00 |
|
Ming Deng
|
26b016a3a4
|
Merge pull request #4143 from flycash/fix/moveIni
Move init so it will be default implementation of config
|
2020-08-09 22:51:47 +08:00 |
|
Ming Deng
|
19aae0b7e1
|
Merge pull request #4107 from AllenX2018/fix-comment-router-issue
add comment router path configuration
|
2020-08-09 19:23:05 +08:00 |
|
Ming Deng
|
2e192e1ed0
|
Depracated config module and recommend using pkg/config
|
2020-08-08 13:26:30 +00:00 |
|
Ming Deng
|
f9a3eae9d5
|
Move init so it will be default implementation of config
|
2020-08-08 13:17:49 +00:00 |
|
Ming Deng
|
7fc1e4de96
|
Merge pull request #4141 from flycash/ftr/ormInterceptor
Orm filter support
|
2020-08-08 20:52:37 +08:00 |
|
AllenX2018
|
993ccac2bd
|
fix comment router generate issue
|
2020-08-08 16:17:12 +08:00 |
|
Ming Deng
|
2fd65a469c
|
Support prometheus
|
2020-08-07 14:14:07 +00:00 |
|
Ming Deng
|
a2fa073072
|
Merge pull request #4139 from IamCathal/coc-grammar-fixes
More minor grammar fixes
|
2020-08-07 22:00:22 +08:00 |
|
Ming Deng
|
08cec9178f
|
Orm filter support
|
2020-08-07 13:45:24 +00:00 |
|
IamCathal
|
63b3fc4a99
|
Fix retry amount comment
|
2020-08-06 16:09:06 +01:00 |
|
IamCathal
|
1b4bb43df0
|
More minor grammar fixes
|
2020-08-06 16:07:18 +01:00 |
|
Ming Deng
|
2fce8f9d1b
|
Merge pull request #4124 from phiphi282/session_exists_return_err
Update session provider interface to return errors on SessionExist
|
2020-08-06 09:17:49 +08:00 |
|
Ming Deng
|
15489fa76a
|
Merge pull request #4135 from IamCathal/grammar-fixes
Minor grammar fixes
|
2020-08-06 09:05:30 +08:00 |
|
IamCathal
|
e7d8bab5d9
|
Improved definition of DefaultEvery
|
2020-08-05 17:56:11 +01:00 |
|
IamCathal
|
2f5683610f
|
Minor grammar fixes
|
2020-08-05 17:50:05 +01:00 |
|
Phillip Stagnet
|
5c8c088684
|
Revert "Change interface in session README"
This reverts commit 6f5c5bd3a6.
|
2020-08-05 18:33:17 +02:00 |
|
Phillip Stagnet
|
009074725e
|
Move interface change to pkg/session/README.md
|
2020-08-05 18:32:33 +02:00 |
|
Phillip Stagnet
|
ce50ca22d7
|
Merge branch 'develop-2.0' of github.com:astaxie/beego into session_exists_return_err
|
2020-08-05 18:30:19 +02:00 |
|
Phillip Stagnet
|
3052c64b6c
|
Revert "Add error to SessionExist interface"
This reverts commit 28e6b3b924.
|
2020-08-05 18:29:47 +02:00 |
|
Phillip Stagnet
|
5f2f6e4f86
|
Add interface change in pkg folder
|
2020-08-05 18:29:22 +02:00 |
|
Ming Deng
|
3382a5baa1
|
Merge pull request #4134 from flycash/ftr/ormInterceptor
Deprecated old web module
|
2020-08-05 22:22:59 +08:00 |
|
Ming Deng
|
882aa9b967
|
Deprecated old web module
|
2020-08-05 21:57:20 +08:00 |
|
Ming Deng
|
02972d8702
|
Merge pull request #4130 from flycash/ftr/prometheuseAndOpentracing
Support prometheus and opentracing by using FilterChainFunc
|
2020-08-05 15:46:03 +08:00 |
|
Ming Deng
|
261b704d8b
|
Fix UT
|
2020-08-05 07:25:34 +00:00 |
|
Ming Deng
|
6c6cf91741
|
Support prometheus and opentracing filter
|
2020-08-04 23:15:42 +08:00 |
|
Ming Deng
|
ae8461f95d
|
Merge pull request #4125 from flycash/ftr/middleware
Support FilterChain
|
2020-08-04 23:06:18 +08:00 |
|
Ming Deng
|
aa3987f816
|
Merge remote-tracking branch 'origin/develop' into ftr/middleware
|
2020-08-04 22:26:01 +08:00 |
|
Ming Deng
|
3dc5ec1060
|
Merge pull request #4129 from astaxie/revert-4128-fix-ci-fail
Revert "fix CI fail for connection log test"
|
2020-08-04 21:38:50 +08:00 |
|
Ming Deng
|
1961c1e441
|
Revert "fix CI fail for connection log test"
|
2020-08-04 21:37:46 +08:00 |
|
Ming Deng
|
787bb60b42
|
Merge pull request #4128 from AllenX2018/fix-ci-fail
fix CI fail for connection log test
|
2020-08-04 21:14:45 +08:00 |
|
AllenX2018
|
12b984861d
|
fix CI fail for connection log test
|
2020-08-04 20:32:07 +08:00 |
|
Ming Deng
|
79ffef90e3
|
support filter chain
|
2020-08-04 07:26:51 +00:00 |
|
Ming Deng
|
310161f9d4
|
Merge pull request #4126 from flycash/fix/secureFlagV1
XSRF add secure and http only flag
|
2020-08-03 21:24:23 +08:00 |
|
Ming Deng
|
a0d1c42dac
|
XSRF add secure and http only flag
|
2020-08-03 21:04:33 +08:00 |
|
Phillip Stagnet
|
6f5c5bd3a6
|
Change interface in session README
|
2020-08-03 13:33:30 +02:00 |
|