aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17014 from grosser/grosser/fast-fixturesAaron Patterson2014-10-103-66/+2
|\ | | | | speed up fixtures by not loading all their classes
| * speed up fixtures by not loading all their classesgrosser2014-10-063-66/+2
| |
* | tests, move `original_` var assignments outside of `begin`.Yves Senn2014-10-102-11/+16
| |
* | Merge pull request #17223 from bgentry/active-job-empty-queue-nameYves Senn2014-10-102-1/+21
|\ \ | | | | | | ActiveJob: allow empty queue names
| * | ActiveJob: allow blank queue namesBlake Gentry2014-10-092-1/+21
|/ / | | | | | | | | | | | | As discussed in #17195, Que uses blank queue names by default for performance reasons. At the very least, ActiveJob should allow users to choose "" as their queue name. This commit allows blank queue names, as well as tests to make sure that nil queue names still use the default.
* | Merge pull request #17221 from StefanH/fix-unknown-http-method-messageRafael Mendonça França2014-10-092-1/+17
|\ \ | | | | | | Invalid HTTP method will raise I18n::InvalidLocale if :en is not a valid locale.
| * | Request#check_method no longer breaks when :en is not available localeStefan Henzen2014-10-092-1/+17
|/ / | | | | | | | | | | | | | | Request#check_method would use to_sentence(locale: :en), which breaks when I18n.available_locales does not include :en and I18n.enforce_available_locales is true (default). Inlined to_sentence functionality to solve this.
* | Merge pull request #17219 from Gaurav2728/gaurav-missing_i18_linkAbdelkader Boudih2014-10-091-9/+6
|\ \ | | | | | | [ci skip] removing ruby-i18n.org/wiki link that is not available and usi...
| * | [ci skip] removing ruby-i18n.org/wiki link that is not available and using ↵Gaurav Sharma2014-10-091-9/+6
|/ / | | | | | | “gems” instead of plugins
* | Merge pull request #17215 from aripollak/sidekiq-no-retry-optionRafael Mendonça França2014-10-081-3/+1
|\ \ | | | | | | Don't pass retry option to Sidekiq
| * | Don't pass retry option to SidekiqAri Pollak2014-10-081-3/+1
|/ / | | | | | | | | * This would override whatever default is configured in Sidekiq system-wide, and retry is true by default anyway.
* | Point to a specific version of guide to make the redirect workRafael Mendonça França2014-10-081-1/+1
| |
* | Merge pull request #17205 from y-yagi/patch-1Abdelkader Boudih2014-10-081-1/+1
|\ \ | | | | | | update error message when InlineAdapter is used
| * | update error message when InlineAdapter is usedyuuji.yaginuma2014-10-081-1/+1
| | |
* | | Merge pull request #17187 from Bounga/middleware_reloading_explainationAbdelkader Boudih2014-10-081-0/+4
|\ \ \ | |/ / |/| | Warning about middleware not auto-reloading
| * | Warning about middleware not auto-reloadingNicolas Cavigneaux2014-10-081-0/+4
|/ / | | | | | | | | | | | | | | | | Add a section in the guide to explain that Rails can't auto-reload a middleware on code change. Fix #16806 [ci skip]
* | Only include the needed assertionsRafael Mendonça França2014-10-072-2/+3
| |
* | Merge pull request #17204 from schneems/schneems/fix-am-tests-masterRafael Mendonça França2014-10-074-7/+9
|\ \ | | | | | | | | | fix tests on action_mailer
| * | fix tests on action_mailerschneems2014-10-074-7/+9
| | | | | | | | | Include appropriate helpers and use `assert_dom_equal` where applicable
* | | Merge pull request #17203 from schneems/schneems/av-tag_helperRafael Mendonça França2014-10-073-10/+9
|\| | | | | | | | remove un-needed sort
| * | remove un-needed sortschneems2014-10-073-10/+9
|/ / | | | | | | | | | | HTML doesn't care what order the elements are rendered in, so why should we? Updates tests to use proper `assert_dom_equal` instead of `assert_equal` /cc @jeremy
* | Merge pull request #17201 from djpowers/patch-1Abdelkader Boudih2014-10-071-1/+1
|\ \ | | | | | | Fix grammar [ci skip]
| * | Fix grammarDave Powers2014-10-071-1/+1
|/ /
* | Merge pull request #17198 from neerajdotname/wordsmitthingRafael Mendonça França2014-10-071-2/+2
|\ \ | | | | | | Rephrasing sentences
| * | Rephrasing sentencesNeeraj Singh2014-10-071-2/+2
| | |
* | | Merge pull request #17184 from fillman/masterRafael Mendonça França2014-10-071-6/+17
|\ \ \ | | | | | | | | fix autoload tests
| * | | fix autoload testsfillman2014-10-051-6/+17
| | | |
* | | | Merge pull request #17146 from divineforest/active-record-gsub-to-trRafael Mendonça França2014-10-074-4/+4
|\ \ \ \ | |_|/ / |/| | | Change `gsub` to `tr` where possible
| * | | Change `gsub` to `tr` where possibleAlexander Balashov2014-10-064-4/+4
| | | |
* | | | Merge pull request #17189 from jipiboily/update-queue-classic-detailsZachary Scott2014-10-062-7/+7
|\ \ \ \ | | | | | | | | | | update queue_classic details [ci skip]
| * | | | 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
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 21:51:06 +0000