aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| | | |
* | | | Merge pull request #14707 from minio-sk/fix-issue-14702Rafael Mendonça França2014-04-111-0/+2
|\ \ \ \ | | | | | | | | | | Be explicit about allowed constraint values, fixes #14702
| * | | | Be explicit about allowed constraint values, fixes #14702Jano Suchal2014-04-111-0/+2
| | | | |
* | | | | Merge pull request #14692 from senny/pg/reload_type_map_for_unknown_typesYves Senn2014-04-118-16/+74
|\ \ \ \ \ | | | | | | | | | | | | PostgreSQL automatic type map reload
| * | | | | PostgreSQL, warn once per connection per missing OID. Closes #14275.Yves Senn2014-04-113-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | [Yves Senn & Matthew Draper]
| * | | | | PostgreSQL, adapter automatically reloads it's type map. Closes #14678.Yves Senn2014-04-118-16/+57
| | |/ / / | |/| | | | | | | | | | | | | [Yves Senn & Matthew Draper]
* | | | | Merge pull request #14705 from akshay-vishnoi/doc_changesRafael Mendonça França2014-04-114-0/+8
|\ \ \ \ \ | |_|/ / / |/| | | | Add more test case for #demodulize, Improve documentation
| * | | | Add more test case for #demodulize, Improve documentationAkshay Vishnoi2014-04-114-0/+8
| | | | |
* | | | | Merge pull request #14684 from Futurelearn/jc-deep-nested-shallow-url-helper-bugAndrew White2014-04-113-3/+40
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | Add a failing test for a URL helper that was broken by a6b9ea2.
| * | | | Only make deeply nested routes shallow when parent is shallowAndrew White2014-04-112-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `:shallow` may be set at any point in the resource nesting we should only make the new and collection routes shallow when the parent is shallow. This is a bit of a hack but until the mapper is refactored to an object graph instead of a hash of merged values it's the best we can do. Fixes #14684.
| * | | | Add a failing test for a URL helper that was broken by a6b9ea2.James Coglan2014-04-101-0/+18
| | |/ / | |/| |
* | | | docs, make association `autosave: true` examples runnable. Closes #14700Yves Senn2014-04-111-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] The examples are written in a way you expect them to be executable. However one snippet assumed there to be two comments when only one was created above. The defined models did not extend `ActiveRecord::Base` The example used `comments.last.mark_for_destruction`. This does no longer load the whole collection but just the last record. It is then refetcht on subsequent calls to `last`. This breaks the example.
* | | | Merge pull request #12829 from iantropov/issue_insert_via_hmt_scope_3548Rafael Mendonça França2014-04-106-4/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix insertion of records for hmt association with scope Conflicts: activerecord/CHANGELOG.md
| * | | | Fix insertion of records for hmt association with scope, fix #3548Ivan Antropov2013-11-176-4/+32
| | | | |
* | | | | Merge pull request #14694 from heironimus/callback_guideRafael Mendonça França2014-04-101-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Add after_commit/after_rollback to callback list
| * | | | | Add after_commit/after_rollback to callback listKyle Heironimus2014-04-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding after_commit/after_rollback to list of callbacks in order helps explain the callback order as well as making it consistent with the API docs at http://api.rubyonrails.org/classes/ActiveRecord/Callbacks.html
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-08 02:30:23 +0000