summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2013-08-15 18:01:42 -0700
committerAndre Arko <andre@arko.net>2013-08-15 18:02:43 -0700
commit1cc3d97a7f71726e16f57462cba2814b1237123e (patch)
tree0ec602d699ebb683447f9f1ebcb8763cb3fea360
parent9c0e5722c63c216994aee012ab72ac61a3ca5fd6 (diff)
downloadbundler-1cc3d97a7f71726e16f57462cba2814b1237123e.tar.gz
Revert "Merge pull request #2569 from fuadsaud/github-https"
This reverts commit e2a5d3b90d8c1d685acc6d1a9d9cc3488b2c1a61, reversing changes made to 435307266d75c82e7601f39551b0b707c58dc9a4. fixes #2600
-rw-r--r--lib/bundler/dsl.rb2
-rw-r--r--spec/bundler/dsl_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index 7f88a1bc5d..947aca7ba8 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -230,7 +230,7 @@ module Bundler
if github = opts.delete("github")
github = "#{github}/#{github}" unless github.include?("/")
- opts["git"] = "https://github.com/#{github}.git"
+ opts["git"] = "git://github.com/#{github}.git"
end
if gist = opts.delete("gist")
diff --git a/spec/bundler/dsl_spec.rb b/spec/bundler/dsl_spec.rb
index 1b05eb48b4..610ff0b55e 100644
--- a/spec/bundler/dsl_spec.rb
+++ b/spec/bundler/dsl_spec.rb
@@ -9,7 +9,7 @@ describe Bundler::Dsl do
describe "#_normalize_options" do
it "converts :github to :git" do
subject.gem("sparks", :github => "indirect/sparks")
- github_uri = "https://github.com/indirect/sparks.git"
+ github_uri = "git://github.com/indirect/sparks.git"
expect(subject.dependencies.first.source.uri).to eq(github_uri)
end
@@ -27,7 +27,7 @@ describe Bundler::Dsl do
it "converts 'rails' to 'rails/rails'" do
subject.gem("rails", :github => "rails")
- github_uri = "https://github.com/rails/rails.git"
+ github_uri = "git://github.com/rails/rails.git"
expect(subject.dependencies.first.source.uri).to eq(github_uri)
end
end