From 05c90716721a6564db796424fa3002a9438a42f5 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 15 Jan 2015 20:37:46 +0800 Subject: [PATCH] Lock Rails version to 4.2 instead of master. --- .travis.yml | 8 ++++---- Gemfile | 8 ++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 958c04b..749fa26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,24 +15,24 @@ env: global: - SQ_CONFIG_FILE=$TRAVIS_BUILD_DIR/spec/config.travis.yml matrix: - - RAILS=master AREL=master ADAPTER=sqlite3 + - RAILS=4-2-stable AREL=6-0-stable ADAPTER=sqlite3 - RAILS=4-1-stable AREL=5-0-stable ADAPTER=sqlite3 - RAILS=4-0-stable AREL=4-0-stable ADAPTER=sqlite3 - RAILS=3-2-stable AREL=3-0-stable ADAPTER=sqlite3 - RAILS=3-1-stable AREL=2-2-stable ADAPTER=sqlite3 - RAILS=3-0-stable AREL=2-0-stable ADAPTER=sqlite3 - - RAILS=master AREL=master ADAPTER=mysql + - RAILS=4-2-stable AREL=6-0-stable ADAPTER=mysql - RAILS=4-1-stable AREL=5-0-stable ADAPTER=mysql - RAILS=4-0-stable AREL=4-0-stable ADAPTER=mysql - RAILS=3-2-stable AREL=3-0-stable ADAPTER=mysql - RAILS=3-1-stable AREL=2-2-stable ADAPTER=mysql - RAILS=3-0-stable AREL=2-0-stable ADAPTER=mysql - - RAILS=master AREL=master ADAPTER=mysql2 + - RAILS=4-2-stable AREL=6-0-stable ADAPTER=mysql2 - RAILS=4-1-stable AREL=5-0-stable ADAPTER=mysql2 - RAILS=4-0-stable AREL=4-0-stable ADAPTER=mysql2 - RAILS=3-2-stable AREL=3-0-stable ADAPTER=mysql2 - RAILS=3-1-stable AREL=2-2-stable ADAPTER=mysql2 - - RAILS=master AREL=master ADAPTER=postgresql + - RAILS=4-2-stable AREL=6-0-stable ADAPTER=postgresql - RAILS=4-1-stable AREL=5-0-stable ADAPTER=postgresql - RAILS=4-0-stable AREL=4-0-stable ADAPTER=postgresql - RAILS=3-2-stable AREL=3-0-stable ADAPTER=postgresql diff --git a/Gemfile b/Gemfile index 1696589..10b4d8f 100644 --- a/Gemfile +++ b/Gemfile @@ -3,12 +3,8 @@ gemspec gem 'rake' -rails = ENV['RAILS'] || 'master' -arel = ENV['AREL'] || 'master' - -if rails == 'master' - gem 'i18n', github: 'svenfuchs/i18n', branch: 'master' -end +rails = ENV['RAILS'] || '4-2-stable' +arel = ENV['AREL'] || '6-0-stable' arel_opts = case arel when /\// # A path