diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 28008c0a..a3fa7822 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +1,14 @@
# Contributing Guidelines
-We love improvements to our tools! EDGI has general [guidelines for contributing](https://github.com/edgi-govdata-archiving/overview/blob/master/CONTRIBUTING.md) and a [code of conduct](https://github.com/edgi-govdata-archiving/overview/blob/master/CONDUCT.md) for all of our organizational repos.
+We love improvements to our tools! EDGI has general [guidelines for contributing][edgi-contributing] and a [code of conduct][edgi-conduct] for all of our organizational repos.
-## Submitting Web Monitoring Issues
+## Here are some notes specific to this project:
+
+### Submitting Web Monitoring Issues
Issues that are project-wide, or relate heavily to the interaction between different components, should be added to our [Web Monitoring issue queue](https://github.com/edgi-govdata-archiving/web-monitoring/issues). Component-specific issues should be added to their respective repository.
+
+
+
+[edgi-conduct]: https://github.com/edgi-govdata-archiving/overview/blob/master/CONDUCT.md
+[edgi-contributing]: https://github.com/edgi-govdata-archiving/overview/blob/master/CONTRIBUTING.md
diff --git a/Gemfile b/Gemfile
index a9ee195f..47144392 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem 'aws-sdk-s3', '~> 1.30'
gem 'devise'
gem 'httparty'
gem 'jwt', '~> 2.1'
-gem 'rails', '~> 5.2.2'
+gem 'rails', '~> 5.2.2.1'
gem 'pg', '~> 1.1'
gem 'puma', '~> 3.12'
gem 'rack-cors', :require => 'rack/cors'
@@ -44,7 +44,7 @@ gem 'bootsnap', '>= 1.3.1', require: false
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platform: :mri
- gem 'rubocop', '~> 0.63.1', require: false
+ gem 'rubocop', '~> 0.65.0', require: false
gem 'dotenv-rails'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index f1b0464b..1117dad0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,43 +1,43 @@
GEM
remote: https://rubygems.org/
specs:
- actioncable (5.2.2)
- actionpack (= 5.2.2)
+ actioncable (5.2.2.1)
+ actionpack (= 5.2.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailer (5.2.2)
- actionpack (= 5.2.2)
- actionview (= 5.2.2)
- activejob (= 5.2.2)
+ actionmailer (5.2.2.1)
+ actionpack (= 5.2.2.1)
+ actionview (= 5.2.2.1)
+ activejob (= 5.2.2.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.2.2)
- actionview (= 5.2.2)
- activesupport (= 5.2.2)
+ actionpack (5.2.2.1)
+ actionview (= 5.2.2.1)
+ activesupport (= 5.2.2.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (5.2.2)
- activesupport (= 5.2.2)
+ actionview (5.2.2.1)
+ activesupport (= 5.2.2.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.2.2)
- activesupport (= 5.2.2)
+ activejob (5.2.2.1)
+ activesupport (= 5.2.2.1)
globalid (>= 0.3.6)
- activemodel (5.2.2)
- activesupport (= 5.2.2)
- activerecord (5.2.2)
- activemodel (= 5.2.2)
- activesupport (= 5.2.2)
+ activemodel (5.2.2.1)
+ activesupport (= 5.2.2.1)
+ activerecord (5.2.2.1)
+ activemodel (= 5.2.2.1)
+ activesupport (= 5.2.2.1)
arel (>= 9.0)
- activestorage (5.2.2)
- actionpack (= 5.2.2)
- activerecord (= 5.2.2)
+ activestorage (5.2.2.1)
+ actionpack (= 5.2.2.1)
+ activerecord (= 5.2.2.1)
marcel (~> 0.3.1)
- activesupport (5.2.2)
+ activesupport (5.2.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -46,9 +46,9 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
arel (9.0.0)
ast (2.4.0)
- aws-eventstream (1.0.1)
- aws-partitions (1.136.0)
- aws-sdk-core (3.46.0)
+ aws-eventstream (1.0.2)
+ aws-partitions (1.144.0)
+ aws-sdk-core (3.46.2)
aws-eventstream (~> 1.0)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.0)
@@ -56,43 +56,44 @@ GEM
aws-sdk-kms (1.13.0)
aws-sdk-core (~> 3, >= 3.39.0)
aws-sigv4 (~> 1.0)
- aws-sdk-s3 (1.30.1)
+ aws-sdk-s3 (1.31.0)
aws-sdk-core (~> 3, >= 3.39.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.0)
- aws-sigv4 (1.0.3)
+ aws-sigv4 (1.1.0)
+ aws-eventstream (~> 1.0, >= 1.0.2)
bcrypt (3.1.12)
bindex (0.5.0)
- bootsnap (1.4.0)
+ bootsnap (1.4.1)
msgpack (~> 1.0)
builder (3.2.3)
- byebug (10.0.2)
+ byebug (11.0.0)
coderay (1.1.2)
- concurrent-ruby (1.1.4)
+ concurrent-ruby (1.1.5)
connection_pool (2.2.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.4)
declarative (0.0.10)
declarative-option (0.1.0)
- devise (4.5.0)
+ devise (4.6.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
responders
warden (~> 1.2.3)
- dotenv (2.6.0)
- dotenv-rails (2.6.0)
- dotenv (= 2.6.0)
- railties (>= 3.2, < 6.0)
+ dotenv (2.7.1)
+ dotenv-rails (2.7.1)
+ dotenv (= 2.7.1)
+ railties (>= 3.2, < 6.1)
erubi (1.8.0)
execjs (2.7.0)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
- ffi (1.9.25)
+ ffi (1.10.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
- google-api-client (0.28.3)
+ google-api-client (0.28.4)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.5, < 0.10.0)
httpclient (>= 2.8.1, < 3.0)
@@ -109,15 +110,15 @@ GEM
signet (~> 0.7)
hashdiff (0.3.8)
hiredis (0.6.3)
- httparty (0.16.3)
+ httparty (0.16.4)
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
- i18n (1.5.3)
+ i18n (1.6.0)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.2)
jmespath (1.4.0)
- json (2.1.0)
+ json (2.2.0)
jwt (2.1.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -140,7 +141,7 @@ GEM
mini_portile2 (2.4.0)
minitest (5.11.3)
mono_logger (1.1.0)
- msgpack (1.2.6)
+ msgpack (1.2.9)
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
@@ -148,10 +149,10 @@ GEM
nio4r (2.3.1)
nokogiri (1.10.1)
mini_portile2 (~> 2.4.0)
- oj (3.7.8)
+ oj (3.7.9)
orm_adapter (0.5.0)
os (1.0.0)
- parallel (1.13.0)
+ parallel (1.14.0)
parser (2.6.0.0)
ast (~> 2.4.0)
pg (1.1.4)
@@ -166,77 +167,79 @@ GEM
method_source (~> 0.9.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
+ psych (3.1.0)
public_suffix (3.0.3)
puma (3.12.0)
rack (2.0.6)
rack-cors (1.0.2)
- rack-protection (2.0.3)
+ rack-protection (2.0.5)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
- rails (5.2.2)
- actioncable (= 5.2.2)
- actionmailer (= 5.2.2)
- actionpack (= 5.2.2)
- actionview (= 5.2.2)
- activejob (= 5.2.2)
- activemodel (= 5.2.2)
- activerecord (= 5.2.2)
- activestorage (= 5.2.2)
- activesupport (= 5.2.2)
+ rails (5.2.2.1)
+ actioncable (= 5.2.2.1)
+ actionmailer (= 5.2.2.1)
+ actionpack (= 5.2.2.1)
+ actionview (= 5.2.2.1)
+ activejob (= 5.2.2.1)
+ activemodel (= 5.2.2.1)
+ activerecord (= 5.2.2.1)
+ activestorage (= 5.2.2.1)
+ activesupport (= 5.2.2.1)
bundler (>= 1.3.0)
- railties (= 5.2.2)
+ railties (= 5.2.2.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
- railties (5.2.2)
- actionpack (= 5.2.2)
- activesupport (= 5.2.2)
+ railties (5.2.2.1)
+ actionpack (= 5.2.2.1)
+ activesupport (= 5.2.2.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (12.3.2)
rb-fsevent (0.10.3)
- rb-inotify (0.9.10)
- ffi (>= 0.5.0, < 2)
+ rb-inotify (0.10.0)
+ ffi (~> 1.0)
readthis (2.2.0)
connection_pool (~> 2.1)
redis (>= 3.0, < 5.0)
- redis (4.0.2)
+ redis (4.1.0)
redis-namespace (1.6.0)
redis (>= 3.0.4)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
uber (< 0.2.0)
- responders (2.4.0)
- actionpack (>= 4.2.0, < 5.3)
- railties (>= 4.2.0, < 5.3)
- resque (1.27.4)
+ responders (2.4.1)
+ actionpack (>= 4.2.0, < 6.0)
+ railties (>= 4.2.0, < 6.0)
+ resque (2.0.0)
mono_logger (~> 1.0)
multi_json (~> 1.0)
- redis-namespace (~> 1.3)
+ redis-namespace (~> 1.6)
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
- resque-heroku-signals (1.27.4.3)
- resque (= 1.27.4)
+ resque-heroku-signals (2.0.0)
+ resque (= 2.0.0)
retriable (3.1.2)
- rubocop (0.63.1)
+ rubocop (0.65.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
powerpack (~> 0.1)
+ psych (>= 3.1.0)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.4.0)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
- safe_yaml (1.0.4)
- sass (3.5.7)
+ safe_yaml (1.0.5)
+ sass (3.7.3)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -254,10 +257,10 @@ GEM
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
- sinatra (2.0.3)
+ sinatra (2.0.5)
mustermann (~> 1.0)
rack (~> 2.0)
- rack-protection (= 2.0.3)
+ rack-protection (= 2.0.5)
tilt (~> 2.0)
spring (2.0.2)
activesupport (>= 4.2)
@@ -273,7 +276,7 @@ GEM
sprockets (>= 3.0.0)
thor (0.20.3)
thread_safe (0.3.6)
- tilt (2.0.8)
+ tilt (2.0.9)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uber (0.1.0)
@@ -282,8 +285,8 @@ GEM
unicode-display_width (1.4.1)
vegas (0.1.11)
rack (>= 1.0.0)
- warden (1.2.7)
- rack (>= 1.0)
+ warden (1.2.8)
+ rack (>= 2.0.6)
web-console (3.7.0)
actionview (>= 5.0)
activemodel (>= 5.0)
@@ -318,11 +321,11 @@ DEPENDENCIES
pry-rails
puma (~> 3.12)
rack-cors
- rails (~> 5.2.2)
+ rails (~> 5.2.2.1)
readthis
resque
resque-heroku-signals
- rubocop (~> 0.63.1)
+ rubocop (~> 0.65.0)
sass-rails (~> 5.0)
sentry-raven
spring
diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb
index 1e66f3d7..b1759d6c 100644
--- a/app/views/users/registrations/edit.html.erb
+++ b/app/views/users/registrations/edit.html.erb
@@ -1,7 +1,7 @@
Edit <%= resource_name.to_s.humanize %>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
- <%= devise_error_messages! %>
+ <%= render 'devise/shared/error_messages' %>
<%= f.label :email %>
diff --git a/config/database.yml b/config/database.yml
index b3e26491..bdfe67da 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -5,10 +5,7 @@
<%
if Rails.env.development? || Rails.env.test?
# Copy current environment and overlay test-specific config onto it
- test_env = {}.update(ENV)
- Dotenv::ignoring_nonexistent_files do
- test_env.update(Dotenv::Environment.new('.env.test', true))
- end
+ test_env = {}.update(ENV).update(Dotenv.parse('.env.test'))
# Copy any `DATABASE_*` variables to current env as `DATABASE_*_TEST`
test_env.each do |key, value|
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 52fc0599..185de212 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -32,7 +32,7 @@
# Mailers
config.action_mailer.default_url_options = {
- :host => ENV.fetch('HOST_URL', 'localhost:3000')
+ host: ENV.fetch('HOST_URL', 'localhost:3000').chomp('/')
}
config.action_mailer.delivery_method = :sendmail
config.action_mailer.raise_delivery_errors = true
diff --git a/config/environments/production.rb b/config/environments/production.rb
index de005721..b9e6be6d 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -71,7 +71,7 @@
# Action Mailer configuration
config.action_mailer.default_url_options = {
- host: ENV.fetch('HOST_URL', 'api.monitoring.envirodatagov.org')
+ host: ENV.fetch('HOST_URL', 'api.monitoring.envirodatagov.org').chomp('/')
}
config.action_mailer.raise_delivery_errors = true
config.action_mailer.perform_caching = false
diff --git a/config/environments/test.rb b/config/environments/test.rb
index abeb4241..7ad101b1 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -33,7 +33,9 @@
config.action_mailer.perform_caching = false
# Action Mailer host default
- config.action_mailer.default_url_options = { :host => ENV.fetch('HOST_URL', 'localhost') }
+ config.action_mailer.default_url_options = {
+ host: ENV.fetch('HOST_URL', 'localhost').chomp('/')
+ }
# Tell Action Mailer not to deliver emails to the real world.
# The :test delivery method accumulates sent emails in the