Skip to content

Commit 41d7540

Browse files
authored
Merge pull request #1009 from enykeev/update_dependencies
Update dependencies
2 parents e409aaa + f67a712 commit 41d7540

File tree

5 files changed

+2551
-2013
lines changed

5 files changed

+2551
-2013
lines changed

CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ Changelog
44
in development
55
--------------
66

7+
Changed
8+
~~~~~~~
9+
* Updated various dependencies (security). #1009
10+
11+
Contributed by @enykeev
12+
713
Fixed
814
~~~~~
915
* Fixed CircleCI tests by pinning [email protected]. #1008

modules/st2-api/api.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ export class API {
9797
'Authorization': `Basic ${toBase64(`${username}:${password}`)}`,
9898
'content-type': 'application/json',
9999
},
100-
// You need to define data field for axios to set content-type header
101-
data: null,
102100
});
103101

104102
if (res.status !== 201) {

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,5 +106,8 @@
106106
"ignore-styles": "5.0.1",
107107
"insert-css": "2.0.0",
108108
"zombie": "5.0.8"
109+
},
110+
"resolutions": {
111+
"open": "^8.4.0"
109112
}
110113
}

tasks/serve.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ gulp.task('serve', () => {
3434
https: true,
3535
proxies: [{
3636
source: '/api',
37-
target: `https://${st2host}/api`,
37+
target: `${process.env.ST2_PROTOCOL || 'https'}://${st2host}/api`,
3838
options,
3939
}, {
4040
source: '/auth',
41-
target: `https://${st2host}/auth`,
41+
target: `${process.env.ST2_PROTOCOL || 'https'}://${st2host}/auth`,
4242
options,
4343
}, {
4444
source: '/stream',
45-
target: `https://${st2host}/stream`,
45+
target: `${process.env.ST2_PROTOCOL || 'https'}://${st2host}/stream`,
4646
options,
4747
}],
4848
}));

0 commit comments

Comments
 (0)