From 05fce4c40a0c90e7e859ee331c7e9756716c1239 Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Tue, 29 Apr 2014 16:02:42 +0200
Subject: [PATCH] Move rails gem to Gemfile

---
 .travis.yml    | 2 +-
 Gemfile        | 1 +
 Gemfile.lock   | 2 +-
 cmtool.gemspec | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ccdbb6f..5415b15 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 rvm:
-- 1.9.3
+- 2.1.0
 services:
 - couchdb
 before_script:
diff --git a/Gemfile b/Gemfile
index 108a84a..00ac1e3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,7 @@ source "http://rubygems.org"
 # development dependencies will be added by default to the :development group.
 gemspec
 
+gem "rails", ">= 4.1.0"
 group :assets do
   gem 'sass-rails'
   gem 'bourbon'
diff --git a/Gemfile.lock b/Gemfile.lock
index d8e4cb8..1a34fe6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,7 +37,6 @@ PATH
       email_validator
       haml-rails
       jquery-rails
-      rails (>= 4.1.0)
       slim-rails
       tinymce-rails
 
@@ -251,6 +250,7 @@ DEPENDENCIES
   orm_adapter!
   paperclip (= 3.5.2)
   pry-rails
+  rails (>= 4.1.0)
   sass-rails
   simply_stored!
   slim-rails
diff --git a/cmtool.gemspec b/cmtool.gemspec
index 1de990b..72ed614 100644
--- a/cmtool.gemspec
+++ b/cmtool.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib,vendor}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
   s.test_files = Dir["spec/**/*"]
 
-  s.add_dependency "rails", ">= 4.1.0"
+  #s.add_dependency "rails", ">= 4.1.0"
   s.add_dependency 'email_validator'
   s.add_dependency 'bourbon'
   s.add_dependency 'haml-rails'