From c26b26d679a11cd1487470ee74ce0286b320f599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafael.franca@plataformatec.com.br>
Date: Tue, 16 Dec 2014 16:11:49 -0200
Subject: [PATCH] Add a new gemfile with Rails 4-2-stable branch

---
 .travis.yml                       |  1 +
 Gemfile                           |  5 +-
 Gemfile.lock                      | 93 +++++++++++--------------------
 gemfiles/Gemfile.rails-4-2-stable | 15 +++++
 4 files changed, 48 insertions(+), 66 deletions(-)
 create mode 100644 gemfiles/Gemfile.rails-4-2-stable

diff --git a/.travis.yml b/.travis.yml
index 8fe62b38..22b5c0b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ rvm:
 gemfile:
   - gemfiles/Gemfile.rails-4-0-stable
   - gemfiles/Gemfile.rails-4-1-stable
+  - gemfiles/Gemfile.rails-4-2-stable
   - Gemfile
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
index 7041c4af..863c6cd8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,8 +8,5 @@ platforms :rbx do
 end
 
 gem 'country_select', '~> 1.1.1'
-gem 'railties', github: 'rails/rails', branch: 'master'
-gem 'activemodel', github: 'rails/rails', branch: 'master'
-gem 'actionpack', github: 'rails/rails', branch: 'master'
-gem 'rails-dom-testing', github: 'rails/rails-dom-testing'
+gem 'railties'
 gem 'rake'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8762d7e0..0e7fc826 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,45 +1,3 @@
-GIT
-  remote: git://github.com/rails/rails-dom-testing.git
-  revision: 6391d4f4389d03a1ae27756cbaa0d077938dda67
-  specs:
-    rails-dom-testing (1.0.4)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: 27a181f7518616b5b508e17271145e330d948cd2
-  branch: master
-  specs:
-    actionpack (4.2.0.beta4)
-      actionview (= 4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
-      rack (~> 1.6.0.beta)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.4)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.4)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activemodel (4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
-      builder (~> 3.1)
-    activesupport (4.2.0.beta4)
-      i18n (>= 0.7.0.beta1, < 0.8)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    railties (4.2.0.beta4)
-      actionpack (= 4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-
 PATH
   remote: .
   specs:
@@ -50,26 +8,40 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    actionpack (4.1.8)
+      actionview (= 4.1.8)
+      activesupport (= 4.1.8)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.8)
+      activesupport (= 4.1.8)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.8)
+      activesupport (= 4.1.8)
+      builder (~> 3.1)
+    activesupport (4.1.8)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
     builder (3.2.2)
     country_select (1.1.3)
     erubis (2.7.0)
     ffi2-generators (0.1.1)
-    i18n (0.7.0.beta1)
+    i18n (0.6.11)
     json (1.8.1)
-    loofah (2.0.1)
-      nokogiri (>= 1.5.9)
-    mini_portile (0.6.1)
-    minitest (5.4.3)
-    nokogiri (1.6.4.1)
-      mini_portile (~> 0.6.0)
-    rack (1.6.0.beta)
+    minitest (5.5.0)
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-html-sanitizer (1.0.1)
-      loofah (~> 2.0)
-    rake (10.3.2)
+    railties (4.1.8)
+      actionpack (= 4.1.8)
+      activesupport (= 4.1.8)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
     rb-readline (0.5.1)
     rubinius-coverage (2.0.3)
     rubinius-debugger (2.1.0)
@@ -212,7 +184,7 @@ GEM
       rubysl-e2mmap (~> 2.0)
       rubysl-mathn (~> 2.0)
       rubysl-thread (~> 2.0)
-    rubysl-logger (2.0.0)
+    rubysl-logger (2.1.0)
     rubysl-mathn (2.0.0)
     rubysl-matrix (2.1.0)
       rubysl-e2mmap (~> 2.0)
@@ -248,7 +220,7 @@ GEM
     rubysl-pty (2.0.2)
     rubysl-rational (2.0.1)
     rubysl-resolv (2.1.0)
-    rubysl-rexml (2.0.3)
+    rubysl-rexml (2.0.4)
     rubysl-rinda (2.0.1)
     rubysl-rss (2.0.0)
     rubysl-scanf (2.0.0)
@@ -260,7 +232,7 @@ GEM
     rubysl-stringio (2.0.0)
     rubysl-strscan (2.0.0)
     rubysl-sync (2.0.0)
-    rubysl-syslog (2.0.1)
+    rubysl-syslog (2.1.0)
       ffi2-generators (~> 0.1)
     rubysl-tempfile (2.0.1)
     rubysl-thread (2.0.2)
@@ -287,11 +259,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack!
-  activemodel!
   country_select (~> 1.1.1)
-  rails-dom-testing!
-  railties!
+  railties
   rake
   rubinius-developer_tools
   rubysl (~> 2.0)
diff --git a/gemfiles/Gemfile.rails-4-2-stable b/gemfiles/Gemfile.rails-4-2-stable
new file mode 100644
index 00000000..717ec993
--- /dev/null
+++ b/gemfiles/Gemfile.rails-4-2-stable
@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+gemspec :path => '..'
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+end
+
+gem 'country_select', '~> 1.1.1'
+gem 'railties', github: 'rails/rails', branch: '4-2-stable'
+gem 'activemodel', github: 'rails/rails', branch: '4-2-stable'
+gem 'actionpack', github: 'rails/rails', branch: '4-2-stable'
+gem 'rake'
+gem 'tzinfo'