Skip to content

Commit

Permalink
Merge branch 'main' into feature/split-up-api-staging
Browse files Browse the repository at this point in the history
  • Loading branch information
FinnIckler committed Aug 30, 2024
2 parents 5014664 + 5631b94 commit b8d411e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 36 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"shakapacker": "8.0.1",
"style-loader": "^4.0.0",
"terser-webpack-plugin": "^5.3.10",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-assets-manifest": "^5.2.1",
"webpack-cli": "^5.1.4",
"webpack-manifest-plugin": "^5.0.0",
Expand Down
2 changes: 2 additions & 0 deletions spec/features/sign_up_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
end

it 'finds people by name' do
pending('Date popup suddenly started obstruting sign-in button. Signed DH 30/Aug/2024')

visit "/users/sign_up"

fill_in "Email", with: "[email protected]"
Expand Down
49 changes: 14 additions & 35 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2717,26 +2717,6 @@ __metadata:
languageName: node
linkType: hard

"@types/eslint-scope@npm:^3.7.3":
version: 3.7.3
resolution: "@types/eslint-scope@npm:3.7.3"
dependencies:
"@types/eslint": "npm:*"
"@types/estree": "npm:*"
checksum: 10c0/3084e2619be57ca318dfddc2557fef855d63ea378d42b6b355216ea3e3aed82ce6adbfa6b620bff1d67aefa95245c5b41e998338bc307c948f8cbf08840b9bb2
languageName: node
linkType: hard

"@types/eslint@npm:*":
version: 8.4.3
resolution: "@types/eslint@npm:8.4.3"
dependencies:
"@types/estree": "npm:*"
"@types/json-schema": "npm:*"
checksum: 10c0/c63c2a5bf8950f53c77048a6e0afcbfa5d897b64b90e31c10be45b9689d4abaf33524384f430dcc8620cfcba838ffd3d5bae4f7b070e9fb51253b2bbfb394ca0
languageName: node
linkType: hard

"@types/estree@npm:*, @types/estree@npm:^1.0.5":
version: 1.0.5
resolution: "@types/estree@npm:1.0.5"
Expand Down Expand Up @@ -2819,7 +2799,7 @@ __metadata:
languageName: node
linkType: hard

"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
"@types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
version: 7.0.11
resolution: "@types/json-schema@npm:7.0.11"
checksum: 10c0/bd1f9a7b898ff15c4bb494eb19124f2d688b804c39f07cbf135ac73f35324970e9e8329b72aae1fb543d925ea295a1568b23056c26658cecec4741fa28c3b81a
Expand Down Expand Up @@ -5028,13 +5008,13 @@ __metadata:
languageName: node
linkType: hard

"enhanced-resolve@npm:^5.17.0":
version: 5.17.0
resolution: "enhanced-resolve@npm:5.17.0"
"enhanced-resolve@npm:^5.17.1":
version: 5.17.1
resolution: "enhanced-resolve@npm:5.17.1"
dependencies:
graceful-fs: "npm:^4.2.4"
tapable: "npm:^2.2.0"
checksum: 10c0/90065e58e4fd08e77ba47f827eaa17d60c335e01e4859f6e644bb3b8d0e32b203d33894aee92adfa5121fa262f912b48bdf0d0475e98b4a0a1132eea1169ad37
checksum: 10c0/81a0515675eca17efdba2cf5bad87abc91a528fc1191aad50e275e74f045b41506167d420099022da7181c8d787170ea41e4a11a0b10b7a16f6237daecb15370
languageName: node
linkType: hard

Expand Down Expand Up @@ -7527,12 +7507,12 @@ __metadata:
linkType: hard

"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.7":
version: 4.0.7
resolution: "micromatch@npm:4.0.7"
version: 4.0.8
resolution: "micromatch@npm:4.0.8"
dependencies:
braces: "npm:^3.0.3"
picomatch: "npm:^2.3.1"
checksum: 10c0/58fa99bc5265edec206e9163a1d2cec5fabc46a5b473c45f4a700adce88c2520456ae35f2b301e4410fb3afb27e9521fb2813f6fc96be0a48a89430e0916a772
checksum: 10c0/166fa6eb926b9553f32ef81f5f531d27b4ce7da60e5baf8c021d043b27a388fb95e46a8038d5045877881e673f8134122b59624d5cecbd16eb50a42e7a6b5ca8
languageName: node
linkType: hard

Expand Down Expand Up @@ -10206,7 +10186,7 @@ __metadata:
stylelint-config-recommended-scss: "npm:^14.0.0"
stylelint-scss: "npm:^6.4.1"
terser-webpack-plugin: "npm:^5.3.10"
webpack: "npm:^5.92.1"
webpack: "npm:^5.94.0"
webpack-assets-manifest: "npm:^5.2.1"
webpack-bundle-analyzer: "npm:^4.10.2"
webpack-cli: "npm:^5.1.4"
Expand Down Expand Up @@ -11764,11 +11744,10 @@ __metadata:
languageName: node
linkType: hard

"webpack@npm:^5.92.1":
version: 5.92.1
resolution: "webpack@npm:5.92.1"
"webpack@npm:^5.94.0":
version: 5.94.0
resolution: "webpack@npm:5.94.0"
dependencies:
"@types/eslint-scope": "npm:^3.7.3"
"@types/estree": "npm:^1.0.5"
"@webassemblyjs/ast": "npm:^1.12.1"
"@webassemblyjs/wasm-edit": "npm:^1.12.1"
Expand All @@ -11777,7 +11756,7 @@ __metadata:
acorn-import-attributes: "npm:^1.9.5"
browserslist: "npm:^4.21.10"
chrome-trace-event: "npm:^1.0.2"
enhanced-resolve: "npm:^5.17.0"
enhanced-resolve: "npm:^5.17.1"
es-module-lexer: "npm:^1.2.1"
eslint-scope: "npm:5.1.1"
events: "npm:^3.2.0"
Expand All @@ -11797,7 +11776,7 @@ __metadata:
optional: true
bin:
webpack: bin/webpack.js
checksum: 10c0/43ca7c76b9c1005bd85f05303d048f918bac10276a209e3ef5e359353fbfef4e5fcee876265e6bc305bf5ef326576e02df63bc7e5af878fb7f06d7e1795b811a
checksum: 10c0/b4d1b751f634079bd177a89eef84d80fa5bb8d6fc15d72ab40fc2b9ca5167a79b56585e1a849e9e27e259803ee5c4365cb719e54af70a43c06358ec268ff4ebf
languageName: node
linkType: hard

Expand Down

0 comments on commit b8d411e

Please sign in to comment.