still a problem with the last heroku gem (json) + fix an issue with invalid assets

This commit is contained in:
did 2011-03-10 02:59:35 +01:00
parent 6befc700c5
commit 63530a3a30
4 changed files with 4 additions and 5 deletions

View File

@ -24,8 +24,7 @@ gem 'custom_fields', '1.0.0.beta.6'
gem 'fog', '0.3.7'
gem 'mimetype-fu'
gem 'actionmailer-with-request'
gem 'json'
gem 'heroku', '1.18.3'
gem 'heroku', '1.18.2'
gem 'httparty', '>= 0.6.1'
gem 'RedCloth', '4.2.7'
gem 'delayed_job', '2.1.4'

View File

@ -82,7 +82,7 @@ GEM
locomotive_carrierwave
mongoid (~> 2.0.0.rc.7)
daemons (1.1.0)
database_cleaner (0.6.4)
database_cleaner (0.6.5)
delayed_job (2.1.4)
activesupport (~> 3.0)
daemons

View File

@ -4,7 +4,7 @@
= f.inputs :name => :information do
= f.input :name
= f.input :source, :hint_options => { :url => link_to(@asset.source_filename, @asset.source.url), :escaping => false }
= f.input :source, :hint_options => @asset.persisted? ? { :url => link_to(@asset.source_filename, @asset.source.url), :escaping => false } : {}
- unless @asset.custom_fields.blank?
= render 'admin/custom_fields/custom_form', :form => f, :title => :other_fields, :parent => @asset_collection

View File

@ -37,7 +37,7 @@ Gem::Specification.new do |s|
s.add_dependency "fog", "0.3.7"
s.add_dependency "mimetype-fu"
s.add_dependency "actionmailer-with-request"
s.add_dependency "heroku", "1.18.3"
s.add_dependency "heroku", "1.18.2"
s.add_dependency "httparty", ">= 0.6.1"
s.add_dependency "RedCloth", "4.2.7"
s.add_dependency "delayed_job", "2.1.4"