Merge remote-tracking branch 'upstream/pull/2023'
authorTom Hughes <tom@compton.nu>
Sat, 3 Nov 2018 14:34:18 +0000 (14:34 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 3 Nov 2018 14:34:18 +0000 (14:34 +0000)
1  2 
Gemfile
Gemfile.lock
app/controllers/diary_entry_controller.rb

diff --cc Gemfile
+++ b/Gemfile
@@@ -45,8 -45,8 +45,9 @@@ gem "image_optim_rails
  
  # Load rails plugins
  gem "actionpack-page_caching"
+ gem "cancancan"
  gem "composite_primary_keys", "~> 11.0.0"
 +gem "delayed_job_active_record"
  gem "dynamic_form"
  gem "http_accept_language", "~> 2.0.0"
  gem "i18n-js", ">= 3.0.0"
diff --cc Gemfile.lock
Simple merge