Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Update docs to reflect revised guidance to check in locks for gems #6184

Merged
merged 2 commits into from
Feb 13, 2018

Conversation

arbonap
Copy link
Contributor

@arbonap arbonap commented Nov 22, 2017

Thanks so much for the contribution!
To make reviewing this PR a bit easier, please fill out answers to the following questions.

What was the end-user problem that led to this PR?

The problem was...

  • Bundler stopped gitignoring gem locks. The change was merged in but we need to reflect that change in documentation.

What was your diagnosis of the problem?

My diagnosis was...

  • To add in documentation explaining why Bunder now does not gitignore gem locks.

What is your fix for the problem, implemented in this PR?

My fix...

  • Update the gemfile.lock section of bundle install man pages as well as the gemfile man page.

Why did you choose this fix out of the possible options?

I chose this fix because...

dependencies again, which will result in different versions of
third-party code being used if `any` of the gems in the Gemfile(5)
or any of their dependencies have been updated.

When Bundler first shipped, the `Gemfile.lock` was gitignored inside gems.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was gitignored

@@ -504,3 +504,13 @@ bundler uses the following priority order:
`rubygems.org`
3. The sources specified via global `source` lines, searching each source in
your `Gemfile` from last added to first added.

## Should I check my `Gemfile.lock` into version control?
Copy link
Member

@colby-swandale colby-swandale Nov 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feels like this is missing a bit of context. We go from talking about the Gemfile.lock in your application to the Gemfile.lock inside a gem which is not imminently obvious.

How about we change the title to something like:

Should I check my Gemfile.lock into version control inside my Gem?

?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or maybe for my gem?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping @arbonap

Copy link
Member

@deivid-rodriguez deivid-rodriguez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than the small comments already made, this one looks good to me!

After reviewing, I think the question and answer is a bad fit for the
`gemfile` man page. It does seem like a good fit for the FAQ page on the
Bundler documentation site, though, and I'll add it over there.
@indirect
Copy link
Member

@bundlerbot r+

@bundlerbot
Copy link
Collaborator

📌 Commit da6e692 has been approved by indirect

@bundlerbot
Copy link
Collaborator

⌛ Testing commit da6e692 with merge 30f7b45...

bundlerbot added a commit that referenced this pull request Feb 13, 2018
Update docs to reflect revised guidance to check in locks for gems

Thanks so much for the contribution!
To make reviewing this PR a bit easier, please fill out answers to the following questions.

### What was the end-user problem that led to this PR?

The problem was...
- Bundler stopped gitignoring gem locks. The change was merged in but we need to reflect that change in documentation.
### What was your diagnosis of the problem?

My diagnosis was...
- To add in documentation explaining why Bunder now does _not_ gitignore gem locks.
### What is your fix for the problem, implemented in this PR?

My fix...
- Update the `gemfile.lock` section of `bundle install` man pages as well as the `gemfile` man page.
### Why did you choose this fix out of the possible options?

I chose this fix because...
- This addresses open issue https://github.com/bundler/bundler/issues/5879
@bundlerbot
Copy link
Collaborator

☀️ Test successful - status-travis
Approved by: indirect
Pushing 30f7b45 to master...

@bundlerbot bundlerbot merged commit da6e692 into rubygems:master Feb 13, 2018
bbuchalter pushed a commit to Shopify/lhm that referenced this pull request Jul 12, 2018
* Do not specify dependencies in Gemfile (this is a gem)
  * rake was already in gemspec causing bundler to complain
  * added package_cloud to gemspec
* Change `mysql` to `mysql2` because `mysql` is so ancient it won't even compile
* Add Gemfile.lock - this is now considered best practice: rubygems/bundler#6184
@colby-swandale colby-swandale added this to the 1.17.1 milestone Sep 24, 2018
colby-swandale pushed a commit that referenced this pull request Oct 5, 2018
Update docs to reflect revised guidance to check in locks for gems

Thanks so much for the contribution!
To make reviewing this PR a bit easier, please fill out answers to the following questions.

### What was the end-user problem that led to this PR?

The problem was...
- Bundler stopped gitignoring gem locks. The change was merged in but we need to reflect that change in documentation.
### What was your diagnosis of the problem?

My diagnosis was...
- To add in documentation explaining why Bunder now does _not_ gitignore gem locks.
### What is your fix for the problem, implemented in this PR?

My fix...
- Update the `gemfile.lock` section of `bundle install` man pages as well as the `gemfile` man page.
### Why did you choose this fix out of the possible options?

I chose this fix because...
- This addresses open issue https://github.com/bundler/bundler/issues/5879

(cherry picked from commit 30f7b45)
colby-swandale pushed a commit that referenced this pull request Oct 5, 2018
Update docs to reflect revised guidance to check in locks for gems

Thanks so much for the contribution!
To make reviewing this PR a bit easier, please fill out answers to the following questions.

### What was the end-user problem that led to this PR?

The problem was...
- Bundler stopped gitignoring gem locks. The change was merged in but we need to reflect that change in documentation.
### What was your diagnosis of the problem?

My diagnosis was...
- To add in documentation explaining why Bunder now does _not_ gitignore gem locks.
### What is your fix for the problem, implemented in this PR?

My fix...
- Update the `gemfile.lock` section of `bundle install` man pages as well as the `gemfile` man page.
### Why did you choose this fix out of the possible options?

I chose this fix because...
- This addresses open issue https://github.com/bundler/bundler/issues/5879

(cherry picked from commit 30f7b45)
colby-swandale added a commit that referenced this pull request Oct 7, 2018
* 1-16-stable:
  Version 1.16.6 with changelog
  fix uninitialized @use_gvp instance var warning
  no longer test Ruby 1.9.3 against rubygems master
  Merge #6708
  Auto merge of #6697 - walf443:added_changelog_section, r=hsbt
  Merge #6687
  Merge #6686
  Auto merge of #6670 - bundler:colby/invite-stephanie-morillo, r=segiddins
  Auto merge of #6627 - agrim123:agr-fix-add-groups, r=deivid-rodriguez
  Auto merge of #6612 - hdf1986:readme-bundle-add, r=segiddins
  Auto merge of #6495 - bundler:segiddins/6491-extra-gem-platform-in-lockfile, r=segiddins
  Auto merge of #6493 - agrim123:agr-update-bundle-update-docs, r=colby-swandale
  Auto merge of #6310 - utilum:rescue_unspecified_exception, r=segiddins
  Auto merge of #6184 - arbonap:pa-check-in-gemfile-docs, r=indirect
  fix typo
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants