From: Tom Hughes Date: Thu, 5 Jan 2012 20:33:19 +0000 (+0000) Subject: Remove lib prefix from includes for ruby 1.9 compatibility X-Git-Tag: live~5909 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3e99bbf5a9e124a59fc5ae72c863e89af7fa8c46 Remove lib prefix from includes for ruby 1.9 compatibility --- diff --git a/db/migrate/001_create_osm_db.rb b/db/migrate/001_create_osm_db.rb index 3e3377921..8ddc68bcd 100644 --- a/db/migrate/001_create_osm_db.rb +++ b/db/migrate/001_create_osm_db.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class CreateOsmDb < ActiveRecord::Migration def self.up diff --git a/db/migrate/002_cleanup_osm_db.rb b/db/migrate/002_cleanup_osm_db.rb index 57a3dbca1..630661a0b 100644 --- a/db/migrate/002_cleanup_osm_db.rb +++ b/db/migrate/002_cleanup_osm_db.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class CleanupOsmDb < ActiveRecord::Migration def self.up diff --git a/db/migrate/003_sql_session_store_setup.rb b/db/migrate/003_sql_session_store_setup.rb index daef768b7..5853d4d00 100644 --- a/db/migrate/003_sql_session_store_setup.rb +++ b/db/migrate/003_sql_session_store_setup.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class SqlSessionStoreSetup < ActiveRecord::Migration def self.up diff --git a/db/migrate/004_user_enhancements.rb b/db/migrate/004_user_enhancements.rb index 1c3bb5007..db17f3c35 100644 --- a/db/migrate/004_user_enhancements.rb +++ b/db/migrate/004_user_enhancements.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class UserEnhancements < ActiveRecord::Migration def self.up diff --git a/db/migrate/005_tile_tracepoints.rb b/db/migrate/005_tile_tracepoints.rb index a4ac5f51a..91d590726 100644 --- a/db/migrate/005_tile_tracepoints.rb +++ b/db/migrate/005_tile_tracepoints.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class TileTracepoints < ActiveRecord::Migration def self.up diff --git a/db/migrate/006_tile_nodes.rb b/db/migrate/006_tile_nodes.rb index 4f40a5f39..b56a095a4 100644 --- a/db/migrate/006_tile_nodes.rb +++ b/db/migrate/006_tile_nodes.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class TileNodes < ActiveRecord::Migration def self.upgrade_table(from_table, to_table, model) diff --git a/db/migrate/007_add_relations.rb b/db/migrate/007_add_relations.rb index cb5410378..41d62928f 100644 --- a/db/migrate/007_add_relations.rb +++ b/db/migrate/007_add_relations.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class AddRelations < ActiveRecord::Migration def self.up diff --git a/db/migrate/008_remove_segments.rb b/db/migrate/008_remove_segments.rb index a7d185e4c..ce49e9cca 100644 --- a/db/migrate/008_remove_segments.rb +++ b/db/migrate/008_remove_segments.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class RemoveSegments < ActiveRecord::Migration def self.up diff --git a/db/migrate/010_diary_comments.rb b/db/migrate/010_diary_comments.rb index bf7319912..ecad2f5dc 100644 --- a/db/migrate/010_diary_comments.rb +++ b/db/migrate/010_diary_comments.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class DiaryComments < ActiveRecord::Migration def self.up diff --git a/db/migrate/018_create_acls.rb b/db/migrate/018_create_acls.rb index d82020892..08ed4f731 100644 --- a/db/migrate/018_create_acls.rb +++ b/db/migrate/018_create_acls.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class CreateAcls < ActiveRecord::Migration def self.up diff --git a/db/migrate/020_populate_node_tags_and_remove.rb b/db/migrate/020_populate_node_tags_and_remove.rb index 0e2fae063..4c9628f27 100644 --- a/db/migrate/020_populate_node_tags_and_remove.rb +++ b/db/migrate/020_populate_node_tags_and_remove.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class PopulateNodeTagsAndRemove < ActiveRecord::Migration def self.up diff --git a/db/migrate/021_move_to_innodb.rb b/db/migrate/021_move_to_innodb.rb index 50e7ec8be..f9110cca6 100644 --- a/db/migrate/021_move_to_innodb.rb +++ b/db/migrate/021_move_to_innodb.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class MoveToInnodb < ActiveRecord::Migration @@conv_tables = ['nodes', 'ways', 'way_tags', 'way_nodes', diff --git a/db/migrate/022_key_constraints.rb b/db/migrate/022_key_constraints.rb index a9d6fb102..f94c965bb 100644 --- a/db/migrate/022_key_constraints.rb +++ b/db/migrate/022_key_constraints.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class KeyConstraints < ActiveRecord::Migration def self.up diff --git a/db/migrate/023_add_changesets.rb b/db/migrate/023_add_changesets.rb index de3e3bc48..5bee21512 100644 --- a/db/migrate/023_add_changesets.rb +++ b/db/migrate/023_add_changesets.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class AddChangesets < ActiveRecord::Migration @@conv_user_tables = ['current_nodes', diff --git a/db/migrate/024_order_relation_members.rb b/db/migrate/024_order_relation_members.rb index 76ec32222..325be5174 100644 --- a/db/migrate/024_order_relation_members.rb +++ b/db/migrate/024_order_relation_members.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class OrderRelationMembers < ActiveRecord::Migration def self.up diff --git a/db/migrate/025_add_end_time_to_changesets.rb b/db/migrate/025_add_end_time_to_changesets.rb index 20d66719d..eaccc008f 100644 --- a/db/migrate/025_add_end_time_to_changesets.rb +++ b/db/migrate/025_add_end_time_to_changesets.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class AddEndTimeToChangesets < ActiveRecord::Migration def self.up diff --git a/db/migrate/029_add_user_foreign_keys.rb b/db/migrate/029_add_user_foreign_keys.rb index 759359258..cb0d9e1dd 100644 --- a/db/migrate/029_add_user_foreign_keys.rb +++ b/db/migrate/029_add_user_foreign_keys.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class AddUserForeignKeys < ActiveRecord::Migration def self.up diff --git a/db/migrate/030_add_foreign_keys.rb b/db/migrate/030_add_foreign_keys.rb index 5adc20559..e3dc7e82d 100644 --- a/db/migrate/030_add_foreign_keys.rb +++ b/db/migrate/030_add_foreign_keys.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class AddForeignKeys < ActiveRecord::Migration def self.up diff --git a/db/migrate/031_create_countries.rb b/db/migrate/031_create_countries.rb index 3ee4a8d77..24331d6a8 100644 --- a/db/migrate/031_create_countries.rb +++ b/db/migrate/031_create_countries.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' require 'rexml/document' class CreateCountries < ActiveRecord::Migration diff --git a/db/migrate/034_create_languages.rb b/db/migrate/034_create_languages.rb index 95ed7d9ce..e62a3dff9 100644 --- a/db/migrate/034_create_languages.rb +++ b/db/migrate/034_create_languages.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class CreateLanguages < ActiveRecord::Migration def self.up diff --git a/db/migrate/035_change_user_locale.rb b/db/migrate/035_change_user_locale.rb index 7dc80549e..bfb43056a 100644 --- a/db/migrate/035_change_user_locale.rb +++ b/db/migrate/035_change_user_locale.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class ChangeUserLocale < ActiveRecord::Migration def self.up diff --git a/db/migrate/039_add_more_controls_to_gpx_files.rb b/db/migrate/039_add_more_controls_to_gpx_files.rb index 133838ac2..7cc485e6b 100644 --- a/db/migrate/039_add_more_controls_to_gpx_files.rb +++ b/db/migrate/039_add_more_controls_to_gpx_files.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class AddMoreControlsToGpxFiles < ActiveRecord::Migration def self.up diff --git a/db/migrate/042_add_foreign_keys_to_oauth_tables.rb b/db/migrate/042_add_foreign_keys_to_oauth_tables.rb index 09de54349..ee8048a36 100644 --- a/db/migrate/042_add_foreign_keys_to_oauth_tables.rb +++ b/db/migrate/042_add_foreign_keys_to_oauth_tables.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class AddForeignKeysToOauthTables < ActiveRecord::Migration def self.up diff --git a/db/migrate/044_create_user_roles.rb b/db/migrate/044_create_user_roles.rb index 10ec3ee7b..6544bbba1 100644 --- a/db/migrate/044_create_user_roles.rb +++ b/db/migrate/044_create_user_roles.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class CreateUserRoles < ActiveRecord::Migration def self.up diff --git a/db/migrate/045_create_user_blocks.rb b/db/migrate/045_create_user_blocks.rb index 7276ef1a5..b3313ce92 100644 --- a/db/migrate/045_create_user_blocks.rb +++ b/db/migrate/045_create_user_blocks.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class CreateUserBlocks < ActiveRecord::Migration def self.up diff --git a/db/migrate/046_alter_user_roles_and_blocks.rb b/db/migrate/046_alter_user_roles_and_blocks.rb index db0813e33..9799e4e5e 100644 --- a/db/migrate/046_alter_user_roles_and_blocks.rb +++ b/db/migrate/046_alter_user_roles_and_blocks.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class AlterUserRolesAndBlocks < ActiveRecord::Migration def self.up diff --git a/db/migrate/051_add_status_to_user.rb b/db/migrate/051_add_status_to_user.rb index cc8a2f238..01d501d01 100644 --- a/db/migrate/051_add_status_to_user.rb +++ b/db/migrate/051_add_status_to_user.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class AddStatusToUser < ActiveRecord::Migration def self.up diff --git a/db/migrate/20111212183945_add_lowercase_user_indexes.rb b/db/migrate/20111212183945_add_lowercase_user_indexes.rb index 27355b1d1..4142a642d 100644 --- a/db/migrate/20111212183945_add_lowercase_user_indexes.rb +++ b/db/migrate/20111212183945_add_lowercase_user_indexes.rb @@ -1,4 +1,4 @@ -require 'lib/migrate' +require 'migrate' class AddLowercaseUserIndexes < ActiveRecord::Migration def up