Merge remote-tracking branch 'upstream/master' into support-facebook-api

Author: nalabjp

README.md

@@ -26,6 +26,7 @@ Fulfill the requirements, setup by following the instructions, and send a pull r
 1. Fork and clone this repository.
 1. `$ bundle install --without production`
 1. `$ bundle exec rails db:migrate`
+1. `$ bundle exec rails db:seed`
 1. `$ bundle exec rails dojos:update_db_by_yaml`
 1. `$ bundle exec rails dojo_event_services:upsert`
 1. `$ bundle exec rails test`

app/models/dojo.rb

@@ -3,6 +3,7 @@ class Dojo < ApplicationRecord
   NUM_OF_WHOLE_DOJOS = "1,400"
   NUM_OF_JAPAN_DOJOS = Dojo.count.to_s
 
+  belongs_to :prefecture
   has_one  :dojo_event_service, dependent: :destroy
   has_many :event_histories,    dependent: :destroy
 

app/models/prefecture.rb

@@ -0,0 +1,4 @@
+class Prefecture < ApplicationRecord
+  validates :name, presence: true, uniqueness: true
+  validates :region, presence: true
+end

db/docs/teikan.md

@@ -176,7 +176,7 @@
 　細谷 崇		(捺印)
 
 上記設立時社員2名の定款作成代理人   
-司法書士 中村圭吾   
-(住所略)
+　司法書士 中村圭吾   
+　(住所略)