bundle update
Forcing rails to version 3.2.17 because of CVE-2014-0081 Forcing net-ssh to version 2.7.0 because of https://github.com/net-ssh/net-ssh/issues/148
This commit is contained in:
wvengen
parent
346bf00b67
commit
775137f7c0
126
Gemfile.lock
126
Gemfile.lock
|
|
@ -6,7 +6,7 @@ GIT
|
||||||
|
|
||||||
GIT
|
GIT
|
||||||
remote: git://github.com/capistrano/rvm.git
|
remote: git://github.com/capistrano/rvm.git
|
||||||
revision: 6aa7cb9d75361c802f466b54d0e345b7237ea3bb
|
revision: dc35ec5e7a74a422250bd6ff5e8885c8b742d0e5
|
||||||
specs:
|
specs:
|
||||||
capistrano-rvm (0.1.1)
|
capistrano-rvm (0.1.1)
|
||||||
capistrano (~> 3.0)
|
capistrano (~> 3.0)
|
||||||
|
|
@ -39,13 +39,12 @@ PATH
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
Ascii85 (1.0.2)
|
actionmailer (3.2.17)
|
||||||
actionmailer (3.2.16)
|
actionpack (= 3.2.17)
|
||||||
actionpack (= 3.2.16)
|
|
||||||
mail (~> 2.5.4)
|
mail (~> 2.5.4)
|
||||||
actionpack (3.2.16)
|
actionpack (3.2.17)
|
||||||
activemodel (= 3.2.16)
|
activemodel (= 3.2.17)
|
||||||
activesupport (= 3.2.16)
|
activesupport (= 3.2.17)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
journey (~> 1.0.4)
|
journey (~> 1.0.4)
|
||||||
|
|
@ -53,52 +52,51 @@ GEM
|
||||||
rack-cache (~> 1.2)
|
rack-cache (~> 1.2)
|
||||||
rack-test (~> 0.6.1)
|
rack-test (~> 0.6.1)
|
||||||
sprockets (~> 2.2.1)
|
sprockets (~> 2.2.1)
|
||||||
activemodel (3.2.16)
|
activemodel (3.2.17)
|
||||||
activesupport (= 3.2.16)
|
activesupport (= 3.2.17)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
activerecord (3.2.16)
|
activerecord (3.2.17)
|
||||||
activemodel (= 3.2.16)
|
activemodel (= 3.2.17)
|
||||||
activesupport (= 3.2.16)
|
activesupport (= 3.2.17)
|
||||||
arel (~> 3.0.2)
|
arel (~> 3.0.2)
|
||||||
tzinfo (~> 0.3.29)
|
tzinfo (~> 0.3.29)
|
||||||
activeresource (3.2.16)
|
activeresource (3.2.17)
|
||||||
activemodel (= 3.2.16)
|
activemodel (= 3.2.17)
|
||||||
activesupport (= 3.2.16)
|
activesupport (= 3.2.17)
|
||||||
activesupport (3.2.16)
|
activesupport (3.2.17)
|
||||||
i18n (~> 0.6, >= 0.6.4)
|
i18n (~> 0.6, >= 0.6.4)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
acts_as_tree (1.5.0)
|
acts_as_tree (1.5.0)
|
||||||
activerecord (>= 3.0.0)
|
activerecord (>= 3.0.0)
|
||||||
afm (0.2.0)
|
|
||||||
arel (3.0.3)
|
arel (3.0.3)
|
||||||
better_errors (1.1.0)
|
better_errors (1.1.0)
|
||||||
coderay (>= 1.0.0)
|
coderay (>= 1.0.0)
|
||||||
erubis (>= 2.6.6)
|
erubis (>= 2.6.6)
|
||||||
binding_of_caller (0.7.2)
|
binding_of_caller (0.7.2)
|
||||||
debug_inspector (>= 0.0.1)
|
debug_inspector (>= 0.0.1)
|
||||||
bootstrap-datepicker-rails (1.1.1.11)
|
bootstrap-datepicker-rails (1.3.0.1)
|
||||||
railties (>= 3.0)
|
railties (>= 3.0)
|
||||||
builder (3.0.4)
|
builder (3.0.4)
|
||||||
bullet (4.7.1)
|
bullet (4.8.0)
|
||||||
activesupport
|
activesupport
|
||||||
uniform_notifier (>= 1.4.0)
|
uniform_notifier (>= 1.4.0)
|
||||||
capistrano (3.1.0)
|
capistrano (3.1.0)
|
||||||
i18n
|
i18n
|
||||||
rake (>= 10.0.0)
|
rake (>= 10.0.0)
|
||||||
sshkit (~> 1.3)
|
sshkit (~> 1.3)
|
||||||
capistrano-bundler (1.1.1)
|
capistrano-bundler (1.1.2)
|
||||||
capistrano (~> 3.0)
|
capistrano (~> 3.0)
|
||||||
sshkit (>= 1.2.0)
|
sshkit (~> 1.2)
|
||||||
capistrano-rails (1.1.0)
|
capistrano-rails (1.1.1)
|
||||||
capistrano (>= 3.0.0)
|
capistrano (~> 3.1)
|
||||||
capistrano-bundler (>= 1.0.0)
|
capistrano-bundler (~> 1.1)
|
||||||
capybara (2.2.1)
|
capybara (2.2.1)
|
||||||
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)
|
||||||
childprocess (0.3.9)
|
childprocess (0.5.1)
|
||||||
ffi (~> 1.0, >= 1.0.11)
|
ffi (~> 1.0, >= 1.0.11)
|
||||||
chronic (0.10.2)
|
chronic (0.10.2)
|
||||||
client_side_validations (3.2.6)
|
client_side_validations (3.2.6)
|
||||||
|
|
@ -112,7 +110,7 @@ GEM
|
||||||
coffee-script (2.2.0)
|
coffee-script (2.2.0)
|
||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.6.3)
|
coffee-script-source (1.7.0)
|
||||||
commonjs (0.2.7)
|
commonjs (0.2.7)
|
||||||
connection_pool (1.2.0)
|
connection_pool (1.2.0)
|
||||||
content_for_in_controllers (0.0.2)
|
content_for_in_controllers (0.0.2)
|
||||||
|
|
@ -127,7 +125,7 @@ GEM
|
||||||
debug_inspector (0.0.2)
|
debug_inspector (0.0.2)
|
||||||
diff-lcs (1.2.5)
|
diff-lcs (1.2.5)
|
||||||
diffy (3.0.1)
|
diffy (3.0.1)
|
||||||
docile (1.1.1)
|
docile (1.1.3)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
eventmachine (1.0.3)
|
eventmachine (1.0.3)
|
||||||
exception_notification (4.0.1)
|
exception_notification (4.0.1)
|
||||||
|
|
@ -135,10 +133,10 @@ GEM
|
||||||
activesupport (>= 3.0.4)
|
activesupport (>= 3.0.4)
|
||||||
execjs (2.0.2)
|
execjs (2.0.2)
|
||||||
expression_parser (0.9.0)
|
expression_parser (0.9.0)
|
||||||
factory_girl (4.3.0)
|
factory_girl (4.4.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
factory_girl_rails (4.3.0)
|
factory_girl_rails (4.4.0)
|
||||||
factory_girl (~> 4.3.0)
|
factory_girl (~> 4.4.0)
|
||||||
railties (>= 3.0.0)
|
railties (>= 3.0.0)
|
||||||
faker (1.2.0)
|
faker (1.2.0)
|
||||||
i18n (~> 0.5)
|
i18n (~> 0.5)
|
||||||
|
|
@ -153,10 +151,9 @@ GEM
|
||||||
has_scope (0.6.0.rc)
|
has_scope (0.6.0.rc)
|
||||||
actionpack (>= 3.2, < 5)
|
actionpack (>= 3.2, < 5)
|
||||||
activesupport (>= 3.2, < 5)
|
activesupport (>= 3.2, < 5)
|
||||||
hashery (2.1.1)
|
|
||||||
hike (1.2.3)
|
hike (1.2.3)
|
||||||
i18n (0.6.9)
|
i18n (0.6.9)
|
||||||
i18n-spec (0.4.0)
|
i18n-spec (0.4.1)
|
||||||
iso
|
iso
|
||||||
inherited_resources (1.4.1)
|
inherited_resources (1.4.1)
|
||||||
has_scope (~> 0.6.0.rc)
|
has_scope (~> 0.6.0.rc)
|
||||||
|
|
@ -164,11 +161,11 @@ GEM
|
||||||
iso (0.2.0)
|
iso (0.2.0)
|
||||||
i18n
|
i18n
|
||||||
journey (1.0.4)
|
journey (1.0.4)
|
||||||
jquery-rails (3.0.4)
|
jquery-rails (3.1.0)
|
||||||
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)
|
||||||
kaminari (0.15.0)
|
kaminari (0.15.1)
|
||||||
actionpack (>= 3.0.0)
|
actionpack (>= 3.0.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
less (2.4.0)
|
less (2.4.0)
|
||||||
|
|
@ -197,45 +194,39 @@ GEM
|
||||||
mime-types (1.25.1)
|
mime-types (1.25.1)
|
||||||
mini_portile (0.5.2)
|
mini_portile (0.5.2)
|
||||||
mono_logger (1.1.0)
|
mono_logger (1.1.0)
|
||||||
multi_json (1.8.2)
|
multi_json (1.8.4)
|
||||||
mysql2 (0.3.14)
|
mysql2 (0.3.15)
|
||||||
net-scp (1.1.2)
|
net-scp (1.1.2)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
net-ssh (2.7.0)
|
net-ssh (2.7.0)
|
||||||
nokogiri (1.6.1)
|
nokogiri (1.6.1)
|
||||||
mini_portile (~> 0.5.0)
|
mini_portile (~> 0.5.0)
|
||||||
pdf-reader (1.3.3)
|
pdf-core (0.1.6)
|
||||||
Ascii85 (~> 1.0.0)
|
|
||||||
afm (~> 0.2.0)
|
|
||||||
hashery (~> 2.0)
|
|
||||||
ruby-rc4
|
|
||||||
ttfunk
|
|
||||||
polyamorous (0.5.0)
|
polyamorous (0.5.0)
|
||||||
activerecord (~> 3.0)
|
activerecord (~> 3.0)
|
||||||
polyglot (0.3.3)
|
polyglot (0.3.4)
|
||||||
prawn (0.13.2)
|
prawn (0.15.0)
|
||||||
pdf-reader (~> 1.2)
|
pdf-core (~> 0.1.3)
|
||||||
ruby-rc4
|
ttfunk (~> 1.1.0)
|
||||||
ttfunk (~> 1.0.3)
|
|
||||||
quiet_assets (1.0.2)
|
quiet_assets (1.0.2)
|
||||||
railties (>= 3.1, < 5.0)
|
railties (>= 3.1, < 5.0)
|
||||||
rack (1.4.5)
|
rack (1.4.5)
|
||||||
rack-cache (1.2)
|
rack-cache (1.2)
|
||||||
rack (>= 0.4)
|
rack (>= 0.4)
|
||||||
rack-protection (1.5.1)
|
rack-protection (1.5.2)
|
||||||
rack
|
rack
|
||||||
rack-ssl (1.3.3)
|
rack-ssl (1.3.3)
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (3.2.16)
|
rails (3.2.17)
|
||||||
actionmailer (= 3.2.16)
|
actionmailer (= 3.2.17)
|
||||||
actionpack (= 3.2.16)
|
actionpack (= 3.2.17)
|
||||||
activerecord (= 3.2.16)
|
activerecord (= 3.2.17)
|
||||||
activeresource (= 3.2.16)
|
activeresource (= 3.2.17)
|
||||||
activesupport (= 3.2.16)
|
activesupport (= 3.2.17)
|
||||||
bundler (~> 1.0)
|
bundler (~> 1.0)
|
||||||
railties (= 3.2.16)
|
railties (= 3.2.17)
|
||||||
rails-assets-listjs (0.2.0.beta.4)
|
rails-assets-listjs (0.2.0.beta.4)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
rails-i18n (3.0.0)
|
rails-i18n (3.0.0)
|
||||||
|
|
@ -243,9 +234,9 @@ GEM
|
||||||
rails (>= 3.0.0, < 4.0.0)
|
rails (>= 3.0.0, < 4.0.0)
|
||||||
rails-settings-cached (0.2.4)
|
rails-settings-cached (0.2.4)
|
||||||
rails (>= 3.0.0)
|
rails (>= 3.0.0)
|
||||||
railties (3.2.16)
|
railties (3.2.17)
|
||||||
actionpack (= 3.2.16)
|
actionpack (= 3.2.17)
|
||||||
activesupport (= 3.2.16)
|
activesupport (= 3.2.17)
|
||||||
rack-ssl (~> 1.3.2)
|
rack-ssl (~> 1.3.2)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
rdoc (~> 3.4)
|
rdoc (~> 3.4)
|
||||||
|
|
@ -253,7 +244,7 @@ GEM
|
||||||
rake (10.1.1)
|
rake (10.1.1)
|
||||||
rdoc (3.12.2)
|
rdoc (3.12.2)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
redis (3.0.6)
|
redis (3.0.7)
|
||||||
redis-namespace (1.4.1)
|
redis-namespace (1.4.1)
|
||||||
redis (~> 3.0.4)
|
redis (~> 3.0.4)
|
||||||
ref (1.0.5)
|
ref (1.0.5)
|
||||||
|
|
@ -273,9 +264,9 @@ GEM
|
||||||
rspec-expectations (~> 2.14.0)
|
rspec-expectations (~> 2.14.0)
|
||||||
rspec-mocks (~> 2.14.0)
|
rspec-mocks (~> 2.14.0)
|
||||||
rspec-core (2.14.7)
|
rspec-core (2.14.7)
|
||||||
rspec-expectations (2.14.4)
|
rspec-expectations (2.14.5)
|
||||||
diff-lcs (>= 1.1.3, < 2.0)
|
diff-lcs (>= 1.1.3, < 2.0)
|
||||||
rspec-mocks (2.14.4)
|
rspec-mocks (2.14.5)
|
||||||
rspec-rails (2.14.1)
|
rspec-rails (2.14.1)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activemodel (>= 3.0)
|
activemodel (>= 3.0)
|
||||||
|
|
@ -287,9 +278,8 @@ GEM
|
||||||
rspec-rerun (0.1.3)
|
rspec-rerun (0.1.3)
|
||||||
rspec (>= 2.11.0)
|
rspec (>= 2.11.0)
|
||||||
ruby-prof (0.14.2)
|
ruby-prof (0.14.2)
|
||||||
ruby-rc4 (0.1.5)
|
|
||||||
rubyzip (1.1.0)
|
rubyzip (1.1.0)
|
||||||
sass (3.2.13)
|
sass (3.2.14)
|
||||||
sass-rails (3.2.6)
|
sass-rails (3.2.6)
|
||||||
railties (~> 3.2.0)
|
railties (~> 3.2.0)
|
||||||
sass (>= 3.1.10)
|
sass (>= 3.1.10)
|
||||||
|
|
@ -331,9 +321,9 @@ GEM
|
||||||
net-scp (>= 1.1.2)
|
net-scp (>= 1.1.2)
|
||||||
net-ssh
|
net-ssh
|
||||||
term-ansicolor
|
term-ansicolor
|
||||||
term-ansicolor (1.2.2)
|
term-ansicolor (1.3.0)
|
||||||
tins (~> 0.8)
|
tins (~> 1.0)
|
||||||
therubyracer (0.12.0)
|
therubyracer (0.12.1)
|
||||||
libv8 (~> 3.16.14.0)
|
libv8 (~> 3.16.14.0)
|
||||||
ref
|
ref
|
||||||
thin (1.5.1)
|
thin (1.5.1)
|
||||||
|
|
@ -342,11 +332,11 @@ GEM
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
thor (0.18.1)
|
thor (0.18.1)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
tins (0.13.1)
|
tins (1.0.0)
|
||||||
treetop (1.4.15)
|
treetop (1.4.15)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
ttfunk (1.0.3)
|
ttfunk (1.1.0)
|
||||||
twitter-bootstrap-rails (2.2.8)
|
twitter-bootstrap-rails (2.2.8)
|
||||||
actionpack (>= 3.1)
|
actionpack (>= 3.1)
|
||||||
execjs
|
execjs
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue