Skip to content

Commit

Permalink
Merge pull request #227 from CodeandoMexico/226-ruby_version
Browse files Browse the repository at this point in the history
Closes #226 Added new ruby version 2.1.5 in project, CI and and updated 'debugger' development dependency.
  • Loading branch information
poguez committed Jan 6, 2015
2 parents 137ca2c + 7406e75 commit d6d9ce8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: ruby
rvm:
- 2.1.0
- 2.1.5
env:
- DB=postgresql
bundler_args: --without development
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby '2.1.0'
ruby '2.1.5'

gem 'rails', '3.2.16'

Expand Down Expand Up @@ -51,7 +51,7 @@ group :development do
gem 'better_errors'
gem 'binding_of_caller'
gem 'thin'
gem 'debugger'
gem 'byebug'
gem 'letter_opener'
gem 'quiet_assets'
gem 'guard'
Expand Down
14 changes: 7 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ GEM
bootstrap-sass (3.0.0.0.rc2)
sass (~> 3.2)
builder (3.0.4)
byebug (3.5.1)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
slop (~> 3.6)
capybara (2.1.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand All @@ -68,7 +72,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.6.3)
columnize (0.3.6)
columnize (0.9.0)
compass (0.12.2)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
Expand All @@ -85,12 +89,7 @@ GEM
daemons (1.1.9)
database_cleaner (1.1.1)
debug_inspector (0.0.2)
debugger (1.6.5)
columnize (>= 0.3.1)
debugger-linecache (~> 1.2.0)
debugger-ruby_core_source (~> 1.3.1)
debugger-linecache (1.2.0)
debugger-ruby_core_source (1.3.1)
devise (2.2.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
Expand Down Expand Up @@ -305,6 +304,7 @@ GEM
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
slop (3.6.0)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
Expand Down Expand Up @@ -356,13 +356,13 @@ DEPENDENCIES
better_errors
binding_of_caller
bootstrap-sass (~> 3.0.0.0.rc)
byebug
capybara
carrierwave
coffee-rails (~> 3.2.1)
compass-rails
coveralls
database_cleaner
debugger
devise (= 2.2.4)
factory_girl_rails
ffaker
Expand Down

0 comments on commit d6d9ce8

Please sign in to comment.