Skip to content

Commit

Permalink
Merge branch 'main' into ik-1985-support-generic-ical-feeds
Browse files Browse the repository at this point in the history
  • Loading branch information
ivan-kocienski-gfsc authored Sep 21, 2023
2 parents eba3b60 + f6e9b0f commit 6fd3a6f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/views/admin/jobs/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<% states.each do |state_name| -%>
<tr>
<td><%= state_name %></td>
<td><%= @calendar_counts[state_name] || 0 %></td>
<td><%= @calendar_counts[state_name.to_s] || 0 %></td>
</tr>
<% end -%>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"leaflet": "1.9.4",
"lodash": "4.17.21",
"popper.js": "1.16.1",
"sass": "1.67.0",
"sass": "1.68.0",
"select2": "4.0.13"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -637,10 +637,10 @@ run-parallel@^1.1.9:
dependencies:
queue-microtask "^1.2.2"

sass@1.67.0:
version "1.67.0"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.67.0.tgz#fed84d74b9cd708db603b1380d6dc1f71bb24f6f"
integrity sha512-SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A==
sass@1.68.0:
version "1.68.0"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.68.0.tgz#0034b0cc9a50248b7d1702ac166fd25990023669"
integrity sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA==
dependencies:
chokidar ">=3.0.0 <4.0.0"
immutable "^4.0.0"
Expand Down

0 comments on commit 6fd3a6f

Please sign in to comment.