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.
49
49
50
50
Maintenance branches are how we manage the different supported point releases
51
51
of 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.
53
53
54
54
## How do the cukes work?
55
55
Original file line number Diff line number Diff line change 1
1
### 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 )
3
3
4
4
Enhancements:
5
5
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
51
51
an RSpec development environment, making it easy to do things like:
52
52
53
53
* 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 `
55
55
* Cut a new release across all repos
56
56
* Push out updated build scripts to all repos
57
57
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ platforms :jruby do
19
19
end
20
20
21
21
case RAILS_VERSION
22
- when /master /
22
+ when /main /
23
23
MAJOR = 6
24
24
MINOR = 0
25
25
when /5-2-stable/
Original file line number Diff line number Diff line change 1
1
version_file = File.expand_path("../.rails-version", __FILE__)
2
2
3
3
case version = ENV['RAILS_VERSION'] || (File.exist?(version_file) && File.read(version_file).chomp) || ''
4
- when /master /
4
+ when /main /
5
5
gem "rails", :git => "https://github.com/rails/rails.git"
6
6
gem "arel", :git => "https://github.com/rails/arel.git"
7
7
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.
11
11
Use ** [ ` rspec-rails ` 3.x] [ ] ** for Rails earlier than 5.0.
12
12
Use ** [ ` rspec-rails ` 1.x] [ ] ** for Rails 2.x.
13
13
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
15
15
[ travis-ci ] : https://travis-ci.org/rspec/rspec-rails
16
16
[ Code Climate ] : https://codeclimate.com/github/rspec/rspec-rails.svg
17
17
[ 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
36
36
gem ' rspec-rails' , ' ~> 4.0.1'
37
37
end
38
38
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)
41
41
group :development , :test do
42
42
%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 '
44
44
end
45
45
end
46
46
```
Original file line number Diff line number Diff line change 28
28
29
29
Cucumber ::Rake ::Task . new ( :cucumber ) do |t |
30
30
version = ENV . fetch ( "RAILS_VERSION" , "~> 6.0.0" ) [ /\d [\. -]\d / ] . tr ( '-' , '.' )
31
- if version == "master " || version . nil?
31
+ if version == "main " || version . nil?
32
32
version = Float ::INFINITY
33
33
end
34
34
tags = [ ]
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ version: "{build}"
8
8
# and once for the merge commit that github creates for each mergable PR.
9
9
branches :
10
10
only :
11
- - master
11
+ - main
12
12
- /.*-maintenance$/
13
13
14
14
# Disable normal Windows builds in favor of our test script.
Original file line number Diff line number Diff line change 16
16
in_root do
17
17
prepend_to_file "Rakefile" , "require 'active_support/all'"
18
18
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
20
20
# edge branches
21
21
gsub_file 'Gemfile' , /^.*\b gem 'rails.*$/ , ''
22
22
gsub_file "Gemfile" , /.*web-console.*/ , ''
You can’t perform that action at this time.
0 commit comments