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

Make URLs in document consistent and secure #6935

Merged
2 commits merged into from
Jan 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Once the admins get involved, they will follow a documented series of steps and

You may get in touch with the Bundler admin team through any of the following methods:

- Email [the Bundler maintainers](http://bundler.io/contributors.html) as a group at [[email protected]](mailto:[email protected]).
- Email [the Bundler maintainers](https://bundler.io/contributors.html) as a group at [[email protected]](mailto:[email protected]).
- Directly message any maintainer in private (through Slack, Twitter, email, or other available option) if that is more comfortable

### Further Enforcement
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ bundle install
bundle exec rspec
```

See [bundler.io](http://bundler.io) for the full documentation.
See [bundler.io](https://bundler.io) for the full documentation.

### Troubleshooting

Expand Down
4 changes: 2 additions & 2 deletions doc/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Docs: Contributing and developing Bundler

_If you're looking for documentation on how to use Bundler: visit [bundler.io](http://bundler.io/), or run `bundle help` from the command line. You may also be interested in [troubleshooting common issues](TROUBLESHOOTING.md) found when using Bundler._
_If you're looking for documentation on how to use Bundler: visit [bundler.io](https://bundler.io/), or run `bundle help` from the command line. You may also be interested in [troubleshooting common issues](TROUBLESHOOTING.md) found when using Bundler._

Bundler welcomes contributions from *everyone*. While contributing, please follow the project [code of conduct](http://bundler.io/conduct.html), so that everyone can be included. Maintainers are expected to work together with the community in accordance with [our project policies](POLICIES.md).
Bundler welcomes contributions from *everyone*. While contributing, please follow the project [code of conduct](https://bundler.io/conduct.html), so that everyone can be included. Maintainers are expected to work together with the community in accordance with [our project policies](POLICIES.md).

If you'd like to help make Bundler better, you totally rock! Thanks for helping us make Bundler better.

Expand Down
4 changes: 2 additions & 2 deletions doc/TROUBLESHOOTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ Please open a ticket with [Heroku](https://www.heroku.com) if you're having trou

## Other problems

First, figure out exactly what it is that you're trying to do (see [XY Problem](http://xyproblem.info/)). Then, go to the [Bundler documentation website](http://bundler.io) and see if we have instructions on how to do that.
First, figure out exactly what it is that you're trying to do (see [XY Problem](http://xyproblem.info/)). Then, go to the [Bundler documentation website](https://bundler.io) and see if we have instructions on how to do that.

Second, check [the compatibility
list](http://bundler.io/compatibility.html), and make sure that the version of Bundler that you are using works with the versions of Ruby and RubyGems that you are using. To see your versions:
list](https://bundler.io/compatibility.html), and make sure that the version of Bundler that you are using works with the versions of Ruby and RubyGems that you are using. To see your versions:

# Bundler version
bundle -v
Expand Down
4 changes: 2 additions & 2 deletions doc/contributing/COMMUNITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ Community is an important part of all we do. If you’d like to be part of the B

It would be tremendously helpful to have more people answering questions about Bundler (and often simply about [RubyGems](https://github.com/rubygems/rubygems) or Ruby itself) in our [issue tracker](https://github.com/bundler/bundler/issues) or on [Stack Overflow](http://stackoverflow.com/questions/tagged/bundler).

Additional documentation and explanation is always helpful, too. If you have any suggestions for the Bundler website [bundler.io](http://bundler.io), we would absolutely love it if you opened an issue or pull request on the [bundler-site](https://github.com/bundler/bundler-site) repository.
Additional documentation and explanation is always helpful, too. If you have any suggestions for the Bundler website [bundler.io](https://bundler.io), we would absolutely love it if you opened an issue or pull request on the [bundler-site](https://github.com/bundler/bundler-site) repository.

Sharing your experiences and discoveries by writing them up is a valuable way to help others who have similar problems or experiences in the future. You can write a blog post, create an example and commit it to GitHub, take screenshots, or make videos.

Publishing examples of how Bundler is used helps everyone, and we’ve discovered that people already use it in ways that we never imagined when we were writing it. If you’re still not sure what to write about, there are also several projects doing interesting things based on Bundler. They could probably use publicity too.

Finally, all contributors to the Bundler project must agree to the contributor [code of conduct](http://bundler.io/conduct.html). By participating in this project you agree to abide by its terms.
Finally, all contributors to the Bundler project must agree to the contributor [code of conduct](https://bundler.io/conduct.html). By participating in this project you agree to abide by its terms.
2 changes: 1 addition & 1 deletion doc/contributing/GETTING_HELP.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ If you have any questions after reading the documentation for contributing, plea
The best ways to get in touch are:

* [Bundler Slack](https://bundler.slack.com).
* Not a member of the Slack? Join the Bundler team slack [here](http://slack.bundler.io/)!
* Not a member of the Slack? Join the Bundler team slack [here](https://slack.bundler.io/)!
* [Bundler mailing list](http://groups.google.com/group/ruby-bundler)

You may also find our guide on [filing issues](ISSUES.md) to be helpful as well!
4 changes: 2 additions & 2 deletions doc/contributing/HOW_YOU_CAN_HELP.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Generally, great ways to get started helping out with Bundler are:
- [reporting bugs you encounter or suggesting new features](https://github.com/bundler/bundler/issues/new)
- see our [issues guide](ISSUES.md) for help on filing issues
- see the [new features documentation](../development/NEW_FEATURES.md) for more
- adding to or editing [the Bundler documentation website](http://bundler.io) and [Bundler man pages](http://bundler.io/man/bundle.1.html)
- adding to or editing [the Bundler documentation website](https://bundler.io) and [Bundler man pages](https://bundler.io/man/bundle.1.html)
- [checking issues for completeness](BUG_TRIAGE.md)
- closing issues that are not complete
- adding a failing test for reproducible [reported bugs](https://github.com/bundler/bundler/issues)
Expand All @@ -24,4 +24,4 @@ Generally, great ways to get started helping out with Bundler are:
- get started setting up your dev environment with [these instructions](../development/SETUP.md)
- backfilling [unit tests](https://github.com/bundler/bundler/tree/master/spec/bundler) for modules that lack [coverage](https://codeclimate.com/github/bundler/bundler/coverage)

If nothing on those lists looks good, [talk to us](http://slack.bundler.io/), and we'll figure out what you can help with. We can absolutely use your help, no matter what level of programming skill you have at the moment.
If nothing on those lists looks good, [talk to us](https://slack.bundler.io/), and we'll figure out what you can help with. We can absolutely use your help, no matter what level of programming skill you have at the moment.
4 changes: 2 additions & 2 deletions doc/contributing/ISSUES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Before filing an issue, check our [troubleshooting guide](../TROUBLESHOOTING.md)

## Documentation

Instructions for common Bundler uses can be found on the [Bundler documentation site](http://bundler.io/).
Instructions for common Bundler uses can be found on the [Bundler documentation site](https://bundler.io/).

Detailed information about each Bundler command, including help with common problems, can be found in the [Bundler man pages](http://bundler.io/man/bundle.1.html) or [Bundler Command Line Reference](http://bundler.io/v1.11/commands.html).
Detailed information about each Bundler command, including help with common problems, can be found in the [Bundler man pages](https://bundler.io/man/bundle.1.html) or [Bundler Command Line Reference](https://bundler.io/v1.11/commands.html).

## Reporting unresolved problems

Expand Down
2 changes: 1 addition & 1 deletion doc/contributing/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Bundler Contributor Guidelines

Thank you for your interest in making Bundler better! We welcome contributions from everyone. Dozens of contributors like you have submitted feature improvements, fixed bugs, and written new documentation. [Join the Bundler Slack community](http://slack.bundler.io/) to connect with the Bundler core team and other contributors like you.
Thank you for your interest in making Bundler better! We welcome contributions from everyone. Dozens of contributors like you have submitted feature improvements, fixed bugs, and written new documentation. [Join the Bundler Slack community](https://slack.bundler.io/) to connect with the Bundler core team and other contributors like you.

Before submitting a contribution, read through the following guidelines:

Expand Down
4 changes: 2 additions & 2 deletions doc/documentation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ Code needs explanation, and sometimes those who know the code well have trouble
Currently, Bundler has two main sources of documentation:

1. built-in `help` (including usage information and man pages)
2. [Bundler documentation site](http://bundler.io)
2. [Bundler documentation site](https://bundler.io)

If you have a suggestion or proposed change for [bundler.io](http://bundler.io), please open an issue or send a pull request to the [bundler-site](https://github.com/bundler/bundler-site) repository.
If you have a suggestion or proposed change for [bundler.io](https://bundler.io), please open an issue or send a pull request to the [bundler-site](https://github.com/bundler/bundler-site) repository.

Not sure where to write documentation? In general, follow these guidelines:

Expand Down
2 changes: 1 addition & 1 deletion doc/documentation/VISION.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Currently, documentation for using Bundler is spread across two places:

1. built-in `help` (including usage information and man pages)
2. [Bundler documentation site](http://bundler.io)
2. [Bundler documentation site](https://bundler.io)

Additional documentation about using Bundler to publish gems can also be found on the [RubyGems guides](http://guides.rubygems.org/).

Expand Down
6 changes: 3 additions & 3 deletions doc/documentation/WRITING.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ $ bin/rspec ./spec/commands/help_spec.rb
$ bin/rspec ./spec/quality_spec.rb
```

# Writing docs for [the Bundler documentation site](http://www.bundler.io)
# Writing docs for [the Bundler documentation site](https://bundler.io)

If you'd like to submit a pull request for any of the primary commands or utilities on [the Bundler documentation site](http://www.bundler.io), please follow the instructions above for writing documentation for man pages from the `bundler/bundler` repository. They are the same in each case.
If you'd like to submit a pull request for any of the primary commands or utilities on [the Bundler documentation site](https://bundler.io), please follow the instructions above for writing documentation for man pages from the `bundler/bundler` repository. They are the same in each case.

Note: Editing `.ronn` files from the `bundler/bundler` repository for the primary commands and utilities documentation is all you need 🎉. There is no need to manually change anything in the `bundler/bundler-site` repository, because the man pages and the docs for primary commands and utilities on [the Bundler documentation site](http://www.bundler.io) are one in the same. They are generated automatically from the `bundler/bundler` repository's `.ronn` files from the `rake man/build` command. In other words, after updating `.ronn` file and running `rake man/build` in `bundler`, `.ronn` files map to the auto-generated files in the `source/man` directory of `bundler-site`.
Note: Editing `.ronn` files from the `bundler/bundler` repository for the primary commands and utilities documentation is all you need 🎉. There is no need to manually change anything in the `bundler/bundler-site` repository, because the man pages and the docs for primary commands and utilities on [the Bundler documentation site](https://bundler.io) are one in the same. They are generated automatically from the `bundler/bundler` repository's `.ronn` files from the `rake man/build` command. In other words, after updating `.ronn` file and running `rake man/build` in `bundler`, `.ronn` files map to the auto-generated files in the `source/man` directory of `bundler-site`.

Additionally, if you'd like to add a guide or tutorial: in the `bundler/bundler-site` repository, go to `/bundler-site/source/current_version_of_bundler/guides` and add [a new Markdown file](https://guides.github.com/features/mastering-markdown/) (with an extension ending in `.md`). Be sure to correctly format the title of your new guide, like so:
```
Expand Down
4 changes: 2 additions & 2 deletions lib/bundler/cli/issue.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ def run
https://github.com/bundler/bundler/blob/master/doc/TROUBLESHOOTING.md
2. Instructions for common Bundler uses can be found on the documentation
site: http://bundler.io/
site: https://bundler.io/
3. Information about each Bundler command can be found in the Bundler
man pages: http://bundler.io/man/bundle.1.html
man pages: https://bundler.io/man/bundle.1.html
Hopefully the troubleshooting steps above resolved your problem! If things
still aren't working the way you expect them to, please let us know so
Expand Down
2 changes: 1 addition & 1 deletion man/bundle-init.ronn
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ results in all string literals in the file being implicitly frozen.

## SEE ALSO

[Gemfile(5)](http://bundler.io/man/gemfile.5.html)
[Gemfile(5)](https://bundler.io/man/gemfile.5.html)
2 changes: 1 addition & 1 deletion man/bundle.ronn
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ bundle(1) -- Ruby Dependency Management
Bundler manages an `application's dependencies` through its entire life
across many machines systematically and repeatably.

See [the bundler website](http://bundler.io) for information on getting
See [the bundler website](https://bundler.io) for information on getting
started, and Gemfile(5) for more information on the `Gemfile` format.

## OPTIONS
Expand Down
2 changes: 1 addition & 1 deletion man/gemfile.5.ronn
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ are not available).
Note that on `bundle install`, bundler downloads and evaluates all gems, in order to
create a single canonical list of all of the required gems and their dependencies.
This means that you cannot list different versions of the same gems in different
groups. For more details, see [Understanding Bundler](http://bundler.io/rationale.html).
groups. For more details, see [Understanding Bundler](https://bundler.io/rationale.html).

### PLATFORMS

Expand Down
2 changes: 1 addition & 1 deletion spec/resolver/basic_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
# dependencies and since the dependency of the selected foo gem changes, the latest matching
# dependency of "bar", "~> 2.1" -- bar-2.1.1 -- is selected. This is not a bug and follows
# the long-standing documented Conservative Updating behavior of bundle install.
# http://bundler.io/v1.12/man/bundle-install.1.html#CONSERVATIVE-UPDATING
# https://bundler.io/v1.12/man/bundle-install.1.html#CONSERVATIVE-UPDATING
should_conservative_resolve_and_include :patch, ["foo"], %w[foo-1.4.5 bar-2.1.1]
end

Expand Down