Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Clutch
Commits
c632ca33
Commit
c632ca33
authored
3 years ago
by
Josh Slaughter
Browse files
Options
Download
Plain Diff
Merge branch 'main' into mui5
parents
22f8fb69
535d9466
mui5
mui-5-upgrade
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
backend/go.mod
+4
-4
backend/go.mod
backend/go.sum
+8
-7
backend/go.sum
frontend/packages/core/jest.config.js
+3
-0
frontend/packages/core/jest.config.js
frontend/packages/core/src/paper.tsx
+2
-0
frontend/packages/core/src/paper.tsx
frontend/packages/data-layout/jest.config.js
+3
-0
frontend/packages/data-layout/jest.config.js
with
20 additions
and
11 deletions
+20
-11
backend/go.mod
+
4
-
4
View file @
c632ca33
...
...
@@ -4,7 +4,7 @@ go 1.17
require (
github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/Masterminds/squirrel v1.5.
2
github.com/Masterminds/squirrel v1.5.
3
github.com/aws/aws-sdk-go-v2 v1.16.2
github.com/aws/aws-sdk-go-v2/config v1.15.3
github.com/aws/aws-sdk-go-v2/credentials v1.11.2
...
...
@@ -39,8 +39,8 @@ require (
github.com/joho/godotenv v1.4.0
github.com/lib/pq v1.10.6
github.com/mitchellh/hashstructure/v2 v2.0.2
github.com/shurcooL/githubv4 v0.0.0-20220
115235240-a14260e6f8a2
github.com/shurcooL/graphql v0.0.0-202
00928012149-18c5c3165e3a
github.com/shurcooL/githubv4 v0.0.0-20220
520033151-0b4e3294ff00
github.com/shurcooL/graphql v0.0.0-202
20520033453-bdb1221e171e
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
github.com/slack-go/slack v0.10.3
github.com/stretchr/testify v1.7.1
...
...
@@ -56,7 +56,7 @@ require (
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0
google.golang.org/protobuf v1.28.0
gopkg.in/square/go-jose.v2 v2.6.0
gopkg.in/yaml.v3 v3.0.
0-20210107192922-496545a6307b
gopkg.in/yaml.v3 v3.0.
1
k8s.io/api v0.23.6
k8s.io/apimachinery v0.23.6
k8s.io/client-go v0.23.6
...
...
This diff is collapsed.
Click to expand it.
backend/go.sum
+
8
-
7
View file @
c632ca33
...
...
@@ -80,8 +80,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
github.com/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
github.com/Masterminds/squirrel v1.5.
2
h1:
UiOEi2ZX4RCSkpiNDQN5kro/XIBpSRk9iTqdIRPzUXE
=
github.com/Masterminds/squirrel v1.5.
2
/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10=
github.com/Masterminds/squirrel v1.5.
3
h1:
YPpoceAcxuzIljlr5iWpNKaql7hLeG1KLSrhvdHpkZc
=
github.com/Masterminds/squirrel v1.5.
3
/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10=
github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
...
...
@@ -1168,10 +1168,10 @@ github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNX
github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/shurcooL/githubv4 v0.0.0-20220
115235240-a14260e6f8a2 h1:82EIpiGB79OIPgSGa63Oj4Ipf+YAX1c6A9qjmEYoRXc
=
github.com/shurcooL/githubv4 v0.0.0-20220
115235240-a14260e6f8a2
/go.mod h1:hAF0iLZy4td2EX+/8Tw+4nodhlMrwN3HupfaXj3zkGo=
github.com/shurcooL/graphql v0.0.0-202
00928012149-18c5c3165e3a h1:KikTa6HtAK8cS1qjvUvvq4QO21QnwC+EfvB+OAuZ/Z
U=
github.com/shurcooL/graphql v0.0.0-202
00928012149-18c5c3165e3a
/go.mod h1:AuYgA5Kyo4c7HfUmvRGs/6rGlMMV/6B1bVnB9JxJEEg=
github.com/shurcooL/githubv4 v0.0.0-20220
520033151-0b4e3294ff00 h1:fiFvD4lT0aWjuuAb64LlZ/67v87m+Kc9Qsu5cMFNK0w
=
github.com/shurcooL/githubv4 v0.0.0-20220
520033151-0b4e3294ff00
/go.mod h1:hAF0iLZy4td2EX+/8Tw+4nodhlMrwN3HupfaXj3zkGo=
github.com/shurcooL/graphql v0.0.0-202
20520033453-bdb1221e171e h1:dmM59/+RIH6bO/gjmUgaJwdyDhAvZkHgA5OJUcoUyG
U=
github.com/shurcooL/graphql v0.0.0-202
20520033453-bdb1221e171e
/go.mod h1:AuYgA5Kyo4c7HfUmvRGs/6rGlMMV/6B1bVnB9JxJEEg=
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk=
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
...
...
@@ -2018,8 +2018,9 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gorm.io/driver/postgres v1.0.8/go.mod h1:4eOzrI1MUfm6ObJU/UcmbXyiHSs8jSwH95G5P5dxcAg=
gorm.io/gorm v1.20.12/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
gorm.io/gorm v1.21.4/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
...
...
This diff is collapsed.
Click to expand it.
frontend/packages/core/jest.config.js
+
3
-
0
View file @
c632ca33
...
...
@@ -4,5 +4,8 @@ module.exports = {
...
baseConfig
,
coverageThreshold
:
{
...
baseConfig
.
coverageThreshold
,
"
.
"
:
{
statements
:
"
47
"
,
},
},
};
This diff is collapsed.
Click to expand it.
frontend/packages/core/src/paper.tsx
+
2
-
0
View file @
c632ca33
...
...
@@ -10,6 +10,8 @@ const StyledPaper = styled(MuiPaper)({
border
:
"
1px solid rgba(13, 16, 48, 0.1)
"
,
background
:
"
#FFFFFF
"
,
padding
:
"
16px
"
,
minWidth
:
"
inherit
"
,
minHeight
:
"
inherit
"
,
});
const
Paper
=
({
children
}:
PaperProps
)
=>
<
StyledPaper
>
{
children
}
</
StyledPaper
>;
...
...
This diff is collapsed.
Click to expand it.
frontend/packages/data-layout/jest.config.js
+
3
-
0
View file @
c632ca33
...
...
@@ -4,5 +4,8 @@ module.exports = {
...
baseConfig
,
coverageThreshold
:
{
...
baseConfig
.
coverageThreshold
,
"
.
"
:
{
statements
:
"
40
"
,
},
},
};
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help