Browse Source

Gemfile change

development
Godwin 11 years ago
parent
commit
c40a7b65ba
  1. 2
      Gemfile
  2. 9
      Gemfile.lock

2
Gemfile

@ -19,7 +19,7 @@ gem 'oauth2', '~> 0.8.0'
gem 'carrierwave' gem 'carrierwave'
gem 'carrierwave-imageoptimizer' gem 'carrierwave-imageoptimizer'
gem 'mini_magick' gem 'mini_magick'
gem 'carmen', :path => '../carmen/' if File.directory?('../carmen/') && RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i #gem 'carmen', :path => '../carmen/' if File.directory?('../carmen/') && RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
gem 'carmen-rails' gem 'carmen-rails'
gem 'nested_form' gem 'nested_form'
gem 'acts_as_list' gem 'acts_as_list'

9
Gemfile.lock

@ -12,11 +12,6 @@ GIT
i18n-active_record (0.0.2) i18n-active_record (0.0.2)
i18n (>= 0.5.0) i18n (>= 0.5.0)
PATH
remote: ../carmen/
specs:
carmen (1.0.1)
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
@ -71,6 +66,8 @@ GEM
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
xpath (~> 2.0) xpath (~> 2.0)
carmen (1.0.1)
unicode_utils (~> 1.4.0)
carmen-rails (1.0.1) carmen-rails (1.0.1)
carmen (~> 1.0.0) carmen (~> 1.0.0)
rails rails
@ -302,6 +299,7 @@ GEM
uglifier (2.5.0) uglifier (2.5.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)
unicode_utils (1.4.0)
wdm (0.1.0) wdm (0.1.0)
webmock (1.18.0) webmock (1.18.0)
addressable (>= 2.3.6) addressable (>= 2.3.6)
@ -321,7 +319,6 @@ DEPENDENCIES
binding_of_caller binding_of_caller
capistrano capistrano
capybara capybara
carmen!
carmen-rails carmen-rails
carrierwave carrierwave
carrierwave-imageoptimizer carrierwave-imageoptimizer

Loading…
Cancel
Save