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

Release v109 #440

Merged
merged 3 commits into from
May 4, 2020
Merged

Release v109 #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f15d14
#439 Try adding an exception handler for UnknownForm so URLs like /ev…
srogers May 4, 2020
fe0f4f9
#439 Keep the JSON handling and rescue unknown format specifically
srogers May 4, 2020
c54bae2
General gem update, including AuthLogic 6, which requires explicit bu…
srogers May 4, 2020
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ gem 'rails-assets-tether' # enables tooltips properly in the pipeline
gem 'rmagick'
gem 'rubyzip' # Used for zipping PDF for download
gem 'scout_apm' # replacement for New Relic
gem 'scrypt' # In AuthLogic 6, no longer built-in
gem 'select2-rails' # used for autocomplete select boxes
gem 'sentry-raven'
gem 'sidekiq'
Expand Down
87 changes: 44 additions & 43 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,15 @@ GEM
ansi (1.5.0)
arel (9.0.0)
ast (2.4.0)
authlogic (5.0.4)
authlogic (6.0.0)
activemodel (>= 5.2, < 6.1)
activerecord (>= 5.2, < 6.1)
activesupport (>= 5.2, < 6.1)
request_store (~> 1.0)
scrypt (>= 1.2, < 4.0)
autoprefixer-rails (9.7.4)
autoprefixer-rails (9.7.6)
execjs
backports (3.17.0)
better_errors (2.6.0)
backports (3.17.1)
better_errors (2.7.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
Expand All @@ -76,14 +75,14 @@ GEM
autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.14.3, < 2)
sassc-rails (>= 2.0.0)
brakeman (4.8.0)
brakeman (4.8.1)
builder (3.2.4)
bullet (6.1.0)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
byebug (11.1.1)
byebug (11.1.3)
cancancan (3.1.0)
capybara (3.31.0)
capybara (3.32.1)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
Expand Down Expand Up @@ -145,7 +144,7 @@ GEM
railties (>= 4.2, < 7)
cucumber-tag_expressions (1.1.1)
cucumber-wire (0.0.1)
database_cleaner (1.8.3)
database_cleaner (1.8.4)
debug_inspector (0.0.3)
diff-lcs (1.3)
dotenv (2.7.5)
Expand All @@ -158,12 +157,12 @@ GEM
ffi (>= 1.3.0)
excon (0.73.0)
execjs (2.7.0)
factory_bot (5.1.1)
factory_bot (5.2.0)
activesupport (>= 4.2.0)
factory_bot_rails (5.1.1)
factory_bot (~> 5.1.0)
factory_bot_rails (5.2.0)
factory_bot (~> 5.2.0)
railties (>= 4.2.0)
faraday (1.0.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
fast_jsonapi (1.5)
activesupport (>= 4.2)
Expand All @@ -172,7 +171,7 @@ GEM
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
fog-aws (3.5.2)
fog-aws (3.6.3)
fog-core (~> 2.1)
fog-json (~> 1.1)
fog-xml (~> 0.1)
Expand Down Expand Up @@ -272,17 +271,17 @@ GEM
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.4.0)
loofah (2.5.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.2)
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009)
mime-types-data (3.2020.0425)
mimemagic (0.3.4)
mini_magick (4.10.1)
mini_mime (1.0.2)
Expand All @@ -291,7 +290,7 @@ GEM
multi_json (1.14.1)
multi_test (0.1.2)
multipart-post (2.1.1)
net-http-persistent (3.1.0)
net-http-persistent (4.0.0)
connection_pool (~> 2.2)
net_http_timeout_errors (0.3.5)
nio4r (2.5.2)
Expand All @@ -302,7 +301,7 @@ GEM
ast
ruby-ll (~> 2.1)
parallel (1.19.1)
parser (2.7.0.4)
parser (2.7.1.2)
ast (~> 2.4.0)
pdf-core (0.7.0)
pg (1.2.3)
Expand All @@ -317,10 +316,10 @@ GEM
prawn (~> 2)
prawn-table (0.2.2)
prawn (>= 1.3.0, < 3.0.0)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (4.0.3)
pry (0.13.1)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.4)
puma (4.3.3)
nio4r (~> 2.0)
rack (2.0.9)
Expand Down Expand Up @@ -364,23 +363,23 @@ GEM
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (13.0.1)
rb-fsevent (0.10.3)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
redis (3.3.5)
regexp_parser (1.7.0)
request_store (1.5.0)
rack (>= 1.4)
rexml (3.2.4)
rmagick (4.0.0)
rmagick (4.1.2)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-collection_matchers (1.2.0)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.9.1)
rspec-support (~> 3.9.1)
rspec-core (3.9.2)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
Expand All @@ -390,27 +389,28 @@ GEM
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-rails (3.9.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.2)
rubocop (0.80.1)
rspec-rails (4.0.0)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
rspec-core (~> 3.9)
rspec-expectations (~> 3.9)
rspec-mocks (~> 3.9)
rspec-support (~> 3.9)
rspec-support (3.9.3)
rubocop (0.82.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.7.0.1)
rainbow (>= 2.2.2, < 4.0)
rexml
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-rails (2.4.2)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-rails (2.5.2)
activesupport
rack (>= 1.1)
rubocop (>= 0.72.0)
rubocop-rspec (1.38.1)
rubocop-rspec (1.39.0)
rubocop (>= 0.68.1)
ruby-graphviz (1.2.5)
rexml
Expand All @@ -423,7 +423,7 @@ GEM
ruby_parser (3.14.2)
sexp_processor (~> 4.9)
rubyzip (2.3.0)
sassc (2.2.1)
sassc (2.3.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
Expand Down Expand Up @@ -473,11 +473,11 @@ GEM
ttfunk (1.6.2.1)
typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.6)
tzinfo (1.2.7)
thread_safe (~> 0.1)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.6.1)
unicode-display_width (1.7.0)
unicode_utils (1.4.0)
uniform_notifier (1.13.0)
video_info (2.7)
Expand Down Expand Up @@ -552,6 +552,7 @@ DEPENDENCIES
rubocop-rspec
rubyzip
scout_apm
scrypt
select2-rails
selenium-webdriver
sentry-raven
Expand Down
23 changes: 16 additions & 7 deletions app/controllers/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,23 @@ def redirect_back_or_default(default)

rescue_from ActiveRecord::RecordNotFound do |exception|
logger.warn "ApplicationController handled failed find: #{ exception }"
respond_to do |format|
format.html do
flash[:notice] = "Couldn't find that information"
redirect_to root_url
end
format.json do
render :json => { :error => 'not found', status: 404 }
begin
respond_to do |format|
format.html do
flash[:notice] = "Couldn't find that information"
redirect_to root_url
end
format.json do
render :json => { :error => 'not found', status: 404 }
end
end
# this can happen often with "robot" URLs like /events/favicon.ico - which raises ActiveRecord::RecordNotFound, then
# raises UnknownFormat on .ico - so we wind up here
rescue ActionController::UnknownFormat
logger.warn "ApplicationController handled unknown format "
flash[:notice] = "Couldn't find that information"
redirect_to root_url
end
end

end