From: Tom Hughes <tom@compton.nu>
Date: Mon, 15 Jul 2019 07:19:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2296'
X-Git-Tag: live~2466
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c162c065c6f6db5dc584599f5639b296b627a165?hp=-c

Merge remote-tracking branch 'upstream/pull/2296'
---

c162c065c6f6db5dc584599f5639b296b627a165
diff --combined INSTALL.md
index 1c4047069,d2d2b79b4..097d4500e
--- a/INSTALL.md
+++ b/INSTALL.md
@@@ -123,6 -123,15 +123,15 @@@ We use [Yarn](https://yarnpkg.com/) to 
  ```
  bundle exec rake yarn:install
  ```
+ 
+ ## Storage setup
+ 
+ The Rails port needs to be configured with an object storage facility - for
+ development and testing purposes you can use the example configuration:
+ 
+ ```
+ cp config/example.storage.yml config/storage.yml
+ ```
  
  ## Database setup
  
@@@ -209,7 -218,7 +218,7 @@@ Rails comes with a built-in webserver, 
  bundle exec rails server
  ```
  
 -You can now view the site in your favourite web-browser at `http://localhost:3000/`
 +You can now view the site in your favourite web-browser at [http://localhost:3000/](http://localhost:3000/)
  
  Note that the OSM map tiles you see aren't created from your local database - they are just the standard map tiles.