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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 9e86b5ec760bc930a583fee86508e8aded2edf55..5eb559113b883aa8aa54b6f482cb5773b6a6565a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem "json"
 gem "pg", "~> 0.18"
 
 # Use SCSS for stylesheets
-gem "sassc-rails", "~> 1.3"
+gem "sassc-rails"
 
 # Use Uglifier as compressor for JavaScript assets
 gem "uglifier", ">= 1.3.0"
@@ -45,6 +45,8 @@ gem "image_optim_rails"
 
 # Load rails plugins
 gem "actionpack-page_caching"
+gem "active_record_union"
+gem "cancancan"
 gem "composite_primary_keys", "~> 11.0.0"
 gem "delayed_job_active_record"
 gem "dynamic_form"