1
0
mirror of https://github.com/danbee/danbarberphoto synced 2025-03-04 08:49:07 +00:00

Update gems and ruby version.

This commit is contained in:
Dan Barber 2014-12-09 10:34:41 +00:00
parent fd29d40921
commit 0021eb05c4
3 changed files with 201 additions and 137 deletions

View File

@ -1 +1 @@
2.1.1 2.1.5

View File

@ -1,17 +1,15 @@
source 'http://rubygems.org' source 'http://rubygems.org'
ruby '2.1.1' ruby '2.1.5'
gem 'rails', '~> 4.0.0' gem 'rails', '~> 4.1.0'
# Bundle edge Rails instead: # Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git' # gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'sass-rails', " ~> 4.0.0" gem 'sass-rails', " ~> 4.0.0"
gem 'coffee-rails', "~> 4.0.0" gem 'coffee-rails', "~> 4.1.0"
gem 'uglifier' gem 'uglifier'
gem 'sprockets_better_errors'
gem 'bourbon' gem 'bourbon'
gem 'jquery-rails' gem 'jquery-rails'

View File

@ -14,231 +14,298 @@ GIT
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionmailer (4.0.3) CFPropertyList (2.2.8)
actionpack (= 4.0.3) actionmailer (4.1.8)
mail (~> 2.5.4) actionpack (= 4.1.8)
actionpack (4.0.3) actionview (= 4.1.8)
activesupport (= 4.0.3) mail (~> 2.5, >= 2.5.4)
builder (~> 3.1.0) actionpack (4.1.8)
erubis (~> 2.7.0) actionview (= 4.1.8)
activesupport (= 4.1.8)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
activemodel (4.0.3) actionview (4.1.8)
activesupport (= 4.0.3) activesupport (= 4.1.8)
builder (~> 3.1.0) builder (~> 3.1)
activerecord (4.0.3) erubis (~> 2.7.0)
activemodel (= 4.0.3) activemodel (4.1.8)
activerecord-deprecated_finders (~> 1.0.2) activesupport (= 4.1.8)
activesupport (= 4.0.3) builder (~> 3.1)
arel (~> 4.0.0) activerecord (4.1.8)
activerecord-deprecated_finders (1.0.3) activemodel (= 4.1.8)
activesupport (4.0.3) activesupport (= 4.1.8)
i18n (~> 0.6, >= 0.6.4) arel (~> 5.0.0)
minitest (~> 4.2) activesupport (4.1.8)
multi_json (~> 1.3) i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1) thread_safe (~> 0.1)
tzinfo (~> 0.3.37) tzinfo (~> 1.1)
addressable (2.3.5) addressable (2.3.6)
arel (4.0.2) arel (5.0.1.20140414130214)
aws-sdk (1.35.0) aws-sdk (1.59.1)
aws-sdk-v1 (= 1.59.1)
aws-sdk-v1 (1.59.1)
json (~> 1.4) json (~> 1.4)
nokogiri (>= 1.4.4) nokogiri (>= 1.4.4)
uuidtools (~> 2.1) bcrypt (3.1.9)
bcrypt (3.1.7) better_errors (2.0.0)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
better_errors (1.1.0)
coderay (>= 1.0.0) coderay (>= 1.0.0)
erubis (>= 2.6.6) erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2) binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
bourbon (3.1.8) bourbon (3.2.3)
sass (>= 3.2.0) sass (~> 3.2)
thor thor
builder (3.1.4) builder (3.2.2)
capybara (2.2.1) capybara (2.4.4)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
xpath (~> 2.0) xpath (~> 2.0)
capybara-screenshot (0.3.17) capybara-screenshot (1.0.3)
capybara (>= 1.0, < 3) capybara (>= 1.0, < 3)
colored
launchy launchy
cliver (0.3.2) cliver (0.3.2)
coderay (1.1.0) coderay (1.1.0)
coffee-rails (4.0.1) coffee-rails (4.1.0)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0) coffee-script (2.3.0)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.7.0) coffee-script-source (1.8.0)
database_cleaner (1.2.0) colored (1.2)
database_cleaner (1.3.0)
debug_inspector (0.0.2) debug_inspector (0.0.2)
devise (3.2.3) devise (3.4.1)
bcrypt-ruby (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5) railties (>= 3.2.6, < 5)
responders
thread_safe (~> 0.1) thread_safe (~> 0.1)
warden (~> 1.2.3) warden (~> 1.2.3)
diff-lcs (1.2.5) diff-lcs (1.2.5)
dragonfly (1.0.3) dragonfly (1.0.7)
addressable (~> 2.3)
multi_json (~> 1.0) multi_json (~> 1.0)
rack rack
dragonfly-s3_data_store (1.0.3) dragonfly-s3_data_store (1.0.4)
dragonfly (~> 1.0) dragonfly (~> 1.0)
fog fog
erubis (2.7.0) erubis (2.7.0)
excon (0.31.0) excon (0.42.1)
execjs (2.0.2) execjs (2.2.2)
factory_girl (4.4.0) factory_girl (4.5.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
factory_girl_rails (4.4.1) factory_girl_rails (4.5.0)
factory_girl (~> 4.4.0) factory_girl (~> 4.5.0)
railties (>= 3.0.0) railties (>= 3.0.0)
fivemat (1.2.1) fission (0.5.0)
fog (1.20.0) CFPropertyList (~> 2.2)
fivemat (1.3.1)
fog (1.25.0)
fog-brightbox (~> 0.4)
fog-core (~> 1.25)
fog-json
fog-profitbricks
fog-radosgw (>= 0.0.2)
fog-sakuracloud (>= 0.0.4)
fog-softlayer
fog-terremark
fog-vmfusion
fog-voxel
fog-xml (~> 0.1.1)
ipaddress (~> 0.5)
nokogiri (~> 1.5, >= 1.5.11)
opennebula
fog-brightbox (0.7.1)
fog-core (~> 1.22)
fog-json
inflecto (~> 0.0.2)
fog-core (1.25.0)
builder builder
excon (~> 0.31.0) excon (~> 0.38)
formatador (~> 0.2.0) formatador (~> 0.2)
mime-types mime-types
multi_json (~> 1.0)
net-scp (~> 1.1) net-scp (~> 1.1)
net-ssh (>= 2.1.3) net-ssh (>= 2.1.3)
nokogiri (>= 1.5.11) fog-json (1.0.0)
formatador (0.2.4) multi_json (~> 1.0)
haml (4.0.5) fog-profitbricks (0.0.1)
fog-core
fog-xml
nokogiri
fog-radosgw (0.0.3)
fog-core (>= 1.21.0)
fog-json
fog-xml (>= 0.0.1)
fog-sakuracloud (0.1.1)
fog-core
fog-json
fog-softlayer (0.3.25)
fog-core
fog-json
fog-terremark (0.0.3)
fog-core
fog-xml
fog-vmfusion (0.0.1)
fission
fog-core
fog-voxel (0.0.2)
fog-core
fog-xml
fog-xml (0.1.1)
fog-core
nokogiri (~> 1.5, >= 1.5.11)
formatador (0.2.5)
haml (4.0.6)
tilt tilt
hike (1.2.3) hike (1.2.3)
hpricot (0.8.6) hpricot (0.8.6)
i18n (0.6.11) i18n (0.6.11)
jquery-rails (3.1.0) inflecto (0.0.2)
ipaddress (0.8.0)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.1) json (1.8.1)
launchy (2.4.2) launchy (2.4.3)
addressable (~> 2.3) addressable (~> 2.3)
letter_opener (1.2.0) letter_opener (1.2.0)
launchy (~> 2.2) launchy (~> 2.2)
mail (2.5.4) mail (2.6.3)
mime-types (~> 1.16) mime-types (>= 1.16, < 3)
treetop (~> 1.4.8)
method_source (0.8.2) method_source (0.8.2)
mime-types (1.25.1) mime-types (2.4.3)
mini_portile (0.5.2) mini_portile (0.6.1)
minitest (4.7.5) minitest (5.4.3)
multi_json (1.10.1) multi_json (1.10.1)
net-scp (1.1.2) net-scp (1.2.1)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (2.8.0) net-ssh (2.9.1)
newrelic_rpm (3.7.2.195) newrelic_rpm (3.9.8.273)
nokogiri (1.6.1) nokogiri (1.6.5)
mini_portile (~> 0.5.0) mini_portile (~> 0.6.0)
opennebula (4.10.1)
json
nokogiri
rbvmomi
orm_adapter (0.5.0) orm_adapter (0.5.0)
pg (0.17.1) pg (0.17.1)
poltergeist (1.5.0) poltergeist (1.5.1)
capybara (~> 2.1) capybara (~> 2.1)
cliver (~> 0.3.1) cliver (~> 0.3.1)
multi_json (~> 1.0) multi_json (~> 1.0)
websocket-driver (>= 0.2.0) websocket-driver (>= 0.2.0)
polyamorous (0.6.4) polyamorous (1.1.0)
activerecord (>= 3.0) activerecord (>= 3.0)
polyglot (0.3.4) powder (0.3.0)
powder (0.2.1)
thor (>= 0.11.5) thor (>= 0.11.5)
pry (0.9.12.6) pry (0.10.1)
coderay (~> 1.0) coderay (~> 1.1.0)
method_source (~> 0.8) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
puma (2.8.1) puma (2.10.2)
rack (>= 1.1, < 2.0) rack (>= 1.1, < 2.0)
rack (1.5.2) rack (1.5.2)
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (4.0.3) rails (4.1.8)
actionmailer (= 4.0.3) actionmailer (= 4.1.8)
actionpack (= 4.0.3) actionpack (= 4.1.8)
activerecord (= 4.0.3) actionview (= 4.1.8)
activesupport (= 4.0.3) activemodel (= 4.1.8)
activerecord (= 4.1.8)
activesupport (= 4.1.8)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.0.3) railties (= 4.1.8)
sprockets-rails (~> 2.0.0) sprockets-rails (~> 2.0)
rails_12factor (0.0.2) rails_12factor (0.0.3)
rails_serve_static_assets rails_serve_static_assets
rails_stdout_logging rails_stdout_logging
rails_serve_static_assets (0.0.2) rails_serve_static_assets (0.0.2)
rails_stdout_logging (0.0.3) rails_stdout_logging (0.0.3)
railties (4.0.3) railties (4.1.8)
actionpack (= 4.0.3) actionpack (= 4.1.8)
activesupport (= 4.0.3) activesupport (= 4.1.8)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.1.1) rake (10.4.2)
redcarpet (3.1.1) rbvmomi (1.8.2)
rspec-core (2.14.8) builder
rspec-expectations (2.14.5) nokogiri (>= 1.4.1)
diff-lcs (>= 1.1.3, < 2.0) trollop
rspec-mocks (2.14.6) redcarpet (3.2.1)
rspec-rails (2.14.1) responders (1.1.2)
railties (>= 3.2, < 4.2)
rspec-core (3.1.7)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.1.0)
rspec-mocks (3.1.3)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0) actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)
rspec-core (~> 2.14.0) rspec-core (~> 3.1.0)
rspec-expectations (~> 2.14.0) rspec-expectations (~> 3.1.0)
rspec-mocks (~> 2.14.0) rspec-mocks (~> 3.1.0)
ruby_parser (3.4.1) rspec-support (~> 3.1.0)
rspec-support (3.1.2)
ruby_parser (3.6.3)
sexp_processor (~> 4.1) sexp_processor (~> 4.1)
sass (3.2.14) sass (3.2.19)
sass-rails (4.0.1) sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10) sass (~> 3.2.2)
sprockets-rails (~> 2.0.0) sprockets (~> 2.8, < 3.0)
sexp_processor (4.4.1) sprockets-rails (~> 2.0)
shoulda-matchers (2.5.0) sexp_processor (4.4.4)
shoulda-matchers (2.7.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
simple_form (3.0.1) simple_form (3.1.0)
actionpack (>= 4.0.0, < 4.1) actionpack (~> 4.0)
activemodel (>= 4.0.0, < 4.1) activemodel (~> 4.0)
skylight (0.3.17) skylight (0.5.1)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
slop (3.4.7) slop (3.6.0)
slugtastic (1.2.1) slugtastic (1.2.1)
sprockets (2.11.0) sprockets (2.12.3)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.1) sprockets-rails (2.2.2)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (~> 2.8) sprockets (>= 2.8, < 4.0)
sprockets_better_errors (0.0.4) sqlite3 (1.3.10)
sprockets-rails (>= 1.0.0) squeel (1.2.2)
sqlite3 (1.3.9)
squeel (1.1.1)
activerecord (>= 3.0) activerecord (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
polyamorous (~> 0.6.0) polyamorous (~> 1.1.0)
thor (0.18.1) thor (0.19.1)
thread_safe (0.3.4) thread_safe (0.3.4)
tilt (1.4.1) tilt (1.4.1)
treetop (1.4.15) trollop (2.0)
polyglot tzinfo (1.2.2)
polyglot (>= 0.3.1) thread_safe (~> 0.1)
tzinfo (0.3.39) uglifier (2.5.3)
uglifier (2.4.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)
unf (0.1.3) unf (0.1.4)
unf_ext unf_ext
unf_ext (0.0.6) unf_ext (0.0.6)
uuidtools (2.1.4)
warden (1.2.3) warden (1.2.3)
rack (>= 1.0) rack (>= 1.0)
websocket-driver (0.3.2) websocket-driver (0.4.0)
will_paginate (3.0.5) will_paginate (3.0.7)
xpath (2.0.0) xpath (2.0.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)
@ -251,7 +318,7 @@ DEPENDENCIES
binding_of_caller binding_of_caller
bourbon bourbon
capybara-screenshot capybara-screenshot
coffee-rails (~> 4.0.0) coffee-rails (~> 4.1.0)
database_cleaner database_cleaner
devise devise
dragonfly dragonfly
@ -269,7 +336,7 @@ DEPENDENCIES
powder powder
pry pry
puma puma
rails (~> 4.0.0) rails (~> 4.1.0)
rails_12factor rails_12factor
redcarpet redcarpet
rspec-rails rspec-rails
@ -279,7 +346,6 @@ DEPENDENCIES
simple_form simple_form
skylight skylight
slugtastic slugtastic
sprockets_better_errors
sqlite3 sqlite3
squeel squeel
uglifier uglifier