aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't blindly call blame_file! on exceptions in ActiveSupport::Dependencies::...Andrew Kreiling2013-06-094-1/+19
* Merge pull request #10710 from senny/5554_let_the_database_raise_on_countsJon Leighton2013-06-094-11/+32
|\
| * Remove fall back and column restrictions for `count`.Yves Senn2013-06-093-10/+31
| * cleanup whitespace in relation.rbYves Senn2013-06-091-1/+1
|/
* Merge pull request #10886 from wangjohn/chnges_for_automatic_inverse_associat...Jon Leighton2013-06-0911-19/+45
|\
| * Getting rid of the +automatic_inverse_of: false+ option in associations in favorwangjohn2013-06-0811-19/+45
* | Merge pull request #10889 from diatmpravin/fix-typo-in-action-viewXavier Noria2013-06-081-1/+1
|\ \
| * | fixed typo in action_view templatediatmpravin2013-06-081-1/+1
| |/
* | Merge pull request #10893 from arunagw/test_for_checkpending_middlewareGuillermo Iguaran2013-06-081-0/+8
|\ \ | |/ |/|
| * Testing CheckPending middlewareArun Agrawal2013-06-081-0/+8
* | Override Time.at to work with Time-like valuesAndrew White2013-06-083-0/+38
* | ’ -> ' [ci skip]Steve Klabnik2013-06-081-1/+1
|/
* Merge pull request #10872 from AJAlabs/masterSteve Klabnik2013-06-071-4/+11
|\
| * Update Getting Started Guide - Strong ParametersAJ Acevedo2013-06-071-4/+11
* | Revert "Merge pull request #10539 from davidcelis/ar-sql-improvements"Jon Leighton2013-06-071-1/+5
* | Merge pull request #10539 from davidcelis/ar-sql-improvementsJon Leighton2013-06-071-5/+1
|\ \
| * | ActiveRecord::Relation#blank? should `LIMIT 1`David Celis2013-06-071-5/+1
|/ /
* | Merge pull request #10860 from ka8725/activemodel_logCarlos Antonio da Silva2013-06-071-0/+4
|\ \
| * | Stub logger for testsAndrey Koleshko2013-06-061-0/+4
* | | Merge pull request #10875 from vipulnsward/fix_some_typos_in_asCarlos Antonio da Silva2013-06-072-2/+2
|\ \ \
| * | | Fix some typosVipul A M2013-06-072-2/+2
| |/ /
* | | Merge pull request #10874 from rlivsey/patch-1Andrew White2013-06-071-1/+1
|\ \ \
| * | | Docfix: Use public interface instead of setting instance variablesRichard Livsey2013-06-071-1/+1
|/ / /
* | | Merge pull request #10561 from Empact/nix-throwresultJon Leighton2013-06-076-23/+35
|\ \ \ | |_|/ |/| |
| * | Rather than raising ThrowResult when construct_limited_ids_conditions comes u...Ben Woosley2013-05-103-21/+15
| * | Make NullRelation a bit more like a real relation by returning 0 for #calcula...Ben Woosley2013-05-102-3/+8
| * | No point in memoizing a simple literal string.Ben Woosley2013-05-101-1/+1
| * | Add coverage for the fact that pluck without an argument returns all the tabl...Ben Woosley2013-05-101-0/+5
| * | Fix that #pluck wasn't rescuing ThrowResult, meaning it would blow up when fa...Ben Woosley2013-05-102-0/+8
* | | Merge pull request #10871 from arunagw/lifo-to-railsXavier Noria2013-06-063-5/+5
|\ \ \
| * | | As we have moved to rails/docrails from lifo/docrailsArun Agrawal2013-06-063-5/+5
|/ / /
* | | registers recent patch in the railties CHANGELOGXavier Noria2013-06-061-0/+4
* | | clearing autoloaded constants triggers routes reloading [Fixes #10685]Xavier Noria2013-06-062-9/+61
* | | Merge pull request #10867 from iHiD/patch-1Xavier Noria2013-06-061-0/+2
|\ \ \ | |_|/ |/| |
| * | Add info about contributing to docs to CONTRIBUTING.mdJeremy Walker2013-06-061-0/+2
|/ /
* | Merge pull request #10851 from arunagw/fixing_build_pending_migrationAaron Patterson2013-06-051-0/+1
|\ \
| * | Fixing build for not checking migrationArun Agrawal2013-06-051-0/+1
|/ /
* | Merge pull request #10850 from arunagw/build_fix_null_migrationAaron Patterson2013-06-051-3/+3
|\ \
| * | Fix Build. Changing constructor.Arun Agrawal2013-06-051-3/+3
|/ /
* | Merge pull request #10482 from scudco/10432-fix-add-column-with-arrayAaron Patterson2013-06-053-0/+34
|\ \
| * | Fixes #10432 add_column not creating array columns in PostgreSQLAdam Anderson2013-06-043-0/+34
* | | only check pending migrations if there are new filesAaron Patterson2013-06-051-2/+25
* | | Fix #10789. Now at last ::Logger doesn't support #silence method .kennyj2013-06-052-3/+10
* | | the typecast value should be passed to the serializer. fixes #10830Aaron Patterson2013-06-052-6/+5
* | | adding a test for #10830Aaron Patterson2013-06-051-0/+18
* | | Merge pull request #10841 from latortuga/fix-underscore-dependency-trackingDavid Heinemeier Hansson2013-06-042-14/+42
|\ \ \
| * | | Fix mismatching variable names when using an underscoreDrew Ulmer2013-06-042-14/+42
* | | | Merge pull request #10839 from gsamokovarov/clean-normalize_encoded_pathsRafael Mendonça França2013-06-041-11/+7
|\ \ \ \
| * | | | Refactor ActionDispatch::Http::Parameters#normalize_encode_paramsGenadi Samokovarov2013-06-041-11/+7
* | | | | Merge pull request #10838 from gsamokovarov/routing-autoload_underRafael Mendonça França2013-06-041-5/+7
|\ \ \ \ \ | |_|/ / / |/| | | |