repair broken build
This commit is contained in:
parent
486c6a12a2
commit
f0e8848ffd
2
Gemfile
2
Gemfile
@ -8,7 +8,7 @@ gemspec # Include gemspec dependencies
|
|||||||
# The rest of the dependencies are for use when in the locomotive development environment
|
# The rest of the dependencies are for use when in the locomotive development environment
|
||||||
|
|
||||||
group :development do
|
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 'custom_fields', :git => 'git://github.com/locomotivecms/custom_fields.git', :branch => '2.0.0.rc' # Branch on Github
|
||||||
|
|
||||||
gem 'rspec-rails', '~> 2.8.0' # In order to have rspec tasks and generators
|
gem 'rspec-rails', '~> 2.8.0' # In order to have rspec tasks and generators
|
||||||
|
13
Gemfile.lock
13
Gemfile.lock
@ -55,14 +55,6 @@ PATH
|
|||||||
sanitize (~> 2.0.3)
|
sanitize (~> 2.0.3)
|
||||||
unidecoder (~> 1.1.1)
|
unidecoder (~> 1.1.1)
|
||||||
|
|
||||||
PATH
|
|
||||||
remote: ../gems/custom_fields
|
|
||||||
specs:
|
|
||||||
custom_fields (2.0.0.rc10)
|
|
||||||
activesupport (~> 3.2.1)
|
|
||||||
carrierwave-mongoid (~> 0.1.3)
|
|
||||||
mongoid (~> 2.4.7)
|
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
remote: http://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
@ -142,6 +134,10 @@ GEM
|
|||||||
capybara (>= 1.1.2)
|
capybara (>= 1.1.2)
|
||||||
cucumber (>= 1.1.8)
|
cucumber (>= 1.1.8)
|
||||||
nokogiri (>= 1.5.0)
|
nokogiri (>= 1.5.0)
|
||||||
|
custom_fields (2.0.0.rc10)
|
||||||
|
activesupport (~> 3.2.1)
|
||||||
|
carrierwave-mongoid (~> 0.1.3)
|
||||||
|
mongoid (~> 2.4.7)
|
||||||
database_cleaner (0.7.2)
|
database_cleaner (0.7.2)
|
||||||
devise (1.5.3)
|
devise (1.5.3)
|
||||||
bcrypt-ruby (~> 3.0)
|
bcrypt-ruby (~> 3.0)
|
||||||
@ -333,7 +329,6 @@ DEPENDENCIES
|
|||||||
compass!
|
compass!
|
||||||
compass-rails!
|
compass-rails!
|
||||||
cucumber-rails
|
cucumber-rails
|
||||||
custom_fields!
|
|
||||||
database_cleaner
|
database_cleaner
|
||||||
factory_girl_rails (~> 1.6.0)
|
factory_girl_rails (~> 1.6.0)
|
||||||
json_spec
|
json_spec
|
||||||
|
Loading…
Reference in New Issue
Block a user