Skip to content

GitLab

You need to sign in or sign up before continuing.
Commit d511c7a7 authored by quzha's avatar quzha
Browse files

fix issues in merging master

parent 8c7b03cc
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
src/webui/src/components/overview/count/EditExperimentParam.tsx
View file @ d511c7a7
...@@ -154,6 +154,7 @@ export const EditExperimentParam = (): any => { ...@@ -154,6 +154,7 @@ export const EditExperimentParam = (): any => {
return val; return val;
} }
} }
return ( return (
<AppContext.Consumer> <AppContext.Consumer>
{(values): React.ReactNode => { {(values): React.ReactNode => {
......
src/webui/src/components/overview/table/SuccessTable.tsx
View file @ d511c7a7
...@@ -68,6 +68,7 @@ class SuccessTable extends React.Component<SuccessTableProps, SuccessTableState> ...@@ -68,6 +68,7 @@ class SuccessTable extends React.Component<SuccessTableProps, SuccessTableState>
job with <span>{DETAILTABS}</span> button. job with <span>{DETAILTABS}</span> button.
</React.Fragment> </React.Fragment>
); );
columns = [ columns = [
{ {
name: 'Trial No.', name: 'Trial No.',
......
src/webui/yarn.lock
View file @ d511c7a7
...@@ -8913,10 +8913,10 @@ node-fetch-npm@^2.0.2: ...@@ -8913,10 +8913,10 @@ node-fetch-npm@^2.0.2:
json-parse-better-errors "^1.0.0" json-parse-better-errors "^1.0.0"
safe-buffer "^5.1.1" safe-buffer "^5.1.1"
   
node-forge@0.9.0: node-forge@^0.10.0:
version "0.9.0" version "0.10.0"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ== integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
   
node-gyp@^3.8.0: node-gyp@^3.8.0:
version "3.8.0" version "3.8.0"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment