aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | update queue_classic detailsJean-Philippe Boily2014-10-062-7/+7
|/ / / /
* | / / unify PG spelling in CHANGELOGs. [ci skip]Yves Senn2014-10-061-1/+1
| |/ / |/| |
* | | Merge pull request #17183 from prathamesh-sonpatki/fix-typo-in-am-guideAbdelkader Boudih2014-10-051-2/+2
|\ \ \ | | | | | | | | Fix typo in Active Model guide
| * | | Fix typo in Active Model guidePrathamesh Sonpatki2014-10-051-2/+2
|/ / / | | | | | | | | | | | | - instrospection -> introspection. - [ci skip]
* | | [ci skip] Merge ActiveModel::SecurePassword guide from @aditya-kapoorZachary Scott2014-10-041-0/+46
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'active-model-secure-password-guide' of https://github.com/aditya-kapoor/rails into aditya-kapoor-active-model-secure-password-guide Conflicts: guides/source/active_model_basics.md
| * | | [ci skip] add guide for ActiveModel::SecurePasswordAditya Kapoor2014-08-111-0/+46
| | | |
* | | | Edits to ActiveModel guide [ci skip]Nick Meehan2014-10-041-36/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Some grammatical errors and rewording of sentences throughout document - Renaming headers to be more human readable, and if following paragraphs do not include module names, adding those in - In ActiveModel::AttributeMethods * formatting expected output correctly, changing from `#` to `# =>` - In ActiveModel::Dirty * changing expected output of person.first_name_was from "First Name" to nil * removing 'active_model' requirement at top of code snippet - In ActiveModel::Validations * originally Person.new(token: "2b1f325") raises an argument error (1 for 0), so setting of attribute occurs on the line after object instantiation - In ActiveModel::Naming * closing code snippet tag at end of section so ActiveModel::Model is a separate section - In ActiveModel::Model * fixing spelling mistake of attr_accessor - In ActiveModel::Serialization * adding edit to description of how from_json and from_xml works under serialization - In ActiveModel::Lint::Tests * capitalizing person for class name
* | | | Add Active Model to guides [ci skip]Mauro George2014-10-042-14/+302
| | | |
* | | | Merge pull request #17179 from ↵Zachary Scott2014-10-041-17/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | eileencodes/clarify-delete-strategies-on-collection-proxy [ci skip] Clarify deletion strategies for collection proxies
| * | | | [ci skip] Clarify deletion strategies for collection proxieseileencodes2014-10-041-17/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For detailed testing of behavior see: https://gist.github.com/eileencodes/5b0a2fe011dcff6203fe This shows destroy_all always destroys records and fires callbacks. It will never use nullify or delete_all delete_all's behavior varies greatly based on `hm` vs `hm:t` and deletion strategy.
* | | | | Merge pull request #17176 from kuldeepaggarwal/doc-alias_method_chainZachary Scott2014-10-041-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | doc added for `writer` method in `alias_method_chain` [ci skip]
| * | | | doc added for `writer` method in `alias_method_chain`[ci skip]Kuldeep Aggarwal2014-10-041-2/+2
|/ / / /
* | | | Clarify possible validations you can use to avoid a NULL boolean valueZachary Scott2014-10-031-2/+8
| | | | | | | | | | | | | | | | in the database. Closes #16304 [ci skip]
* | | | Merge pull request #16409 from ↵Zachary Scott2014-10-035-15/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | justinweiss/update_validation_context_documentation Docs: Add a note on custom validation contexts. [ci skip]
| * | | | Add a note on custom validation contexts.Justin Weiss2014-08-055-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation on `:on` for validations was inconsistent, and most only referenced the `:create` and `:update` contexts. I fixed those to be consistent with the documentation on `AM::Validations.validates`, which seemed to have the best docs. [ci skip]
* | | | | :heart: 1.9Matthew Draper2014-10-041-1/+1
| | | | |
* | | | | Merge pull request #14146 from chewi/fix-underscore-acronyms-regexMatthew Draper2014-10-043-1/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix underscore inflector handling of namespaced and adjacent acronyms
| * | | | | Fix underscore inflector handling of adjacent acronymsJames Le Cuirot2014-10-032-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I suspect that positive lookbehind would have been used in the original implementation had it been available in supported Ruby versions at the time. Now that Rails requires Ruby 1.9.2 or above, this is no longer an issue. This fixes #14146 for acronyms such as APIRESTful. This technique also addresses namespaced acronyms that are not entirely uppercased. This was broken when the commit was originally written but has since been fixed in ccbb481. The latter does not deal with adjacent acronyms so this commit wins.
* | | | | | Merge pull request #17150 from effektz/tr-instead-of-gsubJeremy Kemper2014-10-032-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use #tr instead of #gsub where possible
| * | | | | | Use #tr instead of #gsub where possibleAlex Weidmann2014-10-022-2/+2
| | | | | | |
* | | | | | | Merge pull request #17172 from rselk/typoAbdelkader Boudih2014-10-032-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | fix typo in in define_model_callbacks comment [ci skip]
| * | | | | | fix typo in in define_model_callbacks comment [ci skip]Ryan Selk2014-10-032-2/+2
|/ / / / / /
* | | | | | Merge pull request #17168 from jwworth/task/fix_typoXavier Noria2014-10-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix typo [ci skip]
| * | | | | | Fix typoJake Worth2014-10-031-1/+1
|/ / / / / /
* | | | | | Merge pull request #17167 from kuldeepaggarwal/doc-define_model_callbacksRafael Mendonça França2014-10-032-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | add notes for `define_model_callbacks`
| * | | | | | add notes for `define_model_callbacks` [ci skip]Kuldeep Aggarwal2014-10-032-0/+6
|/ / / / / /
* | | | | | Merge pull request #17160 from lsylvester/duration-hashAaron Patterson2014-10-032-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | define hash on duration
| * | | | | | define hash on durationlsylvester2014-10-032-0/+8
|/ / / / / /
* | | | | | minor fixes in the configuring guide [ci skip]Xavier Noria2014-10-031-15/+15
| | | | | |
* | | | | | Revert "Fix style for rescue responses doc [ci skip]"Xavier Noria2014-10-031-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: There is a wrong newline, a typo, and the change to singular is not good. This reverts commit d76380cf1ccec7ffeff19827ae9b6d9b71327418.
* | | | | | Merge pull request #17153 from yuki24/fix-doc-format-for-rescue-responsesAbdelkader Boudih2014-10-031-15/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | [Railsguides] Fix style for rescue responses doc [ci skip]
| * | | | | | Fix style for rescue responses doc [ci skip]Yuki Nishijima2014-10-021-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Change 'Any ***s that are...' to 'Any *** that is...' * Fix style for default rescue_responses setting This is a follow-up commit to: * https://github.com/rails/rails/pull/17076 * https://github.com/yuki24/rails/commit/89b8836f2470c689f6b7d52cab3a418bb63aef26
* | | | | | | Merge pull request #17151 from y-yagi/patch-1Abdelkader Boudih2014-10-031-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] add `test:jobs` task to testing guide
| * | | | | | | [ci skip] add `test:jobs` task to testing guideyuuji.yaginuma2014-10-031-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #17148 from mgenereu/patch-1Xavier Noria2014-10-021-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Disallow appended newlines when parsing as integer
| * | | | | | | Disallow appended newlines when parsing as integerMichael Genereux2014-10-021-1/+1
|/ / / / / / / | | | | | | | | | | | | | | \Z allows appended newlines where \z does not.
* | | | | | | Merge pull request #17068 from mokhan/update-active-job-documentationAbdelkader Boudih2014-10-026-5/+64
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | [ci-skip] Update Active Job API documentation
| * | | | | | Add documentation on Active Job.mo khan2014-10-026-5/+64
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds documentation for the Active Job API. It includes documentation on how to configure the queue_adapter, and how to create new jobs. It adds links to the various other sections of the Active Job documentation.
* | | | | | Merge pull request #17088 from robin850/jruby-devRafael Mendonça França2014-10-019-2/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Follow up to #16613
| * | | | | | Follow up to #16613Robin Dupret2014-09-289-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we want this flag to be enabled anytime we are running the tests under JRuby, let's enable this at the Rakefile level so people get the performance boost on their local checkout. Moreover, we avoid having to update this particular line anytime the option changes on the JRuby side. The only drawback is that we have to define it in every Rakefile but there's no big deal, this is already the case for other options.
* | | | | | | Merge pull request #17125 from acrogenesis/masterXavier Noria2014-10-012-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | use tr instead of gsub when possible
| * | | | | | | use tr instead of gsub when possibleAdrian Rangel2014-10-012-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #17124 from yuktikhurana/fix_render_file_guideAbdelkader Boudih2014-10-011-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | In render file, by default the current layout is rendered always [ci skip]
| * | | | | | | In render file, by default the current layout is rendered alwaysyuktikhurana2014-10-011-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #17113 from igor04/helpers-highlightRafael Mendonça França2014-09-302-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added processing of `nil` to `highlight` helper method
| * | | | | | | | Added processing of `nil` to `highlight` helper methodigor042014-09-302-1/+5
| |/ / / / / / /
* | | | | | | | Merge pull request #17114 from pabloh/replace_use_of_eval_with_lambdaRafael Mendonça França2014-09-302-3/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Refactor callback setup to use lambda instead of eval
| * | | | | | | | Refactor callback setup in to use lambda instead of evalPablo Herrero2014-09-302-3/+5
| |/ / / / / / /
* | | | | | | | Generate the application pointing to rails-dom-testing masterRafael Mendonça França2014-09-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is temporary until we do the final release
* | | | | | | | Merge pull request #17118 from zhangsu/patch-1Abdelkader Boudih2014-09-301-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Update single table inheritance link anchor