From 9bd1455a64730954527d4236f79e2d9010f04ec6 Mon Sep 17 00:00:00 2001 From: poguez Date: Tue, 16 Dec 2014 14:59:24 -0600 Subject: [PATCH 1/3] Added new ruby version --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index f9d97c53..b67250a3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -ruby '2.1.0' +ruby '2.1.5' gem 'rails', '3.2.16' From ca9127f8e8bc1cf63413bacee17e6bca6e57968a Mon Sep 17 00:00:00 2001 From: poguez Date: Mon, 5 Jan 2015 18:00:15 -0600 Subject: [PATCH 2/3] Changed debugger dependency for development environment because it is not compatible with ruby versions greater or equal to 2. --- Gemfile | 2 +- Gemfile.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index b67250a3..4e4dd480 100644 --- a/Gemfile +++ b/Gemfile @@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index ed0dd7a7..dd26cc0e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) @@ -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) @@ -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) @@ -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) @@ -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 From 7406e756f56f686b726a981af680d0af2db40ad0 Mon Sep 17 00:00:00 2001 From: poguez Date: Mon, 5 Jan 2015 18:14:11 -0600 Subject: [PATCH 3/3] Changed ruby version for travis build. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 307911a1..cbb6feea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: - - 2.1.0 + - 2.1.5 env: - DB=postgresql bundler_args: --without development