diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-06-18 17:01:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-18 17:01:19 -0400 |
| commit | 433a3122697e41bb46c4f072d2d8223233af5dd4 (patch) | |
| tree | 77ea3d6eceb183d6fb891027b9bc71ab7133b1c4 /railties/lib | |
| parent | b43aa17b8acfa85b2ddfcf71ca7ba0f876a6d4db (diff) | |
| parent | 1aace5e2cc7784799c2b91fb3feb2bd285c0e628 (diff) | |
| download | rails-433a3122697e41bb46c4f072d2d8223233af5dd4.tar.gz rails-433a3122697e41bb46c4f072d2d8223233af5dd4.tar.bz2 rails-433a3122697e41bb46c4f072d2d8223233af5dd4.zip | |
Merge pull request #33152 from bogdanvlviv/fix-ruby-version-file
Fix Ruby version in `.ruby-version`
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/ruby-version.tt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/ruby-version.tt b/railties/lib/rails/generators/rails/app/templates/ruby-version.tt index 19f0d7f202..bac1339923 100644 --- a/railties/lib/rails/generators/rails/app/templates/ruby-version.tt +++ b/railties/lib/rails/generators/rails/app/templates/ruby-version.tt @@ -1 +1 @@ -<%= "#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}" -%> +<%= ENV["RBENV_VERSION"] || ENV["rvm_ruby_string"] || "#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}" -%> |