diff options
author | José Valim <jose.valim@gmail.com> | 2011-12-20 17:58:45 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-12-20 17:59:26 +0100 |
commit | 51095be1b08b1dd2a8a049f009bac6220fa7a68b (patch) | |
tree | 25d95e9b68455d237d058828fe48bfa87123de82 /railties/lib/rails/generators | |
parent | 2d5f5c32e6a172863e08a1eecea39b69b1d23d14 (diff) | |
download | rails-51095be1b08b1dd2a8a049f009bac6220fa7a68b.tar.gz rails-51095be1b08b1dd2a8a049f009bac6220fa7a68b.tar.bz2 rails-51095be1b08b1dd2a8a049f009bac6220fa7a68b.zip |
Get rid of more 1.8.x dead code
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r-- | railties/lib/rails/generators/app_base.rb | 6 | ||||
-rw-r--r-- | railties/lib/rails/generators/named_base.rb | 9 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 1 |
3 files changed, 3 insertions, 13 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index ab699e4c9e..0ed1eb4af8 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -182,11 +182,7 @@ module Rails end def ruby_debugger_gemfile_entry - if RUBY_VERSION < "1.9" - "gem 'ruby-debug'" - else - "gem 'ruby-debug19', :require => 'ruby-debug'" - end + "gem 'ruby-debug19', :require => 'ruby-debug'" end def assets_gemfile_entry diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb index 547b31cf7b..e96fc63ee9 100644 --- a/railties/lib/rails/generators/named_base.rb +++ b/railties/lib/rails/generators/named_base.rb @@ -182,14 +182,9 @@ module Rails end end - # Returns Ruby 1.9 style key-value pair if current code is running on - # Ruby 1.9.x. Returns the old-style (with hash rocket) otherwise. + # Returns Ruby 1.9 style key-value pair. def key_value(key, value) - if options[:old_style_hash] || RUBY_VERSION < '1.9' - ":#{key} => #{value}" - else - "#{key}: #{value}" - end + "#{key}: #{value}" end end end diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 082642d5cd..60ea394d2f 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -5,7 +5,6 @@ source 'https://rubygems.org' <%= database_gemfile_entry -%> <%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) -%> -<%= "gem 'json'\n" if RUBY_VERSION < "1.9.2" -%> <%= assets_gemfile_entry %> <%= javascript_gemfile_entry %> |