Update to CPK 5.0.10 and remove monkey patch

diff --git a/Gemfile b/Gemfile
index 1b35b6074c0a4283c6ca359c9aa1b4eeedee61de..7656092f1407d4dff7c98aec9ee2a3d58a1a0f55 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 gem 'oauth-plugin', '>= 0.4.1', :require => 'oauth-plugin'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
 gem 'oauth-plugin', '>= 0.4.1', :require => 'oauth-plugin'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'

-gem 'composite_primary_keys', '>= 5.0.9'
+gem 'composite_primary_keys', '>= 5.0.10'

 gem 'http_accept_language', '>= 1.0.2'
 gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'
 gem 'http_accept_language', '>= 1.0.2'
 gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'

diff --git a/Gemfile.lock b/Gemfile.lock
index 7292a7141e1611002396da34e75a592ad0cac31f..5d4372f2a1670950a8ca3f1ec867d854a8767a53 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,8 +40,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.4.0)
       coffee-script-source
       execjs
     coffee-script-source (1.4.0)

-    composite_primary_keys (5.0.9)
-      activerecord (~> 3.2.0, >= 3.2.8)
+    composite_primary_keys (5.0.10)
+      activerecord (~> 3.2.0, >= 3.2.9)

     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
     ejs (1.1.1)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
     ejs (1.1.1)


@@ -74,7 +74,7 @@ GEM
       treetop (~> 1.4.8)
     memcached (1.4.6)
     mime-types (1.19)
       treetop (~> 1.4.8)
     memcached (1.4.6)
     mime-types (1.19)

-    minitest (4.2.0)
+    minitest (4.3.0)

     multi_json (1.3.7)
     multipart-post (1.1.5)
     nokogiri (1.5.5)
     multi_json (1.3.7)
     multipart-post (1.1.5)
     nokogiri (1.5.5)


@@ -129,7 +129,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)

-    rake (10.0.0)
+    rake (10.0.2)

     rdoc (3.12)
       json (~> 1.4)
     redcarpet (2.2.2)
     rdoc (3.12)
       json (~> 1.4)
     redcarpet (2.2.2)


@@ -168,7 +168,7 @@ DEPENDENCIES
   SystemTimer (>= 1.1.3)
   bigdecimal
   coffee-rails (~> 3.2.1)
   SystemTimer (>= 1.1.3)
   bigdecimal
   coffee-rails (~> 3.2.1)

-  composite_primary_keys (>= 5.0.9)
+  composite_primary_keys (>= 5.0.10)

   deadlock_retry (>= 1.2.0)
   dynamic_form
   ejs
   deadlock_retry (>= 1.2.0)
   dynamic_form
   ejs

diff --git a/config/initializers/active_record.rb b/config/initializers/active_record.rb
deleted file mode 100644 (file)
index fdb6888..0000000
--- a/config/initializers/active_record.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# We need to restore field_changed? support until CPK is updated
-module ActiveRecord
-  module AttributeMethods
-    module Dirty
-    private
-      alias_method :field_changed?, :_field_changed?
-    end
-  end
-end