danbarber/danbarberphoto
1
0
Fork 0
mirror of https://github.com/danbee/danbarberphoto synced 2025-03-04 08:49:07 +00:00
Code Issues Releases Wiki Activity

Merge branch 'main' into depfu/update/capybara-screenshot-1.0.26

Browse Source
This commit is contained in:
Daniel Barber 2023-08-08 09:46:23 -05:00 committed by GitHub
commit edc1d8ef14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -61,5 +61,4 @@ end
group :production do
gem "puma"
gem "rails_12factor"
end

42
Gemfile.lock
View File

@ -143,32 +143,32 @@ GEM
formatador (0.3.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (1.8.10)
i18n (1.8.11)
concurrent-ruby (~> 1.0)
ipaddress (0.8.3)
jquery-rails (4.4.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
kaminari (1.2.1)
kaminari (1.2.2)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.1)
kaminari-activerecord (= 1.2.1)
kaminari-core (= 1.2.1)
kaminari-actionview (1.2.1)
kaminari-actionview (= 1.2.2)
kaminari-activerecord (= 1.2.2)
kaminari-core (= 1.2.2)
kaminari-actionview (1.2.2)
actionview
kaminari-core (= 1.2.1)
kaminari-activerecord (1.2.1)
kaminari-core (= 1.2.2)
kaminari-activerecord (1.2.2)
activerecord
kaminari-core (= 1.2.1)
kaminari-core (1.2.1)
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
kramdown (2.3.1)
rexml
launchy (2.5.0)
addressable (~> 2.7)
letter_opener (1.7.0)
launchy (~> 2.2)
loofah (2.10.0)
loofah (2.13.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
@ -176,12 +176,12 @@ GEM
marcel (1.0.1)
matrix (0.4.2)
method_source (1.0.0)
mime-types (3.3.1)
mime-types (3.5.0)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0704)
mini_mime (1.1.2)
mini_portile2 (2.7.1)
minitest (5.14.4)
mime-types-data (3.2023.0808)
mini_mime (1.1.0)
mini_portile2 (2.6.1)
minitest (5.15.0)
momentjs-rails (2.20.1)
railties (>= 3.1)
multi_json (1.15.0)
@ -198,7 +198,7 @@ GEM
parallel (1.20.1)
parser (3.0.2.0)
ast (~> 2.4.1)
pg (1.2.3)
pg (1.4.5)
poltergeist (1.18.1)
capybara (>= 2.1, < 4)
cliver (~> 0.3.1)
@ -235,13 +235,8 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (5.2.6)
actionpack (= 5.2.6)
activesupport (= 5.2.6)
@ -386,7 +381,6 @@ DEPENDENCIES
puma
rails (~> 5.1)
rails-controller-testing
rails_12factor
rspec-rails
rubocop
ruby_parser

2
config/environments/development.rb
View File

@ -10,7 +10,7 @@ DanBarberPhoto::Application.configure do
config.eager_load = false
# Show full error reports and disable caching
config.consider_all_requests_local = true
config.consider_all_requests_local = true
config.action_controller.perform_caching = false
# Don't care if the mailer can't send

4
config/environments/production.rb
View File

@ -11,7 +11,7 @@ DanBarberPhoto::Application.configure do
config.eager_load = true
# Full error reports are disabled and caching is turned on
config.consider_all_requests_local = false
config.consider_all_requests_local = false
config.action_controller.perform_caching = true
# Disable Rails's static asset server (Apache or nginx will already do this)
@ -71,7 +71,7 @@ DanBarberPhoto::Application.configure do
authentication: :plain,
user_name: ENV["SENDGRID_USERNAME"],
password: ENV["SENDGRID_PASSWORD"],
domain: "heroku.com",
domain: "heroku.com"
}
ActionMailer::Base.delivery_method = :smtp