Skip to content

Commit

Permalink
update to new maps public key (#675)
Browse files Browse the repository at this point in the history
* update to new public key

* upgrade to rails 6

* add net gems to Gemfile

* update lock file

* fix linting errors with upgrade

* use proper "visible" syntax

* update API gems

* change to old css rspec helper
  • Loading branch information
mi-wood committed Oct 5, 2022
1 parent 947caf5 commit df47564
Show file tree
Hide file tree
Showing 19 changed files with 304 additions and 283 deletions.
8 changes: 4 additions & 4 deletions .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export DEVISE_SECRET_KEY=3f4915489bd10fdbacb4f22dbf772a4be6e2d2d1616a1af7913f0f6645784ddffd6a71ab9f69a99ed7941f16d3092e1872bc4bc9add5a0615c630c90f94fc032
export RAILS_SECRET_KEY=4944cf251e3dbf309ed71ebcd8990a1479d793011cd4011761e3fbea9ecc59edefd0cb49a0ed9b5c0261ab0dda841962bb7dd28fd3f99579bfa2beec26329961
export RECAPTCHA_SITE_KEY=6Le_W5gUAAAAAJFOELNu2LkSR2E6sXYIVZrMe6V0
export RECAPTCHA_SECRET_KEY=6Le_W5gUAAAAABZpnGQtfVaQdfluuLrf8wihooeo
DEVISE_SECRET_KEY=3f4915489bd10fdbacb4f22dbf772a4be6e2d2d1616a1af7913f0f6645784ddffd6a71ab9f69a99ed7941f16d3092e1872bc4bc9add5a0615c630c90f94fc032
RAILS_SECRET_KEY=4944cf251e3dbf309ed71ebcd8990a1479d793011cd4011761e3fbea9ecc59edefd0cb49a0ed9b5c0261ab0dda841962bb7dd28fd3f99579bfa2beec26329961
RECAPTCHA_SITE_KEY=6Le_W5gUAAAAAJFOELNu2LkSR2E6sXYIVZrMe6V0
RECAPTCHA_SECRET_KEY=6Le_W5gUAAAAABZpnGQtfVaQdfluuLrf8wihooeo
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Style/StringLiterals:
Enabled: false

Metrics/BlockLength:
ExcludedMethods:
AllowedMethods:
- describe
- context
- factory
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.6
3.1.0
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7.6-slim
FROM ruby:3.1.0-slim

# Add basic binaries
RUN apt-get update \
Expand Down
17 changes: 9 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
source 'https://rubygems.org'
ruby '2.7.6'
ruby '3.1.0'

gem 'rails', '5.2.8'
gem 'rails', '6.1.7'

gem 'activeadmin', '~> 2.1'
gem 'bootsnap', require: false
gem 'bootstrap-sass', '>= 3.4.1'
gem 'bugsnag'
gem 'coffee-rails', '~> 4.2'
gem 'country_select'
gem 'devise', '~> 4.6'
gem 'devise', '~> 4.8.1'
gem 'geocoder', '~> 1.6.1'
gem 'grape', '~> 1.3.0'
gem 'grape', '~> 1.6.2'
gem 'grape-swagger'
gem 'grape-kaminari'
gem 'grape-kaminari', '~> 0.4.3'
gem 'haml'
gem 'high_voltage', '~> 3.0.0'
gem 'http_accept_language'
gem 'jbuilder', '~> 2.5'
gem 'kaminari', '~> 1.1'
gem 'kaminari', '~> 1.2.2'
gem 'kaminari-grape', '~> 1.0'
gem 'mail_form', '>= 1.7.0'
gem 'net-smtp', require: false
gem 'net-imap', require: false
gem 'net-pop', require: false
gem 'pg'
gem 'pg_search'
gem 'puma'
Expand All @@ -37,9 +40,7 @@ gem 'webpacker', '~> 5'
group :development, :test do
gem 'better_errors', '~> 2.9.1'
gem 'binding_of_caller'
gem 'dotenv-rails', '~> 2.2.1'
gem 'factory_bot_rails', '~> 4.8.2'
gem 'listen', '>= 3.0.5', '< 3.2'
gem 'pry'
gem 'rspec-rails'
gem 'rubocop', require: false
Expand Down

0 comments on commit df47564

Please sign in to comment.