Skip to content

Commit

Permalink
Ruby and gem updates
Browse files Browse the repository at this point in the history
  • Loading branch information
leesmith committed Aug 4, 2015
1 parent c6ffd2e commit 8887359
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
@@ -1 +1 @@
2.1.6
2.2.2
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -3,7 +3,7 @@ language: ruby
before_script: "./script/ci/before.sh"

rvm:
- 2.1.6
- 2.2.2

env:
- DB=postgres
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

ruby '2.1.6'
ruby '2.2.2'

gem 'bcrypt-ruby', '~> 3.0.1'
gem 'haml'
Expand All @@ -24,6 +24,7 @@ group :test do
gem 'fabrication'
gem 'rake'
gem 'shoulda-matchers'
gem 'test-unit'
end

group :development do
Expand Down
66 changes: 35 additions & 31 deletions Gemfile.lock
@@ -1,31 +1,31 @@
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.2.21)
actionpack (= 3.2.21)
actionmailer (3.2.22)
actionpack (= 3.2.22)
mail (~> 2.5.4)
actionpack (3.2.21)
activemodel (= 3.2.21)
activesupport (= 3.2.21)
actionpack (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.21)
activesupport (= 3.2.21)
activemodel (3.2.22)
activesupport (= 3.2.22)
builder (~> 3.0.0)
activerecord (3.2.21)
activemodel (= 3.2.21)
activesupport (= 3.2.21)
activerecord (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.21)
activemodel (= 3.2.21)
activesupport (= 3.2.21)
activesupport (3.2.21)
activeresource (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
activesupport (3.2.22)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.8)
Expand All @@ -47,7 +47,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
daemons (1.2.2)
daemons (1.2.3)
database_cleaner (1.4.1)
delorean (2.1.0)
chronic
Expand All @@ -58,13 +58,13 @@ GEM
erubis (2.7.0)
eventmachine (1.0.7)
execjs (2.5.2)
fabrication (2.13.2)
fabrication (2.14.0)
haml (4.0.6)
tilt
hike (1.2.3)
i18n (0.7.0)
journey (1.0.4)
jquery-rails (3.1.2)
jquery-rails (3.1.3)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
Expand All @@ -76,35 +76,36 @@ GEM
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.6.2)
multi_json (1.11.1)
multi_json (1.11.2)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
pg (0.18.2)
polyglot (0.3.5)
power_assert (0.2.3)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-rails (0.3.4)
pry (>= 0.9.10)
rack (1.4.5)
rack (1.4.7)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.4)
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.21)
actionmailer (= 3.2.21)
actionpack (= 3.2.21)
activerecord (= 3.2.21)
activeresource (= 3.2.21)
activesupport (= 3.2.21)
rails (3.2.22)
actionmailer (= 3.2.22)
actionpack (= 3.2.22)
activerecord (= 3.2.22)
activeresource (= 3.2.22)
activesupport (= 3.2.22)
bundler (~> 1.0)
railties (= 3.2.21)
railties (3.2.21)
actionpack (= 3.2.21)
activesupport (= 3.2.21)
railties (= 3.2.22)
railties (3.2.22)
actionpack (= 3.2.22)
activesupport (= 3.2.22)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
Expand All @@ -124,7 +125,7 @@ GEM
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
sass (3.4.14)
sass (3.4.16)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
Expand All @@ -137,6 +138,8 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
test-unit (3.1.2)
power_assert
thin (1.6.3)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0)
Expand Down Expand Up @@ -173,8 +176,9 @@ DEPENDENCIES
rspec-rails (= 2.14.2)
sass-rails (~> 3.2.3)
shoulda-matchers
test-unit
thin
uglifier (>= 1.0.3)

BUNDLED WITH
1.10.3
1.10.6

0 comments on commit 8887359

Please sign in to comment.