diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-12-29 20:09:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-29 20:09:43 +0100 |
| commit | ca3eb2c1569a86e9c7eee2e9877dd773797a76b4 (patch) | |
| tree | 016b5f2247d6ad4d95f1b1f05c897b5472abb7bf /railties/lib/rails/generators/erb | |
| parent | 654704247eba742e139cfaa8d1385f13605d9e12 (diff) | |
| parent | c491bf012948383632e53f874c552041a6e23b36 (diff) | |
| download | rails-ca3eb2c1569a86e9c7eee2e9877dd773797a76b4.tar.gz rails-ca3eb2c1569a86e9c7eee2e9877dd773797a76b4.tar.bz2 rails-ca3eb2c1569a86e9c7eee2e9877dd773797a76b4.zip | |
Merge branch 'master' into fix_26964
Diffstat (limited to 'railties/lib/rails/generators/erb')
| -rw-r--r-- | railties/lib/rails/generators/erb/mailer/mailer_generator.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb index f150240908..677f8041ae 100644 --- a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb +++ b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb @@ -26,7 +26,7 @@ module Erb # :nodoc: end end - protected + private def formats [:text, :html] diff --git a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb index 154d85f381..0d77ef21da 100644 --- a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb @@ -21,7 +21,7 @@ module Erb # :nodoc: end end - protected + private def available_views %w(index edit show new _form) |