From 9be3efe9e8b420cec16e5f7a8b237227746a6b8d Mon Sep 17 00:00:00 2001
From: Andriel Nuernberg <andriel.nuernberg@plataformatec.com.br>
Date: Thu, 5 Dec 2013 20:50:15 -0200
Subject: [PATCH] Bump Rails dependencies to 4-0-stable

---
 Gemfile      |  6 +++---
 Gemfile.lock | 40 +++++++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/Gemfile b/Gemfile
index eb04fccf..d2d6ea04 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,9 +3,9 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'country_select', '~> 1.1.1'
-gem 'railties', '>= 4.0.0', '< 4.1'
-gem 'activemodel', '>= 4.0.0', '< 4.1'
-gem 'actionpack', '>= 4.0.0', '< 4.1'
+gem 'railties', github: 'rails/rails', branch: '4-0-stable'
+gem 'activemodel', github: 'rails/rails', branch: '4-0-stable'
+gem 'actionpack', github: 'rails/rails', branch: '4-0-stable'
 gem 'rake'
 gem 'rdoc'
 gem 'tzinfo'
diff --git a/Gemfile.lock b/Gemfile.lock
index d5806451..8cfe7adc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,7 @@
-PATH
-  remote: .
-  specs:
-    simple_form (3.0.1)
-      actionpack (>= 4.0.0, < 4.1)
-      activemodel (>= 4.0.0, < 4.1)
-
-GEM
-  remote: https://rubygems.org/
+GIT
+  remote: git://github.com/rails/rails.git
+  revision: b632a8237745c62747558551c74e32a3bb056e09
+  branch: 4-0-stable
   specs:
     actionpack (4.0.2)
       activesupport (= 4.0.2)
@@ -23,6 +18,22 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
+    railties (4.0.2)
+      actionpack (= 4.0.2)
+      activesupport (= 4.0.2)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+
+PATH
+  remote: .
+  specs:
+    simple_form (3.0.1)
+      actionpack (>= 4.0.0, < 4.1)
+      activemodel (>= 4.0.0, < 4.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
     atomic (1.1.14)
     builder (3.1.4)
     country_select (1.1.3)
@@ -34,11 +45,6 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (4.0.2)
-      actionpack (= 4.0.2)
-      activesupport (= 4.0.2)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
     rake (10.1.0)
     rdoc (4.0.1)
       json (~> 1.4)
@@ -51,10 +57,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (>= 4.0.0, < 4.1)
-  activemodel (>= 4.0.0, < 4.1)
+  actionpack!
+  activemodel!
   country_select (~> 1.1.1)
-  railties (>= 4.0.0, < 4.1)
+  railties!
   rake
   rdoc
   simple_form!