Merge d5bb3a6 into 98bf07c

ZeusWPI · Feb 8, 2015 · f4aa868 · f4aa868
2 parents 98bf07c + d5bb3a6
commit f4aa868
Show file tree

Hide file tree

Showing 165 changed files with 2,255 additions and 2,018 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 4.0'
+gem 'rails', '~> 4.2'
 
 # We <3 New Relic
 gem 'newrelic_rpm'
@@ -39,6 +39,9 @@ gem 'simple_form'
 # Datagrid is nice
 gem 'datagrid'
 
+# Wicked gem
+gem 'wicked'
+
 group :doc do
   # bundle exec rake doc:rails generates the API under doc/api.
   gem 'sdoc', require: false
@@ -60,8 +63,8 @@ gem 'devise_cas_authenticatable'
 # Token authentication for partners
 gem 'simple_token_authentication'
 
-# CanCan is used for authorization
-gem 'cancan'
+# CanCanCan is used for authorization
+gem 'cancancan', '~> 1.9'
 gem 'httparty'
 
 # Logging is awesome, and paper_trail even more
@@ -93,7 +96,7 @@ gem 'spreadsheet'
 
 # Run stuff in the background
 gem 'daemons'
-gem 'delayed_job', '~> 4.0'
+gem 'delayed_job', '~> 4.0.6'
 gem 'delayed_job_active_record'
 #