cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to CPK 7.0.11 and drop monkey patch

Browse source
This commit is contained in:
Tom Hughes 2014-10-10 12:31:42 +01:00
parent 4e976c835a
commit dae66c21d5
3 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -44,7 +44,7 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
gem 'oauth-plugin', '>= 0.5.1' gem 'oauth-plugin', '>= 0.5.1'
gem 'open_id_authentication', '>= 1.1.0' gem 'open_id_authentication', '>= 1.1.0'
gem 'validates_email_format_of', '>= 1.5.1' gem 'validates_email_format_of', '>= 1.5.1'
gem 'composite_primary_keys', '~> 7.0.10' gem 'composite_primary_keys', '~> 7.0.11'
gem 'http_accept_language', '~> 2.0.0' gem 'http_accept_language', '~> 2.0.0'
gem 'paperclip', '~> 4.0' gem 'paperclip', '~> 4.0'
gem 'deadlock_retry', '>= 1.2.0' gem 'deadlock_retry', '>= 1.2.0'

12
Gemfile.lock
View file

@ -31,7 +31,7 @@ GEM
thread_safe (~> 0.1) thread_safe (~> 0.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
arel (5.0.1.20140414130214) arel (5.0.1.20140414130214)
autoprefixer-rails (3.1.0.20140911) autoprefixer-rails (3.1.1.20141001)
execjs execjs
bigdecimal (1.1.0) bigdecimal (1.1.0)
builder (3.2.2) builder (3.2.2)
@ -54,8 +54,8 @@ GEM
execjs execjs
coffee-script-source (1.8.0) coffee-script-source (1.8.0)
colorize (0.7.3) colorize (0.7.3)
composite_primary_keys (7.0.10) composite_primary_keys (7.0.11)
activerecord (~> 4.1.4) activerecord (= 4.1.6)
crass (0.2.1) crass (0.2.1)
dalli (2.7.2) dalli (2.7.2)
deadlock_retry (1.2.0) deadlock_retry (1.2.0)
@ -90,7 +90,7 @@ GEM
libxml-ruby (2.7.0) libxml-ruby (2.7.0)
mail (2.6.1) mail (2.6.1)
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 3)
mime-types (2.3) mime-types (2.4.1)
mini_portile (0.6.0) mini_portile (0.6.0)
minitest (5.4.2) minitest (5.4.2)
multi_json (1.10.1) multi_json (1.10.1)
@ -190,7 +190,7 @@ GEM
validates_email_format_of (1.6.1) validates_email_format_of (1.6.1)
i18n i18n
vendorer (0.1.16) vendorer (0.1.16)
websocket-driver (0.3.4) websocket-driver (0.3.5)
xpath (2.0.0) xpath (2.0.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)
@ -203,7 +203,7 @@ DEPENDENCIES
autoprefixer-rails autoprefixer-rails
bigdecimal (~> 1.1.0) bigdecimal (~> 1.1.0)
coffee-rails (~> 4.0.0) coffee-rails (~> 4.0.0)
composite_primary_keys (~> 7.0.10) composite_primary_keys (~> 7.0.11)
dalli dalli
deadlock_retry (>= 1.2.0) deadlock_retry (>= 1.2.0)
dynamic_form dynamic_form

11
config/initializers/composite_primary_keys.rb
View file

@ -1,11 +0,0 @@
# Monkey patch id_was into CPK pending upstream integration
# https://github.com/composite-primary-keys/composite_primary_keys/pull/236
module ActiveRecord
class Base
module CompositeInstanceMethods
def id_was
attribute_was("id")
end
end
end
end