Skip to content

Commit

Permalink
bundle update
Browse files Browse the repository at this point in the history
  • Loading branch information
@espen
espen committed Feb 9, 2016
1 parent d0dda11 commit cb3fdbc
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 70 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ group :heroku do
gem 'rails_12factor'
end

gem 'rails', '~> 3.2.18'
gem 'rails', '~> 3.2'

gem 'authlogic'
gem 'omniauth'
Expand Down
151 changes: 82 additions & 69 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.3.1)
actionmailer (3.2.22)
actionpack (= 3.2.22)
CFPropertyList (2.3.2)
actionmailer (3.2.22.1)
actionpack (= 3.2.22.1)
mail (~> 2.5.4)
actionpack (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
actionpack (3.2.22.1)
activemodel (= 3.2.22.1)
activesupport (= 3.2.22.1)
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.22)
activesupport (= 3.2.22)
activemodel (3.2.22.1)
activesupport (= 3.2.22.1)
builder (~> 3.0.0)
activerecord (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
activerecord (3.2.22.1)
activemodel (= 3.2.22.1)
activesupport (= 3.2.22.1)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
activesupport (3.2.22)
activeresource (3.2.22.1)
activemodel (= 3.2.22.1)
activesupport (= 3.2.22.1)
activesupport (3.2.22.1)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
arel (3.0.3)
Expand All @@ -41,22 +41,23 @@ GEM
activesupport (>= 3.2.0)
erubis (2.7.0)
excon (0.45.4)
faraday (0.9.1)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
ffi-compiler (0.1.3)
ffi (>= 1.0.0)
rake
fission (0.5.0)
CFPropertyList (~> 2.2)
fog (1.33.0)
fog (1.37.0)
fog-aliyun (>= 0.1.0)
fog-atmos
fog-aws (>= 0.6.0)
fog-brightbox (~> 0.4)
fog-core (~> 1.32)
fog-dynect
fog-ecloud (= 0.1.1)
fog-google (>= 0.0.2)
fog-dynect (~> 0.0.2)
fog-ecloud (~> 0.1)
fog-google (<= 0.1.0)
fog-json
fog-local
fog-powerdns (>= 0.1.1)
Expand All @@ -70,36 +71,39 @@ GEM
fog-terremark
fog-vmfusion
fog-voxel
fog-vsphere (>= 0.4.0)
fog-xenserver
fog-xml (~> 0.1.1)
ipaddress (~> 0.5)
nokogiri (~> 1.5, >= 1.5.11)
fog-aliyun (0.1.0)
fog-core (~> 1.27)
fog-json (~> 1.0)
ipaddress (~> 0.8)
xml-simple (~> 1.1)
fog-atmos (0.1.0)
fog-core
fog-xml
fog-aws (0.7.6)
fog-aws (0.8.1)
fog-core (~> 1.27)
fog-json (~> 1.0)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
fog-brightbox (0.9.0)
fog-brightbox (0.10.1)
fog-core (~> 1.22)
fog-json
inflecto (~> 0.0.2)
fog-core (1.32.1)
fog-core (1.35.0)
builder
excon (~> 0.45)
formatador (~> 0.2)
mime-types
net-scp (~> 1.1)
net-ssh (>= 2.1.3)
fog-dynect (0.0.2)
fog-core
fog-json
fog-xml
fog-ecloud (0.1.1)
fog-ecloud (0.3.0)
fog-core
fog-xml
fog-google (0.0.7)
fog-google (0.1.0)
fog-core
fog-json
fog-xml
Expand All @@ -116,21 +120,21 @@ GEM
fog-core
fog-xml
nokogiri
fog-radosgw (0.0.4)
fog-radosgw (0.0.5)
fog-core (>= 1.21.0)
fog-json
fog-xml (>= 0.0.1)
fog-riakcs (0.1.0)
fog-core
fog-json
fog-xml
fog-sakuracloud (1.0.1)
fog-sakuracloud (1.7.5)
fog-core
fog-json
fog-serverlove (0.1.2)
fog-core
fog-json
fog-softlayer (0.4.7)
fog-softlayer (1.0.3)
fog-core
fog-json
fog-storm_on_demand (0.1.1)
Expand All @@ -145,84 +149,91 @@ GEM
fog-voxel (0.1.0)
fog-core
fog-xml
fog-vsphere (0.6.0)
fog-core
rbvmomi (~> 1.8)
fog-xenserver (0.2.3)
fog-core
fog-xml
fog-xml (0.1.2)
fog-core
nokogiri (~> 1.5, >= 1.5.11)
formatador (0.2.5)
hashie (3.4.2)
hashie (3.4.3)
hike (1.2.3)
i18n (0.7.0)
inflecto (0.0.2)
ipaddress (0.8.0)
ipaddress (0.8.2)
journey (1.0.4)
json (1.8.3)
jwt (1.5.1)
kgio (2.9.3)
kgio (2.10.0)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
mini_exiftool (2.5.1)
mini_exiftool_vendored (9.2.7.v1)
mini_exiftool (>= 1.6.0)
mini_magick (4.2.10)
mini_portile (0.6.2)
mini_magick (4.4.0)
mini_portile2 (2.0.0)
multi_json (1.11.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.2)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
oauth2 (1.0.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
oauth2 (1.1.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
jwt (~> 1.0, < 1.5.2)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
omniauth (1.2.2)
rack (>= 1.2, < 3)
omniauth (1.3.1)
hashie (>= 1.2, < 4)
rack (~> 1.0)
omniauth-facebook (2.0.1)
rack (>= 1.0, < 3)
omniauth-facebook (3.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-oauth2 (1.3.1)
omniauth-oauth2 (1.4.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
pg (0.18.2)
pg (0.18.4)
polyglot (0.3.5)
rack (1.4.7)
rack-cache (1.2)
rack-cache (1.6.0)
rack (>= 0.4)
rack-ssl (1.3.4)
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.22)
actionmailer (= 3.2.22)
actionpack (= 3.2.22)
activerecord (= 3.2.22)
activeresource (= 3.2.22)
activesupport (= 3.2.22)
rails (3.2.22.1)
actionmailer (= 3.2.22.1)
actionpack (= 3.2.22.1)
activerecord (= 3.2.22.1)
activeresource (= 3.2.22.1)
activesupport (= 3.2.22.1)
bundler (~> 1.0)
railties (= 3.2.22)
railties (= 3.2.22.1)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.4)
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.4)
railties (3.2.22)
actionpack (= 3.2.22)
activesupport (= 3.2.22)
railties (3.2.22.1)
actionpack (= 3.2.22.1)
activesupport (= 3.2.22.1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
raindrops (0.15.0)
rake (10.4.2)
rake (10.5.0)
rbvmomi (1.8.2)
builder
nokogiri (>= 1.4.1)
trollop
rdoc (3.12.2)
json (~> 1.4)
request_store (1.2.0)
request_store (1.3.0)
scrypt (2.0.2)
ffi-compiler (>= 0.0.2)
rake
Expand All @@ -231,19 +242,21 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.10)
sqlite3 (1.3.11)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
thor (0.19.1)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.44)
unicorn (4.9.0)
trollop (2.1.2)
tzinfo (0.3.46)
unicorn (5.0.1)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
xml-simple (1.1.5)

PLATFORMS
ruby
Expand All @@ -258,10 +271,10 @@ DEPENDENCIES
omniauth
omniauth-facebook
pg
rails (~> 3.2.18)
rails (~> 3.2)
rails_12factor
sqlite3-ruby
unicorn

BUNDLED WITH
1.10.6
1.11.2

0 comments on commit cb3fdbc

Please sign in to comment.