File tree Expand file tree Collapse file tree 9 files changed +12
-12
lines changed Expand file tree Collapse file tree 9 files changed +12
-12
lines changed Original file line number Diff line number Diff line change @@ -49,7 +49,7 @@ immediately. These are good ones to tackle to help us actively fix bugs.
4949
5050Maintenance branches are how we manage the different supported point releases
5151of RSpec. As such, while they might look like good candidates to merge into
52- master , please do not open pull requests to merge them.
52+ main , please do not open pull requests to merge them.
5353
5454## How do the cukes work?
5555
Original file line number Diff line number Diff line change 11### Development
2- [ Full Changelog] ( https://github.com/rspec/rspec-rails/compare/v4.0.1...master )
2+ [ Full Changelog] ( https://github.com/rspec/rspec-rails/compare/v4.0.1...main )
33
44Enhancements:
55
Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ The rspec-dev project contains many rake tasks for helping manage
5151an RSpec development environment, making it easy to do things like:
5252
5353* Change branches across all repos
54- * Update all repos with the latest code from ` master `
54+ * Update all repos with the latest code from ` main `
5555* Cut a new release across all repos
5656* Push out updated build scripts to all repos
5757
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ platforms :jruby do
1919end
2020
2121case RAILS_VERSION
22- when /master /
22+ when /main /
2323 MAJOR = 6
2424 MINOR = 0
2525when /5-2-stable/
Original file line number Diff line number Diff line change 11version_file = File.expand_path("../.rails-version", __FILE__)
22
33case version = ENV['RAILS_VERSION'] || (File.exist?(version_file) && File.read(version_file).chomp) || ''
4- when /master /
4+ when /main /
55 gem "rails", :git => "https://github.com/rails/rails.git"
66 gem "arel", :git => "https://github.com/rails/arel.git"
77 gem "journey", :git => "https://github.com/rails/journey.git"
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ expressed in plain English.
1111Use ** [ ` rspec-rails ` 3.x] [ ] ** for Rails earlier than 5.0.
1212Use ** [ ` rspec-rails ` 1.x] [ ] ** for Rails 2.x.
1313
14- [ Build Status ] : https://secure.travis-ci.org/rspec/rspec-rails.svg?branch=master
14+ [ Build Status ] : https://secure.travis-ci.org/rspec/rspec-rails.svg?branch=main
1515[ travis-ci ] : https://travis-ci.org/rspec/rspec-rails
1616[ Code Climate ] : https://codeclimate.com/github/rspec/rspec-rails.svg
1717[ code-climate ] : https://codeclimate.com/github/rspec/rspec-rails
@@ -36,11 +36,11 @@ See the `4-0-maintenance` branch on Github if you want or require the latest sta
3636 gem ' rspec-rails' , ' ~> 4.0.1'
3737 end
3838
39- # Or, run against the master branch
40- # (requires master -branch versions of all related RSpec libraries)
39+ # Or, run against the main branch
40+ # (requires main -branch versions of all related RSpec libraries)
4141 group :development , :test do
4242 %w[rspec-core rspec-expectations rspec-mocks rspec-rails rspec-support] .each do |lib |
43- gem lib, git: " https://github.com/rspec/#{ lib } .git" , branch: ' master '
43+ gem lib, git: " https://github.com/rspec/#{ lib } .git" , branch: ' main '
4444 end
4545 end
4646 ```
Original file line number Diff line number Diff line change 2828
2929Cucumber ::Rake ::Task . new ( :cucumber ) do |t |
3030 version = ENV . fetch ( "RAILS_VERSION" , "~> 6.0.0" ) [ /\d [\. -]\d / ] . tr ( '-' , '.' )
31- if version == "master " || version . nil?
31+ if version == "main " || version . nil?
3232 version = Float ::INFINITY
3333 end
3434 tags = [ ]
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ version: "{build}"
88# and once for the merge commit that github creates for each mergable PR.
99branches :
1010 only :
11- - master
11+ - main
1212 - /.*-maintenance$/
1313
1414# Disable normal Windows builds in favor of our test script.
Original file line number Diff line number Diff line change 1616in_root do
1717 prepend_to_file "Rakefile" , "require 'active_support/all'"
1818
19- # Remove the existing rails version so we can properly use master or other
19+ # Remove the existing rails version so we can properly use main or other
2020 # edge branches
2121 gsub_file 'Gemfile' , /^.*\b gem 'rails.*$/ , ''
2222 gsub_file "Gemfile" , /.*web-console.*/ , ''
You can’t perform that action at this time.
0 commit comments