Commit Graph

3697 Commits

Author SHA1 Message Date
Markov Alexey
6f9d7f346b Fix punctuation [ci skip] 2015-10-23 23:20:00 +03:00
Xavier Noria
b9d1e101b4 API guidelines reword re the Oxford comma [ci skip] 2015-10-22 20:56:50 +02:00
Xavier Noria
23eb2e1a99 Revert "[ci skip] removed extra comma"
Reason: That one is an Oxford comma, as per our guidelines. See:

     http://edgeguides.rubyonrails.org/api_documentation_guidelines.html#comma

This reverts commit f184cd34f9ef35ddf85a23c2fb02cc05d3fb26b3.
2015-10-22 20:48:54 +02:00
hemali jain
f184cd34f9 [ci skip] removed extra comma 2015-10-23 01:49:46 +08:00
Sean Griffin
cd46bfc54f Fix minor typo from #20038
We use one period after spaces, not two.
2015-10-20 16:41:26 -06:00
Sean Griffin
7e434d6d2d Merge pull request #20038 from imanel/numeric_prepend
Use Module.prepend instead of alias_method and unify behavior of all Numeric extensions
2015-10-20 16:37:39 -06:00
Sean Griffin
59dee0f04b Update #20768 to address feedback 2015-10-20 15:56:21 -06:00
Vladimir Rybas
23f57413d0 [Rails Guides] Clarify belongs_to_required_by_default option
Original:
    * `config.active_record.belongs_to_required_by_default` is a boolean
      value and controls whether `belongs_to` association is required by
      default.

Modified version:
    * `config.active_record.belongs_to_required_by_default` is a boolean
      value and controls whether validation error is triggered by
      default if `belongs_to` association is not present or not valid.
2015-10-20 15:55:49 -06:00
Sean Griffin
cceaa5c853 Merge pull request #20795 from benjiwheeler/validation_guide_ret_val
activerecord guide: clarified roles of valid method and errors object [ci skip]
2015-10-20 15:50:25 -06:00
yui-knk
666e2cc654 [ci skip] Replace "destroy method" with destroy action
Sure this is `destroy` method of PhotosController, but in this chapter
these methods which mapped by the router are called "action".
For example:

```ruby
get '/patients/:id', to: 'patients#show'
```

is described to dispatch "controller's `show` action".
2015-10-20 20:24:07 +09:00
Simon H
407c87011d added Rails 4 context for migrations:install task 2015-10-19 17:33:02 -06:00
Tim Wade
3c0ae9da87
[ci skip] Improve readability in active model basics guide
* adds/removes a few words
* removes an unnecessary comma
2015-10-18 07:35:54 -07:00
schneems
101821410b [ci skip] Add backend queue starting documentation
If you can't start your queue, you won't process much. This change adds external links to the Queue backends that have Active Job specific docs.
2015-10-16 18:24:58 -05:00
Anna Ershova
5cde56e173 Update active_record_migrations.md
Add 'db/'; corrects structure.rb to structure.sql
2015-10-15 16:37:11 -04:00
AnnaErshova
0166adcee8 Clarifies db can be set up from structure.sql also
I added that *structure.sql* file can be used when *db:reset* is run.

*db:reset* tasks states *db:reset* loads database from *db/schema.rb*
or *db/structure.sql* depending on the configuration (although
*db/schema.rb* is the default), hence the change.
2015-10-15 09:36:57 -04:00
Christian Wesselhoeft
0d34b550a4 Fix formatting of ActiveRecord PostgreSQL guide. 2015-10-13 14:50:19 -06:00
Eric Turner
dfedaf3795 [ci skip] Fix typo in deep_dup docs 2015-10-12 14:05:53 +09:00
Claudio B.
bd65ba7721 Merge pull request #21906 from scottgonzalez/form-helpers
Minor cleanup for form helpers guide
2015-10-08 07:25:41 -07:00
Scott González
8be6b47d1f Minor cleanup for form helpers guide [ci skip] 2015-10-08 08:48:56 -04:00
Andy Lampert
705847578e Improve readability in CSRF section of guide 2015-10-07 22:11:34 -06:00
Rafael Mendonça França
172c25e7b6 Revert "Update asset_pipeline.md"
This reverts commit afe672185d5eba95f387c46f855ae7a21ea69fa5.

Reason: This change was done by mistake. This option is at the `config`
object not in the `config.assets`.

See
cfb371e96a/railties/lib/rails/application/configuration.rb (L16)
2015-10-07 15:46:04 -03:00
Miguel Parramon
6de2813919 Fix "Esperanto" name
Correct spelling is "Esperanto": 

https://en.wikipedia.org/wiki/Esperanto
2015-10-07 17:54:50 +02:00
Richard Schneeman
ffdbfb2704 Merge pull request #21899 from scottgonzalez/layouts-and-rendering-typo
Fix typo in docs
2015-10-07 10:08:38 -05:00
Scott González
0070fc7686 Fix pluralization in docs [ci skip] 2015-10-07 10:30:44 -04:00
Scott González
ab62af7c93 Fix typo in docs [ci skip] 2015-10-07 10:27:46 -04:00
tanmay3011
148d1217a1 [ci skip] Change 'an URL' to 'a URL' as URL doesn't have a vowel sound 2015-10-06 23:34:05 +05:30
kentendo
afe672185d Update asset_pipeline.md 2015-10-05 17:29:49 -07:00
Eileen M. Uchitelle
db448209bd Merge pull request #21796 from dv/docs-change-to-parse-nested-query
Change "parse_query" to "parse_nested_query"
2015-10-05 12:56:41 -04:00
David Verhasselt
b4f4de0500 Remove TIP on parse_query
[ci skip]
2015-10-05 19:55:00 +03:00
Sean Griffin
dcdf231b38 Merge pull request #20981 from dkoprov/ar_postgres_enum_docs_addition
Add more info on working with postgres ENUM type
2015-10-04 18:58:04 -06:00
Claudio B.
5dfc7a9006 Merge pull request #21857 from cllns/fix-myspace-example-wording
Update text on CSS Injection
2015-10-04 10:14:09 -07:00
Vijay Dev
7976b6d306 Merge branch 'master' of github.com:rails/docrails 2015-10-04 12:33:14 +00:00
Aaron Patterson
24f9c03d52 Revert "removing Rack::Runtime from the default stack."
This reverts commit 37423e4ff883ad5584bab983aceb4b2b759a1fd8.

Jeremy is right that we shouldn't remove this.  The fact is that many
engines are depending on this middleware to be in the default stack.
This ties our hands and forces us to keep the middleware in the stack so
that engines will work.  To be extremely clear, I think this is another
smell of "the rack stack" that we have in place.  When manipulating
middleware, we should have meaningful names for places in the req / res
lifecycle **not** have engines depend on a particular constant be in a
particular place in the stack.  This is a weakness of the API that we
have to figure out a way to address before removing the constant.

As far as timing attacks are concerned, we can reduce the granularity
such that it isn't useful information for hackers, but is still useful
for developers.
2015-10-03 14:21:31 -07:00
Sean Collins
19b626a31a Update text on CSS Injection / Myspace
[skip ci]
2015-10-03 12:42:33 -06:00
amitkumarsuroliya
208a33e387 Fixed deprecated string to specify the middleware [ci skip] 2015-10-03 18:19:32 +05:30
Kasper Timm Hansen
1b00c36d85 Merge pull request #21851 from y-yagi/use_class_to_specify_middleware
use class to specify the middleware [ci skip]
2015-10-03 12:57:09 +02:00
yuuji.yaginuma
70b09eda03 use class to specify the middleware [ci skip]
using string for middleware class names is deprecated in 83b767cef90abfc4c2ee9f4b451b0215501fae9a
2015-10-03 19:26:24 +09:00
Aaron Patterson
37423e4ff8 removing Rack::Runtime from the default stack.
The runtime header is a potential target for timing attacks since it
returns the amount of time spent on the server (eliminating network
speed).  Total time is also not accurate for streaming responses.

The middleware can be added back via:

```ruby
config.middleware.ues ::Rack::Runtime
```
2015-10-02 14:45:31 -07:00
Roque Pinel
e2b3ccd1aa Refactor AS::Callbacks halt config and fix the documentation
Move from `AS::Callbacks::CallbackChain.halt_and_display_warning_on_return_false`
to `AS::Callbacks.halt_and_display_warning_on_return_false` base on
[this
discussion](https://github.com/rails/rails/pull/21218#discussion_r39354580)

Fix the documentation broken by 0a120a818d413c64ff9867125f0b03788fc306f8
2015-10-01 13:04:20 -04:00
Niall Burkley
391043ab04 Fix documentation for has_many dependant options.
* A `has_many` dependant association accepts `[:destroy, :delete_all, :nullify,
:restrict_with_error, :restrict_with_exception]` as options.
Currently the documentation references `delete` instead of `delete_all`
* Adds documentation for other options
2015-09-29 17:34:27 +02:00
David Verhasselt
c0d3209b2e Make fuzzy sentence more clear
[ci skip]
2015-09-28 15:16:03 +03:00
Eileen M. Uchitelle
3c52b2000c Merge pull request #21738 from cllns/remove-to_s-from-example
[Engines Guide] Remove to_s example, since it's outside the scope
2015-09-25 12:24:51 -04:00
yui-knk
82f69a7a33 [ci skip] Add : before code blocks. 2015-09-25 13:14:14 +09:00
Sean Collins
30769669e3 Remove to_s example
It's outside the scope of the Engines guide

[skip ci]
2015-09-24 10:15:52 -06:00
Yves Senn
8516d76c62 Merge pull request #21740 from cllns/add-jbuilder-notes
[ci skip]

[Action View Overview Guide] Add note about Jbuilder
2015-09-24 08:38:17 +02:00
Juanito Fatas
cb45950c27 Add a missing period to layouts_and_rendering.md [ci skip] 2015-09-24 14:28:56 +08:00
Sean Collins
961779997c Add note about Jbuilder
[skip ci]
2015-09-23 13:57:52 -06:00
Sean Collins
11f00fd3e3 Change the paths for both Gemfile lines to be 'engines/blorgh'
They're now consistent.

Also changes the quotes to be single, so we only have one type of quote per line

[skip ci]
2015-09-23 12:29:17 -06:00
Sean Collins
1b9e2bc5aa Remove leading slash from path
The leading slash denotes an absolute path,
rather than a relative one (which is more popular)

[ci skip]
2015-09-22 22:05:06 -06:00
Thiago Augusto
c4c70322c4 Update i18n.md [ci skip] 2015-09-22 13:22:53 -03:00