aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Return null type format when format is not knowRafael Mendonça França2014-04-143-1/+13
| | | | | | | | | | | | | | | | | | | | | | When requesting a controller with the following code with a unknown format: def my_action respond_to do |format| format.json { head :ok } format.any { render text: 'Default response' } end end we should render the default response instead of raising ActionController::UnknownFormat Fixes #14462 Conflicts: actionpack/CHANGELOG.md actionpack/test/controller/mime/respond_with_test.rb Conflicts: actionpack/CHANGELOG.md
* Remove outdated commentRafael Mendonça França2014-04-141-1/+0
|
* Merge pull request #14729 from akshay-vishnoi/doc_changesRichard Schneeman2014-04-142-7/+7
|\ | | | | [ci skip] Improve doc, fix grammatical issue
| * [ci skip] Improve doc, fix grammatical issueAkshay Vishnoi2014-04-132-7/+7
| |
* | Merge pull request #14735 from byroot/idempotent-counter-cachesAaron Patterson2014-04-143-4/+47
|\ \ | | | | | | Idempotent counter caches, fix concurrency issues with counter caches
| * | Make counter cache decrementation on destroy idempotentJean Boussier2014-04-132-4/+26
| | |
| * | Write the failing test case for concurrent counter cacheJean Boussier2014-04-131-0/+21
| | |
* | | Merge pull request #14746 from zenati/masterYves Senn2014-04-141-1/+1
|\ \ \ | | | | | | | | Reference and link to install RVM in the Getting Started Guide. [ci skip]
| * | | [ci skip] Added link to ruby-lang.org installation.ZENATI YASSINE2014-04-141-1/+1
| | | |
* | | | Use the index on hidden fieldRafael Mendonça França2014-04-141-1/+1
| | | |
* | | | Merge pull request #14736 from nashby/hidden-indexRafael Mendonça França2014-04-143-4/+26
|\ \ \ \ | |/ / / |/| | | `collection_check_boxes` respects `:index` option for the hidden filed name
| * | | `collection_check_boxes` respects `:index` option for the hidden filed name.Vasiliy Ermolovich2014-04-143-4/+26
| |/ / | | | | | | | | | closes #14147
* | | docs, double meaning of `serialize` argument. Closes #14284.Yves Senn2014-04-141-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | The second argument to serialize has double meaning: * `class_name` of the Type to serialize * `coder` to use then serializing. The new variable name and the docs better describe that behavior.
* | | Merge pull request #14739 from oysta/guide-fixesYves Senn2014-04-141-2/+2
|\ \ \ | | | | | | | | Fix some inconsistent references between text and example code in getting started guide [ci skip]
| * | | - Fix lingering reference to `:text` instead of the newer `:plain`Christopher Owen2014-04-141-2/+2
| | | | | | | | | | | | | | | | - Section references `form_tag` instead of the `form_for` used in the example
* | | | Merge pull request #14740 from laurocaetano/read-attributeRafael Mendonça França2014-04-142-7/+7
|\ \ \ \ | |/ / / |/| | | Just call read_attribute, no need to use send.
| * | | Just call read_attribute, no need to use `send`.Lauro Caetano2014-04-142-7/+7
|/ / / | | | | | | | | | Follow up to af549a1ad6692d7e2c756750651f0e1b293f5185
* | | again, read_attribute is public, so just call itAaron Patterson2014-04-131-1/+1
| | |
* | | read_attribute is public, so we should just call itAaron Patterson2014-04-131-1/+1
| | |
* | | Merge pull request #14737 from nickborromeo/disable-asset-cache-docsArthur Nogueira Neves2014-04-131-0/+8
|\ \ \ | | | | | | | | Disable assest cache store in docs [ci skip]
| * | | Disable assest cache store in docs [ci skip]Nick Borromeo2014-04-131-0/+8
|/ / /
* | | Merge pull request #14732 from JuanitoFatas/doc/patch1Robin Dupret2014-04-134-5/+5
|\ \ \ | |/ / |/| | [ci skip] Use plain underscore instead of "\_". [ci skip]
| * | [ci skip] Use plain underscore instead of "\_".Juanito Fatas2014-04-134-5/+5
|/ /
* | Merge pull request #14592 from ↵Rafael Mendonça França2014-04-134-0/+54
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | laurocaetano/equality_between_relation_and_collection_proxy The comparison between `Relation` and `CollectionProxy` should be consistent. Conflicts: activerecord/CHANGELOG.md
| * | Ensure that the comparison between 'CollectionProxy' and ↵Lauro Caetano2014-04-121-0/+9
| | | | | | | | | | | | 'AssociationRelation' is consistent.
| * | Make the comparison between 'Relation' and 'AssociationRelation'Lauro Caetano2014-04-123-1/+14
| | | | | | | | | | | | consistent.
| * | The comparison between `Relation` and `CollectionProxy` should be consistent.Lauro Caetano2014-04-113-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: author.posts == Post.where(author_id: author.id) # => true Post.where(author_id: author.id) == author.posts # => true Fixes #13506
* | | Merge pull request #14726 from akshay-vishnoi/structural-changeRafael Mendonça França2014-04-132-0/+0
|\ \ \ | | | | | | | | Move tests for deep_dup and duplicable to object directory
| * | | Move tests for deep_dup and duplicable to object directoryAkshay Vishnoi2014-04-132-0/+0
| | |/ | |/|
* | | Merge pull request #14722 from maurogeorge/mg-readonly-collectionSantiago Pastorino2014-04-132-1/+45
|\ \ \ | | | | | | | | CollectionHelpers now accepts a readonly option
| * | | CollectionHelpers now accepts a readonly optionMauro George2014-04-122-1/+45
| | | |
* | | | Merge pull request #14718 from ↵Santiago Pastorino2014-04-1318-25/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | mcmorgan/update-documentation-to-match-generated-config Update documentation to use Rails.application instead
| * | | | Update documentation to use Rails.application insteadMarcel Morgan2014-04-1318-25/+24
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | References to ``AppName::Application` removed in favour of ``Rails.application`` as generated with a new rails 4.1 app. [ci skip]
* | | | Merge pull request #14727 from robin850/patch-17Yves Senn2014-04-131-0/+14
|\ \ \ \ | |/ / / |/| | | Add a changelog entry for #14546 [ci skip]
| * | | Add a changelog entry for #14546 [ci skip]Robin Dupret2014-04-131-0/+14
|/ / /
* | | Merge pull request #14725 from afshinator/patch-1Richard Schneeman2014-04-121-1/+1
|\ \ \ | | | | | | | | Missing 'are' in note - [ci skip]
| * | | Missing 'are' in note - [ci skip]Afshin Mokhtari2014-04-121-1/+1
|/ / / | | | | | | This is in the note at the end of Section 2: Controller Naming Convention. [ci skip]
* | | Fix a few typos [ci skip]Robin Dupret2014-04-121-13/+13
| | | | | | | | | | | | This is a follow up to 545afc15.
* | | Merge pull request #14720 from philr/tzinfo_data_x64_mingwRafael Mendonça França2014-04-121-1/+1
|\ \ \ | | | | | | | | Bundle tzinfo-data on :x64_mingw (64-bit Ruby on Windows).
| * | | Bundle tzinfo-data on :x64_mingw (64-bit Ruby on Windows).Phil Ross2014-04-121-1/+1
|/ / /
* | | don't bother with an offset if the offset is zeroAaron Patterson2014-04-121-6/+9
| | | | | | | | | | | | | | | we're guaranteed to pass a numeric value for offset, so if it's zero, just don't add an offset to the query
* | | only add the offset and index when we need toAaron Patterson2014-04-121-8/+9
| | |
* | | remove branching logic from calls to find_nthAaron Patterson2014-04-121-6/+10
|/ /
* | Merge pull request #14717 from vipulnsward/change-37signal-linksRobin Dupret2014-04-123-4/+4
|\ \ | | | | | | Change links to 37signals and svn blog to point to new destinations. [ci skip]
| * | Change links to 37signals and svn blog to point to new destinations. [ci skip]Vipul A M2014-04-123-4/+4
|/ /
* / please use Ruby, not ActiveSupportAaron Patterson2014-04-111-1/+1
|/
* Merge branch 'rm-fix-13648'Rafael Mendonça França2014-04-115-3/+35
|\ | | | | | | | | | | | | Includes https://github.com/rails/rails/pull/14711 and some cleanup commits. Fixes #13648
| * Use assert_notRafael Mendonça França2014-04-111-1/+1
| |
| * New CHANGELOG entries are in to top of fileRafael Mendonça França2014-04-111-7/+7
| |
| * :scissors:Rafael Mendonça França2014-04-113-7/+7
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 19:12:28 +0000