Skip to content

Commit

Permalink
new version of the custom fields gem
Browse files Browse the repository at this point in the history
  • Loading branch information
Didier Lafforgue committed Jul 28, 2012
1 parent 7cd2328 commit c310713
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gemspec # Include gemspec dependencies
# The rest of the dependencies are for use when in the locomotive development environment

group :development do
gem 'custom_fields', :path => '../gems/custom_fields' # for Developers
# gem 'custom_fields', :path => '../gems/custom_fields' # for Developers
# gem 'custom_fields', :git => 'git://github.com/locomotivecms/custom_fields.git', :branch => '2.0.0.rc' # Branch on Github

# gem 'locomotive-aloha-rails', :path => '../gems/aloha-rails' # for Developers
Expand Down
15 changes: 5 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ PATH
carrierwave-mongoid (~> 0.2.1)
cells (~> 3.8.0)
codemirror-rails (~> 2.21)
custom_fields (~> 2.0.0.rc12)
custom_fields (~> 2.0.0.rc13)
devise (~> 2.1.0)
devise-encryptable (~> 0.1.1)
dragonfly (~> 0.9.8)
Expand Down Expand Up @@ -38,14 +38,6 @@ PATH
sanitize (~> 2.0.3)
unidecoder (~> 1.1.1)

PATH
remote: ../gems/custom_fields
specs:
custom_fields (2.0.0.rc12)
activesupport (~> 3.2.1)
carrierwave-mongoid (~> 0.2.1)
mongoid (~> 2.4.9)

GEM
remote: http://rubygems.org/
specs:
Expand Down Expand Up @@ -130,6 +122,10 @@ GEM
capybara (>= 1.1.2)
cucumber (>= 1.1.8)
nokogiri (>= 1.5.0)
custom_fields (2.0.0.rc13)
activesupport (~> 3.2.1)
carrierwave-mongoid (~> 0.2.1)
mongoid (~> 2.4.9)
database_cleaner (0.8.0)
devise (2.1.2)
bcrypt-ruby (~> 3.0)
Expand Down Expand Up @@ -331,7 +327,6 @@ DEPENDENCIES
coffee-rails (~> 3.2.2)
compass-rails
cucumber-rails
custom_fields!
database_cleaner
factory_girl_rails (~> 1.6.0)
json_spec
Expand Down
2 changes: 1 addition & 1 deletion locomotive_cms.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Gem::Specification.new do |s|
s.add_dependency 'mongoid', '~> 2.4.12'
s.add_dependency 'locomotive-mongoid-tree', '~> 0.6.2'

s.add_dependency 'custom_fields', '~> 2.0.0.rc12'
s.add_dependency 'custom_fields', '~> 2.0.0.rc13'

s.add_dependency 'kaminari', '~> 0.13.0'

Expand Down

0 comments on commit c310713

Please sign in to comment.