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 3e3377921df5fa4504c7da242dcce94d648c2521..8ddc68bcd1695f28cf01857b7ffdc9e98f3379a7 100644 (file)
--- 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 57a3dbca195141ff1cdac866a068ca97ba97486c..630661a0be01c8ea872678d6b830f761b5307178 100644 (file)
--- 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 daef768b7cb7d875375aef3d449b143e0494bf7c..5853d4d000a65e3f8cc9e7f6c101f4013559d9a9 100644 (file)
--- 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 1c3bb50073d48f81d85e7afac745cb1bb3c46c77..db17f3c35d586c5cde47d021ca6edd3729a57b55 100644 (file)
--- 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 a4ac5f51a7cde11834cf7918f01d265e2af26b3e..91d5907265f191f8324827ca52f972f9943b1dc8 100644 (file)
--- 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 4f40a5f398a2f7732d0db78a0f3bcf1f7aba5895..b56a095a44bee5499085ee9c339cd237e310adcd 100644 (file)
--- 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 cb541037830b7ec8cef1cce34b076b7d63544502..41d62928f1f6bd6a7e067cf06d558061f457d5f3 100644 (file)
--- 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 a7d185e4cf7aa54db0b01dd8981729960daa3560..ce49e9ccaf4e76608065d8968a52a7a15c84e72f 100644 (file)
--- 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 bf73199121bf01416a89f968948a91883e039e8f..ecad2f5dcd50478217ba569baa9d268c6fcce7e2 100644 (file)
--- 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 d82020892eca9863391da5da324768220f926712..08ed4f7316b8b9fad91873b7d0c067c91e0d5373 100644 (file)
--- 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 0e2fae06399ad022e6df6705b426b74d01650d33..4c9628f2700cf8cda16f6369229161b4b2b1b776 100644 (file)
--- 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 50e7ec8bed92eb7c7c48b498692efe690fb63a8b..f9110cca67e676c0613f96f1915577604115459a 100644 (file)
--- 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 a9d6fb10218d7fbb7f55ece699a80ab493a6b984..f94c965bb087dc8501378cc2efb92acb47649865 100644 (file)
--- 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 de3e3bc483a5818c266f15953de7cfb7b49dff5b..5bee215122e23f21c415a77ad8471821d0a915c1 100644 (file)
--- 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 76ec32222237ef32649849426140aa9b9cd0022e..325be5174c96a3bb3a4100aa66aab4f1c0dbc723 100644 (file)
--- 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 20d66719df800384a2a708a83cdda4b0fcb172ee..eaccc008f7666d38713a6e110658a1d6095715da 100644 (file)
--- 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 7593592582f2f2b6a618d643ebc09a9de50ef9e9..cb0d9e1dddc5fd0b4cb870f370e8b2942f61b6f0 100644 (file)
--- 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 5adc20559ef206fffc26dd7fd08fc3fe03b3ee77..e3dc7e82ddd566b974b01e7e6915b4562cb5a302 100644 (file)
--- 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 3ee4a8d77e2ae20a5cb87cf002c783c1e8d7ef2c..24331d6a833292cc4cc7bc28a7da5ec5ee5599c9 100644 (file)
--- 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 95ed7d9cedac1235756aa763582016e1e9fef08c..e62a3dff9cbe82c415033248f4753ff0086e24a0 100644 (file)
--- 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 7dc80549e3e14ebc5445ffb5cc1d2538a621de42..bfb43056a5bc741285aaa36c0ff05f2fc8ef163f 100644 (file)
--- 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 133838ac2e2e6f0086f88c3ac1e3b6fcb7419412..7cc485e6be5c889b870f98cf677abe641b71dcb7 100644 (file)
--- 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 09de54349c26bd477acc187275d56c2e902a2f4c..ee8048a36328f975371db0281e36af20a7ac1eb2 100644 (file)
--- 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 10ec3ee7bf86ab236e8442be3103ffbeda72d084..6544bbba1dc3e0fcdf310f6de655678896f35100 100644 (file)
--- 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 7276ef1a5d1d8108332fa4d4c0bd083f71690101..b3313ce921ccf3ef976b97a87bb041897d082f37 100644 (file)
--- 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 db0813e33f63c29f778f4ce408551f17f8542935..9799e4e5ec5f0ea7f7dc3c7e8c4f5d4514547f19 100644 (file)
--- 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 cc8a2f23848af8ffaf86dc6f5bb65cb42597d2d3..01d501d0162ec4ae2c18d710ac9b4dbaff11d11a 100644 (file)
--- 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 27355b1d13766bec2e94d9d3a6402d32ca1d0cb2..4142a642d65ca93ca55c232094e5624481fa3f8a 100644 (file)
--- 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