github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new custom_fields version

This commit is contained in:
did 2011-06-17 01:55:27 +02:00
parent afe07d4976
commit be055e51bc
3 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -23,7 +23,7 @@ gem 'inherited_resources', '~> 1.1.2'
gem 'rmagick', '2.12.2' gem 'rmagick', '2.12.2'
gem 'locomotive_carrierwave', '0.5.4.beta2' gem 'locomotive_carrierwave', '0.5.4.beta2'
gem 'custom_fields', '1.0.0.beta.17' gem 'custom_fields', '1.0.0.beta.18'
gem 'fog', '0.8.2' gem 'fog', '0.8.2'
gem 'mimetype-fu' gem 'mimetype-fu'
gem 'actionmailer-with-request', :require => 'actionmailer_with_request' gem 'actionmailer-with-request', :require => 'actionmailer_with_request'

62
Gemfile.lock
View File

@ -29,14 +29,14 @@ GEM
SystemTimer (1.2.3) SystemTimer (1.2.3)
ZenTest (4.5.0) ZenTest (4.5.0)
abstract (1.0.0) abstract (1.0.0)
actionmailer (3.0.8) actionmailer (3.0.9)
actionpack (= 3.0.8) actionpack (= 3.0.9)
mail (~> 2.2.19) mail (~> 2.2.19)
actionmailer-with-request (0.3.0) actionmailer-with-request (0.3.0)
rails (>= 3) rails (>= 3)
actionpack (3.0.8) actionpack (3.0.9)
activemodel (= 3.0.8) activemodel (= 3.0.9)
activesupport (= 3.0.8) activesupport (= 3.0.9)
builder (~> 2.1.2) builder (~> 2.1.2)
erubis (~> 2.6.6) erubis (~> 2.6.6)
i18n (~> 0.5.0) i18n (~> 0.5.0)
@ -44,19 +44,19 @@ GEM
rack-mount (~> 0.6.14) rack-mount (~> 0.6.14)
rack-test (~> 0.5.7) rack-test (~> 0.5.7)
tzinfo (~> 0.3.23) tzinfo (~> 0.3.23)
activemodel (3.0.8) activemodel (3.0.9)
activesupport (= 3.0.8) activesupport (= 3.0.9)
builder (~> 2.1.2) builder (~> 2.1.2)
i18n (~> 0.5.0) i18n (~> 0.5.0)
activerecord (3.0.8) activerecord (3.0.9)
activemodel (= 3.0.8) activemodel (= 3.0.9)
activesupport (= 3.0.8) activesupport (= 3.0.9)
arel (~> 2.0.10) arel (~> 2.0.10)
tzinfo (~> 0.3.23) tzinfo (~> 0.3.23)
activeresource (3.0.8) activeresource (3.0.9)
activemodel (= 3.0.8) activemodel (= 3.0.9)
activesupport (= 3.0.8) activesupport (= 3.0.9)
activesupport (3.0.8) activesupport (3.0.9)
archive-tar-minitar (0.5.2) archive-tar-minitar (0.5.2)
arel (2.0.10) arel (2.0.10)
autotest (4.4.6) autotest (4.4.6)
@ -65,7 +65,7 @@ GEM
bson (1.3.1) bson (1.3.1)
bson_ext (1.3.1) bson_ext (1.3.1)
builder (2.1.2) builder (2.1.2)
bushido (0.0.21) bushido (0.0.25)
highline (>= 1.6.1) highline (>= 1.6.1)
json (>= 1.4.6) json (>= 1.4.6)
rest-client (>= 1.6.1) rest-client (>= 1.6.1)
@ -139,7 +139,7 @@ GEM
heroku (1.19.1) heroku (1.19.1)
activesupport (>= 2.1.0) activesupport (>= 2.1.0)
launchy (~> 0.3.2) launchy (~> 0.3.2)
rest-client (>= 1.4.0, < 1.7.0) rest-client (< 1.7.0, >= 1.4.0)
highline (1.6.2) highline (1.6.2)
httparty (0.7.8) httparty (0.7.8)
crack (= 0.1.8) crack (= 0.1.8)
@ -149,9 +149,9 @@ GEM
responders (~> 0.6.0) responders (~> 0.6.0)
jammit (0.6.3) jammit (0.6.3)
yui-compressor (>= 0.9.3) yui-compressor (>= 0.9.3)
json (1.5.1) json (1.5.2)
json_pure (1.4.6) json_pure (1.4.6)
kgio (2.4.1) kgio (2.4.2)
launchy (0.3.7) launchy (0.3.7)
configuration (>= 0.0.5) configuration (>= 0.0.5)
rake (>= 0.8.1) rake (>= 0.8.1)
@ -182,7 +182,7 @@ GEM
mongo (~> 1.3) mongo (~> 1.3)
tzinfo (~> 0.3.22) tzinfo (~> 0.3.22)
net-ssh (2.1.4) net-ssh (2.1.4)
nokogiri (1.4.4) nokogiri (1.4.5)
open4 (1.0.1) open4 (1.0.1)
orm_adapter (0.0.5) orm_adapter (0.0.5)
pickle (0.4.7) pickle (0.4.7)
@ -195,20 +195,22 @@ GEM
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (0.5.7) rack-test (0.5.7)
rack (>= 1.0) rack (>= 1.0)
rails (3.0.8) rails (3.0.9)
actionmailer (= 3.0.8) actionmailer (= 3.0.9)
actionpack (= 3.0.8) actionpack (= 3.0.9)
activerecord (= 3.0.8) activerecord (= 3.0.9)
activeresource (= 3.0.8) activeresource (= 3.0.9)
activesupport (= 3.0.8) activesupport (= 3.0.9)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.0.8) railties (= 3.0.9)
railties (3.0.8) railties (3.0.9)
actionpack (= 3.0.8) actionpack (= 3.0.9)
activesupport (= 3.0.8) activesupport (= 3.0.9)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4) thor (~> 0.14.4)
rake (0.8.7) rake (0.8.7)
rdoc (3.6.1)
responders (0.6.4) responders (0.6.4)
rest-client (1.6.3) rest-client (1.6.3)
mime-types (>= 1.16) mime-types (>= 1.16)
@ -257,7 +259,7 @@ GEM
treetop (1.4.9) treetop (1.4.9)
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
trollop (1.16.2) trollop (1.16.2)
tzinfo (0.3.27) tzinfo (0.3.28)
unicorn (3.7.0) unicorn (3.7.0)
kgio (~> 2.3) kgio (~> 2.3)
rack rack

2
locomotive_cms.gemspec
View File

@ -38,7 +38,7 @@ Gem::Specification.new do |s|
s.add_dependency "rmagick", "2.12.2" s.add_dependency "rmagick", "2.12.2"
s.add_dependency "locomotive_carrierwave", "0.5.4.beta2" s.add_dependency "locomotive_carrierwave", "0.5.4.beta2"
s.add_dependency "custom_fields", "1.0.0.beta.17" s.add_dependency "custom_fields", "1.0.0.beta.18"
s.add_dependency "fog", "0.8.2" s.add_dependency "fog", "0.8.2"
s.add_dependency "mimetype-fu" s.add_dependency "mimetype-fu"
s.add_dependency "actionmailer-with-request" s.add_dependency "actionmailer-with-request"