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

Merge remote-tracking branch 'upstream/master' into current_user_liquid_extensions

Browse Source
This commit is contained in:
Enrique García Cota 2012-03-03 00:01:14 +01:00
commit 7466f17141
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -40,7 +40,7 @@ gem 'delayed_job_mongoid', '1.0.8'
gem 'rubyzip' gem 'rubyzip'
gem 'locomotive_jammit-s3', :require => 'jammit-s3' gem 'locomotive_jammit-s3', :require => 'jammit-s3'
gem 'SystemTimer', :platforms => :ruby_18 gem 'SystemTimer', :platforms => :ruby_18
gem 'cells' gem 'cells', '3.8.0'
gem 'sanitize' gem 'sanitize'
gem 'highline' gem 'highline'

2
Gemfile.lock
View File

@ -294,7 +294,7 @@ DEPENDENCIES
cancan cancan
capybara capybara
carrierwave (= 0.5.6) carrierwave (= 0.5.6)
cells cells (= 3.8.0)
cucumber-rails (= 1.2.0) cucumber-rails (= 1.2.0)
custom_fields (= 1.0.0.beta.25) custom_fields (= 1.0.0.beta.25)
database_cleaner database_cleaner

2
locomotive_cms.gemspec
View File

@ -35,7 +35,7 @@ Gem::Specification.new do |s|
s.add_dependency 'locomotive_liquid', '2.2.2' s.add_dependency 'locomotive_liquid', '2.2.2'
s.add_dependency 'formtastic', '~> 1.2.3' s.add_dependency 'formtastic', '~> 1.2.3'
s.add_dependency 'inherited_resources', '~> 1.1.2' s.add_dependency 'inherited_resources', '~> 1.1.2'
s.add_dependency 'cells' s.add_dependency 'cells', '3.8.0'
s.add_dependency 'highline' s.add_dependency 'highline'
s.add_dependency 'sanitize' s.add_dependency 'sanitize'