From 7a0092ab32bcbfdadb3fe54f74a8aa52c843915e Mon Sep 17 00:00:00 2001 From: Francesco Rodriguez Date: Sun, 25 Nov 2012 14:58:59 -0500 Subject: [PATCH] move gemfiles/Gemfile.edge to root --- .travis.yml | 16 ++++++++-------- gemfiles/Gemfile.edge-rails => Gemfile.edge | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) rename gemfiles/Gemfile.edge-rails => Gemfile.edge (91%) diff --git a/.travis.yml b/.travis.yml index 71ac978e..9dcacdd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,22 +11,22 @@ rvm: - rbx-19mode gemfile: - Gemfile - - gemfiles/Gemfile.edge-rails + - Gemfile.edge matrix: exclude: # Edge Rails is only compatible with 1.9.3 - - gemfile: gemfiles/Gemfile.edge-rails + - gemfile: Gemfile.edge rvm: 1.8.7 - - gemfile: gemfiles/Gemfile.edge-rails + - gemfile: Gemfile.edge rvm: 1.9.2 - - gemfile: gemfiles/Gemfile.edge-rails + - gemfile: Gemfile.edge rvm: ree - - gemfile: gemfiles/Gemfile.edge-rails + - gemfile: Gemfile.edge rvm: jruby - - gemfile: gemfiles/Gemfile.edge-rails + - gemfile: Gemfile.edge rvm: rbx-18mode allow_failures: - - gemfile: gemfiles/Gemfile.edge-rails + - gemfile: Gemfile.edge rvm: 1.9.3 - - gemfile: gemfiles/Gemfile.edge-rails + - gemfile: Gemfile.edge rvm: rbx-19mode diff --git a/gemfiles/Gemfile.edge-rails b/Gemfile.edge similarity index 91% rename from gemfiles/Gemfile.edge-rails rename to Gemfile.edge index a8f7440c..d4e1c028 100644 --- a/gemfiles/Gemfile.edge-rails +++ b/Gemfile.edge @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gemspec :path => '..' +gemspec gem 'rails', github: 'rails/rails'