jro_apps/redmine Commit - r2132:e2952d3e5fc4

Rails 2.1.2 deprecations (#2332)....

Jean-Philippe Lang -

r2132:e2952d3e5fc4

parent child

Context file:

r2132:e2952d3e5fc4

app/models/user.rb +1 -1

               end
               def time_zone
-                @time_zone ||= (self.pref.time_zone.blank? ? nil : TimeZone[self.pref.time_zone])
+                @time_zone ||= (self.pref.time_zone.blank? ? nil : ActiveSupport::TimeZone[self.pref.time_zone])
               end
               def wants_comments_in_reverse_order?

app/views/my/account.rhtml +1 -1

             <div class="box tabular">
             <% fields_for :pref, @user.pref, :builder => TabularFormBuilder, :lang => current_language do |pref_fields| %>
             <p><%= pref_fields.check_box :hide_mail %></p>
-            <p><%= pref_fields.select :time_zone, TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :include_blank => true %></p>
+            <p><%= pref_fields.select :time_zone, ActiveSupport::TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :include_blank => true %></p>
             <p><%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p>
             <% end %>
             </div>

vendor/plugins/actionwebservice/init.rb +1 -1

             require 'action_web_service'
             # These need to be in the load path for action_web_service to work
-            Dependencies.load_paths += ["#{RAILS_ROOT}/app/apis"]
+            ActiveSupport::Dependencies.load_paths += ["#{RAILS_ROOT}/app/apis"]
             # AWS Test helpers
             require 'action_web_service/test_invoke' if ENV['RAILS_ENV'] && ENV['RAILS_ENV'] =~ /^test/

vendor/plugins/classic_pagination/lib/pagination.rb +2 -2

                         "Unknown options: #{unknown_option_keys.join(', ')}" unless
                           unknown_option_keys.empty?
-                  options[:singular_name] ||= Inflector.singularize(collection_id.to_s)
+                  options[:singular_name] ||= ActiveSupport::Inflector.singularize(collection_id.to_s)
-                  options[:class_name]  ||= Inflector.camelize(options[:singular_name])
+                  options[:class_name]  ||= ActiveSupport::Inflector.camelize(options[:singular_name])
                 end
                 # Returns a paginator and a collection of Active Record model instances

vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb +1 -1

               end
             end
-            Dependencies.send :include, Engines::RailsExtensions::Dependencies
+            ActiveSupport::Dependencies.send :include, Engines::RailsExtensions::Dependencies

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages