aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* some object allocation reduction for new AR objectsAaron Patterson2014-09-272-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Benchmark: ```ruby require 'objspace' require 'active_record' ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:" ActiveRecord::Base.connection.instance_eval do create_table(:articles) { |t| t.string :name } end class Article < ActiveRecord::Base; end a = Article.create name: "foo" a = Article.find a.id N = 10 ObjectSpace::AllocationTracer.trace do N.times { Article.find a.id } end ObjectSpace::AllocationTracer.allocated_count_table table.sort_by { |_,x| x }.each do |k,v| p k => (v / N) end ```
* Merge pull request #17079 from y-yagi/patch-1Zachary Scott2014-09-261-2/+2
|\ | | | | [ci skip] fix typo in set examples
| * [ci skip] fix typo in set examplesyuuji.yaginuma2014-09-271-2/+2
|/
* Merge pull request #17076 from yuki24/write-doc-for-rescue-responsesZachary Scott2014-09-261-0/+23
|\ | | | | Add documentation about rescue_responses in Configuring [ci skip]
| * Add documentation about `config.action_dispatch.rescue_responses`Yuki Nishijima2014-09-261-0/+23
|/ | | | [ci skip]
* Preparing for 4.2.0.beta2 releaseRafael Mendonça França2014-09-2610-10/+10
|
* Merge pull request #17071 from claudiob/don-t-require-action-dispatch-twiceRafael Mendonça França2014-09-261-2/+0
|\ | | | | Don’t require already required modules
| * Don’t require already required modulesclaudiofullscreen2014-09-261-2/+0
|/ | | | | | | | | abstract_unit.rb requires `action_controller` which [already includes the following lines of code](https://github.com/rails/rails/blob/64fcdce1d3a6a8768ab17f3be144270456814f82/actionpack/lib/action_controller.rb#L2L3): ```ruby require 'abstract_controller' require 'action_dispatch' ```
* Merge pull request #17070 from felipecvo/masterRafael Mendonça França2014-09-261-3/+4
|\ | | | | Add +variants to ActionView::FileSystemResolver documentation.
| * Add +variants to ActionView::FileSystemResolver documentation.Felipe Oliveira2014-09-261-3/+4
|/
* Revert "Merge pull request #16966 from why-el/symbolize-path-params"Rafael Mendonça França2014-09-252-9/+0
| | | | | | | | This reverts commit 9d05d6de52871e57bfbf54a60de005e8a5f5b0e4, reversing changes made to 0863c9248fd47a15e88e05ce4fcd80966684c0e3. The change in the behaviour reported at #16958 doesn't exist since 4.0 and 4.1 works in the same way
* Merge pull request #17061 from bronzle/remove_extra_#Rafael Mendonça França2014-09-251-1/+1
|\ | | | | remove extra # in css
| * remove extra # in cssByron Bischoff2014-09-251-1/+1
| |
* | Merge pull request #17059 from bronzle/remove_threadsafe_from_guidesAbdelkader Boudih2014-09-251-2/+2
|\ \ | |/ |/| [ci skip] Remove reference to config.threadsafe! in guides/configuring.md
| * [ci skip] Remove reference to config.threadsafe! in guides/configuriing.mdByron Bischoff2014-09-251-2/+2
|/
* Merge pull request #16966 from why-el/symbolize-path-paramsRafael Mendonça França2014-09-252-0/+9
|\ | | | | | | Ensure named path params are symbols (Fixes #16958)
| * Ensure named path params are symbols (Fixes #16958)Mohamed Wael Khobalatte2014-09-252-0/+9
|/
* No need CHANGLOG entry for a bug in a non released versionRafael Mendonça França2014-09-251-7/+0
| | | | [ci skip]
* Keep the original implementation to not having to allocate new objectsRafael Mendonça França2014-09-251-2/+15
|
* Merge pull request #17058 from eval/issue-17057Rafael Mendonça França2014-09-253-18/+19
|\ | | | | | | Remove internal options from query string of paths
| * Remove internal options from query string of pathsGert Goet2014-09-253-18/+19
| | | | | | | | Fixes #17057
* | No need to install the deprecated_sanitizer gemRafael Mendonça França2014-09-251-1/+0
| | | | | | | | It is not being used in our tests
* | rails-html-sanitizer is now the defaultRafael Mendonça França2014-09-253-13/+6
| | | | | | | | Also add to upgrading guide a notice about the deprecated sanitizers
* | Remove unused codeRafael Mendonça França2014-09-252-23/+1
| |
* | :nail_care: the CSSRafael Mendonça França2014-09-251-7/+18
| |
* | Merge pull request #17024 from buddhamagnet/amend-welcome-pageRafael Mendonça França2014-09-252-14/+11
|\ \ | | | | | | Amend welcome page
| * | Improve welcome page css and table cell aignments.buddhamagnet2014-09-252-14/+11
| | |
* | | Fix string/gid collision in job argumentsJeremy Kemper2014-09-252-6/+38
| | | | | | | | | | | | Serialize Global IDs as special objects, distinguishable from Strings
* | | Fix actionpack test cases broken by #16888Godfrey Chan2014-09-262-29/+9
| | |
* | | Revert "Revert "Merge pull request #16888 from jejacks0n/render_template""Godfrey Chan2014-09-264-20/+27
| | | | | | | | | | | | This reverts commit 585e75696b31395aee895e5366e331c07c3f5ee1.
* | | Use released rails-html-sanitizer and rails-deprecated_sanitizerGodfrey Chan2014-09-264-7/+5
| | |
* | | Use release web-consoleRafael Mendonça França2014-09-251-1/+1
| | |
* | | Use released rails-dom-testingRafael Mendonça França2014-09-254-5/+3
| |/ |/|
* | Merge pull request #17051 from jwworth/task/fix_typoRafael Mendonça França2014-09-241-1/+1
|\ \ | | | | | | Fix typo
| * | Fix typoJake Worth2014-09-241-1/+1
|/ /
* | Merge pull request #17042 from DanOlson/remove-skip-action-viewRafael Mendonça França2014-09-245-11/+9
|\ \ | | | | | | Remove --skip-action-view option from application generator
| * | Remove --skip-action-view option from application generatorDan Olson2014-09-245-11/+9
|/ /
* | Merge pull request #17020 from Sirupsen/ar-override-rack-testAaron Patterson2014-09-233-1/+14
|\ \ | | | | | | activerecord/connection_pool: honor overidden rack.test in tests
| * | ar/connection_pool: honor overriden rack.test in middlewareSimon Eskildsen2014-09-233-1/+14
| | | | | | | | | | | | | | | | | | | | | Honoring an overidden `rack.test` allows testing closed connection between multiple requests. This is useful if you're working on database resiliency, to ensure the connection is in the expected state from one request to another on the same worker.
* | | Merge pull request #17032 from tgxworld/update_contributing_guideArthur Nogueira Neves2014-09-231-5/+5
|\ \ \ | | | | | | | | [CI SKIP] Improve force push note.
| * | | [CI SKIP] Improve force push note.Guo Xiang Tan2014-09-231-5/+5
|/ / /
* | | Merge pull request #17029 from grk/fix-loading-fixtures-in-engine-testsSantiago Pastorino2014-09-231-1/+1
|\ \ \ | | | | | | | | Fix loading fixtures in engine tests
| * | | Fix loading fixtures in engine testsGrzesiek Kolodziejczyk2014-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixture_path is a class attribute of ActiveSupport::TestCase, so ActiveSupport::TestCase.method_defined?(:fixture_path=) would always return false. This should fix #4971
* | | | Merge pull request #17026 from ↵Richard Schneeman2014-09-231-0/+17
|\ \ \ \ | |/ / / |/| | | | | | | | | | | prathamesh-sonpatki/mention-updating-pull-requests Added note about updating pull requests by force push
| * | | Added note about updating pull requests by force pushPrathamesh Sonpatki2014-09-231-0/+17
| |/ / | | | | | | | | | | | | | | | - Added note about force pushing same branch to update a existing pull request instead of opening new one in contributing guide. - [ci skip]
* | | Merge pull request #17005 from y-yagi/fix_aj_test_helperYves Senn2014-09-232-2/+4
|\ \ \ | | | | | | | | | | | | add message to `assert` in `assert_enqueued_with`
| * | | add message to `assert` in `assert_enqueued_with`yuuji.yaginuma2014-09-232-2/+4
| | | |
* | | | Merge pull request #17022 from prathamesh-sonpatki/test-for-validate-messageYves Senn2014-09-231-1/+3
|\ \ \ \ | |_|/ / |/| | | Added test for exception message for validate method
| * | | Added test for exception message for validate methodPrathamesh Sonpatki2014-09-231-1/+3
|/ / / | | | | | | | | | - Test case for https://github.com/rails/rails/pull/16851
* | | Merge pull request #17018 from prathamesh-sonpatki/tenderloveAbdelkader Boudih2014-09-231-1/+5
|\ \ \ | | | | | | | | Update changelog with tenderlove's entry