aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Deprecated Numeric#{ago,until,since,from_now}Godfrey Chan2013-11-264-31/+58
* Merge pull request #13061 from laurocaetano/fix-uniqueness-validation-for-ali...Rafael Mendonça França2013-11-263-1/+23
* Merge pull request #12183 from chancancode/json_encoder_refactorJeremy Kemper2013-11-263-113/+107
|\
| * Be explicit and use the actual unicode sequenceGodfrey Chan2013-11-261-1/+1
| * Process::Status should get a :nodoc: [ci skip]Godfrey Chan2013-11-261-1/+1
| * Make the JSON encoder pluggableGodfrey Chan2013-11-261-2/+8
| * Removed the Ruby encoder and switched to using the JSON gemGodfrey Chan2013-11-263-82/+74
| * Removed support for encoding BigDecimal as a JSON numberGodfrey Chan2013-11-263-25/+1
| * Expanded coverage on JSON encodingGodfrey Chan2013-11-261-2/+12
| * Added some failing tests where the JSON encoder is not resolving as_json corr...Godfrey Chan2013-11-261-2/+12
* | More typo fixesAkira Matsuda2013-11-272-2/+2
|/
* Minor typo fixesAkira Matsuda2013-11-274-6/+6
* Add branch to arel in Gemfile so that we can use local repos [ci skip]Carlos Antonio da Silva2013-11-261-1/+1
* Merge pull request #13018 from heruku/scoping_fixYves Senn2013-11-264-1/+19
|\
| * changed update counter to act on unscoped modelheruku2013-11-264-1/+19
|/
* Merge pull request #13049 from senny/remove_firebird_testsRafael Mendonça França2013-11-263-148/+0
|\
| * remove leftover firebird adapter tests.Yves Senn2013-11-263-148/+0
* | sync example and documentation for strong_parameters hash whitelisting.Yves Senn2013-11-261-5/+7
* | tyopAkira Matsuda2013-11-261-1/+1
|/
* `rename_index`: add the new index before removing the old one.Yves Senn2013-11-263-8/+29
* Merge pull request #13042 from brianstorti/fix-dependent-destroy-12812Rafael Mendonça França2013-11-255-1/+25
|\
| * move changelog entry to the topBrian Thomas Storti2013-11-251-6/+6
| * Raise `RecordNotDestroyed` when children can't be replacedBrian Thomas Storti2013-11-255-1/+25
|/
* require the files we testAaron Patterson2013-11-251-0/+1
* Merge pull request #13034 from vipulnsward/some_typosRafael Mendonça França2013-11-252-2/+2
|\
| * Fix some minor typos [ci skip]Vipul A M2013-11-262-2/+2
* | Revert "Merge pull request #13027 from akshay-vishnoi/f-refactor"Carlos Antonio da Silva2013-11-251-1/+1
* | Merge pull request #13027 from akshay-vishnoi/f-refactorYves Senn2013-11-251-1/+1
|\ \
| * | avoiding calling of #option_value_selected? two timesAkshay Vishnoi2013-11-251-1/+1
* | | Merge pull request #13029 from akshay-vishnoi/documentationYves Senn2013-11-251-4/+4
|\ \ \ | |_|/ |/| |
| * | `delgated` => `delegated`Akshay Vishnoi2013-11-251-4/+4
* | | Merge pull request #13025 from pwnall/nice_testYves Senn2013-11-253-0/+19
|\ \ \
| * | | Better error message for typos in assert_response argument.Victor Costan2013-11-253-0/+19
|/ / /
* | | Merge pull request #13026 from vipulnsward/document_rewhereYves Senn2013-11-241-0/+26
|\ \ \
| * | | Added `rewhere` usage to AR querying guidesVipul A M2013-11-251-0/+26
|/ / /
* | | Merge pull request #13020 from razielgn/raise-inspectable-messagesCarlos Antonio da Silva2013-11-242-4/+4
|\ \ \
| * | | Raise RuntimeErrors with inspectable and MRI-independent messages.Federico Ravasio2013-11-242-4/+4
* | | | Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-2429-183/+203
|\ \ \ \
| * | | | a couple of copy-edits before merging [ci skip]Xavier Noria2013-11-241-3/+2
| * | | | API Documentation Guidelines link correction [ci skip]Harshad Sabne2013-11-231-1/+1
| * | | | Improve reading / style of hashes in AR guideCarlos Antonio da Silva2013-11-191-5/+5
| * | | | Revert last two commits mistakenly changing join/include syntaxCarlos Antonio da Silva2013-11-191-7/+7
| * | | | syntax error joining/including modelsSergio2013-11-181-2/+2
| * | | | syntax error joining tablesSergio2013-11-181-5/+5
| * | | | The option is called encode_big_decimal_as_string [ci-skip]Godfrey Chan2013-11-151-1/+1
| * | | | Update action_controller_overview.md [ci skip]Harshad Sabne2013-11-151-1/+1
| * | | | Fix broken Wikipedia link.Harshad Sabne2013-11-131-1/+1
| * | | | Remove outdated guide on using rack builder w/o rails middlewareAlex Johnson2013-11-131-20/+0
| * | | | Correct guide relating MiddlewareStackProxy with EnumerableAlex Johnson2013-11-131-5/+4
| * | | | [ci skip] Replace #=> with # =>Alex Johnson2013-11-123-17/+17