Skip to content

Commit

Permalink
Merge pull request #1377 from nextcloud/automated/noid/stable25-fix-n…
Browse files Browse the repository at this point in the history
…pm-audit

[stable25] Fix npm audit
  • Loading branch information
artonge authored Dec 18, 2023
2 parents d416b33 + 54774a7 commit a100500
Show file tree
Hide file tree
Showing 10 changed files with 263 additions and 194 deletions.
4 changes: 2 additions & 2 deletions __mocks__/@nextcloud/axios.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ const axios = jest.createMockFromModule('@nextcloud/axios')

const wsData = require('./activity_ws.json')

axios.get = function(url) {
axios.get = function (url) {
return new Promise((resolve, reject) => {
if (url === 'http://localhostundefined/ocs/v2.php/apps/activity/api/v2/activity/filter') {
if (url === 'http://localhost/ocs/v2.php/apps/activity/api/v2/activity/filter') {
resolve({ data: wsData })
} else {
// eslint-disable-next-line no-console
Expand Down
4 changes: 2 additions & 2 deletions js/activity-adminSettings.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/activity-adminSettings.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/activity-dashboard.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/activity-dashboard.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/activity-personalSettings.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/activity-personalSettings.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/activity-sidebar.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/activity-sidebar.js.map

Large diffs are not rendered by default.

429 changes: 249 additions & 180 deletions package-lock.json

Large diffs are not rendered by default.

0 comments on commit a100500

Please sign in to comment.