diff options
author | elijah <elijah@riseup.net> | 2015-05-05 15:49:07 -0700 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2015-05-05 15:49:07 -0700 |
commit | 6c6b5a88f18f714924530d64486cb88c02bd7ee4 (patch) | |
tree | 3a663822de4c279da8287db04f0a42cfb2c407fb /Gemfile | |
parent | 51195b20531c4dcdf6a76e6a9a8ef7a771cf76be (diff) | |
parent | 61fdf41087b480db12720df5d5beadd32992475a (diff) |
Merge branch 'develop'
Conflicts:
lib/leap_cli/commands/db.rb
lib/leap_cli/commands/vagrant.rb
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 30 |
1 files changed, 0 insertions, 30 deletions
@@ -1,33 +1,3 @@ source 'https://rubygems.org' gemspec -# # -# # Specify support gems used that we might also develop locally. -# # -# # Available options: -# # -# # :dev_path - the development path of the gem. this path is used if running in 'development mode'. -# # -# # :vendor_path - where this gem is vendored. this path is used if it exists and we are running in 'production mode' -# # -# development_gems = { -# 'supply_drop' => {:dev_path => '../gems/supply_drop', :vendor_path => 'vendor/supply_drop'}, -# 'certificate_authority' => {:dev_path => '../gems/certificate_authority', :vendor_path => 'vendor/certificate_authority'} -# } - -# # -# # A little bit of code to magically pick the correct gem -# # - -# mode = :production - -# gem_root = File.dirname(__FILE__) -# path_key = mode == :development ? :dev_path : :vendor_path -# development_gems.each do |gem_name, options| -# path = File.expand_path(options[path_key], gem_root) -# if File.directory?(path) -# gem gem_name, :path => path -# else -# gem gem_name -# end -# end |