diff options
| author | Tim Petricola <tim.petricola@gmail.com> | 2016-08-18 15:02:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-18 15:02:39 +0200 |
| commit | 84cc8fd5d8fa15e868e4873a5f83e5c2b0c2fee1 (patch) | |
| tree | 0e8214feb4e1c3a549a2ad4b6467bf452b258ab6 /guides | |
| parent | dde3bdf214e7376cb2fccf0068da340efa06ec28 (diff) | |
| parent | fd0c33d7cc8dd06083f543cf531ab1f4c52c6a6e (diff) | |
| download | rails-84cc8fd5d8fa15e868e4873a5f83e5c2b0c2fee1.tar.gz rails-84cc8fd5d8fa15e868e4873a5f83e5c2b0c2fee1.tar.bz2 rails-84cc8fd5d8fa15e868e4873a5f83e5c2b0c2fee1.zip | |
Merge branch 'master' into schema-no-standardized-column-widths
Diffstat (limited to 'guides')
| -rw-r--r-- | guides/source/getting_started.md | 3 | ||||
| -rw-r--r-- | guides/source/i18n.md | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/guides/source/getting_started.md b/guides/source/getting_started.md index 0cb5d81042..d56b817bad 100644 --- a/guides/source/getting_started.md +++ b/guides/source/getting_started.md @@ -353,6 +353,7 @@ resource. You need to add the _article resource_ to the ```ruby Rails.application.routes.draw do + get 'welcome/index' resources :articles @@ -1154,7 +1155,7 @@ new articles. Create a file called `app/views/articles/edit.html.erb` and make it look as follows: ```html+erb -<h1>Editing article</h1> +<h1>Edit article</h1> <%= form_for :article, url: article_path(@article), method: :patch do |f| %> diff --git a/guides/source/i18n.md b/guides/source/i18n.md index e623f8cf8a..1565008a69 100644 --- a/guides/source/i18n.md +++ b/guides/source/i18n.md @@ -888,6 +888,7 @@ So, for example, instead of the default error message `"cannot be blank"` you co | inclusion | - | :inclusion | - | | exclusion | - | :exclusion | - | | associated | - | :invalid | - | +| non-optional association | - | :required | - | | numericality | - | :not_a_number | - | | numericality | :greater_than | :greater_than | count | | numericality | :greater_than_or_equal_to | :greater_than_or_equal_to | count | |