Skip to content

Commit 83e9b15

Browse files
bundlerbotdeivid-rodriguez
authored andcommitted
Merge #3028
3028: Vendor bundler 2.1 r=hsbt a=deivid-rodriguez # Description: We should release bundler 2.1 and include it in rubygems before releasing rubygems 3.1 # Tasks: - [x] Describe the problem / feature - [ ] Write tests - [x] Write code to solve the problem - [ ] Get code review from coworkers / friends I will abide by the [code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md). Co-authored-by: David Rodríguez <[email protected]>
1 parent 97007e3 commit 83e9b15

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

Manifest.txt

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ bundler/lib/bundler/fetcher/index.rb
7979
bundler/lib/bundler/friendly_errors.rb
8080
bundler/lib/bundler/gem_helper.rb
8181
bundler/lib/bundler/gem_helpers.rb
82-
bundler/lib/bundler/gem_remote_fetcher.rb
8382
bundler/lib/bundler/gem_tasks.rb
8483
bundler/lib/bundler/gem_version_promoter.rb
8584
bundler/lib/bundler/gemdeps.rb
@@ -172,7 +171,6 @@ bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb
172171
bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb
173172
bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb
174173
bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb
175-
bundler/lib/bundler/vendor/fileutils/lib/fileutils/version.rb
176174
bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb
177175
bundler/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb
178176
bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
@@ -209,13 +207,13 @@ bundler/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb
209207
bundler/lib/bundler/vendor/thor/lib/thor/base.rb
210208
bundler/lib/bundler/vendor/thor/lib/thor/command.rb
211209
bundler/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb
212-
bundler/lib/bundler/vendor/thor/lib/thor/core_ext/io_binary_read.rb
213210
bundler/lib/bundler/vendor/thor/lib/thor/error.rb
214211
bundler/lib/bundler/vendor/thor/lib/thor/group.rb
215212
bundler/lib/bundler/vendor/thor/lib/thor/invocation.rb
216213
bundler/lib/bundler/vendor/thor/lib/thor/line_editor.rb
217214
bundler/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb
218215
bundler/lib/bundler/vendor/thor/lib/thor/line_editor/readline.rb
216+
bundler/lib/bundler/vendor/thor/lib/thor/nested_context.rb
219217
bundler/lib/bundler/vendor/thor/lib/thor/parser.rb
220218
bundler/lib/bundler/vendor/thor/lib/thor/parser/argument.rb
221219
bundler/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb
@@ -229,10 +227,24 @@ bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb
229227
bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb
230228
bundler/lib/bundler/vendor/thor/lib/thor/util.rb
231229
bundler/lib/bundler/vendor/thor/lib/thor/version.rb
230+
bundler/lib/bundler/vendor/uri/lib/uri.rb
231+
bundler/lib/bundler/vendor/uri/lib/uri/common.rb
232+
bundler/lib/bundler/vendor/uri/lib/uri/file.rb
233+
bundler/lib/bundler/vendor/uri/lib/uri/ftp.rb
234+
bundler/lib/bundler/vendor/uri/lib/uri/generic.rb
235+
bundler/lib/bundler/vendor/uri/lib/uri/http.rb
236+
bundler/lib/bundler/vendor/uri/lib/uri/https.rb
237+
bundler/lib/bundler/vendor/uri/lib/uri/ldap.rb
238+
bundler/lib/bundler/vendor/uri/lib/uri/ldaps.rb
239+
bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb
240+
bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb
241+
bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb
242+
bundler/lib/bundler/vendor/uri/lib/uri/version.rb
232243
bundler/lib/bundler/vendored_fileutils.rb
233244
bundler/lib/bundler/vendored_molinillo.rb
234245
bundler/lib/bundler/vendored_persistent.rb
235246
bundler/lib/bundler/vendored_thor.rb
247+
bundler/lib/bundler/vendored_uri.rb
236248
bundler/lib/bundler/version.rb
237249
bundler/lib/bundler/version_ranges.rb
238250
bundler/lib/bundler/vlad.rb

bundler

0 commit comments

Comments
 (0)