diff --git a/db/migrate/003_issue_add_note.rb b/db/migrate/003_issue_add_note.rb
--- a/db/migrate/003_issue_add_note.rb
+++ b/db/migrate/003_issue_add_note.rb
@@ -7,6 +7,6 @@
   end
 
   def self.down
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'issues', 'add_note']).destroy
+    Permission.find(:first, :conditions => ["controller = ? AND action = ?", 'issues', 'add_note']).destroy
   end
 end
diff --git a/db/migrate/004_export_pdf.rb b/db/migrate/004_export_pdf.rb
--- a/db/migrate/004_export_pdf.rb
+++ b/db/migrate/004_export_pdf.rb
@@ -8,7 +8,7 @@
   end
 
   def self.down
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'projects', 'export_issues_pdf']).destroy
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'issues', 'export_pdf']).destroy
+    Permission.find(:first, :conditions => ["controller = ? AND action = ?", 'projects', 'export_issues_pdf']).destroy
+    Permission.find(:first, :conditions => ["controller = ? AND action = ?", 'issues', 'export_pdf']).destroy
   end
 end
diff --git a/db/migrate/006_calendar_and_activity.rb b/db/migrate/006_calendar_and_activity.rb
--- a/db/migrate/006_calendar_and_activity.rb
+++ b/db/migrate/006_calendar_and_activity.rb
@@ -9,8 +9,8 @@
   end
 
   def self.down
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'projects', 'activity']).destroy
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'projects', 'calendar']).destroy
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'projects', 'gantt']).destroy
+    Permission.find(:first, :conditions => ["controller = ? AND action = ?", 'projects', 'activity']).destroy
+    Permission.find(:first, :conditions => ["controller = ? AND action = ?", 'projects', 'calendar']).destroy
+    Permission.find(:first, :conditions => ["controller = ? AND action = ?", 'projects', 'gantt']).destroy
   end
 end
diff --git a/db/migrate/007_create_journals.rb b/db/migrate/007_create_journals.rb
--- a/db/migrate/007_create_journals.rb
+++ b/db/migrate/007_create_journals.rb
@@ -13,6 +13,7 @@
       t.column "notes", :text
       t.column "created_on", :datetime, :null => false
     end
+
     create_table :journal_details, :force => true do |t|
       t.column "journal_id", :integer, :default => 0, :null => false
       t.column "property", :string, :limit => 30, :default => "", :null => false
@@ -28,7 +29,7 @@
     Permission.create :controller => "issues", :action => "history", :description => "label_history", :sort => 1006, :is_public => true, :mail_option => 0, :mail_enabled => 0
 
     # data migration
-    IssueHistory.find(:all, :include => :issue).each {|h|
+    IssueHistory.find(:all, :include => :issue).each do |h|
       j = Journal.new(:journalized => h.issue, :user_id => h.author_id, :notes => h.notes, :created_on => h.created_on)
       j.details << JournalDetail.new(:property => 'attr', :prop_key => 'status_id', :value => h.status_id)
       j.save
@@ -32,7 +33,7 @@
       j = Journal.new(:journalized => h.issue, :user_id => h.author_id, :notes => h.notes, :created_on => h.created_on)
       j.details << JournalDetail.new(:property => 'attr', :prop_key => 'status_id', :value => h.status_id)
       j.save
-    }
+    end
 
     drop_table :issue_histories
   end
@@ -51,6 +52,6 @@
 
     add_index "issue_histories", ["issue_id"], :name => "issue_histories_issue_id"
 
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'issues', 'history']).destroy
+    Permission.find(:first, :conditions => ["controller = ? AND action = ?", 'issues', 'history']).destroy
   end
 end
diff --git a/db/migrate/012_add_comments_permissions.rb b/db/migrate/012_add_comments_permissions.rb
--- a/db/migrate/012_add_comments_permissions.rb
+++ b/db/migrate/012_add_comments_permissions.rb
@@ -8,7 +8,7 @@
   end
 
   def self.down
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'news', 'add_comment']).destroy
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'news', 'destroy_comment']).destroy
+    Permission.find(:first, :conditions => ["controller = ? AND action = ?", 'news', 'add_comment']).destroy
+    Permission.find(:first, :conditions => ["controller = ? AND action = ?", 'news', 'destroy_comment']).destroy
   end
 end
diff --git a/db/migrate/014_add_queries_permissions.rb b/db/migrate/014_add_queries_permissions.rb
--- a/db/migrate/014_add_queries_permissions.rb
+++ b/db/migrate/014_add_queries_permissions.rb
@@ -7,6 +7,6 @@
   end
 
   def self.down
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'projects', 'add_query']).destroy
+    Permission.find(:first, :conditions => ["controller = ? AND action = ?", 'projects', 'add_query']).destroy
   end
 end
diff --git a/db/migrate/016_add_repositories_permissions.rb b/db/migrate/016_add_repositories_permissions.rb
--- a/db/migrate/016_add_repositories_permissions.rb
+++ b/db/migrate/016_add_repositories_permissions.rb
@@ -12,11 +12,11 @@
   end
 
   def self.down
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'repositories', 'show']).destroy
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'repositories', 'browse']).destroy
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'repositories', 'entry']).destroy
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'repositories', 'revisions']).destroy
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'repositories', 'revision']).destroy
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'repositories', 'diff']).destroy
+    Permission.find(:first, :conditions => ["controller = ? AND action = ?", 'repositories', 'show']).destroy
+    Permission.find(:first, :conditions => ["controller = ? AND action = ?", 'repositories', 'browse']).destroy
+    Permission.find(:first, :conditions => ["controller = ? AND action = ?", 'repositories', 'entry']).destroy
+    Permission.find(:first, :conditions => ["controller = ? AND action = ?", 'repositories', 'revisions']).destroy
+    Permission.find(:first, :conditions => ["controller = ? AND action = ?", 'repositories', 'revision']).destroy
+    Permission.find(:first, :conditions => ["controller = ? and action = ?", 'repositories', 'diff']).destroy
   end
 end
diff --git a/db/migrate/019_add_issue_status_position.rb b/db/migrate/019_add_issue_status_position.rb
--- a/db/migrate/019_add_issue_status_position.rb
+++ b/db/migrate/019_add_issue_status_position.rb
@@ -1,7 +1,7 @@
 class AddIssueStatusPosition < ActiveRecord::Migration
   def self.up
     add_column :issue_statuses, :position, :integer, :default => 1
-    IssueStatus.find(:all).each_with_index {|status, i| status.update_attribute(:position, i+1)}
+    IssueStatus.find(:all).each_with_index { |status, i| status.update_attribute(:position, i + 1) }
   end
 
   def self.down
diff --git a/db/migrate/020_add_role_position.rb b/db/migrate/020_add_role_position.rb
--- a/db/migrate/020_add_role_position.rb
+++ b/db/migrate/020_add_role_position.rb
@@ -1,7 +1,7 @@
 class AddRolePosition < ActiveRecord::Migration
   def self.up
     add_column :roles, :position, :integer, :default => 1
-    Role.find(:all).each_with_index {|role, i| role.update_attribute(:position, i+1)}
+    Role.find(:all).each_with_index { |role, i| role.update_attribute(:position, i + 1) }
   end
 
   def self.down
diff --git a/db/migrate/021_add_tracker_position.rb b/db/migrate/021_add_tracker_position.rb
--- a/db/migrate/021_add_tracker_position.rb
+++ b/db/migrate/021_add_tracker_position.rb
@@ -1,7 +1,7 @@
 class AddTrackerPosition < ActiveRecord::Migration
   def self.up
     add_column :trackers, :position, :integer, :default => 1
-    Tracker.find(:all).each_with_index {|tracker, i| tracker.update_attribute(:position, i+1)}
+    Tracker.find(:all).each_with_index { |tracker, i| tracker.update_attribute(:position, i + 1) }
   end
 
   def self.down
diff --git a/db/migrate/024_add_roadmap_permission.rb b/db/migrate/024_add_roadmap_permission.rb
--- a/db/migrate/024_add_roadmap_permission.rb
+++ b/db/migrate/024_add_roadmap_permission.rb
@@ -7,6 +7,6 @@
   end
 
   def self.down
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'projects', 'roadmap']).destroy
+    Permission.find(:first, :conditions => ["controller = ? AND action = ?", 'projects', 'roadmap']).destroy
   end
 end
diff --git a/db/migrate/041_rename_comment_to_comments.rb b/db/migrate/041_rename_comment_to_comments.rb
--- a/db/migrate/041_rename_comment_to_comments.rb
+++ b/db/migrate/041_rename_comment_to_comments.rb
@@ -1,10 +1,10 @@
 class RenameCommentToComments < ActiveRecord::Migration
   def self.up
-    rename_column(:comments, :comment, :comments) if ActiveRecord::Base.connection.columns(Comment.table_name).detect{|c| c.name == "comment"}
-    rename_column(:wiki_contents, :comment, :comments) if ActiveRecord::Base.connection.columns(WikiContent.table_name).detect{|c| c.name == "comment"}
-    rename_column(:wiki_content_versions, :comment, :comments) if ActiveRecord::Base.connection.columns(WikiContent.versioned_table_name).detect{|c| c.name == "comment"}
-    rename_column(:time_entries, :comment, :comments) if ActiveRecord::Base.connection.columns(TimeEntry.table_name).detect{|c| c.name == "comment"}
-    rename_column(:changesets, :comment, :comments) if ActiveRecord::Base.connection.columns(Changeset.table_name).detect{|c| c.name == "comment"}
+    rename_column(:comments, :comment, :comments) if ActiveRecord::Base.connection.columns(Comment.table_name).detect{ |c| c.name == "comment" }
+    rename_column(:wiki_contents, :comment, :comments) if ActiveRecord::Base.connection.columns(WikiContent.table_name).detect{ |c| c.name == "comment" }
+    rename_column(:wiki_content_versions, :comment, :comments) if ActiveRecord::Base.connection.columns(WikiContent.versioned_table_name).detect{ |c| c.name == "comment" }
+    rename_column(:time_entries, :comment, :comments) if ActiveRecord::Base.connection.columns(TimeEntry.table_name).detect{ |c| c.name == "comment" }
+    rename_column(:changesets, :comment, :comments) if ActiveRecord::Base.connection.columns(Changeset.table_name).detect{ |c| c.name == "comment" }
   end
 
   def self.down
diff --git a/db/migrate/078_add_custom_fields_position.rb b/db/migrate/078_add_custom_fields_position.rb
--- a/db/migrate/078_add_custom_fields_position.rb
+++ b/db/migrate/078_add_custom_fields_position.rb
@@ -1,6 +1,6 @@
 class AddCustomFieldsPosition < ActiveRecord::Migration
   def self.up
     add_column(:custom_fields, :position, :integer, :default => 1)
-    CustomField.find(:all).group_by(&:type).each  do |t, fields|
+    CustomField.find(:all).group_by(&:type).each do |t, fields|
       fields.each_with_index do |field, i|
         # do not call model callbacks
@@ -5,6 +5,6 @@
       fields.each_with_index do |field, i|
         # do not call model callbacks
-        CustomField.update_all "position = #{i+1}", {:id => field.id}
+        CustomField.update_all "position = #{i + 1}", { :id => field.id }
       end
     end
   end
diff --git a/db/migrate/20101104182107_add_unique_index_on_members.rb b/db/migrate/20101104182107_add_unique_index_on_members.rb
--- a/db/migrate/20101104182107_add_unique_index_on_members.rb
+++ b/db/migrate/20101104182107_add_unique_index_on_members.rb
@@ -3,8 +3,8 @@
     # Clean and reassign MemberRole rows if needed
     MemberRole.delete_all("member_id NOT IN (SELECT id FROM #{Member.table_name})")
     MemberRole.update_all("member_id =" +
-      " (SELECT min(m2.id) FROM #{Member.table_name} m1, #{Member.table_name} m2" +
+      " (SELECT MIN(m2.id) FROM #{Member.table_name} m1, #{Member.table_name} m2" +
       " WHERE m1.user_id = m2.user_id AND m1.project_id = m2.project_id" +
       " AND m1.id = #{MemberRole.table_name}.member_id)")
     # Remove duplicates
     Member.connection.select_values("SELECT m.id FROM #{Member.table_name} m" +
@@ -7,8 +7,8 @@
       " WHERE m1.user_id = m2.user_id AND m1.project_id = m2.project_id" +
       " AND m1.id = #{MemberRole.table_name}.member_id)")
     # Remove duplicates
     Member.connection.select_values("SELECT m.id FROM #{Member.table_name} m" +
-      " WHERE m.id > (SELECT min(m1.id) FROM #{Member.table_name} m1 WHERE m1.user_id = m.user_id AND m1.project_id = m.project_id)").each do |i|
+      " WHERE m.id > (SELECT MIN(m1.id) FROM #{Member.table_name} m1 WHERE m1.user_id = m.user_id AND m1.project_id = m.project_id)").each do |i|
         Member.delete_all(["id = ?", i])
       end
 
diff --git a/db/migrate/20110223180953_salt_user_passwords.rb b/db/migrate/20110223180953_salt_user_passwords.rb
--- a/db/migrate/20110223180953_salt_user_passwords.rb
+++ b/db/migrate/20110223180953_salt_user_passwords.rb
@@ -1,5 +1,4 @@
 class SaltUserPasswords < ActiveRecord::Migration
-  
   def self.up
     say_with_time "Salting user passwords, this may take some time..." do
       User.salt_unsalted_passwords!
diff --git a/db/migrate/20110228000100_copy_repositories_log_encoding.rb b/db/migrate/20110228000100_copy_repositories_log_encoding.rb
--- a/db/migrate/20110228000100_copy_repositories_log_encoding.rb
+++ b/db/migrate/20110228000100_copy_repositories_log_encoding.rb
@@ -5,10 +5,10 @@
     Repository.find(:all).each do |repo|
       scm = repo.scm_name
       case scm
-        when 'Subversion', 'Mercurial', 'Git', 'Filesystem' 
-          repo.update_attribute(:log_encoding, nil)
-        else
-          repo.update_attribute(:log_encoding, encoding)
+      when 'Subversion', 'Mercurial', 'Git', 'Filesystem'
+        repo.update_attribute(:log_encoding, nil)
+      else
+        repo.update_attribute(:log_encoding, encoding)
       end
     end
   end