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

Update to rails 4.2.0

Browse source
This commit is contained in:
Tom Hughes 2014-12-20 15:08:16 +00:00
parent 0ebbccdcef
commit e65e41a694
13 changed files with 115 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/initializers/assets.rb
View file

@ -3,6 +3,9 @@
# Version of your assets, change this if you want to expire all your assets.
Rails.application.config.assets.version = '1.0'
# Add additional assets to the asset load path
# Rails.application.config.assets.paths << Emoji.images_path
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
Rails.application.config.assets.precompile += %w( index.js browse.js welcome.js fixthemap.js )

2
config/initializers/cookies_serializer.rb
View file

@ -1,3 +1,3 @@
# Be sure to restart your server when you modify this file.
Rails.application.config.action_dispatch.cookies_serializer = :json
Rails.application.config.action_dispatch.cookies_serializer = :json

1
config/initializers/mime_types.rb
View file

@ -2,6 +2,5 @@
# Add new mime types for use in respond_to blocks:
# Mime::Type.register "text/richtext", :rtf
# Mime::Type.register_alias "text/html", :iphone
Mime::Type.register "application/x-amf", :amf
Mime::Type.register "application/gpx+xml", :gpx

34
config/initializers/postgresql_adapter.rb
View file

@ -1,34 +0,0 @@
if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
module ActiveRecord
module ConnectionAdapters
class PostgreSQLAdapter
def initialize_type_map_with_enums(type_map)
OID.alias_type "format_enum", "text"
OID.alias_type "gpx_visibility_enum", "text"
OID.alias_type "note_status_enum", "text"
OID.alias_type "note_event_enum", "text"
OID.alias_type "nwr_enum", "text"
OID.alias_type "user_role_enum", "text"
OID.alias_type "user_status_enum", "text"
initialize_type_map_without_enums(type_map)
end
alias_method_chain :initialize_type_map, :enums
end
class PostgreSQLColumn
def simplified_type_with_enum(field_type)
case field_type
when /_enum$/
:string
else
simplified_type_without_enum(field_type)
end
end
alias_method_chain :simplified_type, :enum
end
end
end
end