aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * Merge pull request #14711 from ↵Rafael Mendonça França2014-04-115-3/+35
|/| | | | | | | | | | | swoker/activerecord_fix_aggregate_methods_with_select Activerecord fix aggregate methods with select
| * fix exception on polymorphic associations with predicatesSimon Woker2014-04-112-0/+16
| |
| * Fix error for aggregate methods with select, see issue #13648Simon Woker2014-04-103-3/+19
| |
* | Merge pull request #14646 from deivid-rodriguez/provide_byebug_by_defaultRafael Mendonça França2014-04-1111-294/+489
|\ \ | | | | | | Improve debugging support
| * | Re-review the debugging guide.David Rodríguez de Dios2014-04-111-133/+218
| | | | | | | | | | | | Tested on a brand new app to exactly match current byebug's behaviour.
| * | Minor fixes in the rails debugging guideDavid Rodríguez de Dios2014-04-111-2/+2
| | |
| * | Prevent generation of extra whitespace in templatesDavid Rodríguez de Dios2014-04-102-6/+6
| | |
| * | Isolate debugger related codeDavid Rodríguez de Dios2014-04-102-24/+32
| | |
| * | Update debugging guide to use byebugDavid Rodríguez de Dios2014-04-081-177/+246
| | |
| * | Update Gemfile templates to provide correct debuggerDavid Rodríguez de Dios2014-04-084-7/+21
| | |
| * | Keep debugger support only for rubies < 2.0.0David Rodríguez de Dios2014-04-086-12/+31
| | |
* | | Fix version indicator on guides and link to Rails 4.0 [ci skip]Rafael Mendonça França2014-04-111-1/+4
| | |
* | | Merge pull request #14689 from matthewd/asset_initializerRafael Mendonça França2014-04-116-11/+24
|\ \ \ | | | | | | | | Move assets precompile (and version) to an initializer
| * | | Move assets precompile (and version) to an initializerMatthew Draper2014-04-116-11/+24
| | |/ | |/| | | | | | | | | | sprockets-rails 2.1 needs the precompile list to be available in all environments.
* | | Add CHANGELOG entry for #14619 [ci skip]Rafael Mendonça França2014-04-111-0/+4
| | |
* | | Merge pull request #14619 from winston/enhance-routing-error-htmlRafael Mendonça França2014-04-111-63/+119
|\ \ \ | | | | | | | | | | | | Enhance routing error html page
| * | | Split search results into 'exact matches' and 'fuzzy matches'.Winston2014-04-111-60/+96
| | | | | | | | | | | | | | | | - also refactored the javascript.
| * | | Improve CSS styling for routing error html page.Winston2014-04-111-7/+25
| | | |
| * | | Implement fuzzy matching for route search on routing error html page.Winston2014-04-111-8/+10
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 06:20:10 +0000