v3.1.3

Merge pull request #810 from TechforgoodCAST/develop
TechforgoodCAST · Dec 14, 2018 · c0bce44 · c0bce44
2 parents 2cc01a9 + 2c7d161
commit c0bce44
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -43,7 +43,7 @@ gem 'sitemap_generator'
 gem 'stripe'
 
 # Admin
-gem 'activeadmin'
+gem 'activeadmin', '~> 1.3.0'
 gem 'devise', '~> 4.4.0'
 
 # Monitoring & metrics

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -24,7 +24,7 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activeadmin (1.4.3)
+    activeadmin (1.3.1)
       arbre (>= 1.1.1)
       coffee-rails
       formtastic (~> 3.1)
@@ -370,7 +370,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeadmin
+  activeadmin (~> 1.3.0)
   activerecord-import
   bcrypt (~> 3.1.7)
   bullet

diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
@@ -14,5 +14,10 @@ def show
         @assessment.proposal_id
       ).pluck(:criterion_id, :eligible).to_h
     end
+
+    respond_to do |format|
+      format.html { render 'errors/not_found', status: 404 }
+      format.js { render }
+    end
   end
 end
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -11,3 +11,4 @@
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 # Rails.application.config.assets.precompile += %w( search.js )
+Rails.application.config.assets.precompile += %w( chartkick.js )