Move rails gem to Gemfile

.travis.yml

@@ -1,5 +1,5 @@
 rvm:
-- 1.9.3
+- 2.1.0
 services:
 - couchdb
 before_script:

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'

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

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'