Merge branch 'develop' into debug-tests

.travis.yml

@@ -7,10 +7,3 @@ script:
   - bundle exec rake cucumber
 rvm:
   - 2.3.1
-notifications:
-    irc: "chat.freenode.com#refugerestrooms"
-    skip_join: true
-    template:
-      - "Build #%{build_number} (%{branch} - %{commit} : %{author}): %{message}"
-      - "Change view : %{compare_url}"
-      - "Build details : %{build_url}"

README.md

@@ -41,10 +41,9 @@ Changes to the site can be tested locally before deploying to the web. To get se
 - [iOS Native Application](https://github.com/RefugeRestrooms/refuge-ios)
 - [Yo Application](https://github.com/raptortech-js/YoRestrooms)
 
-## IRC
+## Slack
 
-Server: irc.freenode.com
-Channel: #refugerestrooms
+If you want to join the Refuge Restrooms Slack channel, please email [email protected] for an invite.
 
 ## License
 

db/migrate/20131128044650_create_bathrooms.rb

@@ -1,4 +1,4 @@
-class CreateBathrooms < ActiveRecord::Migration
+class CreateBathrooms < ActiveRecord::Migration[4.2]
   def change
     create_table :bathrooms do |t|
       t.string :name

db/migrate/20131225210247_change_table.rb

@@ -1,4 +1,4 @@
-class ChangeTable < ActiveRecord::Migration
+class ChangeTable < ActiveRecord::Migration[4.2]
   def change
     rename_column :bathrooms, :type, :bath_type
   end

db/migrate/20131225221341_add_column_for_flags.rb

@@ -1,4 +1,4 @@
-class AddColumnForFlags < ActiveRecord::Migration
+class AddColumnForFlags < ActiveRecord::Migration[4.2]
   def change
     add_column :bathrooms, :flags, :integer, :default => 0
   end

db/migrate/20140117004118_add_visability.rb

@@ -1,4 +1,4 @@
-class AddVisability < ActiveRecord::Migration
+class AddVisability < ActiveRecord::Migration[4.2]
   def change
     add_column :bathrooms, :visable, :boolean, :default => true
   end

db/migrate/20140117055923_change_flags_to_up_vote_down_vote.rb

@@ -1,4 +1,4 @@
-class ChangeFlagsToUpVoteDownVote < ActiveRecord::Migration
+class ChangeFlagsToUpVoteDownVote < ActiveRecord::Migration[4.2]
   def change
     remove_column :bathrooms, :flags
     remove_column :bathrooms, :visable

db/migrate/20140119222501_add_countryfor_international_listings.rb

@@ -1,4 +1,4 @@
-class AddCountryforInternationalListings < ActiveRecord::Migration
+class AddCountryforInternationalListings < ActiveRecord::Migration[4.2]
   def change
     add_column :bathrooms, :country, :string
   end

db/migrate/20140207051319_devise_create_admin_users.rb

@@ -1,4 +1,4 @@
-class DeviseCreateAdminUsers < ActiveRecord::Migration
+class DeviseCreateAdminUsers < ActiveRecord::Migration[4.2]
   def migrate(direction)
     super
     # Create a default user

db/migrate/20140207051321_create_active_admin_comments.rb

@@ -1,4 +1,4 @@
-class CreateActiveAdminComments < ActiveRecord::Migration
+class CreateActiveAdminComments < ActiveRecord::Migration[4.2]
   def self.up
     create_table :active_admin_comments do |t|
       t.string :namespace

db/migrate/20140315033524_add_unaccent_extension.rb

@@ -1,4 +1,4 @@
-class AddUnaccentExtension < ActiveRecord::Migration
+class AddUnaccentExtension < ActiveRecord::Migration[4.2]
   def up
     execute "create extension unaccent"
   end

db/migrate/20140413154842_rename_bathrooms_to_restrooms.rb

@@ -1,4 +1,4 @@
-class RenameBathroomsToRestrooms < ActiveRecord::Migration
+class RenameBathroomsToRestrooms < ActiveRecord::Migration[4.2]
   def change
     rename_table :bathrooms, :restrooms
   end

db/migrate/20140423031801_change_access_and_bath_type_to_boolean.rb

@@ -1,4 +1,4 @@
-class ChangeAccessAndBathTypeToBoolean < ActiveRecord::Migration
+class ChangeAccessAndBathTypeToBoolean < ActiveRecord::Migration[4.2]
   def up
     # If access is 1 it is accessible
     # If bath_type is 0 it is unisex

db/migrate/20151018191859_add_changing_table_flag_to_restrooms.rb

@@ -1,4 +1,4 @@
-class AddChangingTableFlagToRestrooms < ActiveRecord::Migration
+class AddChangingTableFlagToRestrooms < ActiveRecord::Migration[4.2]
   def change
     add_column :restrooms, :changing_table, :boolean, default: false
   end

db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -17,56 +16,54 @@
   enable_extension "plpgsql"
   enable_extension "unaccent"
 
-  create_table "active_admin_comments", force: true do |t|
-    t.string   "namespace"
-    t.text     "body"
-    t.string   "resource_id",   null: false
-    t.string   "resource_type", null: false
-    t.integer  "author_id"
-    t.string   "author_type"
+  create_table "active_admin_comments", id: :serial, force: :cascade do |t|
+    t.string "namespace"
+    t.text "body"
+    t.string "resource_id", null: false
+    t.string "resource_type", null: false
+    t.string "author_type"
+    t.integer "author_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["author_type", "author_id"], name: "index_active_admin_comments_on_author_type_and_author_id"
+    t.index ["namespace"], name: "index_active_admin_comments_on_namespace"
+    t.index ["resource_type", "resource_id"], name: "index_active_admin_comments_on_resource_type_and_resource_id"
   end
 
-  add_index "active_admin_comments", ["author_type", "author_id"], name: "index_active_admin_comments_on_author_type_and_author_id", using: :btree
-  add_index "active_admin_comments", ["namespace"], name: "index_active_admin_comments_on_namespace", using: :btree
-  add_index "active_admin_comments", ["resource_type", "resource_id"], name: "index_active_admin_comments_on_resource_type_and_resource_id", using: :btree
-
-  create_table "admin_users", force: true do |t|
-    t.string   "email",                  default: "", null: false
-    t.string   "encrypted_password",     default: "", null: false
-    t.string   "reset_password_token"
+  create_table "admin_users", id: :serial, force: :cascade do |t|
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,  null: false
+    t.integer "sign_in_count", default: 0, null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["email"], name: "index_admin_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_admin_users_on_reset_password_token", unique: true
   end
 
-  add_index "admin_users", ["email"], name: "index_admin_users_on_email", unique: true, using: :btree
-  add_index "admin_users", ["reset_password_token"], name: "index_admin_users_on_reset_password_token", unique: true, using: :btree
-
-  create_table "restrooms", force: true do |t|
-    t.string   "name"
-    t.string   "street"
-    t.string   "city"
-    t.string   "state"
-    t.boolean  "accessible", default: false
-    t.boolean  "unisex",     default: false
-    t.text     "directions"
-    t.text     "comment"
-    t.float    "latitude"
-    t.float    "longitude"
+  create_table "restrooms", id: :serial, force: :cascade do |t|
+    t.string "name"
+    t.string "street"
+    t.string "city"
+    t.string "state"
+    t.boolean "accessible", default: false
+    t.boolean "unisex", default: false
+    t.text "directions"
+    t.text "comment"
+    t.float "latitude"
+    t.float "longitude"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "downvote",   default: 0
-    t.integer  "upvote",     default: 0
-    t.string   "country"
-    t.boolean  "changing_table", default: false
+    t.integer "downvote", default: 0
+    t.integer "upvote", default: 0
+    t.string "country"
+    t.boolean "changing_table", default: false
   end
 
 end