From 7d57d9d37f193722d552b9a527070eaee51f3850 Mon Sep 17 00:00:00 2001
From: Braulio Bhavamitra <braulio@prout.io>
Date: Tue, 25 Apr 2017 19:04:05 -0300
Subject: [PATCH] ruby2.4: update rails version for ruby 2.4 support

---
 Gemfile      |   3 +-
 Gemfile.lock | 113 ---------------------------------------------------
 2 files changed, 1 insertion(+), 115 deletions(-)
 delete mode 100644 Gemfile.lock

diff --git a/Gemfile b/Gemfile
index 2078cb46..aacd583c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,7 @@
 source 'https://rubygems.org'
 
-
 group :test, :development do
-  gem 'rails', '~> 3.2'
+  gem 'rails', if RUBY_VERSION >= '2.4.0' then '~> 4.2' else '~> 3.2' end
   gem 'sqlite3'
   gem 'pothoven-attachment_fu', :path => '.'
   gem 'rmagick'
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index b0649313..00000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,113 +0,0 @@
-PATH
-  remote: .
-  specs:
-    pothoven-attachment_fu (3.3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.14)
-      actionpack (= 3.2.14)
-      mail (~> 2.5.4)
-    actionpack (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
-    activerecord (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-    activesupport (3.2.14)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    aws-sdk-v1 (1.61.0)
-      json (~> 1.4)
-      nokogiri (>= 1.4.4)
-    builder (3.0.4)
-    core_image (0.0.3.5)
-    erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.6.5)
-    journey (1.0.4)
-    json (1.8.0)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.24)
-    mini_magick (3.6.0)
-      subexec (~> 0.2.1)
-    mini_portile (0.6.2)
-    multi_json (1.7.9)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.14)
-      actionmailer (= 3.2.14)
-      actionpack (= 3.2.14)
-      activerecord (= 3.2.14)
-      activeresource (= 3.2.14)
-      activesupport (= 3.2.14)
-      bundler (~> 1.0)
-      railties (= 3.2.14)
-    railties (3.2.14)
-      actionpack (= 3.2.14)
-      activesupport (= 3.2.14)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.1.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rmagick (2.16.0)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.8)
-    subexec (0.2.3)
-    test-unit (2.5.5)
-    thor (0.18.1)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aws-sdk-v1 (~> 1.61.0)
-  core_image
-  mini_magick
-  pothoven-attachment_fu!
-  rails (~> 3.2)
-  rmagick
-  sqlite3
-  test-unit
-
-BUNDLED WITH
-   1.11.2