Merge pull request #494 from libgit2/vmg/23b4

Vicent Marti · Vicent Marti · commit 12f5a54d6965 · 2015-06-29T15:07:17.000+02:00
Rugged 0.23b4
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 *.bundle
 *.swp
+Gemfile.lock
 tmp/
 test/fixtures/testrepo.git
 ext/rugged/vendor/libgit2-dist/
diff --git a/.travis.yml b/.travis.yml
@@ -34,6 +34,6 @@ matrix:
 
 install:
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./vendor/libgit2/script/install-deps-osx.sh; fi
-  - bundle install --deployment
+  - bundle install --path vendor/local
 
 script: script/travisbuild
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/lib/rugged/version.rb b/lib/rugged/version.rb
@@ -1,3 +1,3 @@
 module Rugged
-  Version = VERSION = '0.23.0b3'
+  Version = VERSION = '0.23.0b4'
 end
diff --git a/vendor/libgit2 b/vendor/libgit2
@@ -1 +1 @@
-Subproject commit c0280bdd1542640a83d732d7c50c30dddf4dc8df
+Subproject commit b977d0177222fea47f721acd225030eda09e65ba
