aboutsummaryrefslogtreecommitdiffstats
path: root/guides
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22298 from ↵Kasper Timm Hansen2015-11-161-1/+1
|\ | | | | | | | | yuki24/make-static-index-part-of-public-file-server-config Make the `config.static_index` option part of the `config.public_server` option
| * Make the `static_index` config part of the `config.public_server` configYuki Nishijima2015-11-161-1/+1
| | | | | | | | Also call it `public_server.index_name` so it'll make more sense.
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-11-151-2/+24
|\ \ | |/ |/|
| * copy edits [ci skip]Vijay Dev2015-11-151-12/+6
| |
| * rollback changes to changelogGaurish Sharma2015-11-141-4/+0
| |
| * Grammer & Style Tweaks as per feedbackGaurish Sharma2015-11-142-4/+5
| |
| * Document time testing helpersGaurish Sharma2015-11-092-0/+31
| |
| * :nailcare: Grammer fixesGaurish Sharma2015-11-091-2/+2
| |
* | Merge pull request #22112 from claudix/masterXavier Noria2015-11-131-0/+21
|\ \ | | | | | | Added warning on coding engine controllers [ci skip]
| * | Improved explanationClaudi Martinez2015-11-131-4/+1
| | |
| * | Improved explanationClaudi Martinez2015-11-011-10/+16
| | |
| * | Fixed typoClaudi Martinez2015-10-291-1/+1
| | |
| * | Added warning on coding engine controllersClaudi Martinez2015-10-291-0/+18
| | |
* | | Fix typo: "in" should be "is"Rémy Coutable2015-11-111-1/+1
| | |
* | | Clarify i18n active[model/record] key differencesJames Coleman2015-11-111-0/+2
| | | | | | | | | | | | I spent a decent amount of time the other day trying to figure out why my active model including class wasn't generating the properly localized validation messages, and a note like this would have saved me a lot of time.
* | | upgrade listen to 3.0.4Xavier Noria2015-11-081-1/+1
| | | | | | | | | | | | 3.0.3 has a bug in OS X.
* | | document the evented file system monitor opt-in in the config guide [ci skip]Xavier Noria2015-11-081-0/+22
| | |
* | | Fixed wording.Mike Boone2015-11-081-1/+1
| | |
* | | Merge pull request #21897 from swaathi/masterKasper Timm Hansen2015-11-071-0/+14
|\ \ \ | | | | | | | | Parameterize with options to preserve the case of string
| * | | Parameterize with options to preserve case of stringSwaathi K2015-11-071-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added test cases Using kwargs instead of three seperate functions Updated parameterize in transliterate.rb Updated parameterize in transliterate.rb Added deprecation warnings and updating RDoc+Guide Misspelled separtor. Fixed. Deprecated test cases and added support to parameterize with keyword parameters Squashing commits. Fixed test cases and added deprecated test cases Small changes to Gemfile.lock and CHANGELOG Update Gemfile.lock
* | | | Merge pull request #22213 from y-yagi/remove_deprecated_option_from_guideRichard Schneeman2015-11-071-15/+0
|\ \ \ \ | | | | | | | | | | remove deprecated `:tokenizer` option from guide [ci skip]
| * | | | remove deprecated `:tokenizer` option from guide [ci skip]yuuji.yaginuma2015-11-071-15/+0
| |/ / / | | | | | | | | | | | | `:tokenizer` option was deprecated in 1c341eb7cbaeb52435f14c2595e391bfb2e5e38b
* | | | Merge pull request #22145 from atul-shimpi/masterYves Senn2015-11-071-2/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | guides, the required option in generators is no longer available. [ci skip]
| * | | Issue #22139 : Edge Guides - ActiveRecord Migrations - Remove required ↵atul-shimpi2015-11-011-2/+0
| | |/ | |/| | | | | | | option for column
* | | Add comma to to make the information clearUbuntu2015-11-071-1/+1
| | |
* | | Clarify automatic creation/deletion of join models for has_many throughSean Collins2015-11-061-2/+4
| | | | | | | | | | | | [ci-skip]
* | | Merge pull request #22150 from raq929/patch-1Yves Senn2015-11-051-2/+4
|\ \ \ | | | | | | | | Update association_basics.md [ci skip]
| * | | Update association_basics.mdraq9292015-11-011-2/+4
| |/ / | | | | | | | | | | | | | | | | | | Moves the definition of an association to the top of the page. I am just starting to learn Rails, and having this definition at the top instead of in the second section would be really useful. Updates the Types of Associations section for clarity. Moves the list of associations before the explanation. Links to wikipedia articles on Primary and Foreign keys.
* | | [ci skip] ( ͡° ͜ʖ ͡°) ( ͡⊙ ͜ʖ ͡⊙) ( ͡◉ ͜ʖ ͡◉) ↵Kasper Timm Hansen2015-11-051-1/+1
| | | | | | | | | | | | | | | | | | javascript => JavaScript JavaScript is spelled with a capital J and S.
* | | [ci skip] Remove final mentions of `static_cache_control` in docs.Kasper Timm Hansen2015-11-051-1/+3
| | | | | | | | | | | | | | | | | | It was deprecated in https://github.com/rails/rails/pull/19135. We're now favoring `public_file_server.headers`.
* | | Remove links to docrailsRafael Mendonça França2015-11-051-2/+2
| | | | | | | | | | | | docrails is a private repository now to avoid pull requests to it.
* | | Replace `serve_static_files` mentions in docs.Kasper Timm Hansen2015-11-044-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | Should use `public_file_server.enabled` instead. Clarified that static files will be served from the public directory, where it made sense. Also removed occurrence of the deprecated `static_cache_control`.
* | | document `try!` in ActiveSupport core ext guideSean Linsley2015-11-041-0/+7
| | | | | | | | | https://twitter.com/avdi/status/660141673993777156
* | | Update docs/comments to use setup/teardown blocks vs. methods.Ken Collins2015-11-032-5/+5
| | | | | | | | | | | | As discussed in the minitest-spec-rails issue (http://git.io/vlHxx) Rails uses setup/teardown callbacks. Defining `setup` or `teardown` methods vs. blocks will yield inconsistent behavior in the callback chain.
* | | [ci skip] querying guide methods first and last: mentioning the influence of ↵r11runner2015-10-311-0/+4
|/ / | | | | | | the default scope
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-10-314-4/+4
|\ \
| * | Improved `KeyError` messages on bang version, since commit ↵amitkumarsuroliya2015-10-111-1/+1
| | | | | | | | | | | | https://github.com/rails/rails/commit/e768c519fb6015e00961702a5165c6dab548a954 bang version produces `KeyError` [ci skip]
| * | Replace `an UNIQUE` with `a UNIQUE` as UNIQUE doesn't have a vowel sound [ci ↵amitkumarsuroliya2015-10-072-2/+2
| | | | | | | | | | | | | | | skip] `A UNIQUE` we pronounce URL as 'yu-ni-k’. We use this everywhere. So, be consistent with it.
| * | Fixed wording in Assertion docs, changed ‘Assert’ -> ‘Asserts’Ronak Jangir2015-10-071-1/+1
| | |
* | | Fix double word 'be' [ci skip]Jake Worth2015-10-311-1/+1
| | |
* | | Merge pull request #12071 from Crunch09/outer_joinsSean Griffin2015-10-301-11/+37
|\ \ \ | | | | | | | | | | | | added ActiveRecord::Relation#outer_joins
| * | | added ActiveRecord::Relation#left_outer_joinsFlorian Thomas2015-05-191-11/+37
| | | | | | | | | | | | | | | | | | | | | | | | Example: User.left_outer_joins(:posts) => SELECT "users".* FROM "users" LEFT OUTER JOIN "posts" ON "posts"."user_id" = "users"."id"
* | | | Use #distinct instead of #uniq in the guides [ci skip]oesgalha2015-10-292-5/+5
| |_|/ |/| | | | | | | | | | | * #uniq is an alias of #distinct * #uniq will be deprecated, see: rails/rails@adfab2dcf4003ca564d78d4425566dd2d9cd8b4f
* | | [ci skip] Add `:binds` to a list of paramaters of `sql.active_record`yui-knk2015-10-281-0/+1
| | |
* | | Merge pull request #19686 from tsun1215/index_errorsSean Griffin2015-10-261-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | Errors can be indexed with nested attributes Close #8638
| * | | Errors can be indexed with nested attributesMichael Probber2015-04-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `has_many` can now take `index_errors: true` as an option. When this is enabled, errors for nested models will be returned alongside an index, as opposed to just the nested model name. This option can also be enabled (or disabled) globally through `ActiveRecord::Base.index_nested_attribute_errors` E.X. ```ruby class Guitar < ActiveRecord::Base has_many :tuning_pegs accepts_nested_attributes_for :tuning_pegs end class TuningPeg < ActiveRecord::Base belongs_to :guitar validates_numericality_of :pitch end ``` - Old style - `guitar.errors["tuning_pegs.pitch"] = ["is not a number"]` - New style (if defined globally, or set in has_many_relationship) - `guitar.errors["tuning_pegs[1].pitch"] = ["is not a number"]` [Michael Probber, Terence Sun]
* | | | Edits default `config/boot.rb` to match what's generated by Rails 4.2.AnnaErshova2015-10-261-2/+1
| | | |
* | | | Fix punctuation [ci skip]Markov Alexey2015-10-231-1/+1
| | | |
* | | | API guidelines reword re the Oxford comma [ci skip]Xavier Noria2015-10-221-3/+4
| | | |
* | | | Revert "[ci skip] removed extra comma"Xavier Noria2015-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.