aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19264 from y-yagi/plugins_guideArthur Nogueira Neves2015-03-091-3/+3
|\ | | | | use public Module#include instead of send :include [ci skip]
| * use public Module#include instead of send :include [ci skip]yuuji.yaginuma2015-03-091-3/+3
| |
* | Revert "Take DST into account when locating TimeZone from Numeric."Andrew White2015-03-093-24/+1
|/ | | | | | | | | | | | | | | | Reverting this as it's not the implementation that we would like it to be. This is being used inside of ActiveSUpport::TimeZone[] and it's unaware of the context in which to find the timezone period so the timezone found changes depending on whether DST is in effect for the current period. This means that `'2001-01-01'.in_time_zone(-9)` changes from winter/summer even though it's the same date that we're trying to convert. Since finding timezones by numeric offsets is a bit hit and miss we should introduce a new API for finding them which supplies the date context in which we want to search and we should probably also deprecate the finding of timezones via the [] method, though this needs further discussion. This reverts commit 2cc2fa3633edd96773023c6b09d07c7b9d9b841d.
* Merge pull request #19263 from splattael/target-2.2.1Yves Senn2015-03-099-9/+9
|\ | | | | Target Ruby 2.2.1 in gemspecs
| * Target Ruby 2.2.1 in gemspecsPeter Suschlik2015-03-099-9/+9
|/ | | | This is a follow-up to #19257
* Merge pull request #19257 from jvanbaarsen/patch-1Eileen M. Uchitelle2015-03-081-1/+1
|\ | | | | Rails 5.0 needs ruby 2.2.1 or higher
| * Rails 5.0 needs ruby 2.2.1 or higherJeroen van Baarsen2015-03-081-1/+1
|/ | | | Since there was a bug in 2.2.0, the minimum ruby requirement is 2.2.1. See https://github.com/rails/rails/commit/8ed0b89b [skip ci]
* Merge pull request #18200 from brainopia/rollback_frozen_recordsArthur Nogueira Neves2015-03-072-1/+21
|\ | | | | Fix rollback of frozen records
| * Fix transaction state for unsynced records when entering transactionbrainopia2015-03-042-0/+10
| |
| * Fix rollback of frozen recordsbrainopia2015-03-042-1/+11
| |
* | Merge pull request #19247 from wazery/doc_fixEileen M. Uchitelle2015-03-074-4/+4
|\ \ | | | | | | Doc fixes [ci skip]
| * | Doc fixes [ci skip]Islam Wazery2015-03-074-4/+4
|/ /
* | Merge pull request #19246 from wazery/patch-1Robin Dupret2015-03-071-7/+7
|\ \ | | | | | | Doc fix [ci skip]
| * | Doc fix [ci skip]Islam Wazery2015-03-071-7/+7
|/ /
* | Merge pull request #19242 from y-yagi/integration_test_exampleKasper Timm Hansen2015-03-071-7/+8
|\ \ | | | | | | update integration test example as is not output deprecation warning [ci skip]
| * | update integration test example as is not output deprecation warning [ci skip]yuuji.yaginuma2015-03-071-7/+8
|/ /
* | Merge pull request #19241 from yui-knk/fix/commentRichard Schneeman2015-03-061-2/+2
|\ \ | | | | | | [ci skip] Fix `AS` and `AR` to full name
| * | [ci skip] Fix `AS` and `AR` to full nameyui-knk2015-03-071-2/+2
|/ /
* | Merge pull request #19234 from sivsushruth/doc_fixKasper Timm Hansen2015-03-071-1/+1
|\ \ | | | | | | Doc fix [ci skip]
| * | Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-071-1/+1
| | |
* | | Merge pull request #19231 from prathamesh-sonpatki/fix-url-for-documentationGuillermo Iguaran2015-03-061-1/+4
|\ \ \ | | | | | | | | Fix documentation of url_for module [ci skip]
| * | | Fix documentation of url_for module [ci skip]Prathamesh Sonpatki2015-03-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The request needs to be instance of ActionDispatch::Request or an object that responds to host, optional_port, protocol and symbolized_path_parameter. - This documentation was correctly added in https://github.com/rails/rails/commit/e3b3f416b57f5642ea25078485f7e9394ad04526 but was changed to https://github.com/rails/rails/commit/e1ceae576e3911f3e6708b5d19a0e3ef63769eb7. - Fixes #16160.
* | | | Merge pull request #19233 from sivsushruth/doc_fixAbdelkader Boudih2015-03-061-1/+1
|\ \ \ \ | | |/ / | |/| | Doc fix [ci skip]
| * | | Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-061-1/+1
| | | |
* | | | Fix leaky `only: …` option for Active Job assertionsJeremy Kemper2015-03-062-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The filter was set on the pseudo-global TestAdapter but not restored to its original value. See e818f65770fe115ab1cc7fbacc0e7e94d92af6a4
* | | | Merge pull request #19230 from prathamesh-sonpatki/fix-clear-docRobin Dupret2015-03-061-0/+3
|\ \ \ \ | | | | | | | | | | Updated documentation of CollectionProxy#clear [ci skip]
| * | | | Updated documentation of CollectionProxy#clear [ci skip]Prathamesh Sonpatki2015-03-061-0/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | - CollectionProxy#clear method calls delete_all so the SQL is directly run into the database. - So the updated_at column of the object on which its run is not updated. - Closes #17161
* | | | Merge pull request #19221 from matthewd/random-testsMatthew Draper2015-03-0610-37/+4
|\ \ \ \ | | | | | | | | | | Run all our tests in random order
| * | | | Revert "For now, we will keep sorting the tests."Matthew Draper2015-03-064-7/+4
| | | | | | | | | | | | | | | | | | | | This reverts commit 7025d7769dc53f0a3ffab8b537727ef3fee367fc.
| * | | | Revert "Leave all our tests as order_dependent! for now"Matthew Draper2015-03-066-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2f52f969885b2834198de0045748436a4651a94e. Conflicts: actionmailer/test/abstract_unit.rb actionview/test/abstract_unit.rb activemodel/test/cases/helper.rb activerecord/test/cases/helper.rb activesupport/test/abstract_unit.rb railties/test/abstract_unit.rb
* | | | | tests, sequences are derived from the base class.Yves Senn2015-03-061-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Using a subclass to check the sequence name does not work in that case. The sequence name will be calucalted based on the base class.
* | | | | Revert ":cut: remove unnecessary rescue Exceptions"Yves Senn2015-03-063-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ff18049ca6f27deb7e7f955478e1464f8d756332. This broke the AR build for every adapter: 1) Error: AssociationCallbacksTest#test_dont_add_if_before_callback_raises_exception: Exception: You can't add a post 2) Failure: QueryCacheTest#test_query_cache_doesnt_leak_cached_results_of_rolled_back_queries [/Users/senny/Projects/rails/activerecord/test/cases/query_cache_test.rb:235]: Expected: 1 Actual: 0 I'm reverting to get the build green again.
* | | | | replace `repair_validations` with a disposable subclass.Yves Senn2015-03-061-32/+33
| | | | |
* | | | | Remove a duplicated changelog entry [ci skip]Robin Dupret2015-03-061-7/+0
| |/ / / |/| | | | | | | | | | | This entry now lives in the Action View's changelog ; refs 8a3bd089.
* | | | tests, remove side effects on `Joke` during `base_test.rb`.Yves Senn2015-03-061-23/+28
| | | | | | | | | | | | | | | | prompted by #19221.
* | | | Merge pull request #19225 from cristianbica/integration-testsYves Senn2015-03-064-3/+9
|\ \ \ \ | | | | | | | | | | Fixed ActiveJob integration tests
| * | | | Fixed ActiveJob integration testsCristian Bica2015-03-054-3/+9
| | | | |
* | | | | put the changelog entry in the right file :sweat: [ci skip]Yves Senn2015-03-061-0/+7
| | | | |
* | | | | `number_to_percentage` and `precision: 0` work with `NAN` and `INFINITY`.Yves Senn2015-03-064-1/+16
| | | | | | | | | | | | | | | | | | | | Closes #19227.
* | | | | Merge pull request #19224 from davydovanton/doc-update-seconds-since-midnightAbdelkader Boudih2015-03-061-1/+5
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Update documentation for Time#seconds_since_midnight
| * | | | | [ci skip] Update documentation for Time#seconds_since_midnightAnton Davydov2015-03-061-1/+5
| |/ / / /
* | | | | Change *args to arg in CallbackSequence#calleileencodes2015-03-051-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `CallbackSequence#call` can only ever take one argument. Using `*args` here produces unnecessary array allocations. Since it only ever takes one argument we should use `arg` instead of `*args`.
* | | | | don't need to rescue Exception in this caseAaron Patterson2015-03-052-1/+7
| | | | |
* | | | | :cut: remove unnecessary rescue ExceptionsAaron Patterson2015-03-053-3/+3
| | | | |
* | | | | remove unnecessary rescueAaron Patterson2015-03-051-2/+0
|/ / / /
* | | | pass a config to the route setAaron Patterson2015-03-055-12/+43
| | | | | | | | | | | | | | | | | | | | This way we can get the relative_url_root from the application without setting another global value
* | | | Merge pull request #19222 from davydovanton/doc-delete-excess-whiteArthur Nogueira Neves2015-03-051-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] Delete excess white in documentation
| * | | | [ci skip] Delete excess white in documentationAnton Davydov2015-03-051-1/+1
|/ / / /
* | | | Revert "Allow failures with Active Job"Jeremy Kemper2015-03-051-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Travis is green. Let's keep it that way rather than let AJ languish as a second-class citizen. This reverts commit 2a6b3e14cff61639978a55f47aea9ff4c8e72758.
* | | | Merge pull request #19220 from ↵Kasper Timm Hansen2015-03-051-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | davydovanton/doc-add-info-about-sanitize-to-highlight [ci skip] Add information about sanitize option in TextHelper#highlight
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 02:44:41 +0000