aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11274 from arunagw/deprecation-removed-build-fixedRafael Mendonça França2013-07-071-20/+0
|\ | | | | Deprecation removed build fixed
| * Removed unused test for DateTime.local_offsetArun Agrawal2013-07-071-20/+0
| | | | | | | | see discussion here #11274
* | Merge pull request #11313 from gsamokovarov/url-encoded-params-testRafael Mendonça França2013-07-061-25/+27
|\ \ | | | | | | Cleanup ul_encoded_params_parsing_test
| * | Cleanup ul_encoded_params_parsing_testGenadi Samokovarov2013-07-051-25/+27
| | |
* | | Merge pull request #11324 from blahedo/masterRafael Mendonça França2013-07-066-27/+53
|\ \ \ | | | | | | | | Cleanup on getting_started tutorial
| * | | Cleaned up wording and tags.blahedo2013-07-066-27/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced <br /> with <br> for consistency; Added note about singular/plural distinction (which was previously confusing to a Rails noob); Rephrased explanation of how form is routed to controller, again to reduce confusion; and added explanation to replace incorrect link. [ci skip]
* | | | Merge pull request #11336 from ankit8898/performance-bmRafael Mendonça França2013-07-061-1/+13
|\ \ \ \ | | | | | | | | | | Some performance benchmarking for take vs limit
| * | | | Some performance benchmarking for take vs limitAnkit Gupta2013-07-061-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added a dummy progress bar during insert of records so it shows something is happening. Performance report Model.take 6198.9 (±13.4%) i/s - 121743 in 20.042671s Model.take! 6173.6 (±13.6%) i/s - 121242 in 20.057006s Model.all limit(100) 107.8 (±15.8%) i/s - 2106 in 20.022316s Model.all take(100) 105.2 (±15.2%) i/s - 2061 in 20.062509s
* | | | | Merge pull request #11339 from arunagw/running-actionpack-isolatedYves Senn2013-07-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Running isolated test for assertions and journey
| * | | | | Running isolated test for assertions and journeyArun Agrawal2013-07-061-1/+1
|/ / / / / | | | | | | | | | | | | | | | in actionpack
* | | | | Merge pull request #11337 from arunagw/actionview-rdocRafael Mendonça França2013-07-062-10/+0
|\ \ \ \ \ | | | | | | | | | | | | RUNNING_UNIT_TESTS tweaks.
| * | | | | actionpack not having activerecord tests [ci skip]Arun Agrawal2013-07-061-10/+0
| | | | | |
| * | | | | RUNNING_UNIT_TESTS file is in rdoc [ci skip]Arun Agrawal2013-07-061-0/+0
| | | | | |
* | | | | | fixes Rails version for the stable API [ci skip]Xavier Noria2013-07-062-1/+13
| | | | | |
* | | | | | Merge pull request #11306 from ↵Rafael Mendonça França2013-07-063-2/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/11288_remove_extra_queries_for_belongs_to_with_touch #11288: Removed duplicated touching Conflicts: activerecord/CHANGELOG.md
| * | | | | | #11288: Removed duplicated touchingPaul Nikitochkin2013-07-053-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if belongs to model with touch option on touch Closes #11288
* | | | | | | fixes broken links in the API [Fixes #11335] [ci skip]Xavier Noria2013-07-061-2/+2
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #11332 from sanemat/fix/av-test-duplicationRafael Mendonça França2013-07-061-3/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | Remove actionview test duplication
| * | | | | Remove action view test duplicationsanemat2013-07-071-3/+0
|/ / / / / | | | | | | | | | | | | | | | Same test exists above 2 or 3 lines.
* | | | | Merge pull request #11329 from vipulnsward/cache_oneRafael Mendonça França2013-07-061-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Extract common query to a constant.
| * | | | | Extract common query to a constant.Vipul A M2013-07-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Perf ref: https://gist.github.com/vipulnsward/8209749201dfdd678c97
* | | | | | Merge pull request #11327 from schuetzm/hash-with-indifferent-access-selectYves Senn2013-07-063-1/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Make HashWithIndifferentAccess#select always return the hash.
| * | | | | Make HashWithIndifferentAccess#select always return the hash.Marc Schütz2013-07-063-1/+12
|/ / / / / | | | | | | | | | | | | | | | | | | | | Hash#select! returns nil if the hash didn't change and thus behaves differently from select, so it's return value can't be used as result for the latter.
* | | | | Merge pull request #11322 from blahedo/masterRafael Mendonça França2013-07-051-3/+1
|\ \ \ \ \ | | |/ / / | |/| | | Tidying "getting started" guide
| * | | | Merged sections to reflect current contents of guide.blahedo2013-07-051-3/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | Section "allowing the update of fields" was now just a general introduction to the idea of the model (actual updating was two sections later). So, merged into the section about validation.
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-07-064-2/+43
|\ \ \ \
| * | | | [doc] fixed printing of code samplesArun Agrawal2013-07-021-1/+1
| | | | |
| * | | | Complete a sentence in i18n guide's introductionRobin Dupret2013-06-301-0/+5
| | | | | | | | | | | | | | | Add a list of what will be covered into this guide
| * | | | doc for more input tag typesVishnu Atrai2013-06-291-0/+36
| | | | |
| * | | | cookies are encrypted starting Rails 4Neeraj Singh2013-06-291-1/+1
| | | | |
* | | | | Merge pull request #11314 from raysrashmi/fix-missing-deprecation-stuffRafael Mendonça França2013-07-051-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Adding back deprecation require in all.rb
| * | | | | Adding back deprecation require in all.rbRashmi Yadav2013-07-051-0/+1
|/ / / / /
* | / / / Revert "Merge pull request #11299 from ↵Yves Senn2013-07-053-4/+11
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arunagw/disable_implicit_join_references_removed" `disable_implicit_join_references=` was only deprecated on `master`, not with rails 4.0. We can remove it after 4.1 This reverts commit 3c719ead414ffd29e71efce185698af979052abb, reversing changes made to d5c3bf9722abd5733a769c8d789de3f74dbfb92d.
* | | | Merge pull request #11131 from ykzts/fix/actiondispatch-ssl-not-required-spaceSteve Klabnik2013-07-053-1/+34
|\ \ \ \ | |_|/ / |/| | | Space is not required for Set-Cookie header
| * | | Space is not required for Set-Cookie headerYamagishi Kazutoshi2013-07-053-1/+34
| | | |
* | | | Revert "remove string based terminators for `ActiveSupport::Callbacks`."Yves Senn2013-07-052-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d108672dada7ba97d3b3b56f0c6001cea621061e. Conflicts: activesupport/CHANGELOG.md
* | | | explain how to extend application templates. [ci skip]Yves Senn2013-07-051-0/+19
| | | |
* | | | fix typo in Active Support CHANGELOG. [ci skip]Yves Senn2013-07-051-1/+1
| | | |
* | | | remove string based terminators for `ActiveSupport::Callbacks`.Yves Senn2013-07-052-6/+4
| | | |
* | | | Merge pull request #11201 from ↵Yves Senn2013-07-051-13/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | jetthoughts/fix_create_post_example_in_getting_started Improve Getting Started Guide
| * | | Removed params permit step from 5.6 section [ci skip]Paul Nikitochkin2013-06-301-13/+10
| | | |
* | | | Merge pull request #11307 from jetthoughts/cleanup_assert_sqlCarlos Antonio da Silva2013-07-041-2/+1
|\ \ \ \ | | | | | | | | | | Cleanup belongs to tests
| * | | | Cleanup belongs to testsPaul Nikitochkin2013-07-051-2/+1
| | | | | | | | | | | | | | | | | | | | simplified logic to calculate number of queries by using assert_queries
* | | | | Merge pull request #11309 from crakalakin/AR-querying-guideCarlos Antonio da Silva2013-07-041-2/+0
|\ \ \ \ \ | |/ / / / |/| | | | removes markdown code markers from displaying in the active record querying guide [ci skip]
| * | | | removed markdown code markers which were rendering in the generated AR ↵Brian Foshee2013-07-041-2/+0
|/ / / / | | | | | | | | | | | | querying guide
* | | | Merge pull request #11303 from evsyukovmv/specify-request-method-in-guidesCarlos Antonio da Silva2013-07-042-2/+2
|\ \ \ \ | | | | | | | | | | Specify request method in guides [ci skip]
| * | | | Specify request method in guides [ci skip]Mihail Evsyukov2013-07-042-2/+2
| | | | |
* | | | | Merge pull request #11187 from ↵Steve Klabnik2013-07-041-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | jetthoughts/form_for_explonation_in_getting_started Added link to Form Helper article from getting strated [ci skip]
| * | | | Added link to Form Helper article from getting strated [ci skip]Paul Nikitochkin2013-07-041-3/+3
|/ / / /
* | | | Merge pull request #11299 from arunagw/disable_implicit_join_references_removedCarlos Antonio da Silva2013-07-043-11/+4
|\ \ \ \ | | | | | | | | | | Remove deprecated `ActiveRecord::Base.disable_implicit_join_references=`
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 06:02:55 +0000