diff options
| author | Andre Arko <andre@arko.net> | 2014-08-24 17:22:41 -0500 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2014-08-24 17:22:41 -0500 |
| commit | 13e860a4f2e687e5e9f26c233d84097712981aaa (patch) | |
| tree | 7d51b8129dc8365d80b3701494ae1d0dc419b804 /lib/bundler/source_list.rb | |
| parent | 6b2f8ceaacbc63a0c3368edc973c3d4fb42564cd (diff) | |
| parent | cda14ce657a1e62957d0277348e43b8dadd5a501 (diff) | |
| download | bundler-13e860a4f2e687e5e9f26c233d84097712981aaa.tar.gz | |
Merge tag 'v1.7.2'
Version 1.7.2
Conflicts:
CHANGELOG.md
lib/bundler/source_list.rb
spec/bundler/source_list_spec.rb
Diffstat (limited to 'lib/bundler/source_list.rb')
| -rw-r--r-- | lib/bundler/source_list.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bundler/source_list.rb b/lib/bundler/source_list.rb index 235f75a2..e7529f27 100644 --- a/lib/bundler/source_list.rb +++ b/lib/bundler/source_list.rb @@ -43,7 +43,8 @@ module Bundler end def lock_sources - (path_sources + git_sources + svn_sources) << combine_rubygems_sources + lock_sources = (path_sources + git_sources + svn_sources).sort_by(&:to_s) + lock_sources << combine_rubygems_sources end def replace_sources!(replacement_sources) |