aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | fix small typo in routing testAccessd2014-10-211-1/+1
|/ / / /
* | | | Merge pull request #17313 from accessd/fix-url-generation-error-messageRafael Mendonça França2014-10-212-1/+11
|\ \ \ \ | | | | | | | | | | Fix url generation error message
| * | | | fix url generation error messageAccessd2014-10-212-1/+11
| | | | |
* | | | | Oops, missed a closing bracket [ci skip]Godfrey Chan2014-10-211-1/+1
| | | | |
* | | | | Merge pull request #17336 from rebyn/patch-1Godfrey Chan2014-10-211-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Provide more reasoning to not accept cosmetic changes [ci skip]
| * | | | [ci skip] Provide more reasoning to not accept cosmetic changesTu Hoang2014-10-211-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #17331 from vipulnsward/activejob-cleanupsRafael Mendonça França2014-10-203-4/+1
|\ \ \ \ | | | | | | | | | | Activejob cleanups
| * | | | - 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 #17337 from claudiob/remove-duplicate-select-methodRafael Mendonça França2014-10-205-17/+3
|\ \ \ \ | | | | | | | | | | Remove duplicate 'select' database statement
| * | | | Remove duplicate 'select' database statementclaudiob2014-10-205-17/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `select` method has the same definition in almost all database adapters, so it can be moved from the database-specific adapters (PostgreSQl, MySQL, SQLite) to the abstract `database_statement`: ```ruby def select(sql, name = nil, binds = []) exec_query(sql, name, binds) end ``` --- More details about this commit: the only two DB-specific adapters that have a different definition of `select` are MySQLAdapter and MySQL2Adapter. In MySQLAdapter, `select` invokes `exec_query(sql, name, binds)`, so calling `super` achieves the same goal with less repetition. In MySQL2Adapter, `select` invokes `exec_query(sql, name)`, that is, it does not pass the `binds` parameter like other methods do. However, [MySQL2Adapter's `exec_query`](https://github.com/rails/rails/blob/74a527cc63ef56f3d0a42cf638299958dc7cb08c/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L228L231) works exactly the same whether this parameters is passed or not, so the output does not change: ```ruby def exec_query(sql, name = 'SQL', binds = []) result = execute(sql, name) ActiveRecord::Result.new(result.fields, result.to_a) end ```
* | | | Merge pull request #17338 from vipulnsward/aj-doc-fixesRafael Mendonça França2014-10-203-6/+6
|\ \ \ \ | |/ / / |/| | | AJ doc fixes [ci skip]
| * | | - Changed description for AJ enqueuing methods to provide a sane description.Vipul A M2014-10-211-3/+3
| | | | | | | | | | | | | | | | [ci skip]
| * | | - Fix mentioned shortcut, to what the shortcut actually is, and that it ↵Vipul A M2014-10-212-3/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | accepts blocks for `assert_no_enqueued_jobs` and `assert_no_performed_jobs` test helpers. - args => arguments when used in actual docs. [ci skip]
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 15:23:18 +0000