Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 ":" | ||||
| * | | | | Replaced older rocket sign to new : | Ankit Gupta-FIR | 2013-07-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #11261 from ryan-endacott/fixguide | Yves Senn | 2013-07-04 | 1 | -10/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Removed redundant upgrade docs on new cookies. | ||||
| * | | | | | Removed redundant upgrade docs on new cookies. | Ryan Endacott | 2013-07-04 | 1 | -10/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | remove leftover if after deprecation removal (68563128). | Yves Senn | 2013-07-04 | 1 | -4/+1 |
| |_|/ / / |/| | | | | |||||
* | | | | | remove useless `env.merge!(env)` from ActionDispatch::IntegrationTest` | Yves Senn | 2013-07-04 | 1 | -2/+0 |
| | | | | | |||||
* | | | | | build fix: railties tests used deprecated `SchemaCache` methods. | Yves Senn | 2013-07-04 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Remove deprecated nil-passing to `SchemaCache` methods. | Yves Senn | 2013-07-04 | 2 | -28/+13 |
| | | | | | |||||
* | | | | | replace artificial space with RDoc markup (follow up #11285). [ci skip] | Yves Senn | 2013-07-04 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Remove deprecated block filter from `ActiveRecord::Migrator#migrate`. | Yves Senn | 2013-07-04 | 2 | -9/+5 |
| | | | | | |||||
* | | | | | Merge pull request #11285 from ankit8898/master | Yves Senn | 2013-07-04 | 1 | -1/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | Fixing the broken wikipedia link for Optimistic Concurrency control [ci skip] | ||||
| * | | | | [ci skip] Separated full stop from the Optimistic_concurrency_control wiki ↵ | ankit8898 | 2013-07-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | link d4e3f8ba826cd42aa3c242149 | ||||
* | | | | | Merge pull request #11286 from edogawaconan/fix/doc-201307041646 | Xavier Noria | 2013-07-04 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Missing closing + in documentation [ci skip] | ||||
| * | | | | | Missing closing + in documentation [ci skip] | Edho Arief | 2013-07-04 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Remove deprecated String constructor from `ActiveRecord::Migrator`. | Yves Senn | 2013-07-04 | 3 | -9/+4 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #11277 from arunagw/deprecation-removed | Yves Senn | 2013-07-04 | 5 | -46/+17 |
|\ \ \ \ \ | |/ / / / |/| | | | | Deprecation removed |