aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Expand)AuthorAgeFilesLines
* temp files are no more requireGaurav Sharma2015-08-251-2/+0
* Merge branch 'master' of github.com:rails/railsVijay Dev2015-08-2443-278/+884
|\
| * Merge pull request #16245 from byroot/more-atomic-writeMatthew Draper2015-08-211-27/+29
| |\
| | * File renaming should be the last operation of an atomic writeJean Boussier2015-08-201-27/+29
| * | Merge pull request #21300 from jonahb/cacheYves Senn2015-08-201-1/+1
| |\ \
| | * | Correct cache store superclass in commentJonah Burke2015-08-191-1/+1
| * | | Merge pull request #21279 from ronakjangir47/test_cleanupKasper Timm Hansen2015-08-202-2/+10
| |\ \ \ | | |/ / | |/| |
| | * | Cleaned up generators tests using internal assertion helperRonak Jangir2015-08-202-2/+10
| | |/
| * / Use == 0 instead of .zero? in #tryJean Boussier2015-08-171-1/+1
| |/
| * Replacing lambda with proc getting argument error because of it.Ronak Jangir2015-08-172-1/+7
| * Merge pull request #20647 from twalpole/method_source_dependencyRafael Mendonça França2015-08-141-0/+1
| |\
| | * Add method_source dependency to activesupportThomas Walpole2015-07-291-0/+1
| * | Merge pull request #21025 from ronakjangir47/assertsKasper Timm Hansen2015-08-132-1/+18
| |\ \
| | * | Added helper methods to stub any instanceRonak Jangir2015-08-132-1/+18
| * | | Merge pull request #21219 from repinel/assert-human-size-prefix-deprecatedYves Senn2015-08-131-8/+10
| |\ \ \
| | * | | Assert that the `:prefix` option of `number_to_human_size` is deprecatedRoque Pinel2015-08-121-8/+10
| * | | | Merge pull request #21217 from myrridin/myrridin-documentation-updatesZachary Scott2015-08-122-4/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ci skip] Switch around a common idiom for readabilityThomas Hart II2015-08-052-4/+4
| | | |/ | | |/|
| * | | [ci skip] Fix rdoc markupakihiro172015-08-121-1/+1
| | |/ | |/|
| * | :nodoc: internal class [ci skip]Godfrey Chan2015-08-101-1/+1
| * | Deprecate :si prefix in number_to_human_size without replacementJean Boussier2015-08-102-9/+15
| * | Deprecate the :prefix option of `number_to_human_size`Jean Boussier2015-08-102-2/+4
| * | Merge pull request #21124 from kirs/feature/reload-i18nKasper Timm Hansen2015-08-101-2/+17
| |\ \
| | * | Reload I18n locales in developmentKir Shatrov2015-08-101-2/+17
| * | | Merge pull request #21173 from repinel/fix-callback-terminator-docsClaudio B.2015-08-081-3/+3
| |\ \ \
| | * | | [ci skip] Fix the AS::Callbacks terminator docsRoque Pinel2015-08-081-3/+3
| * | | | replace each with each_key when only the key is neededAaron Lasseigne2015-08-081-1/+1
| |/ / /
| * | | Regexp#=== is faster than String#=~schneems2015-08-071-1/+1
| * | | Only invoke the default block for mattr_accessor once so that it does not cau...Lachlan Sylvester2015-08-072-1/+7
| * | | speed up code and avoid unnecessary MatchData objectsAaron Lasseigne2015-08-061-1/+1
| |/ /
| * | Merge pull request #21087 from vngrs/fix_hash_except_docKasper Timm Hansen2015-08-031-8/+9
| |\ \
| | * | Fix the documentation of Hash#except method [ci skip]Mehmet Emin İNAÇ2015-08-031-8/+9
| * | | [ci skip] Update Time#advance documentation with examplesMichael Stock2015-08-021-0/+6
| |/ /
| * | String#freeze optimizationsschneems2015-07-302-2/+2
| * | Decrease allocations in transliterateschneems2015-07-301-5/+13
| * | Decrease string allocations in apply_inflectionsschneems2015-07-292-5/+36
| |/
| * Tiny documentation edits [ci skip]Robin Dupret2015-07-281-1/+1
| * Add `:nodoc:` for internal testing methods [ci skip]Robin Dupret2015-07-281-2/+2
| * Merge pull request #20928 from matthewd/unload-interlockMatthew Draper2015-07-244-34/+384
| |\
| | * 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-203-33/+48
| * | Don't apply locking around basic #load / #requireMatthew Draper2015-07-231-6/+4
| |/
| * Fix tests broken by previous commitSean Griffin2015-07-191-1/+1
| * Merge pull request #20946 from schneems/schneems/let-it-goSean Griffin2015-07-198-20/+20
| |\