Merge pull request #218 from indykish/0.5

Move Rails to 4.2RC3, saas-rails to 5.0.0

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem "rails",  "~> 4.2.0.rc1"
-gem 'arel', '6.0.0'
+gem "rails",  "~> 4.2.0.rc3"
+#gem 'arel', '6.0.0'
 # add these gems to help with the transition to Rails 4.2.x
 gem 'protected_attributes', "~> 1.0.8"
 gem "responders", "~> 2.0.0"
@@ -64,8 +64,8 @@ gem "sshkey", "~> 1.6.1"
 
 # Gems used only for assets and not required
 # in production environments by default.
-gem "less-rails", "~> 2.5.0"
-gem 'sass-rails', "~> 5.0.0.beta1"
+gem "less-rails", "~> 2.6.0"
+gem 'sass-rails', "~> 5.0.0"
 gem 'coffee-rails', "~> 4.1.0"
 gem 'uglifier', "~> 2.5.3"
 

Gemfile.lock

@@ -22,36 +22,36 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.2.8)
-    actionmailer (4.2.0.rc2)
-      actionpack (= 4.2.0.rc2)
-      actionview (= 4.2.0.rc2)
-      activejob (= 4.2.0.rc2)
+    actionmailer (4.2.0.rc3)
+      actionpack (= 4.2.0.rc3)
+      actionview (= 4.2.0.rc3)
+      activejob (= 4.2.0.rc3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.0.rc2)
-      actionview (= 4.2.0.rc2)
-      activesupport (= 4.2.0.rc2)
+    actionpack (4.2.0.rc3)
+      actionview (= 4.2.0.rc3)
+      activesupport (= 4.2.0.rc3)
       rack (~> 1.6.0.beta2)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0.rc2)
-      activesupport (= 4.2.0.rc2)
+    actionview (4.2.0.rc3)
+      activesupport (= 4.2.0.rc3)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0.rc2)
-      activesupport (= 4.2.0.rc2)
+    activejob (4.2.0.rc3)
+      activesupport (= 4.2.0.rc3)
       globalid (>= 0.3.0)
-    activemodel (4.2.0.rc2)
-      activesupport (= 4.2.0.rc2)
+    activemodel (4.2.0.rc3)
+      activesupport (= 4.2.0.rc3)
       builder (~> 3.1)
-    activerecord (4.2.0.rc2)
-      activemodel (= 4.2.0.rc2)
-      activesupport (= 4.2.0.rc2)
+    activerecord (4.2.0.rc3)
+      activemodel (= 4.2.0.rc3)
+      activesupport (= 4.2.0.rc3)
       arel (~> 6.0)
-    activesupport (4.2.0.rc2)
+    activesupport (4.2.0.rc3)
       i18n (>= 0.7.0.beta1, < 0.8)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -121,7 +121,7 @@ GEM
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
-    fog-core (1.25.0)
+    fog-core (1.27.1)
       builder
       excon (~> 0.38)
       formatador (~> 0.2)
@@ -192,11 +192,11 @@ GEM
     json (1.8.1)
     jwt (1.2.0)
     kgio (2.9.2)
-    less (2.5.1)
+    less (2.6.0)
       commonjs (~> 0.2.7)
-    less-rails (2.5.0)
+    less-rails (2.6.0)
       actionpack (>= 3.1)
-      less (~> 2.5.0)
+      less (~> 2.6.0)
     libv8 (3.16.14.7)
     loofah (2.0.1)
       nokogiri (>= 1.5.9)
@@ -226,7 +226,7 @@ GEM
       railties (>= 3.0.0, < 5.0.0)
     mime-types (2.4.3)
     mini_portile (0.6.1)
-    minitest (5.4.3)
+    minitest (5.5.0)
     mixlib-config (2.1.0)
     mixlib-log (1.6.0)
     multi_json (1.10.1)
@@ -282,16 +282,16 @@ GEM
       rack (>= 0.9.1)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.2.0.rc2)
-      actionmailer (= 4.2.0.rc2)
-      actionpack (= 4.2.0.rc2)
-      actionview (= 4.2.0.rc2)
-      activejob (= 4.2.0.rc2)
-      activemodel (= 4.2.0.rc2)
-      activerecord (= 4.2.0.rc2)
-      activesupport (= 4.2.0.rc2)
+    rails (4.2.0.rc3)
+      actionmailer (= 4.2.0.rc3)
+      actionpack (= 4.2.0.rc3)
+      actionview (= 4.2.0.rc3)
+      activejob (= 4.2.0.rc3)
+      activemodel (= 4.2.0.rc3)
+      activerecord (= 4.2.0.rc3)
+      activesupport (= 4.2.0.rc3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0.rc2)
+      railties (= 4.2.0.rc3)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -301,9 +301,9 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.1)
       loofah (~> 2.0)
-    railties (4.2.0.rc2)
-      actionpack (= 4.2.0.rc2)
-      activesupport (= 4.2.0.rc2)
+    railties (4.2.0.rc3)
+      actionpack (= 4.2.0.rc3)
+      activesupport (= 4.2.0.rc3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
@@ -340,11 +340,12 @@ GEM
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
     sass (3.4.9)
-    sass-rails (5.0.0.beta1)
+    sass-rails (5.0.0)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2)
-      sprockets (~> 2.12)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
     simple_oauth (0.2.0)
     socket.io-rails (1.2.1)
       railties (>= 3.1)
@@ -396,7 +397,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  arel (= 6.0.0)
   bcrypt (~> 3.1.9)
   better_errors
   binding_of_caller
@@ -413,7 +413,7 @@ DEPENDENCIES
   jquery-rails (~> 4.0.0)
   jquery-turbolinks (~> 2.1.0)
   json (~> 1.8.1)
-  less-rails (~> 2.5.0)
+  less-rails (~> 2.6.0)
   megam_api (~> 0.31)
   megam_assembla (~> 0.1.0)
   megam_deccanplato (~> 0.1.0)
@@ -429,13 +429,13 @@ DEPENDENCIES
   omniauth-oauth2 (~> 1.2.0)
   omniauth-twitter (~> 1.1.0)
   protected_attributes (~> 1.0.8)
-  rails (~> 4.2.0.rc1)
+  rails (~> 4.2.0.rc3)
   randexp (~> 0.1.7)
   remotipart (~> 1.2.1)
   responders (~> 2.0.0)
   riak-client (~> 2.1.0)
   rspec-rails
-  sass-rails (~> 5.0.0.beta1)
+  sass-rails (~> 5.0.0)
   socket.io-rails (~> 1.2.0)
   sqlite3 (~> 1.3.10)
   sshkey (~> 1.6.1)