Index: app/controllers/settings_controller.rb
===================================================================
--- app/controllers/settings_controller.rb	(revision 17454)
+++ app/controllers/settings_controller.rb	(working copy)
@@ -46,7 +46,7 @@
     end
 
     @options = {}
-    user_format = User::USER_FORMATS.collect{|key, value| [key, value[:setting_order]]}.sort{|a, b| a[1] <=> b[1]}
+    user_format = User::USER_FORMATS.collect{|key, value| [key, value[:setting_order]]}.sort_by{|f| f[1]}
     @options[:user_format] = user_format.collect{|f| [User.current.name(f[0]), f[0].to_s]}
     @deliveries = ActionMailer::Base.perform_deliveries
 
Index: app/helpers/activities_helper.rb
===================================================================
--- app/helpers/activities_helper.rb	(revision 17454)
+++ app/helpers/activities_helper.rb	(working copy)
@@ -21,9 +21,9 @@
   def sort_activity_events(events)
     events_by_group = events.group_by(&:event_group)
     sorted_events = []
-    events.sort {|x, y| y.event_datetime <=> x.event_datetime}.each do |event|
+    events.sort_by(&:event_datetime).reverse_each do |event|
       if group_events = events_by_group.delete(event.event_group)
-        group_events.sort {|x, y| y.event_datetime <=> x.event_datetime}.each_with_index do |e, i|
+        group_events.sort_by(&:event_datetime).reverse.each_with_index do |e, i|
           sorted_events << [e, i > 0]
         end
       end
Index: app/helpers/issue_relations_helper.rb
===================================================================
--- app/helpers/issue_relations_helper.rb	(revision 17454)
+++ app/helpers/issue_relations_helper.rb	(working copy)
@@ -20,6 +20,6 @@
 module IssueRelationsHelper
   def collection_for_relation_type_select
     values = IssueRelation::TYPES
-    values.keys.sort{|x,y| values[x][:order] <=> values[y][:order]}.collect{|k| [l(values[k][:name]), k]}
+    values.keys.sort_by{|k| values[k][:order]}.collect{|k| [l(values[k][:name]), k]}
   end
 end
Index: app/helpers/search_helper.rb
===================================================================
--- app/helpers/search_helper.rb	(revision 17454)
+++ app/helpers/search_helper.rb	(working copy)
@@ -55,7 +55,7 @@
   def render_results_by_type(results_by_type)
     links = []
     # Sorts types by results count
-    results_by_type.keys.sort {|a, b| results_by_type[b] <=> results_by_type[a]}.each do |t|
+    results_by_type.keys.sort_by {|k| results_by_type[k]}.reverse_each do |t|
       c = results_by_type[t]
       next if c == 0
       text = "#{type_label(t)} (#{c})"
Index: app/models/query.rb
===================================================================
--- app/models/query.rb	(revision 17454)
+++ app/models/query.rb	(working copy)
@@ -118,7 +118,7 @@
   def value_object(object)
     if custom_field.visible_by?(object.project, User.current)
       cv = object.custom_values.select {|v| v.custom_field_id == @cf.id}
-      cv.size > 1 ? cv.sort {|a,b| a.value.to_s <=> b.value.to_s} : cv.first
+      cv.size > 1 ? cv.sort_by {|e| e.value.to_s} : cv.first
     else
       nil
     end
Index: lib/redmine/i18n.rb
===================================================================
--- lib/redmine/i18n.rb	(revision 17454)
+++ lib/redmine/i18n.rb	(working copy)
@@ -120,7 +120,7 @@
         valid_languages.
           select {|locale| ::I18n.exists?(:general_lang_name, locale)}.
           map {|lang| [ll(lang.to_s, :general_lang_name), lang.to_s]}.
-          sort {|x,y| x.first <=> y.first }
+          sort_by(&:first)
       else
         ActionController::Base.cache_store.fetch "i18n/languages_options/#{Redmine::VERSION}" do
           languages_options :cache => false
Index: lib/redmine/scm/adapters/mercurial_adapter.rb
===================================================================
--- lib/redmine/scm/adapters/mercurial_adapter.rb	(revision 17454)
+++ lib/redmine/scm/adapters/mercurial_adapter.rb	(working copy)
@@ -206,7 +206,7 @@
                :path          => with_leading_slash(p),
                :from_path     => (cpmap.member?(p) ? with_leading_slash(cpmap[p]) : nil),
                :from_revision => (cpmap.member?(p) ? le['node'] : nil)}
-            end.sort { |a, b| a[:path] <=> b[:path] }
+            end.sort_by { |e| e[:path] }
             parents_ary = []
             as_ary(le['parents']['parent']).map do |par|
               parents_ary << par['__content__'] if par['__content__'] != "0000000000000000000000000000000000000000"
Index: lib/tasks/permissions.rake
===================================================================
--- lib/tasks/permissions.rake	(revision 17454)
+++ lib/tasks/permissions.rake	(working copy)
@@ -2,7 +2,7 @@
   desc "List all permissions and the actions registered with them"
   task :permissions => :environment do
     puts "Permission Name - controller/action pairs"
-    Redmine::AccessControl.permissions.sort {|a,b| a.name.to_s <=> b.name.to_s }.each do |permission|
+    Redmine::AccessControl.permissions.sort_by {|p| p.name.to_s}.each do |permission|
       puts ":#{permission.name} - #{permission.actions.join(', ')}"
     end
   end