Skip to content

Merge in 1.0 stable#136

Merged
bundlerbot merged 15 commits intomasterfrom
merge-1-0-stable
Jan 28, 2017
Merged

Merge in 1.0 stable#136
bundlerbot merged 15 commits intomasterfrom
merge-1-0-stable

Conversation

@smellsblue
Copy link
Copy Markdown
Contributor

Pull in 1.0 to get the latest changes

smellsblue and others added 13 commits January 23, 2017 17:59
Conflicts:
	lib/gemstash/db/version.rb
	lib/gemstash/specs_builder.rb
… rubygems

Add explicit HOME environment variable to any command that bundles, as bundler is giving an error if it is set to a non-writable directory
New speaker binstub for the new test, and use the basename of the command to ensure the new binstub will be used
Fix null pointer errors showing up by logging when a route doesn't exist (this is happening because bundler is using the new index API and we haven't implemented it yet)
Backport latest_specs api for private gems to the 1.0 stable branch
Conflicts:
	CHANGELOG.md
	lib/gemstash/db/version.rb
	lib/gemstash/gem_source/private_source.rb
	lib/gemstash/specs_builder.rb
	rake/changelog.rb
	spec/gemstash/specs_builder_spec.rb
	spec/integration_spec.rb
	spec/support/jruby_binstubs/git
	spec/support/simple_server.rb
@smellsblue
Copy link
Copy Markdown
Contributor Author

@bundlerbot r+

@bundlerbot
Copy link
Copy Markdown
Contributor

📌 Commit db71118 has been approved by smellsblue

@bundlerbot
Copy link
Copy Markdown
Contributor

⌛ Testing commit db71118 with merge 33a8735...

bundlerbot added a commit that referenced this pull request Jan 28, 2017
Merge in 1.0 stable

Pull in 1.0 to get the latest changes
@bundlerbot
Copy link
Copy Markdown
Contributor

☀️ Test successful - status-travis
Approved by: smellsblue
Pushing 33a8735 to master...

@bundlerbot bundlerbot merged commit db71118 into master Jan 28, 2017
@smellsblue smellsblue deleted the merge-1-0-stable branch January 31, 2017 19:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants