aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Do not run remove_connection in memory db testRafael Mendonça França2015-02-051-7/+7
* Mark some methods as nodocRafael Mendonça França2015-02-051-6/+6
* Remove special case for symbols at findRafael Mendonça França2015-02-051-2/+0
* Merge branch 'rm-use-active-model-correctly'Rafael Mendonça França2015-02-056-28/+103
|\
| * Rename method to make explicit its intentionRafael Mendonça França2015-02-053-3/+3
| * Use kwags to make the argument meaning explicitRafael Mendonça França2015-02-053-6/+6
| * Use new hash syntaxRafael Mendonça França2015-02-051-1/+1
| * Change the method visibilityRafael Mendonça França2015-02-051-2/+4
| * Add tests to make sure label and placeholder respect to_modelRafael Mendonça França2015-02-052-0/+58
| * Only check if object respond_to to_model onceRafael Mendonça França2015-02-051-6/+2
| * placeholder doesn't exist inside this contextRafael Mendonça França2015-02-051-2/+2
| * Merge pull request #18647 from mcls/placeholderable-to-modelRafael Mendonça França2015-02-054-28/+47
| |\
| | * Reduce duplication when generating translationsMaarten Claes2015-01-224-34/+47
| | * Convert with `to_model` before calling ActiveModel methods on `object`Maarten Claes2015-01-222-8/+14
* | | Force generated route to be insertedAndrew White2015-02-053-1/+10
|/ /
* | Partial template name does no more have to be a valid Ruby identifierAkira Matsuda2015-02-065-16/+21
* | Merge pull request #18610 from amatsuda/privatize_config_accessorAkira Matsuda2015-02-063-0/+13
|\ \
| * | Privatize config_accessor as with attr_accessorAkira Matsuda2015-02-063-0/+13
|/ /
* | Move ruby-head to allowed failures [ci skip]Sean Griffin2015-02-051-0/+1
* | Merge pull request #18820 from tycooon/transaction-rollback-fixSean Griffin2015-02-051-1/+1
|\ \
| * | fix transaction rollback in case of aborting threadYuri Smirnov2015-02-051-1/+1
|/ /
* | Merge pull request #18817 from y-yagi/fix_action_controller_gem_templateArthur Nogueira Neves2015-02-041-1/+1
|\ \
| * | load "rack/test" before "action_controller/railtie" in bug report templates [...yuuji.yaginuma2015-02-051-1/+1
|/ /
* | Merge pull request #18809 from meltheadorable/bugfix/postgres_moneySean Griffin2015-02-043-5/+7
|\ \
| * | Fix test cases for money, bit and bit_varyingMelody2015-02-042-2/+4
| * | Add default options to 'bit' and 'bit_varying' methodsMelody2015-02-031-2/+2
| * | Adds default options hash for postgres money typeMelody Berton2015-02-031-1/+1
* | | Respect custom primary keys for associations in `Relation#where`Sean Griffin2015-02-044-2/+65
* | | revert 539d929b7b32302afe548e4cb06b5f4dd56e9942 [ci skip]Abdelkader Boudih2015-02-041-1/+1
* | | Merge pull request #18812 from yatmsu/fix_typo_in_rails_guidesAbdelkader Boudih2015-02-041-1/+1
|\ \ \ | |/ / |/| |
| * | Fix typo in Creating and Customizing Rails Generators & Templates guidesYasuhiko Katoh (y@su)2015-02-041-1/+1
|/ /
* | Don't remove all line endings from routes.rbAndrew White2015-02-033-2/+26
* | rm `Column#cast_type`Sean Griffin2015-02-0314-138/+185
* | Correct errors in counter cache updatingSean Griffin2015-02-033-3/+14
* | `RouteSet` should not be listed in the public API [ci skip]Sean Griffin2015-02-031-10/+10
* | Merge pull request #18801 from andreynering/fix-js-linkEileen M. Uchitelle2015-02-031-1/+1
|\ \
| * | Fix link [ci skip]Andrey Nering2015-02-031-1/+1
* | | Merge pull request #18800 from jtperreault/masterAbdelkader Boudih2015-02-031-1/+1
|\ \ \
| * | | [ci skip]James T. Perreault2015-02-031-1/+1
| |/ /
* | | Merge pull request #18758 from yuki24/change-travel-to-stub-datetime-tooRafael Mendonça França2015-02-033-0/+17
|\ \ \ | |/ / |/| |
| * | Change AS::Testing::TimeHelpers#travel_to to also stub DateTime.nowYuki Nishijima2015-02-033-0/+17
* | | Merge pull request #18795 from vipulnsward/remove-magic-commentsJeremy Kemper2015-02-0377-78/+0
|\ \ \ | |/ / |/| |
| * | Removed magic comments # encoding: utf-8 , since its default from ruby 2.0 on...Vipul A M2015-02-0377-78/+0
* | | Merge pull request #18796 from 5minpause/masterCarlos Antonio da Silva2015-02-031-2/+2
|\ \ \
| * | | Small enhancement for generatorsHolger Frohloff2015-02-031-2/+2
* | | | Wrap method arguments with parentheses in docsCarlos Antonio da Silva2015-02-031-1/+1
|/ / /
* | | Merge pull request #18794 from vipulnsward/fix-dirtyAbdelkader Boudih2015-02-031-1/+5
|\ \ \ | |/ / |/| |
| * | Person class doesn't contain finder methods, hence usage of Person.find_by is...Vipul A M2015-02-031-1/+5
|/ /
* | Merge pull request #18791 from Sinjo/consistent-foreign-key-name-generationSean Griffin2015-02-023-3/+16
|\ \
| * | Generate consistent names for foreign keysChris Sinjakli2015-02-033-3/+16