Skip to content
This repository has been archived by the owner on Apr 26, 2022. It is now read-only.

Upgrades dependency on Ruby to 2.1.0 #179

Merged
merged 3 commits into from
Dec 31, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0-p353
2.1.0
12 changes: 2 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,18 @@
services:
- memcache
bundler_args: --path=~/.bundle
before_install:
- "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
- gem install bundler bundle_cache
- bundle_cache_install
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- gem update bundler
before_script:
- psql -c 'create database appfab_test;' -U postgres
- cp config/database-travis.yml config/database.yml
- bundle exec rake db:migrate
after_script:
- bundle_cache
rvm:
- 2.0.0
- 2.1.0
env:
global:
- RAILS_ENV=test
- AWS_S3_BUCKET=bundle-cache-us
- BUNDLE_ARCHIVE=appfab
- secure: HdqU0O47txQMZhQy2aXEQ514g7Bh01XRgOvINI+8+rCK+176rARzux0NIzVUaPYODcEvsAK/7PV6PQvFpLJ6GaA9QngASWWbNCF3Za/wZDjbUSyP73FSszfXzQK1QfHvs/vH1nPt8Ul7L4nnU2Z2dpoXXPvtB/HCnszpB6mlNdw=
matrix:
- BUILD_TARGET=spec
- BUILD_TARGET=cucumber
Expand Down
5 changes: 1 addition & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source ENV.fetch('GEM_SOURCE','https://rubygems.org')
ruby '2.0.0'
ruby '2.1.0'

gem 'rails', '~> 4.0.0'

Expand Down Expand Up @@ -83,9 +83,6 @@ gem 'jquery-turbolinks'
# push / websocket events
gem 'pusher'

# speeds up Travis builds by caching the bundle
gem 'bundle_cache'

# makes the app (more) 12-factor compliant
gem 'rails_12factor', group: :production

Expand Down
9 changes: 0 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ GEM
sass (>= 3.2.0.alpha.95)
arel (4.0.1)
atomic (1.1.14)
aws-sdk (1.27.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
uuidtools (~> 2.1)
axiom-types (0.0.5)
descendants_tracker (~> 0.0.1)
ice_nine (~> 0.9)
Expand All @@ -56,9 +52,6 @@ GEM
bootstrap-sass (2.3.2.2)
sass (~> 3.2)
builder (3.1.4)
bundle_cache (0.2.1)
aws-sdk (>= 1.0.0)
bundler
cancan (1.6.10)
capybara (2.0.3)
mime-types (>= 1.16)
Expand Down Expand Up @@ -206,7 +199,6 @@ GEM
jquery-turbolinks (2.0.1)
railties (>= 3.1.0)
turbolinks
json (1.8.1)
jwt (0.1.8)
multi_json (>= 1.5)
kgio (2.8.1)
Expand Down Expand Up @@ -448,7 +440,6 @@ DEPENDENCIES
better_errors
binding_of_caller
bootstrap-sass
bundle_cache
cancan
capybara (~> 2.0.3)
coffee-rails
Expand Down