Merge pull request #553 from bjfish/bjfish/update-rails-main

Update rails master to main
ruby-i18n · Jan 26, 2021 · 76fc94c · 76fc94c
2 parents cc66238 + 6b94c2f
commit 76fc94c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -22,15 +22,15 @@ jobs:
             gemfiles/Gemfile.rails-5.2.x,
             gemfiles/Gemfile.rails-6.0.x,
             gemfiles/Gemfile.rails-6.1.x,
-            gemfiles/Gemfile.rails-master,
+            gemfiles/Gemfile.rails-main,
           ]
         exclude:
           # Ruby 3.x is not supported by Rails 5.2.x
           - ruby_version: 3.0.0
             gemfile: gemfiles/Gemfile.rails-5.2.x
-          # Ruby 2.4.x is not supported by Rails master
+          # Ruby 2.4.x is not supported by Rails main
           - ruby_version: 2.4.9
-            gemfile: gemfiles/Gemfile.rails-master
+            gemfile: gemfiles/Gemfile.rails-main
           # Ruby 2.4.x is not supported by Rails 6.1.x
           - ruby_version: 2.4.9
             gemfile: gemfiles/Gemfile.rails-6.1.x
@@ -40,15 +40,15 @@ jobs:
           # Ruby 2.3.x is not supported by Rails 6.1.x
           - ruby_version: 2.3.8
             gemfile: gemfiles/Gemfile.rails-6.1.x
-          # Ruby 2.3.x is not supported by Rails master
+          # Ruby 2.3.x is not supported by Rails main
           - ruby_version: 2.3.8
-            gemfile: gemfiles/Gemfile.rails-master
+            gemfile: gemfiles/Gemfile.rails-main
           # Ruby 2.3.x is not supported by Rails 6.0.x
           - ruby_version: 2.3.8
             gemfile: gemfiles/Gemfile.rails-6.0.x
-          # JRuby is not supported by Rails master
+          # JRuby is not supported by Rails main
           - ruby_version: jruby
-            gemfile: gemfiles/Gemfile.rails-master
+            gemfile: gemfiles/Gemfile.rails-main
 
     runs-on: ubuntu-latest
 

diff --git a/gemfiles/Gemfile.rails-master → gemfiles/Gemfile.rails-main b/gemfiles/Gemfile.rails-master → gemfiles/Gemfile.rails-main
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec :path => '..'
 
-gem 'activesupport', github: 'rails/rails', branch: 'master'
+gem 'activesupport', github: 'rails/rails', branch: 'main'
 gem 'mocha', '~> 1.7.0'
 gem 'test_declarative', '0.0.6'
 gem 'rake'