Merge remote-tracking branch 'upstream/pull/2023'

diff --cc Gemfile
index d60f1ba947bde44a591a0036042a2e493c82be8a,b559027c2062fc1625604bc679417dca36e28831..05bfc6cbd3e6d14ea36f335a468cf6767038de70
--- 1/Gemfile
--- 2/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

diff --cc app/controllers/diary_entry_controller.rb
Simple merge