Merge branch 'master' into moderation

db/migrate/001_create_osm_db.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class CreateOsmDb < ActiveRecord::Migration
+class CreateOsmDb < ActiveRecord::Migration[5.0]
   def self.up
     create_table "current_nodes", :id => false do |t|
       t.column "id",        :bigint, :null => false

db/migrate/002_cleanup_osm_db.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class CleanupOsmDb < ActiveRecord::Migration
+class CleanupOsmDb < ActiveRecord::Migration[5.0]
   def self.up
     change_column "current_nodes", "latitude", :float, :limit => 53, :null => false
     change_column "current_nodes", "longitude", :float, :limit => 53, :null => false

db/migrate/003_sql_session_store_setup.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class SqlSessionStoreSetup < ActiveRecord::Migration
+class SqlSessionStoreSetup < ActiveRecord::Migration[5.0]
   def self.up
     create_table "sessions" do |t|
       t.column "session_id", :string

db/migrate/004_user_enhancements.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class UserEnhancements < ActiveRecord::Migration
+class UserEnhancements < ActiveRecord::Migration[5.0]
   def self.up
     add_column "diary_entries", "latitude", :float, :limit => 53
     add_column "diary_entries", "longitude", :float, :limit => 53

db/migrate/005_tile_tracepoints.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class TileTracepoints < ActiveRecord::Migration
+class TileTracepoints < ActiveRecord::Migration[5.0]
   def self.up
     add_column "gps_points", "tile", :bigint
     add_index "gps_points", ["tile"], :name => "points_tile_idx"

db/migrate/006_tile_nodes.rb

@@ -1,35 +1,35 @@
 require "migrate"
 
-class TileNodes < ActiveRecord::Migration
+class TileNodes < ActiveRecord::Migration[5.0]
   def self.upgrade_table(from_table, to_table, model)
     if ENV["USE_DB_FUNCTIONS"]
-      execute <<-END_SQL
+      execute <<-SQL
       INSERT INTO #{to_table} (id, latitude, longitude, user_id, visible, tags, timestamp, tile)
       SELECT id, ROUND(latitude * 10000000), ROUND(longitude * 10000000),
              user_id, visible, tags, timestamp,
              tile_for_point(CAST(ROUND(latitude * 10000000) AS INTEGER),
                             CAST(ROUND(longitude * 10000000) AS INTEGER))
       FROM #{from_table}
-      END_SQL
+      SQL
     else
-      execute <<-END_SQL
+      execute <<-SQL
       INSERT INTO #{to_table} (id, latitude, longitude, user_id, visible, tags, timestamp, tile)
       SELECT id, ROUND(latitude * 10000000), ROUND(longitude * 10000000),
              user_id, visible, tags, timestamp, 0
       FROM #{from_table}
-      END_SQL
+      SQL
 
       model.all.each(&:save!)
     end
   end
 
   def self.downgrade_table(from_table, to_table)
-    execute <<-END_SQL
+    execute <<-SQL
     INSERT INTO #{to_table} (id, latitude, longitude, user_id, visible, tags, timestamp)
     SELECT id, latitude / 10000000, longitude / 10000000,
            user_id, visible, tags, timestamp
     FROM #{from_table}
-    END_SQL
+    SQL
   end
 
   def self.up

db/migrate/007_add_relations.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddRelations < ActiveRecord::Migration
+class AddRelations < ActiveRecord::Migration[5.0]
   def self.up
     # enums work like strings but are more efficient
     create_enumeration :nwr_enum, %w[Node Way Relation]

db/migrate/008_remove_segments.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class RemoveSegments < ActiveRecord::Migration
+class RemoveSegments < ActiveRecord::Migration[5.0]
   def self.up
     have_segs = select_value("SELECT count(*) FROM current_segments").to_i.nonzero?
 
@@ -10,7 +10,7 @@ class RemoveSegments < ActiveRecord::Migration
       cmd = "db/migrate/008_remove_segments_helper"
       src = "#{cmd}.cc"
       if !File.exist?(cmd) || File.mtime(cmd) < File.mtime(src)
-        system("c++ -O3 -Wall `mysql_config --cflags --libs` " +
+        system("c++ -O3 -Wall `mysql_config --cflags --libs` " \
           "#{src} -o #{cmd}") || raise
       end
 

db/migrate/009_way_nodes_node_idx.rb

@@ -1,4 +1,4 @@
-class WayNodesNodeIdx < ActiveRecord::Migration
+class WayNodesNodeIdx < ActiveRecord::Migration[5.0]
   def self.up
     add_index "way_nodes", ["node_id"], :name => "way_nodes_node_idx"
   end

db/migrate/010_diary_comments.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class DiaryComments < ActiveRecord::Migration
+class DiaryComments < ActiveRecord::Migration[5.0]
   def self.up
     create_table "diary_comments", :id => false do |t|
       t.column "id",             :bigserial, :primary_key => true, :null => false

db/migrate/011_add_user_image.rb

@@ -1,4 +1,4 @@
-class AddUserImage < ActiveRecord::Migration
+class AddUserImage < ActiveRecord::Migration[5.0]
   def self.up
     add_column "users", "image", :text
   end

db/migrate/012_add_admin_flag.rb

@@ -1,4 +1,4 @@
-class AddAdminFlag < ActiveRecord::Migration
+class AddAdminFlag < ActiveRecord::Migration[5.0]
   def self.up
     add_column "users", "administrator", :boolean, :default => false, :null => false
   end

db/migrate/013_add_email_valid.rb

@@ -1,4 +1,4 @@
-class AddEmailValid < ActiveRecord::Migration
+class AddEmailValid < ActiveRecord::Migration[5.0]
   def self.up
     add_column "users", "email_valid", :boolean, :default => false, :null => false
     User.update_all("email_valid = (active != 0)") # email_valid is :boolean, but active is :integer. "email_valid = active" (see r11802 or earlier) will fail for stricter dbs than mysql

db/migrate/014_add_new_email.rb

@@ -1,4 +1,4 @@
-class AddNewEmail < ActiveRecord::Migration
+class AddNewEmail < ActiveRecord::Migration[5.0]
   def self.up
     add_column "users", "new_email", :string
   end

db/migrate/015_add_user_visible.rb

@@ -1,4 +1,4 @@
-class AddUserVisible < ActiveRecord::Migration
+class AddUserVisible < ActiveRecord::Migration[5.0]
   def self.up
     add_column "users", "visible", :boolean, :default => true, :null => false
     User.update_all(:visible => true)

db/migrate/016_add_creation_ip.rb

@@ -1,4 +1,4 @@
-class AddCreationIp < ActiveRecord::Migration
+class AddCreationIp < ActiveRecord::Migration[5.0]
   def self.up
     add_column "users", "creation_ip", :string
   end

db/migrate/017_add_gpx_indexes.rb

@@ -1,4 +1,4 @@
-class AddGpxIndexes < ActiveRecord::Migration
+class AddGpxIndexes < ActiveRecord::Migration[5.0]
   def self.up
     add_index "gpx_files", ["user_id"], :name => "gpx_files_user_id_idx"
     add_index "gpx_file_tags", ["tag"], :name => "gpx_file_tags_tag_idx"

db/migrate/018_create_acls.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class CreateAcls < ActiveRecord::Migration
+class CreateAcls < ActiveRecord::Migration[5.0]
   def self.up
     create_table "acls", :id => false do |t|
       t.column "id",      :primary_key, :null => false

db/migrate/019_add_timestamp_indexes.rb

@@ -1,4 +1,4 @@
-class AddTimestampIndexes < ActiveRecord::Migration
+class AddTimestampIndexes < ActiveRecord::Migration[5.0]
   def self.up
     add_index :current_ways, :timestamp, :name => :current_ways_timestamp_idx
     add_index :current_relations, :timestamp, :name => :current_relations_timestamp_idx

db/migrate/020_populate_node_tags_and_remove.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class PopulateNodeTagsAndRemove < ActiveRecord::Migration
+class PopulateNodeTagsAndRemove < ActiveRecord::Migration[5.0]
   def self.up
     have_nodes = select_value("SELECT count(*) FROM current_nodes").to_i.nonzero?
 
@@ -10,7 +10,7 @@ class PopulateNodeTagsAndRemove < ActiveRecord::Migration
       cmd = "db/migrate/020_populate_node_tags_and_remove_helper"
       src = "#{cmd}.c"
       if !File.exist?(cmd) || File.mtime(cmd) < File.mtime(src)
-        system("cc -O3 -Wall `mysql_config --cflags --libs` " +
+        system("cc -O3 -Wall `mysql_config --cflags --libs` " \
           "#{src} -o #{cmd}") || raise
       end
 

db/migrate/021_move_to_innodb.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class MoveToInnodb < ActiveRecord::Migration
+class MoveToInnodb < ActiveRecord::Migration[5.0]
   @conv_tables = %w[nodes ways way_tags way_nodes current_way_tags relation_members relations relation_tags current_relation_tags]
 
   @ver_tbl = %w[nodes ways relations]

db/migrate/022_key_constraints.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class KeyConstraints < ActiveRecord::Migration
+class KeyConstraints < ActiveRecord::Migration[5.0]
   def self.up
     # Primary keys
     add_primary_key :current_node_tags, [:id, :k]

db/migrate/023_add_changesets.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddChangesets < ActiveRecord::Migration
+class AddChangesets < ActiveRecord::Migration[5.0]
   @conv_user_tables = %w[current_nodes current_relations current_ways nodes relations ways]
 
   def self.up
@@ -28,7 +28,7 @@ class AddChangesets < ActiveRecord::Migration
     # all edits up to the API change,
     # all the changesets will have the id of the user that made them.
     # We need to generate a changeset for each user in the database
-    execute "INSERT INTO changesets (id, user_id, created_at, open)" +
+    execute "INSERT INTO changesets (id, user_id, created_at, open)" \
             "SELECT id, id, creation_time, false from users;"
 
     @conv_user_tables.each do |tbl|

db/migrate/024_order_relation_members.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class OrderRelationMembers < ActiveRecord::Migration
+class OrderRelationMembers < ActiveRecord::Migration[5.0]
   def self.up
     # add sequence column. rails won't let us define an ordering here,
     # as defaults must be constant.

db/migrate/025_add_end_time_to_changesets.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddEndTimeToChangesets < ActiveRecord::Migration
+class AddEndTimeToChangesets < ActiveRecord::Migration[5.0]
   def self.up
     # swap the boolean closed-or-not for a time when the changeset will
     # close or has closed.

db/migrate/026_add_changeset_user_index.rb

@@ -1,4 +1,4 @@
-class AddChangesetUserIndex < ActiveRecord::Migration
+class AddChangesetUserIndex < ActiveRecord::Migration[5.0]
   def self.up
     add_index "changesets", ["user_id"], :name => "changesets_user_id_idx"
   end

db/migrate/027_add_changeset_indexes.rb

@@ -1,4 +1,4 @@
-class AddChangesetIndexes < ActiveRecord::Migration
+class AddChangesetIndexes < ActiveRecord::Migration[5.0]
   def self.up
     add_index "nodes", ["changeset_id"], :name => "nodes_changeset_id_idx"
     add_index "ways", ["changeset_id"], :name => "ways_changeset_id_idx"

db/migrate/028_add_more_changeset_indexes.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddMoreChangesetIndexes < ActiveRecord::Migration
+class AddMoreChangesetIndexes < ActiveRecord::Migration[5.0]
   def self.up
     add_index "changesets", ["created_at"], :name => "changesets_created_at_idx"
     add_index "changesets", ["closed_at"], :name => "changesets_closed_at_idx"

db/migrate/029_add_user_foreign_keys.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddUserForeignKeys < ActiveRecord::Migration
+class AddUserForeignKeys < ActiveRecord::Migration[5.0]
   def change
     add_foreign_key :changesets, :users, :name => "changesets_user_id_fkey"
     add_foreign_key :diary_comments, :users, :name => "diary_comments_user_id_fkey"

db/migrate/030_add_foreign_keys.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddForeignKeys < ActiveRecord::Migration
+class AddForeignKeys < ActiveRecord::Migration[5.0]
   def self.up
     add_foreign_key :changeset_tags, :changesets, :column => :id, :name => "changeset_tags_id_fkey"
     add_foreign_key :diary_comments, :diary_entries, :name => "diary_comments_diary_entry_id_fkey"

db/migrate/031_create_countries.rb

@@ -1,7 +1,7 @@
 require "migrate"
 require "rexml/document"
 
-class CreateCountries < ActiveRecord::Migration
+class CreateCountries < ActiveRecord::Migration[5.0]
   def self.up
     create_table :countries, :id => false do |t|
       t.column :id,      :primary_key, :null => false

db/migrate/032_add_user_locale.rb

@@ -1,4 +1,4 @@
-class AddUserLocale < ActiveRecord::Migration
+class AddUserLocale < ActiveRecord::Migration[5.0]
   def self.up
     add_column "users", "locale", :string
   end

db/migrate/033_change_diary_entries_language.rb

@@ -1,4 +1,4 @@
-class ChangeDiaryEntriesLanguage < ActiveRecord::Migration
+class ChangeDiaryEntriesLanguage < ActiveRecord::Migration[5.0]
   def self.up
     remove_column "diary_entries", "language"
     add_column "diary_entries", "language_code", :string, :null => false, :default => "en"

db/migrate/034_create_languages.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class CreateLanguages < ActiveRecord::Migration
+class CreateLanguages < ActiveRecord::Migration[5.0]
   def change
     create_table :languages, :id => false do |t|
       t.string :code, :null => false

db/migrate/035_change_user_locale.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class ChangeUserLocale < ActiveRecord::Migration
+class ChangeUserLocale < ActiveRecord::Migration[5.0]
   def self.up
     remove_foreign_key :users, :column => :locale, :name => "users_locale_fkey"
 

db/migrate/036_add_visible_to_message.rb

@@ -1,4 +1,4 @@
-class AddVisibleToMessage < ActiveRecord::Migration
+class AddVisibleToMessage < ActiveRecord::Migration[5.0]
   def self.up
     add_column :messages, :visible, :boolean, :default => true, :null => false
   end

db/migrate/037_add_sender_visible_to_message.rb

@@ -1,4 +1,4 @@
-class AddSenderVisibleToMessage < ActiveRecord::Migration
+class AddSenderVisibleToMessage < ActiveRecord::Migration[5.0]
   def self.up
     rename_column :messages, :visible, :to_user_visible
     add_column :messages, :from_user_visible, :boolean, :default => true, :null => false

db/migrate/038_add_message_sender_index.rb

@@ -1,4 +1,4 @@
-class AddMessageSenderIndex < ActiveRecord::Migration
+class AddMessageSenderIndex < ActiveRecord::Migration[5.0]
   def self.up
     add_index :messages, [:from_user_id], :name => "messages_from_user_id_idx"
   end

db/migrate/039_add_more_controls_to_gpx_files.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddMoreControlsToGpxFiles < ActiveRecord::Migration
+class AddMoreControlsToGpxFiles < ActiveRecord::Migration[5.0]
   def self.up
     create_enumeration :gpx_visibility_enum, %w[private public trackable identifiable]
     add_column :gpx_files, :visibility, :gpx_visibility_enum, :default => "public", :null => false

db/migrate/040_create_oauth_tables.rb

@@ -1,4 +1,4 @@
-class CreateOauthTables < ActiveRecord::Migration
+class CreateOauthTables < ActiveRecord::Migration[5.0]
   def self.up
     create_table :client_applications do |t|
       t.string :name

db/migrate/041_add_fine_o_auth_permissions.rb

@@ -1,4 +1,4 @@
-class AddFineOAuthPermissions < ActiveRecord::Migration
+class AddFineOAuthPermissions < ActiveRecord::Migration[5.0]
   PERMISSIONS = [:allow_read_prefs, :allow_write_prefs, :allow_write_diary, :allow_write_api, :allow_read_gpx, :allow_write_gpx].freeze
 
   def self.up

db/migrate/042_add_foreign_keys_to_oauth_tables.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddForeignKeysToOauthTables < ActiveRecord::Migration
+class AddForeignKeysToOauthTables < ActiveRecord::Migration[5.0]
   def change
     add_foreign_key :oauth_tokens, :users, :name => "oauth_tokens_user_id_fkey"
     add_foreign_key :oauth_tokens, :client_applications, :name => "oauth_tokens_client_application_id_fkey"

db/migrate/043_add_referer_to_user_token.rb

@@ -1,4 +1,4 @@
-class AddRefererToUserToken < ActiveRecord::Migration
+class AddRefererToUserToken < ActiveRecord::Migration[5.0]
   def self.up
     add_column :user_tokens, :referer, :text
   end

db/migrate/044_create_user_roles.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class CreateUserRoles < ActiveRecord::Migration
+class CreateUserRoles < ActiveRecord::Migration[5.0]
   def self.up
     create_enumeration :user_role_enum, %w[administrator moderator]
 

db/migrate/045_create_user_blocks.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class CreateUserBlocks < ActiveRecord::Migration
+class CreateUserBlocks < ActiveRecord::Migration[5.0]
   def change
     create_table :user_blocks do |t|
       t.column :user_id,      :bigint,   :null => false

db/migrate/046_alter_user_roles_and_blocks.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AlterUserRolesAndBlocks < ActiveRecord::Migration
+class AlterUserRolesAndBlocks < ActiveRecord::Migration[5.0]
   def self.up
     # the initial granter IDs can be "self" - there are none of these
     # in the current live DB, but there may be some in people's own local

db/migrate/047_add_visible_to_diaries.rb

@@ -1,4 +1,4 @@
-class AddVisibleToDiaries < ActiveRecord::Migration
+class AddVisibleToDiaries < ActiveRecord::Migration[5.0]
   def self.up
     add_column :diary_entries, :visible, :boolean, :null => false, :default => true
     add_column :diary_comments, :visible, :boolean, :null => false, :default => true

db/migrate/048_add_diary_creation_indexes.rb

@@ -1,4 +1,4 @@
-class AddDiaryCreationIndexes < ActiveRecord::Migration
+class AddDiaryCreationIndexes < ActiveRecord::Migration[5.0]
   def self.up
     add_index :diary_entries, [:created_at], :name => "diary_entry_created_at_index"
     add_index :diary_entries, [:user_id, :created_at], :name => "diary_entry_user_id_created_at_index"

db/migrate/049_improve_changeset_user_index.rb

@@ -1,4 +1,4 @@
-class ImproveChangesetUserIndex < ActiveRecord::Migration
+class ImproveChangesetUserIndex < ActiveRecord::Migration[5.0]
   def self.up
     add_index :changesets, [:user_id, :id], :name => "changesets_user_id_id_idx"
     remove_index :changesets, :name => "changesets_user_id_idx"

db/migrate/050_add_user_index_to_diary_comments.rb

@@ -1,4 +1,4 @@
-class AddUserIndexToDiaryComments < ActiveRecord::Migration
+class AddUserIndexToDiaryComments < ActiveRecord::Migration[5.0]
   def self.up
     add_index :diary_comments, [:user_id, :created_at], :name => "diary_comment_user_id_created_at_index"
   end

db/migrate/051_add_status_to_user.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddStatusToUser < ActiveRecord::Migration
+class AddStatusToUser < ActiveRecord::Migration[5.0]
   def self.up
     create_enumeration :user_status_enum, %w[pending active confirmed suspended deleted]
 

db/migrate/052_add_contributor_terms_to_user.rb

@@ -1,4 +1,4 @@
-class AddContributorTermsToUser < ActiveRecord::Migration
+class AddContributorTermsToUser < ActiveRecord::Migration[5.0]
   def self.up
     add_column :users, :terms_agreed, :datetime
     add_column :users, :consider_pd, :boolean, :null => false, :default => false

db/migrate/053_add_map_bug_tables.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddMapBugTables < ActiveRecord::Migration
+class AddMapBugTables < ActiveRecord::Migration[5.0]
   def self.up
     create_enumeration :map_bug_status_enum, %w[open closed hidden]
 

db/migrate/054_refactor_map_bug_tables.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class RefactorMapBugTables < ActiveRecord::Migration
+class RefactorMapBugTables < ActiveRecord::Migration[5.0]
   def self.up
     create_table :map_bug_comment do |t|
       t.column :bug_id, :bigint, :null => false

db/migrate/055_change_map_bug_comment_type.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class ChangeMapBugCommentType < ActiveRecord::Migration
+class ChangeMapBugCommentType < ActiveRecord::Migration[5.0]
   def self.up
     change_column :map_bug_comment, :comment, :text
   end

db/migrate/056_add_date_closed.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddDateClosed < ActiveRecord::Migration
+class AddDateClosed < ActiveRecord::Migration[5.0]
   def self.up
     add_column :map_bugs, :date_closed, :timestamp
   end

db/migrate/057_add_map_bug_comment_event.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddMapBugCommentEvent < ActiveRecord::Migration
+class AddMapBugCommentEvent < ActiveRecord::Migration[5.0]
   def self.up
     create_enumeration :map_bug_event_enum, %w[opened closed reopened commented hidden]
 

db/migrate/20100513171259_add_user_date_index_to_changeset.rb

@@ -1,4 +1,4 @@
-class AddUserDateIndexToChangeset < ActiveRecord::Migration
+class AddUserDateIndexToChangeset < ActiveRecord::Migration[5.0]
   def self.up
     add_index :changesets, [:user_id, :created_at], :name => "changesets_user_id_created_at_idx"
   end

db/migrate/20100516124737_add_open_id.rb

@@ -1,4 +1,4 @@
-class AddOpenId < ActiveRecord::Migration
+class AddOpenId < ActiveRecord::Migration[5.0]
   def self.up
     add_column :users, :openid_url, :string
     add_index :users, [:openid_url], :name => "user_openid_url_idx", :unique => true

db/migrate/20100910084426_add_callback_to_oauth_tokens.rb

@@ -1,4 +1,4 @@
-class AddCallbackToOauthTokens < ActiveRecord::Migration
+class AddCallbackToOauthTokens < ActiveRecord::Migration[5.0]
   def self.up
     add_column :oauth_tokens, :callback_url, :string
     add_column :oauth_tokens, :verifier, :string, :limit => 20

db/migrate/20101114011429_add_editor_preference_to_user.rb

@@ -1,4 +1,4 @@
-class AddEditorPreferenceToUser < ActiveRecord::Migration
+class AddEditorPreferenceToUser < ActiveRecord::Migration[5.0]
   def self.up
     add_column :users, :preferred_editor, :string
   end

db/migrate/20110322001319_add_terms_seen_to_user.rb

@@ -1,4 +1,4 @@
-class AddTermsSeenToUser < ActiveRecord::Migration
+class AddTermsSeenToUser < ActiveRecord::Migration[5.0]
   def self.up
     add_column :users, :terms_seen, :boolean, :null => false, :default => false
 

db/migrate/20110508145337_cleanup_bug_tables.rb

@@ -1,4 +1,4 @@
-class CleanupBugTables < ActiveRecord::Migration
+class CleanupBugTables < ActiveRecord::Migration[5.0]
   def self.up
     rename_column :map_bugs, :date_created, :created_at
     rename_column :map_bugs, :last_changed, :updated_at

db/migrate/20110521142405_rename_bugs_to_notes.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class RenameBugsToNotes < ActiveRecord::Migration
+class RenameBugsToNotes < ActiveRecord::Migration[5.0]
   def self.up
     rename_enumeration "map_bug_status_enum", "note_status_enum"
     rename_enumeration "map_bug_event_enum", "note_event_enum"

db/migrate/20110925112722_rename_ids.rb

@@ -1,4 +1,4 @@
-class RenameIds < ActiveRecord::Migration
+class RenameIds < ActiveRecord::Migration[5.0]
   def change
     rename_column :changeset_tags, :id, :changeset_id
     rename_column :current_node_tags, :id, :node_id

db/migrate/20111116184519_update_oauth.rb

@@ -1,4 +1,4 @@
-class UpdateOauth < ActiveRecord::Migration
+class UpdateOauth < ActiveRecord::Migration[5.0]
   def up
     add_column :oauth_tokens, :scope, :string
     add_column :oauth_tokens, :valid_to, :timestamp

db/migrate/20111212183945_add_lowercase_user_indexes.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddLowercaseUserIndexes < ActiveRecord::Migration
+class AddLowercaseUserIndexes < ActiveRecord::Migration[5.0]
   def up
     add_index :users, [], :columns => "LOWER(display_name)", :name => "users_display_name_lower_idx"
     add_index :users, [], :columns => "LOWER(email)", :name => "users_email_lower_idx"

db/migrate/20120123184321_switch_to_paperclip.rb

@@ -1,4 +1,4 @@
-class SwitchToPaperclip < ActiveRecord::Migration
+class SwitchToPaperclip < ActiveRecord::Migration[5.0]
   def up
     rename_column :users, :image, :image_file_name
   end

db/migrate/20120208122334_merge_acl_address_and_mask.rb

@@ -10,7 +10,7 @@ class IPAddr
   end
 end
 
-class MergeAclAddressAndMask < ActiveRecord::Migration
+class MergeAclAddressAndMask < ActiveRecord::Migration[5.0]
   def up
     Acl.find_each do |acl|
       address = IPAddr.new(acl.address)

db/migrate/20120208194454_add_domain_to_acl.rb

@@ -1,4 +1,4 @@
-class AddDomainToAcl < ActiveRecord::Migration
+class AddDomainToAcl < ActiveRecord::Migration[5.0]
   def up
     add_column :acls, :domain, :string
     change_column :acls, :address, :inet, :null => true

db/migrate/20120214210114_add_text_format.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddTextFormat < ActiveRecord::Migration
+class AddTextFormat < ActiveRecord::Migration[5.0]
   def up
     create_enumeration :format_enum, %w[html markdown text]
     add_column :users, :description_format, :format_enum, :null => false, :default => "html"

db/migrate/20120219161649_add_user_image_fingerprint.rb

@@ -1,4 +1,4 @@
-class AddUserImageFingerprint < ActiveRecord::Migration
+class AddUserImageFingerprint < ActiveRecord::Migration[5.0]
   def up
     add_column :users, :image_fingerprint, :string, :null => true
 

db/migrate/20120318201948_create_redactions.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class CreateRedactions < ActiveRecord::Migration
+class CreateRedactions < ActiveRecord::Migration[5.0]
   def change
     create_table :redactions do |t|
       t.string :title

db/migrate/20120328090602_drop_session_table.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class DropSessionTable < ActiveRecord::Migration
+class DropSessionTable < ActiveRecord::Migration[5.0]
   def up
     drop_table "sessions"
   end

db/migrate/20120404205604_add_user_and_description_to_redaction.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddUserAndDescriptionToRedaction < ActiveRecord::Migration
+class AddUserAndDescriptionToRedaction < ActiveRecord::Migration[5.0]
   def change
     add_column :redactions, :user_id, :bigint, :null => false
     add_column :redactions, :description_format, :format_enum, :null => false, :default => "markdown"

db/migrate/20120808231205_add_counter_caches.rb

@@ -1,4 +1,4 @@
-class AddCounterCaches < ActiveRecord::Migration
+class AddCounterCaches < ActiveRecord::Migration[5.0]
   def self.up
     add_column :users, :changesets_count, :integer, :null => false, :default => 0
     add_column :users, :traces_count, :integer, :null => false, :default => 0

db/migrate/20121005195010_add_diary_entry_counter_caches.rb

@@ -1,4 +1,4 @@
-class AddDiaryEntryCounterCaches < ActiveRecord::Migration
+class AddDiaryEntryCounterCaches < ActiveRecord::Migration[5.0]
   def self.up
     add_column :users, :diary_entries_count, :integer, :null => false, :default => 0
 

db/migrate/20121012044047_add_image_use_gravatar_to_users.rb

@@ -1,4 +1,4 @@
-class AddImageUseGravatarToUsers < ActiveRecord::Migration
+class AddImageUseGravatarToUsers < ActiveRecord::Migration[5.0]
   def self.up
     add_column :users, :image_use_gravatar, :boolean, :null => false, :default => false
 

db/migrate/20121119165817_drop_nearby_place_from_notes.rb

@@ -1,4 +1,4 @@
-class DropNearbyPlaceFromNotes < ActiveRecord::Migration
+class DropNearbyPlaceFromNotes < ActiveRecord::Migration[5.0]
   def up
     remove_column :notes, :nearby_place
   end

db/migrate/20121202155309_remove_author_name_from_note_comment.rb

@@ -1,4 +1,4 @@
-class RemoveAuthorNameFromNoteComment < ActiveRecord::Migration
+class RemoveAuthorNameFromNoteComment < ActiveRecord::Migration[5.0]
   def up
     remove_column :note_comments, :author_name
   end

db/migrate/20121203124841_change_note_address_to_inet.rb

@@ -1,4 +1,4 @@
-class ChangeNoteAddressToInet < ActiveRecord::Migration
+class ChangeNoteAddressToInet < ActiveRecord::Migration[5.0]
   def up
     execute "ALTER TABLE note_comments ALTER COLUMN author_ip TYPE inet USING CAST(author_ip AS inet)"
   end

db/migrate/20130328184137_add_write_notes_permission.rb

@@ -1,4 +1,4 @@
-class AddWriteNotesPermission < ActiveRecord::Migration
+class AddWriteNotesPermission < ActiveRecord::Migration[5.0]
   def up
     add_column :oauth_tokens, :allow_write_notes, :boolean, :null => false, :default => false
     add_column :client_applications, :allow_write_notes, :boolean, :null => false, :default => false

db/migrate/20131212124700_add_created_at_index_to_note_comments.rb

@@ -1,4 +1,4 @@
-class AddCreatedAtIndexToNoteComments < ActiveRecord::Migration
+class AddCreatedAtIndexToNoteComments < ActiveRecord::Migration[5.0]
   def change
     add_index :note_comments, :created_at
   end

db/migrate/20140115192822_add_text_index_to_note_comments.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddTextIndexToNoteComments < ActiveRecord::Migration
+class AddTextIndexToNoteComments < ActiveRecord::Migration[5.0]
   def up
     add_index :note_comments, [], :columns => "to_tsvector('english', body)", :using => "GIN", :name => "index_note_comments_on_body"
   end

db/migrate/20140117185510_drop_countries.rb

@@ -1,4 +1,4 @@
-class DropCountries < ActiveRecord::Migration
+class DropCountries < ActiveRecord::Migration[5.0]
   def up
     drop_table :countries
   end

db/migrate/20140210003018_add_user_image_content_type.rb

@@ -1,4 +1,4 @@
-class AddUserImageContentType < ActiveRecord::Migration
+class AddUserImageContentType < ActiveRecord::Migration[5.0]
   def change
     add_column :users, :image_content_type, :string
   end

db/migrate/20140507110937_create_changeset_comments.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class CreateChangesetComments < ActiveRecord::Migration
+class CreateChangesetComments < ActiveRecord::Migration[5.0]
   def change
     create_table :changeset_comments do |t|
       t.column :changeset_id, :bigint, :null => false

db/migrate/20140519141742_add_join_table_between_users_and_changesets.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddJoinTableBetweenUsersAndChangesets < ActiveRecord::Migration
+class AddJoinTableBetweenUsersAndChangesets < ActiveRecord::Migration[5.0]
   def change
     create_table :changesets_subscribers, :id => false do |t|
       t.column :subscriber_id, :bigint, :null => false

db/migrate/20150110152606_change_default_formats.rb

@@ -1,4 +1,4 @@
-class ChangeDefaultFormats < ActiveRecord::Migration
+class ChangeDefaultFormats < ActiveRecord::Migration[5.0]
   def up
     change_column_default :diary_entries, :body_format, "markdown"
     change_column_default :diary_comments, :body_format, "markdown"

db/migrate/20150111192335_subscribe_old_changesets.rb

@@ -1,4 +1,4 @@
-class SubscribeOldChangesets < ActiveRecord::Migration
+class SubscribeOldChangesets < ActiveRecord::Migration[5.0]
   def up
     Changeset.find_each do |changeset|
       changeset.subscribers << changeset.user unless changeset.subscribers.exists?(changeset.user.id)

db/migrate/20150222101847_rename_openid_url.rb

@@ -1,4 +1,4 @@
-class RenameOpenidUrl < ActiveRecord::Migration
+class RenameOpenidUrl < ActiveRecord::Migration[5.0]
   def change
     rename_column :users, :openid_url, :auth_uid
     add_column :users, :auth_provider, :string

db/migrate/20150818224516_set_default_gravatar_to_false_for_privacy.rb

@@ -1,4 +1,4 @@
-class SetDefaultGravatarToFalseForPrivacy < ActiveRecord::Migration
+class SetDefaultGravatarToFalseForPrivacy < ActiveRecord::Migration[5.0]
   def up
     change_column :users, :image_use_gravatar, :boolean, :default => false
   end

db/migrate/20161002153425_add_join_table_between_users_and_diary_entries.rb

@@ -1,6 +1,6 @@
 require "migrate"
 
-class AddJoinTableBetweenUsersAndDiaryEntries < ActiveRecord::Migration
+class AddJoinTableBetweenUsersAndDiaryEntries < ActiveRecord::Migration[5.0]
   def self.up
     create_table :diary_entry_subscriptions, :id => false do |t|
       t.column :user_id, :bigint, :null => false

db/migrate/20161011010929_subscribe_authors_to_diary_entries.rb

@@ -1,4 +1,4 @@
-class SubscribeAuthorsToDiaryEntries < ActiveRecord::Migration
+class SubscribeAuthorsToDiaryEntries < ActiveRecord::Migration[5.0]
   def up
     DiaryEntry.find_each do |diary_entry|
       diary_entry.subscriptions.create(:user => diary_entry.user) unless diary_entry.subscribers.exists?(diary_entry.user.id)

db/migrate/20170222134109_add_user_indexes.rb

@@ -1,4 +1,4 @@
-class AddUserIndexes < ActiveRecord::Migration
+class AddUserIndexes < ActiveRecord::Migration[5.0]
   def change
     add_index :oauth_tokens, [:user_id]
     add_index :client_applications, [:user_id]