Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update to new maps public key #675

Merged
merged 8 commits into from
Oct 5, 2022
Merged

update to new maps public key #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8340b2f
update to new public key
mi-wood Sep 18, 2022
520e8c5
upgrade to rails 6
mi-wood Oct 5, 2022
5cbbd9c
add net gems to Gemfile
mi-wood Oct 5, 2022
bfd288f
update lock file
mi-wood Oct 5, 2022
147eabf
fix linting errors with upgrade
mi-wood Oct 5, 2022
3a83550
use proper "visible" syntax
mi-wood Oct 5, 2022
29cb405
update API gems
mi-wood Oct 5, 2022
2ec766e
change to old css rspec helper
mi-wood Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions .env
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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