Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4316 from wrozka/time_advance_nsec | Aaron Patterson | 2012-01-05 | 2 | -1/+6 |
|\ | | | | | Time advance nsec bug | ||||
| * | Nano seconds fraction of time is copied properly in Time#advance | Pawel Pierzchala | 2012-01-05 | 2 | -1/+6 |
| | | | | | | | | | | | | When day, month or year was passed, advance created a new time ignoring previous nsec fraction. Now nsec is passed through usec as a Rational number. | ||||
* | | Merge pull request #4320 from castlerock/include_only_minitest | Santiago Pastorino | 2012-01-05 | 1 | -29/+1 |
|\ \ | | | | | | | support only MiniTest run with Isolation test | ||||
| * | | support only MiniTest run with Isolation test | Vishnu Atrai | 2012-01-05 | 1 | -29/+1 |
| | | | |||||
* | | | Merge pull request #4319 from castlerock/parse_only_minitest_results | Santiago Pastorino | 2012-01-05 | 1 | -21/+1 |
|\ \ \ | | | | | | | | | parse only minitest results in isolation test | ||||
| * | | | parse only minitest results in isolation test | Vishnu Atrai | 2012-01-05 | 1 | -21/+1 |
| |/ / | |||||
* | | | Merge pull request #4325 from juanpastas/master | Aaron Patterson | 2012-01-05 | 1 | -1/+0 |
|\ \ \ | |/ / |/| | | erased duplicated line | ||||
| * | | deleted duplicated line | juan david pastas | 2012-01-05 | 1 | -1/+0 |
|/ / | |||||
* | | Revert "active record base class test case should not be public" | Santiago Pastorino | 2012-01-05 | 1 | -0/+0 |
| | | | | | | | | | | People use this! This reverts commit 071c8bf62ac7ffdb587268a6789fd825d0dae2a6. | ||||
* | | call super from setup | Aaron Patterson | 2012-01-04 | 2 | -0/+5 |
| | | |||||
* | | just use the list of formatting keys we care about | Aaron Patterson | 2012-01-04 | 1 | -1/+1 |
| | | |||||
* | | call super | Aaron Patterson | 2012-01-04 | 1 | -0/+10 |
| | | |||||
* | | clear the sql counter on teardown so the GC can do it's thing | Aaron Patterson | 2012-01-04 | 1 | -0/+4 |
| | | |||||
* | | fix some formatting | Aaron Patterson | 2012-01-04 | 1 | -2/+6 |
| | | |||||
* | | use regular expression or statement. loltargetrichenvironment | Aaron Patterson | 2012-01-04 | 1 | -1/+1 |
| | | |||||
* | | active record base class test case should not be public | Aaron Patterson | 2012-01-04 | 1 | -0/+0 |
| | | |||||
* | | use logger.warn for warnings | Aaron Patterson | 2012-01-04 | 1 | -1/+1 |
| | | |||||
* | | push exception message formatting to the exception class | Aaron Patterson | 2012-01-04 | 1 | -1/+4 |
| | | |||||
* | | push target down to the classes that care about it | Aaron Patterson | 2012-01-04 | 1 | -4/+5 |
| | | |||||
* | | just implement the delegate method | Aaron Patterson | 2012-01-04 | 1 | -4/+4 |
| | | |||||
* | | Array.wrap no longer needed | Aaron Patterson | 2012-01-04 | 1 | -3/+2 |
| | | |||||
* | | Revert "AS::Callbacks: remove __define_runner" | José Valim | 2012-01-04 | 1 | -3/+16 |
| | | | | | | | | | | | | Runners are used internally. This reverts commit 40c8aa706adbb60ff9d289016fb9020d48969fea. | ||||
* | | Remove more references to postgres on the release notes | Santiago Pastorino | 2012-01-04 | 1 | -2/+0 |
| | | |||||
* | | Postgres is on travis right now, don't need an special mention here | Santiago Pastorino | 2012-01-04 | 1 | -6/+0 |
| | | |||||
* | | Merge pull request #4302 from lest/simplify-descendants | Xavier Noria | 2012-01-04 | 1 | -1/+1 |
|\ \ | | | | | | | simplify Class#descendants using singleton_class method | ||||
| * | | simplify Class#descendants using singleton_class method | Sergey Nartimov | 2012-01-04 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #4282 from edgecase/order_after_reorder | Aaron Patterson | 2012-01-04 | 6 | -9/+25 |
|\ \ | | | | | | | correctly handle order calls after a reorder | ||||
| * | | correctly handle order calls after a reorder | Matt Jones + Scott Walker | 2012-01-03 | 6 | -9/+25 |
| | | | |||||
* | | | Merge pull request #4296 from kuroda/negative_format | Aaron Patterson | 2012-01-04 | 2 | -0/+8 |
|\ \ \ | | | | | | | | | Infer currency negative format from positive one. | ||||
| * | | | Infer currency negative format from positive one. | Tsutomu Kuroda | 2012-01-05 | 2 | -0/+8 |
| | |/ | |/| | | | | | | | | | | | | | When a locale file sets the format of the positive currency value as '%n %u', the default negative currency format should be '-%n %u'. | ||||
* | | | Merge pull request #4298 from rafaelfranca/patch-2 | Aaron Patterson | 2012-01-04 | 12 | -129/+22 |
|\ \ \ | | | | | | | | | Remove rescue block to require psych gem | ||||
| * | | | No need to require psych since require yaml does that. | Rafael Mendonça França | 2012-01-04 | 7 | -7/+0 |
| | | | | |||||
| * | | | No need to override to_yaml and yaml_initialize methods in ActiveRecord::Core | Rafael Mendonça França | 2012-01-04 | 1 | -20/+0 |
| | | | | |||||
| * | | | No need to override to_yaml method in ActiveSupport::TimeWithZone | Rafael Mendonça França | 2012-01-04 | 1 | -7/+1 |
| | | | | |||||
| * | | | No need to override to_yaml method in ActiveSupport::OrderedHash | Rafael Mendonça França | 2012-01-04 | 1 | -15/+0 |
| | | | | |||||
| * | | | No need to override the to_yaml method in ActiveSupporte::SafeBuffer | Rafael Mendonça França | 2012-01-04 | 1 | -5/+0 |
| | | | | |||||
| * | | | No need to override the to_yaml method in BigDecimal | Rafael Mendonça França | 2012-01-04 | 1 | -15/+0 |
| | | | | |||||
| * | | | No need to use rescue block to require psych | Rafael Mendonça França | 2012-01-04 | 9 | -69/+30 |
| | | | | |||||
| * | | | No need to check if YAML::ENGINE is defined since ruby 1.9 does that | Rafael Mendonça França | 2012-01-04 | 5 | -5/+5 |
| | | | | |||||
* | | | | Merge pull request #4299 from Karunakar/logger | Aaron Patterson | 2012-01-04 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | using the active support logger | ||||
| * | | | using the active support logger | Karunakar (Ruby) | 2012-01-04 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #4289 from rafaelfranca/patch-1 | Santiago Pastorino | 2012-01-04 | 3 | -2/+10 |
|\ \ \ | | | | | | | | | No need of html_safe here | ||||
| * | | | Whitespaces :scissors: | Rafael Mendonça França | 2012-01-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Make sure that check_box helper return a safe buffer | Rafael Mendonça França | 2012-01-04 | 1 | -0/+1 |
| | | | | |||||
| * | | | Add test to make sure that add two safe buffers always return a safe buffer | Rafael Mendonça França | 2012-01-04 | 1 | -0/+7 |
| | | | | |||||
| * | | | No need of html_safe here | Rafael Mendonça França | 2012-01-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | tag helper always return a html safe string and concat two html safe strings always return a html safe string | ||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-01-04 | 2 | -75/+112 |
|\ \ \ \ | |||||
| * | | | | copy edits | Vijay Dev | 2012-01-04 | 1 | -10/+7 |
| | | | | | |||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | Pablo Ifran | 2012-01-02 | 30 | -240/+570 |
| |\ \ \ \ | |||||
| | * | | | | General editing pass over assets pipeline guide | Mike Gunderloy | 2011-12-31 | 1 | -56/+58 |
| | | | | | |