aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Skip assets, helpers and views generation for API pluginsRobin Dupret2015-07-232-8/+27
| * | | | | | | Add the `--api` option for the plugin generatorRobin Dupret2015-07-232-0/+12
* | | | | | | | Merge pull request #21035 from radar/ryan-bigg-has-changed-jobsGodfrey Chan2015-07-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Ryan Bigg has changed jobs.Ryan Bigg2015-07-271-1/+1
* | | | | | | | | Merge pull request #21030 from yahonda/mysql2_20969Kasper Timm Hansen2015-07-261-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Remove @connection instance variable only when definedYasuo Honda2015-07-261-2/+2
|/ / / / / / / /
* | | | | | | | Properly allow uniqueness validations on primary keys.Sean Griffin2015-07-253-1/+28
* | | | | | | | Merge pull request #21007 from clayton-shopify/fix-mailto-encodingRafael Mendonça França2015-07-242-1/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Encode the email address as prescribed in RFC 6068 section 2.Clayton Smith2015-07-232-1/+9
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | `destroy` shouldn't raise when child associations fail to saveSean Griffin2015-07-244-1/+48
* | | | | | | | Merge pull request #20256 from arunagw/aa-remove-unused-rule-and-task-activer...Sean Griffin2015-07-241-9/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused rule and task from activerecordArun Agrawal2015-05-221-9/+0
* | | | | | | | | Merge pull request #20928 from matthewd/unload-interlockMatthew Draper2015-07-245-35/+385
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Small tweaks to mainly lock-ordering tests.thedarkone2015-07-221-21/+58
| * | | | | | | | | Handle thread death during lock acquisitionMatthew Draper2015-07-212-4/+27
| * | | | | | | | | Adjust expectations around purpose/compatibility optionsMatthew Draper2015-07-212-9/+36
| * | | | | | | | | Add some meta-assertions for the custom assertionsMatthew Draper2015-07-211-11/+63
| * | | | | | | | | Order of execution is only guaranteed if upgradingMatthew Draper2015-07-212-2/+4
| * | | | | | | | | Fix ShareLock issues.thedarkone2015-07-201-2/+2
| * | | | | | | | | Tests for AS::Concurrency::ShareLock.thedarkone2015-07-201-0/+194
| * | | | | | | | | We need stricter locking before we can unloadMatthew Draper2015-07-204-34/+49
* | | | | | | | | | Remove ivar only when definedAkira Matsuda2015-07-241-2/+2
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Improvements on the enum documentation [ci skip]Robin Dupret2015-07-231-9/+11
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #20999 from robin850/enum-prefix-suffixKasper Timm Hansen2015-07-233-15/+15
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Rename the enum_{prefix,suffix} options to _{prefix,suffix}Robin Dupret2015-07-233-15/+15
|/ / / / / / /
* | | | | | | Merge pull request #20993 from budnik/patch-1Robin Dupret2015-07-231-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fixes documentation typo.Дмитро Будник2015-07-231-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #20989 from matthewd/no-lock-basic-requireMatthew Draper2015-07-231-6/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Don't apply locking around basic #load / #requireMatthew Draper2015-07-231-6/+4
| |/ / / / /
* | | | | | rm `deep_munge`. You will live on in our hearts (and git history)Aaron Patterson2015-07-213-26/+15
* | | | | | push param encoding in to the utils moduleAaron Patterson2015-07-212-14/+30
* | | | | | stop keeping track of keys when "deep munging"Aaron Patterson2015-07-211-5/+3
* | | | | | recurse for arrays in `normalize_encode_params`Aaron Patterson2015-07-211-5/+3
* | | | | | drop conditionals in conversion logicAaron Patterson2015-07-211-7/+5
* | | | | | rearrange logic to use positive branchesAaron Patterson2015-07-211-4/+6
* | | | | | Merge pull request #20973 from vngrs/fix_rails_testsRafael Mendonça França2015-07-211-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | fix rails testsMehmet Emin İNAÇ2015-07-211-1/+1
|/ / / / /
* | | | | Merge pull request #20967 from lxsameer/record_not_foundRafael Mendonça França2015-07-215-5/+35
|\ \ \ \ \
| * | | | | Extra caller details added to ActiveRecord::RecordNotFoundSameer Rahmani2015-07-215-5/+35
* | | | | | Merge pull request #20926 from rsanheim/fail-fast-bin-setupRafael Mendonça França2015-07-211-5/+9
|\ \ \ \ \ \
| * | | | | | add system! to fail fast in bin/setupRob Sanheim2015-07-181-5/+9
* | | | | | | Merge pull request #20819 from y-yagi/rails_api_gemfileRafael Mendonça França2015-07-212-1/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | remove `web-console` from API app generated Gemfileyuuji.yaginuma2015-07-092-1/+4
* | | | | | | Merge pull request #20668 from repinel/rename-restrict-dependent-destroy-i18n...Rafael Mendonça França2015-07-216-4/+73
|\ \ \ \ \ \ \
| * | | | | | | Deprecate and rename the keys for association restrict_dependent_destroyRoque Pinel2015-07-206-4/+73
|/ / / / / / /
* | | | | | | Merge pull request #20732 from jorihardman/timestamp_precison2Sean Griffin2015-07-206-18/+62
|\ \ \ \ \ \ \
| * | | | | | | Ensure that microsecond precision is only used for version of mysql that supp...Jori Hardman2015-07-206-18/+62
* | | | | | | | Merge pull request #20751 from repinel/remove-unnecessary-dupRafael Mendonça França2015-07-201-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unnecessary `dup` from Mapper `add_route`Roque Pinel2015-07-011-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #17109 from thejamespinto/patch-1Rafael Mendonça França2015-07-201-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |