aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* - Remove duplication in AJ logging test for setting logger.Vipul A M2014-10-202-3/+1
| | | | - Remove un-needed require in AJ rescue test.
* No need to specify log level, run at log level as all other Rails components.Vipul A M2014-10-201-1/+0
|
* Merge pull request #17329 from vipulnsward/mention-perform-later-docsYves Senn2014-10-201-0/+4
|\ | | | | Mention `perform_now` in AJ base docs to specify how to immediately invoke a job [ci skip]
| * Mention `perform_now` in AJ base docs to specify how to immediately invoke a ↵Vipul A M2014-10-201-0/+4
| | | | | | | | job. [ci skip]
* | docs, It's "Active Job" not "Active job". [ci skip]Yves Senn2014-10-201-2/+2
| |
* | Merge pull request #17324 from vipulnsward/activejob-warningsYves Senn2014-10-206-5/+7
|\ \ | | | | | | Enable emitting of warnings from ActiveJob tests.
| * | - Removed unused variable warnings from ActiveJob AdaptersVipul A M2014-10-195-5/+5
| | |
| * | Enable emitting of warnings from ActiveJob tests.Vipul A M2014-10-191-0/+2
| | |
* | | Merge pull request #17019 from yuki24/add-class-name-to-unknown-attr-errorYves Senn2014-10-203-7/+4
|\ \ \ | | | | | | | | | | | | Message on AR::UnknownAttributeError should include the class name of a record
| * | | AR::UnknownAttributeError should include the class name of a recordYuki Nishijima2014-10-153-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would be helpful if 2 models have an attribute that has a similar name to the other. e.g: before: User.new(name: "Yuki Nishijima", projects_attributes: [name: "kaminari"]) # => ActiveRecord::UnknownAttributeError: unknown attribute: name after: User.new(name: "Yuki Nishijima", projects_attributes: [name: "kaminari"]) # => ActiveRecord::UnknownAttributeError: unknown attribute on User: name
* | | | AR::UnknownAttributeError should include the class name of a recordYuki Nishijima2014-10-203-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would be helpful if 2 models have an attribute that has a similar name to the other. e.g: before: User.new(name: "Yuki Nishijima", projects_attributes: [name: "kaminari"]) # => ActiveRecord::UnknownAttributeError: unknown attribute: name after: User.new(name: "Yuki Nishijima", projects_attributes: [name: "kaminari"]) # => ActiveRecord::UnknownAttributeError: unknown attribute on User: name
* | | | Merge branch 'justanshulsharma-activerecord-merge-docs'Zachary Scott2014-10-191-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'activerecord-merge-docs' of ↵Zachary Scott2014-10-191-1/+1
|/| | | | | | | | | | | | | | | https://github.com/justanshulsharma/rails into justanshulsharma-activerecord-merge-docs
| * | | [ci skip] Make merge method nodocAnshul Sharma2014-10-201-8/+1
| | | |
| * | | [ci skip] merge docsAnshul Sharma2014-10-201-0/+7
| | |/ | |/|
* | | Merge pull request #17323 from seuros/masterRafael Mendonça França2014-10-192-4/+1
|\ \ \ | |/ / |/| | remove duplicate method (_status_code) in action_dispatch
| * | remove duplicate method (_status_code) in action_dispatchAbdelkader Boudih2014-10-192-4/+1
| | |
* | | Merge pull request #17322 from vipulnsward/fix-test-warningMatthew Draper2014-10-201-1/+1
|\ \ \ | |/ / |/| | Fixed test throwing unused variable warning
| * | Fixed test throwing unused variable warningVipul A M2014-10-191-1/+1
| | |
* | | Merge pull request #17321 from prathamesh-sonpatki/nodoc-status_atAbdelkader Boudih2014-10-192-4/+4
|\ \ \ | |/ / |/| | Make status_at methods nodoc
| * | Make _status_code methods nodocPrathamesh Sonpatki2014-10-192-4/+4
| | | | | | | | | | | | | | | - Also one minor change for documenting url_for method in ActionController::Metal. [ci skip]
* | | Merge pull request #17319 from igas/fix-17318Matthew Draper2014-10-191-1/+1
|\ \ \ | | | | | | | | fix wrong example from #17318 [ci skip]
| * | | fix wrong #17318 [ci skip]Igor Kapkov2014-10-191-1/+1
|/ / /
* | | Merge pull request #17318 from igas/guides-more-friendly-for-nonlatinAbdelkader Boudih2014-10-191-1/+1
|\ \ \ | | | | | | | | make guides example more friendly to nonlatin langs [ci skip]
| * | | make guides example more friendly to nonlatin langsIgor Kapkov2014-10-191-1/+1
|/ / /
* | | :nail_care: it's -> its (see comments on 9a586ac)Godfrey Chan2014-10-181-1/+1
| | |
* | | Merge pull request #17314 from y-yagi/message_delivery_docZachary Scott2014-10-181-0/+2
|\ \ \ | | | | | | | | [ci skip] add :queue option to deliver_later and deliver_later! documentation
| * | | [ci skip] add :queue option to deliver_later and deliver_later! documentationyuuji.yaginuma2014-10-191-0/+2
|/ / /
* | | [ci skip] A Rails engine is not a man :ok_woman:Zachary Scott2014-10-181-1/+1
| | |
* | | [ci skip] Fix word wrap, capitalization, and spacing of text from #17284Zachary Scott2014-10-181-4/+5
| | |
* | | Merge pull request #17302 from ↵Rafael Mendonça França2014-10-185-11/+11
| | | | | | | | | | | | | | | | | | claudiob/replace-slower-block-call-with-faster-yield Replace (slower) block.call with (faster) yield
* | | Revert "Replace (slower) block.call with (faster) yield"Zachary Scott2014-10-185-11/+11
| | | | | | | | | | | | This reverts commit 0ab075e75f58bf403f7ebe20546c7005f35db1f6.
* | | Merge branch 'master' of github.com:rails/railsZachary Scott2014-10-180-0/+0
|\ \ \
| * \ \ Merge pull request #17034 from pramod-sharma/masterZachary Scott2014-10-181-1/+15
| |\ \ \ | | |/ / | |/| | [ci skip] Add Doc of with_options for the case when inherited default options and original options have same keys
| | * | [ci skip] Add Doc of with_options for the case when inherited default ↵Pramod Sharma2014-09-251-1/+15
| | | | | | | | | | | | | | | | options and original options have same keys
| * | | Merge pull request #17302 from ↵Rafael Mendonça França2014-10-175-11/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | claudiob/replace-slower-block-call-with-faster-yield Replace (slower) block.call with (faster) yield
| | * | | Replace (slower) block.call with (faster) yieldclaudiob2014-10-175-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance optimization: `yield` with an implicit `block` is faster than `block.call`. See http://youtu.be/fGFM_UrSp70?t=10m35s and the following benchmark: ```ruby require 'benchmark/ips' def fast yield end def slow(&block) block.call end Benchmark.ips do |x| x.report('fast') { fast{} } x.report('slow') { slow{} } end # => fast 154095 i/100ms # => slow 71454 i/100ms # => # => fast 7511067.8 (±5.0%) i/s - 37445085 in 4.999660s # => slow 1227576.9 (±6.8%) i/s - 6145044 in 5.028356s ```
* | | | | [ci skip] Add a note about headers overwritingNicolas Cavigneaux2014-10-181-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since some headers can appear multiple times in an email it's required to set it to nil first when you want to overwrite an existing one. This commit add some information about this process. Fix #15912
* | | | | [ci skip] Add Doc of with_options for the case when inherited default ↵Pramod Sharma2014-10-181-1/+15
| | | | | | | | | | | | | | | | | | | | options and original options have same keys
* | | | | Replace (slower) block.call with (faster) yieldclaudiob2014-10-185-11/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance optimization: `yield` with an implicit `block` is faster than `block.call`. See http://youtu.be/fGFM_UrSp70?t=10m35s and the following benchmark: ```ruby require 'benchmark/ips' def fast yield end def slow(&block) block.call end Benchmark.ips do |x| x.report('fast') { fast{} } x.report('slow') { slow{} } end # => fast 154095 i/100ms # => slow 71454 i/100ms # => # => fast 7511067.8 (±5.0%) i/s - 37445085 in 4.999660s # => slow 1227576.9 (±6.8%) i/s - 6145044 in 5.028356s ```
* | | | Merge pull request #17300 from claudiob/add-necessary-require-reverse-mergeRafael Mendonça França2014-10-172-0/+11
|\ \ \ \ | |/ / / |/| | | Add necessary 'require reverse_merge' to HAWI.rb
| * | | Add necessary 'require reverse_merge' to HAWI.rbclaudiob2014-10-172-0/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hashes with indifferent access should support `reverse_merge` out-of-the-box but they don't; for instance the following code fails: ```ruby require 'active_support' require 'active_support/hash_with_indifferent_access' hash = HashWithIndifferentAccess.new key: :old_value hash.reverse_merge key: :new_value ``` This PR fixes the case above by simply requiring `active_support/core_ext/hash/reverse_merge` in `hash_with_indifferent_access.rb` and adding a test that confirms the fix. --- Here are more details about the bugfix. Currently, `reverse_merge` is [defined in HashWithIndifferentAccess](https://github.com/rails/rails/blob/4e8ea13ba1a0870905a46fac5f232d9f41eef8a4/activesupport/lib/active_support/hash_with_indifferent_access.rb#L208) by invoking `super`, that is by invoking `Hash#reverse_merge`: ```ruby def reverse_merge(other_hash) super(self.class.new_from_hash_copying_default(other_hash)) end ``` However, Ruby's `Hash` does not have the `reverse_merge` by default: it must be added by ActiveSupport, and that requires the following line of code to be present: ```ruby require 'active_support/core_ext/hash/reverse_merge' ```
* | | Merge pull request #17296 from sgrif/sg-booleans-should-make-senseRafael Mendonça França2014-10-162-5/+14
|\ \ \ | | | | | | | | Add a deprecation warning for abiguous boolean values
| * | | Add a deprecation warning for abiguous boolean valuesSean Griffin2014-10-162-5/+14
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5.0, we'd like to change the behavior of boolean columns in Rails to be closer to Ruby's semantics. Currently we have a small set of values which are "truthy", and all others are "falsy". In Rails 5.0, we will reverse this to have a small number of values which are "falsy", and all others will become "truthy". In the interim, all values which are ambiguous must emit a deprecation warning.
* | | Improve the warning a bit [ci skip]Rafael Mendonça França2014-10-161-1/+1
| | |
* | | Merge pull request #15827 from ↵Rafael Mendonça França2014-10-161-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | yuki24/another-improvements-for-dynamic-error-pages A warning line should look like a warning section in Guides
| * | | A warning line should look like a warning sectionYuki Nishijima2014-06-191-1/+3
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #17293 from djpowers/patch-1Rafael Mendonça França2014-10-161-1/+1
|\ \ \ \ | | | | | | | | | | Clarify wording in Rails HTML Sanitizer section [ci skip]
| * | | | Clarify wording in Rails HTML Sanitizer sectionDave Powers2014-10-161-1/+1
|/ / / / | | | | | | | | [ci skip]
* | | | Merge pull request #17292 from tricknotes/generator-test-docRafael Mendonça França2014-10-161-1/+1
|\ \ \ \ | | | | | | | | | | Fix example code for `Rails::Generators::Testing::Behaviour` [ci skip]