common and haml dependency refinement
arnaud sellenet
committed Jun 03, 2014
commit 2453e34d53a2610d9993d72c7086ee5dd634a9c0
Showing 3
changed files with
10 additions
and 6 deletions
Gemfile
+2
-2
| @@ | @@ -3,8 +3,8 @@ source 'https://rubygems.org' |
| gemspec | |
| group :development do | |
| - | gem 'locomotivecms_common', '~> 0.0.1', require: 'common' # path: '../common' |
| - | gem 'locomotivecms_models', '~> 0.0.1', path: '../models', require: 'locomotive/models' |
| + | gem 'locomotivecms_common', '~> 0.0.1'#, path: '../common' |
| + | gem 'locomotivecms_models', '~> 0.0.1'#, path: '../models' |
| gem 'thin' | |
| end | |
Gemfile.lock
+8
-3
| @@ | @@ -4,7 +4,6 @@ PATH |
| locomotivecms_steam (0.1.2) | |
| coffee-script (~> 2.2.0) | |
| dragonfly (~> 1.0.3) | |
| - | haml |
| haml (~> 4.0.3) | |
| httparty (~> 0.13) | |
| kramdown (~> 1.3.3) | |
| @@ | @@ -17,6 +16,12 @@ PATH |
| sprockets-sass (~> 1.0) | |
| will_paginate (~> 3.0) | |
| + | PATH |
| + | remote: ../common |
| + | specs: |
| + | locomotivecms_common (0.0.1) |
| + | colorize |
| + | |
| PATH | |
| remote: ../models | |
| specs: | |
| @@ | @@ -40,6 +45,7 @@ GEM |
| coffee-script-source | |
| execjs | |
| coffee-script-source (1.7.0) | |
| + | colorize (0.5.8) |
| coveralls (0.7.0) | |
| multi_json (~> 1.3) | |
| rest-client | |
| @@ | @@ -74,7 +80,6 @@ GEM |
| locomotivecms-liquid (2.6.0) | |
| locomotivecms-solid (0.2.2.1) | |
| locomotivecms-liquid (~> 2.6.0) | |
| - | locomotivecms_common (0.0.1) |
| method_source (0.8.2) | |
| mime-types (1.25.1) | |
| minitest (5.3.4) | |
| @@ | @@ -142,7 +147,7 @@ DEPENDENCIES |
| coveralls | |
| i18n-spec | |
| launchy | |
| - | locomotivecms_common (~> 0.0.1) |
| + | locomotivecms_common (~> 0.0.1)! |
| locomotivecms_models (~> 0.0.1)! | |
| locomotivecms_steam! | |
| pry | |
locomotivecms_steam.gemspec
+0
-1
| @@ | @@ -33,7 +33,6 @@ Gem::Specification.new do |spec| |
| spec.add_dependency 'dragonfly', '~> 1.0.3' | |
| spec.add_dependency 'will_paginate', '~> 3.0' # TODO: move to kaminari | |
| spec.add_dependency 'kramdown', '~> 1.3.3' | |
| - | spec.add_dependency 'haml' |
| spec.add_dependency 'coffee-script', '~> 2.2.0' | |
| spec.add_dependency 'haml', '~> 4.0.3' | |