#29: update "newrelic_rpm" and fix "undefined method empty? for nil:NilClass"
This commit is contained in:
parent
e055d0080b
commit
29eed84f7d
2
Gemfile
2
Gemfile
|
@ -41,7 +41,7 @@ gem 'wikicloth'
|
|||
|
||||
gem 'unicorn', '~> 4.3.1', :platforms => [:mri, :rbx]
|
||||
gem 'trinidad', '~> 1.0.2', :platforms => :jruby
|
||||
gem 'newrelic_rpm', '~> 3.5.5.38', :platforms => [:mri, :rbx]
|
||||
gem 'newrelic_rpm', '~> 3.5.8.72', :platforms => [:mri, :rbx]
|
||||
gem 'whenever', '~> 0.7.3', :require => false
|
||||
|
||||
gem 'jbuilder', '~> 0.8.2'
|
||||
|
|
68
Gemfile.lock
68
Gemfile.lock
|
@ -52,7 +52,7 @@ GEM
|
|||
activesupport (3.2.12)
|
||||
i18n (~> 0.6)
|
||||
multi_json (~> 1.0)
|
||||
airbrake (3.1.7)
|
||||
airbrake (3.1.8)
|
||||
activesupport
|
||||
builder
|
||||
json
|
||||
|
@ -72,15 +72,15 @@ GEM
|
|||
mocha (= 0.10.5)
|
||||
builder (3.0.4)
|
||||
cancan (1.6.7)
|
||||
cape (1.6.0)
|
||||
capistrano (2.14.1)
|
||||
cape (1.7.0)
|
||||
capistrano (2.14.2)
|
||||
highline
|
||||
net-scp (>= 1.0.0)
|
||||
net-sftp (>= 2.0.0)
|
||||
net-ssh (>= 2.0.14)
|
||||
net-ssh-gateway (>= 1.1.0)
|
||||
capistrano_colors (0.5.5)
|
||||
charlock_holmes (0.6.9)
|
||||
charlock_holmes (0.6.9.1)
|
||||
chronic (0.6.7)
|
||||
chunky_png (1.2.7)
|
||||
cocaine (0.4.2)
|
||||
|
@ -90,7 +90,7 @@ GEM
|
|||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.4.0)
|
||||
coffee-script-source (1.6.1)
|
||||
compass (0.12.2)
|
||||
chunky_png (~> 1.2)
|
||||
fssm (>= 0.2.7)
|
||||
|
@ -110,7 +110,7 @@ GEM
|
|||
encryptor (1.1.3)
|
||||
erubis (2.7.0)
|
||||
escape_utils (0.2.4)
|
||||
eventmachine (1.0.0)
|
||||
eventmachine (1.0.3)
|
||||
execjs (1.4.0)
|
||||
multi_json (~> 1.0)
|
||||
expression_parser (0.9.0)
|
||||
|
@ -140,17 +140,17 @@ GEM
|
|||
sinatra (~> 1.0)
|
||||
stringex (~> 1.4.0)
|
||||
useragent (~> 0.4.9)
|
||||
haml (3.1.7)
|
||||
haml (3.1.8)
|
||||
haml-rails (0.3.5)
|
||||
actionpack (>= 3.1, < 4.1)
|
||||
activesupport (>= 3.1, < 4.1)
|
||||
haml (~> 3.1)
|
||||
railties (>= 3.1, < 4.1)
|
||||
hashie (1.2.0)
|
||||
highline (1.6.15)
|
||||
highline (1.6.16)
|
||||
hike (1.2.1)
|
||||
hirb (0.7.1)
|
||||
i18n (0.6.1)
|
||||
i18n (0.6.4)
|
||||
jbuilder (0.8.3)
|
||||
activesupport (>= 3.0.0)
|
||||
journey (1.0.4)
|
||||
|
@ -158,7 +158,7 @@ GEM
|
|||
railties (>= 3.1.0, < 5.0)
|
||||
thor (~> 0.14)
|
||||
json (1.7.7)
|
||||
kgio (2.8.0)
|
||||
kgio (2.7.4)
|
||||
libv8 (3.3.10.4)
|
||||
macaddr (1.6.1)
|
||||
systemu (~> 2.5.0)
|
||||
|
@ -166,10 +166,10 @@ GEM
|
|||
i18n (>= 0.4.0)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
mailcatcher (0.5.10)
|
||||
mailcatcher (0.5.11)
|
||||
activesupport (~> 3.0)
|
||||
eventmachine (~> 1.0.0)
|
||||
haml (~> 3.1)
|
||||
haml (>= 3.1, < 5)
|
||||
mail (~> 2.3)
|
||||
sinatra (~> 1.2)
|
||||
skinny (~> 0.2.3)
|
||||
|
@ -182,18 +182,18 @@ GEM
|
|||
mocha (0.10.5)
|
||||
metaclass (~> 0.0.1)
|
||||
mock_redis (0.6.2)
|
||||
multi_json (1.5.1)
|
||||
multi_json (1.7.0)
|
||||
mustache (0.99.4)
|
||||
net-scp (1.0.4)
|
||||
net-ssh (>= 1.99.1)
|
||||
net-sftp (2.0.5)
|
||||
net-ssh (>= 2.0.9)
|
||||
net-ssh (2.6.3)
|
||||
net-ssh-gateway (1.1.0)
|
||||
net-ssh (>= 1.99.1)
|
||||
newrelic_rpm (3.5.5.38)
|
||||
net-scp (1.1.0)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-sftp (2.1.1)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh (2.6.6)
|
||||
net-ssh-gateway (1.2.0)
|
||||
net-ssh (>= 2.6.5)
|
||||
newrelic_rpm (3.5.8.72)
|
||||
nokogiri (1.5.6)
|
||||
omniauth (1.1.1)
|
||||
omniauth (1.1.3)
|
||||
hashie (~> 1.2)
|
||||
rack
|
||||
omniauth-openid (1.0.1)
|
||||
|
@ -221,7 +221,7 @@ GEM
|
|||
rack-openid (1.3.1)
|
||||
rack (>= 1.1.0)
|
||||
ruby-openid (>= 2.1.8)
|
||||
rack-protection (1.3.2)
|
||||
rack-protection (1.5.0)
|
||||
rack
|
||||
rack-ssl (1.3.3)
|
||||
rack
|
||||
|
@ -243,7 +243,7 @@ GEM
|
|||
railties (>= 3.1.0)
|
||||
rails3-generators (1.0.0)
|
||||
railties (>= 3.0.0)
|
||||
rails3-jquery-autocomplete (1.0.10)
|
||||
rails3-jquery-autocomplete (1.0.11)
|
||||
rails (~> 3.0)
|
||||
railties (3.2.12)
|
||||
actionpack (= 3.2.12)
|
||||
|
@ -254,11 +254,11 @@ GEM
|
|||
thor (>= 0.14.6, < 2.0)
|
||||
raindrops (0.10.0)
|
||||
rake (10.0.3)
|
||||
rdiscount (2.0.7)
|
||||
rdoc (3.12.1)
|
||||
rdiscount (2.0.7.1)
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
redcarpet (2.1.1)
|
||||
redis (3.0.2)
|
||||
redis (3.0.3)
|
||||
redis-namespace (1.2.1)
|
||||
redis (~> 3.0.0)
|
||||
redisk (0.2.2)
|
||||
|
@ -294,7 +294,7 @@ GEM
|
|||
ruby-haml-js (0.0.3)
|
||||
execjs
|
||||
sprockets (>= 2.0.0)
|
||||
ruby-openid (2.2.2)
|
||||
ruby-openid (2.2.3)
|
||||
rubypython (0.5.3)
|
||||
blankslate (>= 2.1.2.3)
|
||||
ffi (~> 1.0.7)
|
||||
|
@ -304,7 +304,7 @@ GEM
|
|||
capistrano (>= 2.0.0)
|
||||
sanitize (2.0.3)
|
||||
nokogiri (>= 1.4.4, < 1.6)
|
||||
sass (3.2.5)
|
||||
sass (3.2.7)
|
||||
sass-rails (3.2.6)
|
||||
railties (~> 3.2.0)
|
||||
sass (>= 3.1.10)
|
||||
|
@ -318,7 +318,7 @@ GEM
|
|||
shoulda-matchers (1.4.2)
|
||||
activesupport (>= 3.0.0)
|
||||
bourne (~> 1.1.2)
|
||||
sinatra (1.3.4)
|
||||
sinatra (1.3.6)
|
||||
rack (~> 1.4)
|
||||
rack-protection (~> 1.3)
|
||||
tilt (~> 1.3, >= 1.3.3)
|
||||
|
@ -341,14 +341,14 @@ GEM
|
|||
eventmachine (>= 0.12.6)
|
||||
rack (>= 1.0.0)
|
||||
thor (0.17.0)
|
||||
tilt (1.3.3)
|
||||
tilt (1.3.6)
|
||||
treetop (1.4.12)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
turbo-sprockets-rails3 (0.3.6)
|
||||
railties (> 3.2.8, < 4.0.0)
|
||||
sprockets (>= 2.0.0)
|
||||
tzinfo (0.3.35)
|
||||
tzinfo (0.3.37)
|
||||
uglifier (1.2.7)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (~> 1.3)
|
||||
|
@ -357,7 +357,7 @@ GEM
|
|||
rack
|
||||
raindrops (~> 0.7)
|
||||
useragent (0.4.16)
|
||||
uuid (2.3.5)
|
||||
uuid (2.3.7)
|
||||
macaddr (~> 1.0)
|
||||
vegas (0.1.11)
|
||||
rack (>= 1.0.0)
|
||||
|
@ -403,7 +403,7 @@ DEPENDENCIES
|
|||
mailcatcher
|
||||
meta-tags (~> 1.2.5)
|
||||
mock_redis (= 0.6.2)
|
||||
newrelic_rpm (~> 3.5.5.38)
|
||||
newrelic_rpm (~> 3.5.8.72)
|
||||
omniauth (~> 1.1.0)
|
||||
omniauth-openid (~> 1.0.1)
|
||||
paperclip (~> 3.3.1)
|
||||
|
|
Loading…
Reference in New Issue