aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15049 from arthurnn/fix_ciRafael Mendonça França2014-05-091-1/+1
|\
| * Fix broken proc syntax for 1.9.3Arthur Neves2014-05-091-1/+1
|/
* skip dealing with params if none are providedAaron Patterson2014-05-091-4/+11
* don't mutate the options hash, so we don't have to dupAaron Patterson2014-05-091-4/+3
* use fnmatch to test for case insensitive file systemsAaron Patterson2014-05-091-4/+2
* use unless and || since these options are booleanAaron Patterson2014-05-091-1/+1
* Merge pull request #15045 from xanhast/patch-1Godfrey Chan2014-05-091-2/+4
|\
| * Documentation, add examples of using an Enum scopeZac2014-05-091-2/+4
|/
* test, regression test for has_many with instance dependent scope.Yves Senn2014-05-092-0/+12
* Merge pull request #15044 from zzak/travis_ruby_too_wonRafael Mendonça França2014-05-091-1/+1
|\
| * Only need MINOR version level to test Ruby 2.1.x on TravisZachary Scott2014-05-091-1/+1
|/
* Merge pull request #15042 from arthurnn/revert_dirty_transactionsRafael Mendonça França2014-05-093-52/+0
|\
| * Reverts "Fix bugs with changed attributes tracking when transaction gets roll...Arthur Neves2014-05-093-52/+0
* | just call the method and assert the return valueAaron Patterson2014-05-091-8/+1
|/
* Merge pull request #15041 from arthurnn/update_rubyGuillermo Iguaran2014-05-091-1/+1
|\
| * Use ruby 2.1.2 on travisArthur Neves2014-05-091-1/+1
|/
* add tests for path based url_for callsAaron Patterson2014-05-081-2/+19
* don't manipulate the testclass, just add helpers to the instanceAaron Patterson2014-05-081-10/+11
* add a test for classes with optionsAaron Patterson2014-05-081-0/+7
* add tests for the polymorphic_path methodAaron Patterson2014-05-081-0/+3
* Merge pull request #15030 from mechanicles/a-to-anRafael Mendonça França2014-05-081-1/+1
|\
| * Change 'a' to 'an' [ci skip]Santosh Wadghule2014-05-091-1/+1
* | Merge pull request #15029 from JuanitoFatas/docpatch/routingRafael Mendonça França2014-05-081-11/+11
|\ \ | |/ |/|
| * [ci skip] Minor improvements on routing.md.Juanito Fatas2014-05-091-11/+11
* | add more tests around the polymorphic url apiAaron Patterson2014-05-081-0/+12
* | set a constant for the "anonymous" habtm model fixes #15022Aaron Patterson2014-05-082-0/+11
* | test, regression test for unparsable PostgreSQL defaults.Yves Senn2014-05-081-0/+17
* | Merge pull request #14992 from fredwu/habtm_relation_size_calculation_fixCarlos Antonio da Silva2014-05-084-1/+30
|\ \
| * | Fixed HABTM's CollectionAssociation sizeFred Wu2014-05-084-1/+30
* | | test, reset changed state in PG's uuid tests.Yves Senn2014-05-081-2/+4
* | | pg guide, inet code example. [ci skip]Yves Senn2014-05-081-3/+29
|/ /
* | Merge pull request #15020 from ivantsepp/contributing_to_rails_guide_fixGodfrey Chan2014-05-071-1/+1
|\ \
| * | Branch name should match in text and code example.Ivan Tse2014-05-081-1/+1
|/ /
* | Merge pull request #15016 from arthurnn/dup_attr_on_save_stateGodfrey Chan2014-05-071-1/+1
|\ \
| * | Dup the changed_attributes otherwise we could lose themArthur Neves2014-05-071-1/+1
|/ /
* | Merge pull request #15015 from pothibo/database-configurationRafael Mendonça França2014-05-073-1/+22
|\ \
| * | Use Rails::Paths::Path#existent in database_configurationPier-Olivier Thibault2014-05-073-1/+22
* | | Add CHANGELOG entry for #14989Rafael Mendonça França2014-05-071-0/+5
* | | Return a non zero code when db has never been setup on statusPaul B2014-05-072-3/+2
* | | Merge pull request #12746 from coreyward/masterRafael Mendonça França2014-05-072-15/+36
|\ \ \
| * | | Fix Hash#deep_merge bug and improve documentation — resolves #12738Corey Ward2013-12-092-11/+31
* | | | Merge branch 'rm-trasaction-fix-13166'Rafael Mendonça França2014-05-073-0/+52
|\ \ \ \ | |_|/ / |/| | |
| * | | Keep track of dirty attrs after after rollback.Arthur Neves2014-05-074-20/+11
| * | | Merge pull request #13166 from bogdan/transaction-magicRafael Mendonça França2014-05-073-1/+62
|/| | |
| * | | Fix bugs with changed attributes tracking when transaction gets rollbackBogdan Gusiev2013-12-043-1/+62
* | | | Merge pull request #15012 from schneems/schneems/headers-keyYves Senn2014-05-072-1/+5
|\ \ \ \
| * | | | HTTP::Headers#key? correctly convertsschneems2014-05-072-1/+5
* | | | | test for inconsistency between String and Symbol url_for handlingAaron Patterson2014-05-071-0/+4
* | | | | add tests for symbols passed to polymorphic_urlAaron Patterson2014-05-071-0/+12
|/ / / /
* | | | test, persist inherited class with different table name. Refs #14971.Yves Senn2014-05-071-0/+14