aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Change AS::Testing::TimeHelpers#travel_to to also stub DateTime.nowYuki Nishijima2015-02-033-0/+17
* 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
* | Merge pull request #18789 from jafrog/masterSean Griffin2015-02-021-1/+2
|\ \
| * | Fix a typo in autoloading doc and note on autoload_paths [ci skip]jafrog2015-02-021-1/+2
* | | Properly lookup the limit for bigintSean Griffin2015-02-022-1/+11
| |/ |/|
* | Rename `user_provided_types` to something more meaningfulSean Griffin2015-02-021-4/+4
* | Remove unused `Column#with_type`Sean Griffin2015-02-021-6/+0
|/
* Merge pull request #18779 from jduff/fix_documentation_typoAbdelkader Boudih2015-02-021-1/+1
|\
| * Fix typo in Time#change docsJohn Duff2015-02-021-1/+1
|/
* Merge pull request #18612 from eileencodes/fix-validates-on-associated-record...Aaron Patterson2015-02-019-5/+80
|\
| * Fix validations on child record when record parent has validate: falseeileencodes2015-02-019-5/+80
|/
* Cache `url_helpers` separately for mailersAndrew White2015-02-011-44/+50
* Merge pull request #18776 from eileencodes/cache-url-helpersAndrew White2015-02-011-42/+44
|\
| * Cache `url_helpers`eileencodes2015-02-011-42/+44
* | add destroyed records to the currend transactionAaron Patterson2015-02-012-1/+5
* | Fix Issue #15549, unbounded memory growth when saving records that have any a...Will Bryant2015-02-011-2/+3
* | make the private methods privateAaron Patterson2015-02-011-2/+2
* | push add to transaction logic down to the instanceAaron Patterson2015-02-013-6/+10
* | remove conditional that is always trueAaron Patterson2015-02-011-3/+2
* | stop making calls to add_recordAaron Patterson2015-02-011-1/+1
* | Merge pull request #18770 from palkan/docs-hasone-dependentAbdelkader Boudih2015-02-011-0/+4
|\ \
| * | [ci skip] add note about has_one :through and :dependentpalkan2015-02-011-0/+4
* | | Merge pull request #18756 from ajgrover/activejob_testsMatthew Draper2015-02-011-1/+1
|\ \ \ | |_|/ |/| |
| * | Update queue_classic gem to use latestAlex Grover2015-01-311-1/+1
* | | Merge pull request #18721 from sj26/pre-discard-flashAaron Patterson2015-02-014-28/+51
|\ \ \
| * | | Migrate old flash behaviourSamuel Cochran2015-01-302-6/+13
| * | | Discard from flash before persisting in sessionSamuel Cochran2015-01-292-24/+26
| * | | Fix flash remaining after last flash deletedSamuel Cochran2015-01-292-0/+14
* | | | Merge pull request #18769 from gsamokovarov/exception-wrapper-windows-pathsAndrew White2015-02-012-2/+25
|\ \ \ \
| * | | | Show proper traces on Windows for the error pagesGenadi Samokovarov2015-02-012-2/+25
* | | | | Merge branch 'master' into mdluo-masterAaron Patterson2015-02-0129-45/+45
|\ \ \ \ \
| * | | | | Move required error message and changelog to Active RecordCarlos Antonio da Silva2015-02-014-7/+7
| | |_|_|/ | |/| | |
| * | | | Merge pull request #18759 from yuki24/remove-warningYves Senn2015-02-011-3/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | :scissors: warning from controller renderer testYuki Nishijima2015-01-311-3/+3
| * | | | Merge pull request #18767 from robertomiranda/ruby-2.2Sean Griffin2015-01-3122-32/+32
| |\ \ \ \
| | * | | | Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846robertomiranda2015-01-3122-32/+32
| * | | | | Merge pull request #18763 from robertomiranda/ruby-2.2Sean Griffin2015-01-312-3/+3
| |\| | | |
| | * | | | Use Module#include instead of send :include, since now is a public method [ci...robertomiranda2015-01-312-3/+3
| |/ / / /
* | | | | Merge pull request #1 from mdluo/pr/18316Mingdong Luo2015-01-313-1/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' into pr/18316Mingdong Luo2015-01-31571-4788/+7210
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Attribute assignment and type casting has nothing to do with columnsSean Griffin2015-01-3115-113/+153
* | | | | Merge pull request #18760 from hjoo/fix_fixturesAaron Patterson2015-01-311-1/+2
|\ \ \ \ \
| * | | | | changed deleted_tables list to setHyonjee Joo2015-01-311-1/+2
|/ / / / /
* | | | | Merge pull request #18512 from vipulnsward/18492-fixtures-with-stiAaron Patterson2015-01-317-12/+46
|\ \ \ \ \ | |_|/ / / |/| | | |