Skip to content

Commit

Permalink
rolling to ruby 2.2.0 + updated gemset
Browse files Browse the repository at this point in the history
  • Loading branch information
@adamlutz
adamlutz committed Jan 28, 2015
1 parent c6166bd commit 6f87d3c
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 87 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.2
2.2.0
7 changes: 4 additions & 3 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
source 'https://rubygems.org'
ruby '2.1.2'
ruby '2.2.0'

gem 'rails', '~> 4.1.8'
gem 'rails', '~> 4.1.9'
gem 'pg', '~> 0.17.1'

gem 'cancancan', '~> 1.9.2'
gem 'devise', '~> 3.4.0'

#front-end
gem 'sass-rails', '~> 4.0.0'

gem 'sass-rails', '~> 4.0.5'
gem 'autoprefixer-rails', '~> 2.1.0'
gem 'uglifier', '>= 1.3.0'
gem 'jquery-rails', '~> 3.1.0'
Expand Down
178 changes: 95 additions & 83 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.2.8)
actionmailer (4.1.8)
actionpack (= 4.1.8)
actionview (= 4.1.8)
CFPropertyList (2.3.0)
actionmailer (4.1.9)
actionpack (= 4.1.9)
actionview (= 4.1.9)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.8)
actionview (= 4.1.8)
activesupport (= 4.1.8)
actionpack (4.1.9)
actionview (= 4.1.9)
activesupport (= 4.1.9)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.8)
activesupport (= 4.1.8)
actionview (4.1.9)
activesupport (= 4.1.9)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.8)
activesupport (= 4.1.8)
activemodel (4.1.9)
activesupport (= 4.1.9)
builder (~> 3.1)
activerecord (4.1.8)
activemodel (= 4.1.8)
activesupport (= 4.1.8)
activerecord (4.1.9)
activemodel (= 4.1.9)
activesupport (= 4.1.9)
arel (~> 5.0.0)
activesupport (4.1.8)
activesupport (4.1.9)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
ansi (1.4.3)
ansi (1.5.0)
arel (5.0.1.20140414130214)
asset_sync (1.0.0)
activemodel
fog (>= 1.8.0)
autoprefixer-rails (2.1.1.20140710)
execjs
aws-sdk (1.59.0)
aws-sdk-v1 (= 1.59.0)
aws-sdk-v1 (1.59.0)
aws-sdk (1.61.0)
aws-sdk-v1 (= 1.61.0)
aws-sdk-v1 (1.61.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
bcrypt (3.1.9)
better_errors (2.0.0)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
bullet (4.14.0)
bullet (4.14.2)
activesupport (>= 3.0.0)
uniform_notifier (>= 1.6.0)
byebug (3.5.1)
Expand All @@ -58,10 +58,10 @@ GEM
cancancan (1.9.2)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.4)
cocaine (0.5.5)
climate_control (>= 0.0.3, < 1.0)
coderay (1.1.0)
columnize (0.8.9)
columnize (0.9.0)
daemons (1.1.9)
debug_inspector (0.0.2)
debugger-linecache (1.2.0)
Expand All @@ -77,8 +77,8 @@ GEM
dotenv-rails (1.0.2)
dotenv (= 1.0.2)
erubis (2.7.0)
eventmachine (1.0.3)
excon (0.41.0)
eventmachine (1.0.4)
excon (0.43.0)
execjs (2.2.2)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
Expand All @@ -87,38 +87,53 @@ GEM
railties (>= 3.0.0)
faker (1.4.3)
i18n (~> 0.5)
faraday (0.9.0)
faraday (0.9.1)
multipart-post (>= 1.2, < 3)
figaro (1.0.0)
figaro (1.1.0)
thor (~> 0.14)
fission (0.5.0)
CFPropertyList (~> 2.2)
fog (1.25.0)
fog (1.27.0)
fog-atmos
fog-aws (~> 0.0)
fog-brightbox (~> 0.4)
fog-core (~> 1.25)
fog-core (~> 1.27, >= 1.27.3)
fog-ecloud
fog-json
fog-profitbricks
fog-radosgw (>= 0.0.2)
fog-sakuracloud (>= 0.0.4)
fog-serverlove
fog-softlayer
fog-storm_on_demand
fog-terremark
fog-vmfusion
fog-voxel
fog-xml (~> 0.1.1)
ipaddress (~> 0.5)
nokogiri (~> 1.5, >= 1.5.11)
opennebula
fog-brightbox (0.6.1)
fog-atmos (0.1.0)
fog-core
fog-xml
fog-aws (0.0.8)
fog-core (~> 1.27)
fog-json (~> 1.0)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
fog-brightbox (0.7.1)
fog-core (~> 1.22)
fog-json
inflecto
fog-core (1.25.0)
inflecto (~> 0.0.2)
fog-core (1.27.4)
builder
excon (~> 0.38)
formatador (~> 0.2)
mime-types
net-scp (~> 1.1)
net-ssh (>= 2.1.3)
fog-ecloud (0.0.2)
fog-core
fog-xml
fog-json (1.0.0)
multi_json (~> 1.0)
fog-profitbricks (0.0.1)
Expand All @@ -129,10 +144,16 @@ GEM
fog-core (>= 1.21.0)
fog-json
fog-xml (>= 0.0.1)
fog-sakuracloud (0.1.1)
fog-sakuracloud (1.0.0)
fog-core
fog-json
fog-serverlove (0.1.1)
fog-core
fog-json
fog-softlayer (0.4.0)
fog-core
fog-json
fog-softlayer (0.3.24)
fog-storm_on_demand (0.1.0)
fog-core
fog-json
fog-terremark (0.0.3)
Expand All @@ -141,21 +162,21 @@ GEM
fog-vmfusion (0.0.1)
fission
fog-core
fog-voxel (0.0.1)
fog-voxel (0.0.2)
fog-core
fog-xml
fog-xml (0.1.1)
fog-core
nokogiri (~> 1.5, >= 1.5.11)
foreman (0.63.0)
dotenv (>= 0.7)
thor (>= 0.13.6)
foreman (0.77.0)
dotenv (~> 1.0.2)
thor (~> 0.19.1)
formatador (0.2.5)
google-analytics-rails (0.0.6)
hashie (2.1.2)
hike (1.2.3)
hpricot (0.8.6)
html2slim (0.1.0)
html2slim (0.1.1)
hpricot
httmultiparty (0.3.16)
httparty (>= 0.7.3)
Expand All @@ -164,7 +185,7 @@ GEM
httparty (0.13.3)
json (~> 1.8)
multi_xml (>= 0.5.2)
i18n (0.6.11)
i18n (0.7.0)
inflecto (0.0.2)
interception (0.5)
ipaddress (0.8.0)
Expand All @@ -178,21 +199,21 @@ GEM
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.2)
jquery-ui-rails (5.0.3)
railties (>= 3.2.16)
jscrollpane-rails (2.0.20)
railties (>= 3.1)
json (1.8.1)
jwt (1.2.0)
kgio (2.9.2)
json (1.8.2)
jwt (1.2.1)
kgio (2.9.3)
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.4.3)
mimemagic (0.2.1)
mini_portile (0.6.1)
minitest (5.4.3)
minitest-reporters (1.0.7)
mini_portile (0.6.2)
minitest (5.5.1)
minitest-reporters (1.0.8)
ansi
builder
minitest (>= 5.0)
Expand All @@ -203,9 +224,9 @@ GEM
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.1)
newrelic_rpm (3.9.7.266)
nokogiri (1.6.4.1)
net-ssh (2.9.2)
newrelic_rpm (3.9.9.275)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
oauth2 (0.9.4)
faraday (>= 0.8, < 0.10)
Expand All @@ -223,12 +244,8 @@ GEM
omniauth (~> 1.2)
omniauth-soundcloud (1.0.1)
omniauth-oauth2 (~> 1.1.0)
opennebula (4.10.1)
json
nokogiri
rbvmomi
orm_adapter (0.5.0)
paperclip (4.2.0)
paperclip (4.2.1)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
cocaine (~> 0.5.3)
Expand All @@ -243,41 +260,37 @@ GEM
pry-rescue (1.4.1)
interception (>= 0.5)
pry
quiet_assets (1.0.3)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.5.2)
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.1.8)
actionmailer (= 4.1.8)
actionpack (= 4.1.8)
actionview (= 4.1.8)
activemodel (= 4.1.8)
activerecord (= 4.1.8)
activesupport (= 4.1.8)
rails (4.1.9)
actionmailer (= 4.1.9)
actionpack (= 4.1.9)
actionview (= 4.1.9)
activemodel (= 4.1.9)
activerecord (= 4.1.9)
activesupport (= 4.1.9)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.8)
railties (= 4.1.9)
sprockets-rails (~> 2.0)
rails_stdout_logging (0.0.3)
railties (4.1.8)
actionpack (= 4.1.8)
activesupport (= 4.1.8)
railties (4.1.9)
actionpack (= 4.1.9)
activesupport (= 4.1.9)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
rake (10.3.2)
rbvmomi (1.8.2)
builder
nokogiri (>= 1.4.1)
trollop
rake (10.4.2)
responders (1.0.0)
railties (>= 3.2, < 5)
ruby-progressbar (1.7.0)
ruby-progressbar (1.7.1)
sass (3.2.19)
sass-rails (4.0.4)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.2)
sprockets (~> 2.8, < 2.12)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
simplecov (0.9.1)
docile (~> 1.1.0)
Expand All @@ -297,12 +310,12 @@ GEM
hashie (~> 2.0)
httmultiparty (~> 0.3.0)
spring (1.2.0)
sprockets (2.11.3)
sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.1)
sprockets-rails (2.2.4)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
Expand All @@ -314,10 +327,9 @@ GEM
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
trollop (2.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.3)
uglifier (2.7.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicorn (4.8.3)
Expand Down Expand Up @@ -364,10 +376,10 @@ DEPENDENCIES
pry-rails
pry-rescue
quiet_assets
rails (~> 4.1.8)
rails (~> 4.1.9)
rails_stdout_logging (~> 0.0.3)
responders (~> 1.0.0)
sass-rails (~> 4.0.0)
sass-rails (~> 4.0.5)
simplecov
slim-rails (~> 2.1.4)
soundcloud (~> 0.3.2)
Expand Down

0 comments on commit 6f87d3c

Please sign in to comment.