done for production tests (installation from source)
This commit is contained in:
commit
5bf6d46574
6
Gemfile
6
Gemfile
@ -21,11 +21,13 @@ gem 'formtastic', '~> 1.2.3'
|
||||
gem 'inherited_resources', '~> 1.1.2'
|
||||
|
||||
gem 'rmagick', '2.12.2'
|
||||
gem 'carrierwave', :path => '../gems/carrierwave_did'
|
||||
gem 'carrierwave', :git => 'git://github.com/did/carrierwave.git', :branch => 'mongoid'
|
||||
# gem 'carrierwave', :path => '../gems/carrierwave_did'
|
||||
# gem 'locomotive_carrierwave', '0.5.0.1.beta3', :require => 'carrierwave'
|
||||
|
||||
# gem 'custom_fields', '1.0.0.beta.15'
|
||||
gem 'custom_fields', '1.0.0.beta.15', :path => '../gems/custom_fields'
|
||||
# gem 'custom_fields', '1.0.0.beta.15', :path => '../gems/custom_fields'
|
||||
gem 'custom_fields', :git => 'git://github.com/locomotivecms/custom_fields.git'
|
||||
gem 'fog', '0.8.2'
|
||||
gem 'mimetype-fu'
|
||||
gem 'actionmailer-with-request', :require => 'actionmailer_with_request'
|
||||
|
31
Gemfile.lock
31
Gemfile.lock
@ -5,12 +5,28 @@ GIT
|
||||
bushido_stub (0.0.1)
|
||||
activesupport (>= 3.0.7)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/did/carrierwave.git
|
||||
revision: 00a41fb1952c4d75c8eafa0cf20f3d32712b53e4
|
||||
branch: mongoid
|
||||
specs:
|
||||
carrierwave (0.5.4)
|
||||
activesupport (~> 3.0)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/floehopper/mocha.git
|
||||
revision: 6da1242f26b12a24c4fcf67bf5921a25bc1bc88d
|
||||
specs:
|
||||
mocha (0.9.12.20110213002255)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/locomotivecms/custom_fields.git
|
||||
revision: 441e2fc23e9d69b5328c30c3fb75bf6cb3d97950
|
||||
specs:
|
||||
custom_fields (1.0.0.beta.15)
|
||||
activesupport (>= 3.0.7)
|
||||
mongoid (= 2.0.2)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/wunderbread/xpath.git
|
||||
revision: d04da707886287e7dfe82705fda5b3d4f65e94c3
|
||||
@ -18,19 +34,6 @@ GIT
|
||||
xpath (0.1.2)
|
||||
nokogiri (~> 1.4)
|
||||
|
||||
PATH
|
||||
remote: ../gems/carrierwave_did
|
||||
specs:
|
||||
carrierwave (0.5.4)
|
||||
activesupport (~> 3.0)
|
||||
|
||||
PATH
|
||||
remote: ../gems/custom_fields
|
||||
specs:
|
||||
custom_fields (1.0.0.beta.15)
|
||||
activesupport (>= 3.0.7)
|
||||
mongoid (= 2.0.2)
|
||||
|
||||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
@ -291,7 +294,7 @@ DEPENDENCIES
|
||||
carrierwave!
|
||||
cucumber (= 0.8.5)
|
||||
cucumber-rails
|
||||
custom_fields (= 1.0.0.beta.15)!
|
||||
custom_fields!
|
||||
database_cleaner
|
||||
delayed_job (= 2.1.4)
|
||||
delayed_job_mongoid (= 1.0.2)
|
||||
|
@ -19,13 +19,14 @@ Gem::Specification.new do |s|
|
||||
|
||||
s.add_dependency "rails", ">= 3.0.7"
|
||||
s.add_dependency "warden"
|
||||
s.add_dependency "devise", "1.1.3"
|
||||
s.add_dependency "devise", "1.3.4"
|
||||
s.add_dependency "mongoid", "2.0.2"
|
||||
s.add_dependency "bson_ext", "~> 1.3.0"
|
||||
s.add_dependency "locomotive_mongoid_acts_as_tree", "0.1.5.7"
|
||||
s.add_dependency "will_paginate"
|
||||
|
||||
s.add_dependency "haml", "3.0.25"
|
||||
s.add_dependency "haml", "3.1.1"
|
||||
s.add_dependency "sass", "3.1.1"
|
||||
s.add_dependency "locomotive_liquid", "2.2.2"
|
||||
s.add_dependency "formtastic", "~> 1.2.3"
|
||||
s.add_dependency "inherited_resources", "~> 1.1.2"
|
||||
@ -35,10 +36,11 @@ Gem::Specification.new do |s|
|
||||
s.add_dependency "heroku", "1.19.1"
|
||||
|
||||
s.add_dependency "rmagick", "2.12.2"
|
||||
s.add_dependency "locomotive_carrierwave", "0.5.0.1.beta3"
|
||||
# s.add_dependency "locomotive_carrierwave", "0.5.0.1.beta3"
|
||||
s.add_dependency "carrierwave"
|
||||
|
||||
s.add_dependency "custom_fields", "1.0.0.beta.15"
|
||||
s.add_dependency "fog", "0.3.7"
|
||||
s.add_dependency "fog", "0.8.2"
|
||||
s.add_dependency "mimetype-fu"
|
||||
s.add_dependency "actionmailer-with-request"
|
||||
s.add_dependency "httparty", ">= 0.6.1"
|
||||
|
Loading…
Reference in New Issue
Block a user