Merge pull request #35 from eyupatis/master

Rails: Rails version updated to latest stable version of Rails that is 4.1....
komarserjio · Nov 21, 2014 · 0de4d88 · 0de4d88
2 parents 4664635 + 2a85765
commit 0de4d88
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 36 deletions.
diff --git a/rubyonrails/notejam/Gemfile b/rubyonrails/notejam/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.0.10'
+gem 'rails', '4.1.7'
 
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'

diff --git a/rubyonrails/notejam/Gemfile.lock b/rubyonrails/notejam/Gemfile.lock
@@ -1,35 +1,37 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.10)
-      actionpack (= 4.0.10)
+    actionmailer (4.1.7)
+      actionpack (= 4.1.7)
+      actionview (= 4.1.7)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.10)
-      activesupport (= 4.0.10)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionpack (4.1.7)
+      actionview (= 4.1.7)
+      activesupport (= 4.1.7)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.10)
-      activesupport (= 4.0.10)
-      builder (~> 3.1.0)
-    activerecord (4.0.10)
-      activemodel (= 4.0.10)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.10)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.10)
+    actionview (4.1.7)
+      activesupport (= 4.1.7)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.7)
+      activesupport (= 4.1.7)
+      builder (~> 3.1)
+    activerecord (4.1.7)
+      activemodel (= 4.1.7)
+      activesupport (= 4.1.7)
+      arel (~> 5.0.0)
+    activesupport (4.1.7)
       i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.2)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
     bcrypt (3.1.7)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
-    builder (3.1.4)
+    builder (3.2.2)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
@@ -48,25 +50,27 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
-    mail (2.6.1)
+    mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.4.1)
-    minitest (4.7.5)
+    mime-types (2.4.3)
+    minitest (5.4.3)
     multi_json (1.10.1)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.10)
-      actionmailer (= 4.0.10)
-      actionpack (= 4.0.10)
-      activerecord (= 4.0.10)
-      activesupport (= 4.0.10)
+    rails (4.1.7)
+      actionmailer (= 4.1.7)
+      actionpack (= 4.1.7)
+      actionview (= 4.1.7)
+      activemodel (= 4.1.7)
+      activerecord (= 4.1.7)
+      activesupport (= 4.1.7)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.10)
+      railties (= 4.1.7)
       sprockets-rails (~> 2.0)
-    railties (4.0.10)
-      actionpack (= 4.0.10)
-      activesupport (= 4.0.10)
+    railties (4.1.7)
+      actionpack (= 4.1.7)
+      activesupport (= 4.1.7)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
@@ -96,7 +100,8 @@ GEM
     tilt (1.4.1)
     turbolinks (2.4.0)
       coffee-rails
-    tzinfo (0.3.41)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -109,7 +114,7 @@ DEPENDENCIES
   coffee-rails (~> 4.0.0)
   jbuilder (~> 1.2)
   jquery-rails
-  rails (= 4.0.10)
+  rails (= 4.1.7)
   sass-rails (~> 4.0.0)
   sdoc
   sqlite3