Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #11339 from arunagw/running-actionpack-isolated | Yves Senn | 2013-07-06 | 1 | -1/+1 |
|\ | | | | | Running isolated test for assertions and journey | ||||
| * | Running isolated test for assertions and journey | Arun Agrawal | 2013-07-06 | 1 | -1/+1 |
|/ | | | | in actionpack | ||||
* | Merge pull request #11337 from arunagw/actionview-rdoc | Rafael Mendonça França | 2013-07-06 | 2 | -10/+0 |
|\ | | | | | RUNNING_UNIT_TESTS tweaks. | ||||
| * | actionpack not having activerecord tests [ci skip] | Arun Agrawal | 2013-07-06 | 1 | -10/+0 |
| | | |||||
| * | RUNNING_UNIT_TESTS file is in rdoc [ci skip] | Arun Agrawal | 2013-07-06 | 1 | -0/+0 |
| | | |||||
* | | fixes Rails version for the stable API [ci skip] | Xavier Noria | 2013-07-06 | 2 | -1/+13 |
| | | |||||
* | | Merge pull request #11306 from ↵ | Rafael Mendonça França | 2013-07-06 | 3 | -2/+50 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/11288_remove_extra_queries_for_belongs_to_with_touch #11288: Removed duplicated touching Conflicts: activerecord/CHANGELOG.md | ||||
| * | | #11288: Removed duplicated touching | Paul Nikitochkin | 2013-07-05 | 3 | -2/+50 |
| | | | | | | | | | | | | | | | | | | if belongs to model with touch option on touch Closes #11288 | ||||
* | | | fixes broken links in the API [Fixes #11335] [ci skip] | Xavier Noria | 2013-07-06 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Merge pull request #11332 from sanemat/fix/av-test-duplication | Rafael Mendonça França | 2013-07-06 | 1 | -3/+0 |
|\ \ | | | | | | | Remove actionview test duplication | ||||
| * | | Remove action view test duplication | sanemat | 2013-07-07 | 1 | -3/+0 |
|/ / | | | | | | | Same test exists above 2 or 3 lines. | ||||
* | | Merge pull request #11329 from vipulnsward/cache_one | Rafael Mendonça França | 2013-07-06 | 1 | -1/+3 |
|\ \ | | | | | | | Extract common query to a constant. | ||||
| * | | Extract common query to a constant. | Vipul A M | 2013-07-06 | 1 | -1/+3 |
| | | | | | | | | | | | | Perf ref: https://gist.github.com/vipulnsward/8209749201dfdd678c97 | ||||
* | | | Merge pull request #11327 from schuetzm/hash-with-indifferent-access-select | Yves Senn | 2013-07-06 | 3 | -1/+12 |
|\ \ \ | |/ / |/| | | Make HashWithIndifferentAccess#select always return the hash. | ||||
| * | | Make HashWithIndifferentAccess#select always return the hash. | Marc Schütz | 2013-07-06 | 3 | -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/master | Rafael Mendonça França | 2013-07-05 | 1 | -3/+1 |
|\ \ | | | | | | | Tidying "getting started" guide | ||||
| * | | Merged sections to reflect current contents of guide. | blahedo | 2013-07-05 | 1 | -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/docrails | Vijay Dev | 2013-07-06 | 4 | -2/+43 |
|\ \ | |||||
| * | | [doc] fixed printing of code samples | Arun Agrawal | 2013-07-02 | 1 | -1/+1 |
| | | | |||||
| * | | Complete a sentence in i18n guide's introduction | Robin Dupret | 2013-06-30 | 1 | -0/+5 |
| | | | | | | | | | Add a list of what will be covered into this guide | ||||
| * | | doc for more input tag types | Vishnu Atrai | 2013-06-29 | 1 | -0/+36 |
| | | | |||||
| * | | cookies are encrypted starting Rails 4 | Neeraj Singh | 2013-06-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #11314 from raysrashmi/fix-missing-deprecation-stuff | Rafael Mendonça França | 2013-07-05 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Adding back deprecation require in all.rb | ||||
| * | | | Adding back deprecation require in all.rb | Rashmi Yadav | 2013-07-05 | 1 | -0/+1 |
|/ / / | |||||
* | / | Revert "Merge pull request #11299 from ↵ | Yves Senn | 2013-07-05 | 3 | -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-space | Steve Klabnik | 2013-07-05 | 3 | -1/+34 |
|\ \ | | | | | | | Space is not required for Set-Cookie header | ||||
| * | | Space is not required for Set-Cookie header | Yamagishi Kazutoshi | 2013-07-05 | 3 | -1/+34 |
| | | | |||||
* | | | Revert "remove string based terminators for `ActiveSupport::Callbacks`." | Yves Senn | 2013-07-05 | 2 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d108672dada7ba97d3b3b56f0c6001cea621061e. Conflicts: activesupport/CHANGELOG.md | ||||
* | | | explain how to extend application templates. [ci skip] | Yves Senn | 2013-07-05 | 1 | -0/+19 |
| | | | |||||
* | | | fix typo in Active Support CHANGELOG. [ci skip] | Yves Senn | 2013-07-05 | 1 | -1/+1 |
| | | | |||||
* | | | remove string based terminators for `ActiveSupport::Callbacks`. | Yves Senn | 2013-07-05 | 2 | -6/+4 |
| | | | |||||
* | | | Merge pull request #11201 from ↵ | Yves Senn | 2013-07-05 | 1 | -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 Nikitochkin | 2013-06-30 | 1 | -13/+10 |
| | | | |||||
* | | | Merge pull request #11307 from jetthoughts/cleanup_assert_sql | Carlos Antonio da Silva | 2013-07-04 | 1 | -2/+1 |
|\ \ \ | | | | | | | | | Cleanup belongs to tests | ||||
| * | | | Cleanup belongs to tests | Paul Nikitochkin | 2013-07-05 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | simplified logic to calculate number of queries by using assert_queries | ||||
* | | | | Merge pull request #11309 from crakalakin/AR-querying-guide | Carlos Antonio da Silva | 2013-07-04 | 1 | -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 Foshee | 2013-07-04 | 1 | -2/+0 |
|/ / / | | | | | | | | | | querying guide | ||||
* | | | Merge pull request #11303 from evsyukovmv/specify-request-method-in-guides | Carlos Antonio da Silva | 2013-07-04 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Specify request method in guides [ci skip] | ||||
| * | | | Specify request method in guides [ci skip] | Mihail Evsyukov | 2013-07-04 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #11187 from ↵ | Steve Klabnik | 2013-07-04 | 1 | -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 Nikitochkin | 2013-07-04 | 1 | -3/+3 |
|/ / / | |||||
* | | | Merge pull request #11299 from arunagw/disable_implicit_join_references_removed | Carlos Antonio da Silva | 2013-07-04 | 3 | -11/+4 |
|\ \ \ | | | | | | | | | Remove deprecated `ActiveRecord::Base.disable_implicit_join_references=` | ||||
| * | | | Remove deprecated `ActiveRecord::Base.disable_implicit_join_references=`. | Arun Agrawal | 2013-07-04 | 3 | -11/+4 |
| | | | | |||||
* | | | | Merge pull request #11298 from raysrashmi/removed-deprecation-require | Carlos Antonio da Silva | 2013-07-04 | 3 | -3/+0 |
|\ \ \ \ | | | | | | | | | | | Removed unsued deprecation require | ||||
| * | | | | Removed unsued deprecation require | Rashmi Yadav | 2013-07-04 | 3 | -3/+0 |
| | | | | | |||||
* | | | | | Merge pull request #11300 from arunagw/railties-engine-deprecation-removed | José Valim | 2013-07-04 | 3 | -12/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | Removed deprecated `Rails.application.railties.engines`. | ||||
| * | | | | Removed deprecated `Rails.application.railties.engines`. | Arun Agrawal | 2013-07-04 | 3 | -12/+4 |
| |/ / / | |||||
* | | | | Merge pull request #11297 from ankit8898/master | Rafael Mendonça França | 2013-07-04 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | SQL keywords in UPPERCASE | ||||
| * | | | | SQL Keywords to be in UPPERCASE | ankit8898 | 2013-07-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #11295 from ankit8898/master | Rafael Mendonça França | 2013-07-04 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | Replaced older rocket sign to new ":" |