Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ group :development do
gem 'ed25519'
gem 'bcrypt_pbkdf'
gem 'puma', '~> 6.4.2'
gem 'openssl', '~> 4.0' # can be removed after upgrading Ruby
end

group :test do
Expand Down
2 changes: 2 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ GEM
octokit (10.0.0)
faraday (>= 1, < 3)
sawyer (~> 0.9)
openssl (4.0.0)
orm_adapter (0.5.0)
ostruct (0.6.3)
parallel (1.27.0)
Expand Down Expand Up @@ -596,6 +597,7 @@ DEPENDENCIES
mechanize (>= 2.10)
mysql2 (>= 0.5.6)
nokogiri (= 1.16.2)
openssl (~> 4.0)
parallel (~> 1.27)
pronto (~> 0.11.2)
pronto-flay (~> 0.11.1)
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/


@import "@fortawesome/fontawesome-free/css/all.css";
@import "assets/@fortawesome/fontawesome-free/css/all.css";
@import "variables";
@import "typography";
@import "buttons";
Expand Down
8 changes: 4 additions & 4 deletions config/deploy/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
# background - used for actions that are meant to run only on background server (daemons amd cron scripts).
# sidekiq, sidekiq_blockchain - used for managing sidekiq instances

# Web server www1
# First web server www1
server(
'app01-prod.blocklogic.validators.app',
'app03-prod.blocklogic.validators.app',
user: 'deploy-validators_p',
roles: %w[web app db www1 cron sidekiq_blockchain],
roles: %w[web app www1 cron sidekiq_blockchain],
procfile: "Procfile.prod_web"
)

# Second web server www2
server(
'app02-prod.blocklogic.validators.app',
'app04-prod.blocklogic.validators.app',
user: 'deploy-validators_p',
roles: %w[web app www2 cron sidekiq_blockchain],
procfile: "Procfile.prod_web"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@babel/plugin-transform-regenerator": "^7.24.7",
"@babel/plugin-transform-runtime": "^7.24.7",
"@babel/preset-env": "^7.24.7",
"@fortawesome/fontawesome-free": "^7.0.0",
"@fortawesome/fontawesome-free": "^7.2.0",
"@googlemaps/markerclusterer": "^2.5.3",
"@rails/actioncable": "^6.1.7",
"@rails/activestorage": "^6.1.7",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1058,10 +1058,10 @@
resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==

"@fortawesome/fontawesome-free@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-7.0.0.tgz#e4a6788a2d395ea97e7812a096e29bf9c95b944c"
integrity sha512-X48nISrSOa89zu2VMljC4XaRf8NmgTwQBVHfS2Nu5G00ZwM31oOVrAtGxZF3b6wDYf9lJsf/Eq4cCSFKIkOWPQ==
"@fortawesome/fontawesome-free@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-7.2.0.tgz#188c1053ce422ad1f934d7df242a973fcb89636d"
integrity sha512-3DguDv/oUE+7vjMeTSOjCSG+KeawgVQOHrKRnvUuqYh1mfArrh7s+s8hXW3e4RerBA1+Wh+hBqf8sJNpqNrBWg==

"@gar/promisify@^1.0.1":
version "1.1.3"
Expand Down
Loading