Rename `master` branch to `main` (#1894)
Related to https://github.com/sinatra/sinatra/issues/1696
This commit is contained in:
parent
89dd6f28f9
commit
c0ee2c3d84
|
@ -65,21 +65,21 @@ track patch requests.
|
||||||
also has its own [Git repository](http://github.com/sinatra/sinatra-recipes).
|
also has its own [Git repository](http://github.com/sinatra/sinatra-recipes).
|
||||||
|
|
||||||
* [The Introduction](http://www.sinatrarb.com/intro.html) is generated from
|
* [The Introduction](http://www.sinatrarb.com/intro.html) is generated from
|
||||||
Sinatra's [README file](http://github.com/sinatra/sinatra/blob/master/README.md).
|
Sinatra's [README file](http://github.com/sinatra/sinatra/blob/main/README.md).
|
||||||
|
|
||||||
* If you want to help translating the documentation, the README is already
|
* If you want to help translating the documentation, the README is already
|
||||||
available in
|
available in
|
||||||
[Japanese](http://github.com/sinatra/sinatra/blob/master/README.ja.md),
|
[Japanese](http://github.com/sinatra/sinatra/blob/main/README.ja.md),
|
||||||
[German](http://github.com/sinatra/sinatra/blob/master/README.de.md),
|
[German](http://github.com/sinatra/sinatra/blob/main/README.de.md),
|
||||||
[Chinese](https://github.com/sinatra/sinatra/blob/master/README.zh.md),
|
[Chinese](https://github.com/sinatra/sinatra/blob/main/README.zh.md),
|
||||||
[Russian](https://github.com/sinatra/sinatra/blob/master/README.ru.md),
|
[Russian](https://github.com/sinatra/sinatra/blob/main/README.ru.md),
|
||||||
[European](https://github.com/sinatra/sinatra/blob/master/README.pt-pt.md) and
|
[European](https://github.com/sinatra/sinatra/blob/main/README.pt-pt.md) and
|
||||||
[Brazilian](https://github.com/sinatra/sinatra/blob/master/README.pt-br.md)
|
[Brazilian](https://github.com/sinatra/sinatra/blob/main/README.pt-br.md)
|
||||||
Portuguese,
|
Portuguese,
|
||||||
[French](https://github.com/sinatra/sinatra/blob/master/README.fr.md),
|
[French](https://github.com/sinatra/sinatra/blob/main/README.fr.md),
|
||||||
[Spanish](https://github.com/sinatra/sinatra/blob/master/README.es.md),
|
[Spanish](https://github.com/sinatra/sinatra/blob/main/README.es.md),
|
||||||
[Korean](https://github.com/sinatra/sinatra/blob/master/README.ko.md), and
|
[Korean](https://github.com/sinatra/sinatra/blob/main/README.ko.md), and
|
||||||
[Hungarian](https://github.com/sinatra/sinatra/blob/master/README.hu.md).
|
[Hungarian](https://github.com/sinatra/sinatra/blob/main/README.hu.md).
|
||||||
The translations tend to fall behind the English version. Translations into
|
The translations tend to fall behind the English version. Translations into
|
||||||
other languages would also be appreciated.
|
other languages would also be appreciated.
|
||||||
|
|
||||||
|
|
|
@ -4,13 +4,13 @@
|
||||||
|
|
||||||
### Releases
|
### Releases
|
||||||
|
|
||||||
The next major version of Sinatra will be released from the master branch. Each version will be tagged so it will be possible to branch of should there be a need for bug fixes and other updates.
|
The next major version of Sinatra will be released from the main branch. Each version will be tagged so it will be possible to branch of should there be a need for bug fixes and other updates.
|
||||||
|
|
||||||
## Issues
|
## Issues
|
||||||
|
|
||||||
### New features
|
### New features
|
||||||
|
|
||||||
New features will only be added to the master branch and will not be made available in point releases.
|
New features will only be added to the main branch and will not be made available in point releases.
|
||||||
|
|
||||||
### Bug fixes
|
### Bug fixes
|
||||||
|
|
||||||
|
|
|
@ -1933,7 +1933,7 @@ end
|
||||||
### Configuring attack protection
|
### Configuring attack protection
|
||||||
|
|
||||||
Sinatra is using
|
Sinatra is using
|
||||||
[Rack::Protection](https://github.com/sinatra/sinatra/tree/master/rack-protection#readme) to
|
[Rack::Protection](https://github.com/sinatra/sinatra/tree/main/rack-protection#readme) to
|
||||||
defend your application against common, opportunistic attacks. You can
|
defend your application against common, opportunistic attacks. You can
|
||||||
easily disable this behavior (which will open up your application to tons
|
easily disable this behavior (which will open up your application to tons
|
||||||
of common vulnerabilities):
|
of common vulnerabilities):
|
||||||
|
@ -2838,7 +2838,7 @@ Running Sinatra on a not officially supported Ruby flavor means that if things o
|
||||||
## The Bleeding Edge
|
## The Bleeding Edge
|
||||||
|
|
||||||
If you would like to use Sinatra's latest bleeding-edge code, feel free
|
If you would like to use Sinatra's latest bleeding-edge code, feel free
|
||||||
to run your application against the master branch, it should be rather
|
to run your application against the main branch, it should be rather
|
||||||
stable.
|
stable.
|
||||||
|
|
||||||
We also push out prerelease gems from time to time, so you can do a
|
We also push out prerelease gems from time to time, so you can do a
|
||||||
|
|
|
@ -30,7 +30,7 @@ RubyGems 2.0 or newer is required to protect against public gem pushes. You can
|
||||||
end
|
end
|
||||||
|
|
||||||
s.metadata = {
|
s.metadata = {
|
||||||
'source_code_uri' => 'https://github.com/sinatra/sinatra/tree/master/rack-protection',
|
'source_code_uri' => 'https://github.com/sinatra/sinatra/tree/main/rack-protection',
|
||||||
'homepage_uri' => 'http://sinatrarb.com/protection/',
|
'homepage_uri' => 'http://sinatrarb.com/protection/',
|
||||||
'documentation_uri' => 'https://www.rubydoc.info/gems/rack-protection',
|
'documentation_uri' => 'https://www.rubydoc.info/gems/rack-protection',
|
||||||
'rubygems_mfa_required' => 'true'
|
'rubygems_mfa_required' => 'true'
|
||||||
|
|
|
@ -167,7 +167,7 @@ For more info check the [official docs](http://www.sinatrarb.com/contrib/) and
|
||||||
[sinatra-webdav]: http://www.sinatrarb.com/contrib/webdav
|
[sinatra-webdav]: http://www.sinatrarb.com/contrib/webdav
|
||||||
[sinatra-runner]: http://www.sinatrarb.com/contrib/runner
|
[sinatra-runner]: http://www.sinatrarb.com/contrib/runner
|
||||||
[sinatra-extension]: http://www.sinatrarb.com/contrib/extension
|
[sinatra-extension]: http://www.sinatrarb.com/contrib/extension
|
||||||
[sinatra-test-helpers]: https://github.com/sinatra/sinatra/blob/master/sinatra-contrib/lib/sinatra/test_helpers.rb
|
[sinatra-test-helpers]: https://github.com/sinatra/sinatra/blob/main/sinatra-contrib/lib/sinatra/test_helpers.rb
|
||||||
[sinatra-required-params]: http://www.sinatrarb.com/contrib/required_params
|
[sinatra-required-params]: http://www.sinatrarb.com/contrib/required_params
|
||||||
[sinatra-custom-logger]: http://www.sinatrarb.com/contrib/custom_logger
|
[sinatra-custom-logger]: http://www.sinatrarb.com/contrib/custom_logger
|
||||||
[sinatra-multi-route]: http://www.sinatrarb.com/contrib/multi_route
|
[sinatra-multi-route]: http://www.sinatrarb.com/contrib/multi_route
|
||||||
|
@ -176,5 +176,5 @@ For more info check the [official docs](http://www.sinatrarb.com/contrib/) and
|
||||||
[sinatra-config-file]: http://www.sinatrarb.com/contrib/config_file
|
[sinatra-config-file]: http://www.sinatrarb.com/contrib/config_file
|
||||||
[sinatra-link-header]: http://www.sinatrarb.com/contrib/link_header
|
[sinatra-link-header]: http://www.sinatrarb.com/contrib/link_header
|
||||||
[sinatra-capture]: http://www.sinatrarb.com/contrib/capture
|
[sinatra-capture]: http://www.sinatrarb.com/contrib/capture
|
||||||
[sinatra-engine-tracking]: https://github.com/sinatra/sinatra/blob/master/sinatra-contrib/lib/sinatra/engine_tracking.rb
|
[sinatra-engine-tracking]: https://github.com/sinatra/sinatra/blob/main/sinatra-contrib/lib/sinatra/engine_tracking.rb
|
||||||
|
|
||||||
|
|
|
@ -69,7 +69,7 @@ task release: :gemspec do
|
||||||
gem push sinatra-contrib*.gem &&
|
gem push sinatra-contrib*.gem &&
|
||||||
git commit --allow-empty -a -m '#{Sinatra::Contrib::VERSION} release' &&
|
git commit --allow-empty -a -m '#{Sinatra::Contrib::VERSION} release' &&
|
||||||
git tag -s v#{Sinatra::Contrib::VERSION} -m '#{Sinatra::Contrib::VERSION} release' &&
|
git tag -s v#{Sinatra::Contrib::VERSION} -m '#{Sinatra::Contrib::VERSION} release' &&
|
||||||
git push && (git push origin master || true) &&
|
git push && (git push origin main || true) &&
|
||||||
git push --tags && (git push origin --tags || true)
|
git push --tags && (git push origin --tags || true)
|
||||||
SH
|
SH
|
||||||
end
|
end
|
||||||
|
|
|
@ -29,7 +29,7 @@ RubyGems 2.0 or newer is required to protect against public gem pushes. You can
|
||||||
end
|
end
|
||||||
|
|
||||||
s.metadata = {
|
s.metadata = {
|
||||||
'source_code_uri' => 'https://github.com/sinatra/sinatra/tree/master/sinatra-contrib',
|
'source_code_uri' => 'https://github.com/sinatra/sinatra/tree/main/sinatra-contrib',
|
||||||
'homepage_uri' => 'http://sinatrarb.com/contrib/',
|
'homepage_uri' => 'http://sinatrarb.com/contrib/',
|
||||||
'documentation_uri' => 'https://www.rubydoc.info/gems/sinatra-contrib',
|
'documentation_uri' => 'https://www.rubydoc.info/gems/sinatra-contrib',
|
||||||
'rubygems_mfa_required' => 'true'
|
'rubygems_mfa_required' => 'true'
|
||||||
|
|
|
@ -36,7 +36,7 @@ RubyGems 2.0 or newer is required to protect against public gem pushes. You can
|
||||||
|
|
||||||
s.metadata = {
|
s.metadata = {
|
||||||
'source_code_uri' => 'https://github.com/sinatra/sinatra',
|
'source_code_uri' => 'https://github.com/sinatra/sinatra',
|
||||||
'changelog_uri' => 'https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md',
|
'changelog_uri' => 'https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md',
|
||||||
'homepage_uri' => 'http://sinatrarb.com/',
|
'homepage_uri' => 'http://sinatrarb.com/',
|
||||||
'bug_tracker_uri' => 'https://github.com/sinatra/sinatra/issues',
|
'bug_tracker_uri' => 'https://github.com/sinatra/sinatra/issues',
|
||||||
'mailing_list_uri' => 'http://groups.google.com/group/sinatrarb',
|
'mailing_list_uri' => 'http://groups.google.com/group/sinatrarb',
|
||||||
|
|
Loading…
Reference in New Issue