Skip to content

Commit

Permalink
Merge 6200f72 into d7105c1
Browse files Browse the repository at this point in the history
  • Loading branch information
kaladay committed Dec 9, 2022
2 parents d7105c1 + 6200f72 commit ffa6ac5
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
Empty file modified .gitignore
100755 → 100644
Empty file.
Empty file modified .jshintrc
100755 → 100644
Empty file.
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
"devDependencies": {
},
"overrides": {
"glob-stream": "^7.0.0"
"glob-stream": "^7.0.0",
"minimatch": "^3.1.2",
"qs": "^6.11.0"
}
}
2 changes: 1 addition & 1 deletion tests/unit/controllers/activeSprintsControlerTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ describe("controller: ActiveSprintsController", function () {
"name": "Ryan Laddusaw",
"avatar": "no_avatar.png"
});
expect(avatarUrl).toEqual("http://localhost:9001/products/images/no_avatar.png");
expect(avatarUrl).toEqual("http://localhost:9000/products/images/no_avatar.png");
});

it("getHtmlContent get trusted content", function () {
Expand Down

0 comments on commit ffa6ac5

Please sign in to comment.