mirror of
https://github.com/danbee/danbarberphoto
synced 2025-03-04 08:49:07 +00:00
Update bundle.
This commit is contained in:
parent
aac11ec039
commit
4ef40d5611
2
Gemfile
2
Gemfile
@ -6,7 +6,7 @@ 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', " ~> 5.0.0"
|
||||||
gem 'coffee-rails', "~> 4.1.0"
|
gem 'coffee-rails', "~> 4.1.0"
|
||||||
gem 'uglifier'
|
gem 'uglifier'
|
||||||
|
|
||||||
|
|||||||
57
Gemfile.lock
57
Gemfile.lock
@ -48,8 +48,8 @@ GEM
|
|||||||
rack (>= 0.9.0)
|
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.2.3)
|
bourbon (4.0.2)
|
||||||
sass (~> 3.2)
|
sass (~> 3.3)
|
||||||
thor
|
thor
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
capybara (2.4.4)
|
capybara (2.4.4)
|
||||||
@ -101,32 +101,40 @@ GEM
|
|||||||
fission (0.5.0)
|
fission (0.5.0)
|
||||||
CFPropertyList (~> 2.2)
|
CFPropertyList (~> 2.2)
|
||||||
fivemat (1.3.1)
|
fivemat (1.3.1)
|
||||||
fog (1.25.0)
|
fog (1.26.0)
|
||||||
|
fog-atmos
|
||||||
fog-brightbox (~> 0.4)
|
fog-brightbox (~> 0.4)
|
||||||
fog-core (~> 1.25)
|
fog-core (~> 1.27, >= 1.27.1)
|
||||||
|
fog-ecloud
|
||||||
fog-json
|
fog-json
|
||||||
fog-profitbricks
|
fog-profitbricks
|
||||||
fog-radosgw (>= 0.0.2)
|
fog-radosgw (>= 0.0.2)
|
||||||
fog-sakuracloud (>= 0.0.4)
|
fog-sakuracloud (>= 0.0.4)
|
||||||
fog-softlayer
|
fog-softlayer
|
||||||
|
fog-storm_on_demand
|
||||||
fog-terremark
|
fog-terremark
|
||||||
fog-vmfusion
|
fog-vmfusion
|
||||||
fog-voxel
|
fog-voxel
|
||||||
fog-xml (~> 0.1.1)
|
fog-xml (~> 0.1.1)
|
||||||
ipaddress (~> 0.5)
|
ipaddress (~> 0.5)
|
||||||
nokogiri (~> 1.5, >= 1.5.11)
|
nokogiri (~> 1.5, >= 1.5.11)
|
||||||
opennebula
|
fog-atmos (0.1.0)
|
||||||
|
fog-core
|
||||||
|
fog-xml
|
||||||
fog-brightbox (0.7.1)
|
fog-brightbox (0.7.1)
|
||||||
fog-core (~> 1.22)
|
fog-core (~> 1.22)
|
||||||
fog-json
|
fog-json
|
||||||
inflecto (~> 0.0.2)
|
inflecto (~> 0.0.2)
|
||||||
fog-core (1.25.0)
|
fog-core (1.27.1)
|
||||||
builder
|
builder
|
||||||
excon (~> 0.38)
|
excon (~> 0.38)
|
||||||
formatador (~> 0.2)
|
formatador (~> 0.2)
|
||||||
mime-types
|
mime-types
|
||||||
net-scp (~> 1.1)
|
net-scp (~> 1.1)
|
||||||
net-ssh (>= 2.1.3)
|
net-ssh (>= 2.1.3)
|
||||||
|
fog-ecloud (0.0.2)
|
||||||
|
fog-core
|
||||||
|
fog-xml
|
||||||
fog-json (1.0.0)
|
fog-json (1.0.0)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
fog-profitbricks (0.0.1)
|
fog-profitbricks (0.0.1)
|
||||||
@ -143,6 +151,9 @@ GEM
|
|||||||
fog-softlayer (0.3.25)
|
fog-softlayer (0.3.25)
|
||||||
fog-core
|
fog-core
|
||||||
fog-json
|
fog-json
|
||||||
|
fog-storm_on_demand (0.1.0)
|
||||||
|
fog-core
|
||||||
|
fog-json
|
||||||
fog-terremark (0.0.3)
|
fog-terremark (0.0.3)
|
||||||
fog-core
|
fog-core
|
||||||
fog-xml
|
fog-xml
|
||||||
@ -170,14 +181,14 @@ GEM
|
|||||||
json (1.8.1)
|
json (1.8.1)
|
||||||
launchy (2.4.3)
|
launchy (2.4.3)
|
||||||
addressable (~> 2.3)
|
addressable (~> 2.3)
|
||||||
letter_opener (1.2.0)
|
letter_opener (1.3.0)
|
||||||
launchy (~> 2.2)
|
launchy (~> 2.2)
|
||||||
mail (2.6.3)
|
mail (2.6.3)
|
||||||
mime-types (>= 1.16, < 3)
|
mime-types (>= 1.16, < 3)
|
||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
mime-types (2.4.3)
|
mime-types (2.4.3)
|
||||||
mini_portile (0.6.1)
|
mini_portile (0.6.1)
|
||||||
minitest (5.4.3)
|
minitest (5.5.0)
|
||||||
multi_json (1.10.1)
|
multi_json (1.10.1)
|
||||||
net-scp (1.2.1)
|
net-scp (1.2.1)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
@ -185,10 +196,6 @@ GEM
|
|||||||
newrelic_rpm (3.9.8.273)
|
newrelic_rpm (3.9.8.273)
|
||||||
nokogiri (1.6.5)
|
nokogiri (1.6.5)
|
||||||
mini_portile (~> 0.6.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.1)
|
poltergeist (1.5.1)
|
||||||
@ -230,11 +237,7 @@ GEM
|
|||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rake (10.4.2)
|
rake (10.4.2)
|
||||||
rbvmomi (1.8.2)
|
redcarpet (3.2.2)
|
||||||
builder
|
|
||||||
nokogiri (>= 1.4.1)
|
|
||||||
trollop
|
|
||||||
redcarpet (3.2.1)
|
|
||||||
responders (1.1.2)
|
responders (1.1.2)
|
||||||
railties (>= 3.2, < 4.2)
|
railties (>= 3.2, < 4.2)
|
||||||
rspec-core (3.1.7)
|
rspec-core (3.1.7)
|
||||||
@ -255,12 +258,13 @@ GEM
|
|||||||
rspec-support (3.1.2)
|
rspec-support (3.1.2)
|
||||||
ruby_parser (3.6.3)
|
ruby_parser (3.6.3)
|
||||||
sexp_processor (~> 4.1)
|
sexp_processor (~> 4.1)
|
||||||
sass (3.2.19)
|
sass (3.4.9)
|
||||||
sass-rails (4.0.5)
|
sass-rails (5.0.0)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
sass (~> 3.2.2)
|
sass (~> 3.1)
|
||||||
sprockets (~> 2.8, < 3.0)
|
sprockets (>= 2.8, < 4.0)
|
||||||
sprockets-rails (~> 2.0)
|
sprockets-rails (>= 2.0, < 4.0)
|
||||||
|
tilt (~> 1.1)
|
||||||
sexp_processor (4.4.4)
|
sexp_processor (4.4.4)
|
||||||
shoulda-matchers (2.7.0)
|
shoulda-matchers (2.7.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
@ -291,13 +295,12 @@ GEM
|
|||||||
thor (0.19.1)
|
thor (0.19.1)
|
||||||
thread_safe (0.3.4)
|
thread_safe (0.3.4)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
trollop (2.0)
|
|
||||||
tunnel (0.0.3)
|
tunnel (0.0.3)
|
||||||
highline (~> 1.6)
|
highline (~> 1.6)
|
||||||
thor
|
thor
|
||||||
tzinfo (1.2.2)
|
tzinfo (1.2.2)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (2.5.3)
|
uglifier (2.6.0)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
json (>= 1.8.0)
|
json (>= 1.8.0)
|
||||||
unf (0.1.4)
|
unf (0.1.4)
|
||||||
@ -305,7 +308,9 @@ GEM
|
|||||||
unf_ext (0.0.6)
|
unf_ext (0.0.6)
|
||||||
warden (1.2.3)
|
warden (1.2.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
websocket-driver (0.4.0)
|
websocket-driver (0.5.0)
|
||||||
|
websocket-extensions (>= 0.1.0)
|
||||||
|
websocket-extensions (0.1.1)
|
||||||
will_paginate (3.0.7)
|
will_paginate (3.0.7)
|
||||||
xpath (2.0.0)
|
xpath (2.0.0)
|
||||||
nokogiri (~> 1.3)
|
nokogiri (~> 1.3)
|
||||||
@ -342,7 +347,7 @@ DEPENDENCIES
|
|||||||
redcarpet
|
redcarpet
|
||||||
rspec-rails
|
rspec-rails
|
||||||
ruby_parser
|
ruby_parser
|
||||||
sass-rails (~> 4.0.0)
|
sass-rails (~> 5.0.0)
|
||||||
shoulda-matchers
|
shoulda-matchers
|
||||||
simple_form
|
simple_form
|
||||||
simplecov
|
simplecov
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user