From 5e0d93b689b5635830ec82e2bb63cbb215a0b453 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 6 Apr 2014 13:32:35 +0000
Subject: [PATCH] fix typo of Enumeration#overridding_change?

git-svn-id: http://svn.redmine.org/redmine/trunk@13056 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/enumeration.rb | 2 +-
 app/models/project.rb     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb
index b593665e9..72d7278e2 100644
--- a/app/models/enumeration.rb
+++ b/app/models/enumeration.rb
@@ -104,7 +104,7 @@ class Enumeration < ActiveRecord::Base
   end
 
   # Does the +new+ Hash override the previous Enumeration?
-  def self.overridding_change?(new, previous)
+  def self.overriding_change?(new, previous)
     if (same_active_state?(new['active'], previous.active)) && same_custom_values?(new,previous)
       return false
     else
diff --git a/app/models/project.rb b/app/models/project.rb
index fd9d647bb..3bfe440ae 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -252,10 +252,10 @@ class Project < ActiveRecord::Base
       parent_activity = TimeEntryActivity.find(activity['parent_id'])
       activity['name'] = parent_activity.name
       activity['position'] = parent_activity.position
-      if Enumeration.overridding_change?(activity, parent_activity)
+      if Enumeration.overriding_change?(activity, parent_activity)
         project_activity = self.time_entry_activities.create(activity)
         if project_activity.new_record?
-          raise ActiveRecord::Rollback, "Overridding TimeEntryActivity was not successfully saved"
+          raise ActiveRecord::Rollback, "Overriding TimeEntryActivity was not successfully saved"
         else
           self.time_entries.
             where(["activity_id = ?", parent_activity.id]).