aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #11563 from ↵Rafael Mendonça França2013-07-233-2/+23
|\ | | | | | | | | 90yukke/fix-nomethoderror-on-non-attribute-equalities Fix merge error when Equality LHS is non-attribute.
| * Fix merge error when Equality LHS is non-attribute.90yukke2013-07-233-2/+23
|/ | | | This is reworking of rails/rails/pull/7380 made for rails 3.
* Fix actionpack CHANGELOG entryRafael Mendonça França2013-07-221-1/+4
| | | | It was included by git on the wrong release
* Merge branch '3-2-14' into 3-2-stableRafael Mendonça França2013-07-2216-16/+24
|\
| * Fix activemodel CHANGELOGRafael Mendonça França2013-07-221-6/+1
| |
| * Preparing for 3.2.14 releaseRafael Mendonça França2013-07-229-9/+9
| |
| * Update CHANGELOG entryRafael Mendonça França2013-07-226-34/+6
| |
| * Preparing for 3.2.14.rc2 releaseRafael Mendonça França2013-07-1616-17/+47
| |
| * Use Ruby 1.8 syntaxRafael Mendonça França2013-07-151-1/+1
| |
| * Merge pull request #11451 from ↵Yves Senn2013-07-153-0/+18
| | | | | | | | | | | | | | | | jetthoughts/11450_do_not_resave_destroyed_association Do not re-save destroyed association on saving parent object Conflicts: activerecord/lib/active_record/autosave_association.rb
| * Preparing for 3.2.14.rc1 releaseRafael Mendonça França2013-07-1216-24/+26
| |
* | Add test to prevent route reloading regressionAndrew White2013-07-211-0/+45
| | | | | | | | | | | | | | Journey doesn't clear its named route hash when the routes are reloaded but Rails 3.2 isn't affected because Journey overwrites the existing route. This is just a backport of the test to make sure it doesn't become affected in some future release.
* | Merge pull request #11486 from ↵Rafael Mendonça França2013-07-183-0/+12
|\ \ | | | | | | | | | | | | wolframarnold/3-2-stable_fix_respond_to_missing_in_tagged_loggging 3-2-stable patch: Add respond_to_missing? in TaggedLoggging
| * | Add respond_to_missing? for TaggedLogging which is needed if another log ↵Wolfram Arnold2013-07-173-0/+12
| | | | | | | | | | | | | | | | | | abstracter wraps a TaggedLogging instance. It's also best practice when overriding method_missing.
* | | Merge pull request #10800 from 907th/fix-custom-message-for-assert_redirected_toRafael Mendonça França2013-07-173-2/+11
|\ \ \ | | | | | | | | Fix #10842. `assert_redirected_to` does not show user-supplied message.
| * | | Fix `assert_redirected_to` does not show user-supplied message.Alexey Chernenkov2013-07-183-2/+11
|/ / / | | | | | | | | | | | | | | | Issue: when `assert_redirected_to` fails due to the response redirect not matching the expected redirect the user-supplied message (second parameter) is not shown. This message is only shown if the response is not a redirect.
* | | Merge pull request #11468 from arunagw/removed_unsed_testCarlos Antonio da Silva2013-07-171-32/+0
|\| | | | | | | | Removed unused test file
| * | Removed unused test fileArun Agrawal2013-07-171-32/+0
|/ / | | | | | | This test file is not be running from a long time This test is already covered in controller/caching_test.rb
* | Use Ruby 1.8 syntaxRafael Mendonça França2013-07-151-1/+1
| |
* | Merge pull request #11451 from ↵Yves Senn2013-07-152-0/+9
|/ | | | | | | | | | | jetthoughts/11450_do_not_resave_destroyed_association Do not re-save destroyed association on saving parent object Conflicts: activerecord/lib/active_record/autosave_association.rb Conflicts: activerecord/CHANGELOG.md
* Add missing require so that DateTime has the right superclassAndrew White2013-07-101-0/+1
| | | | | | | | | | If the DateTime core extensions were loaded before the Date core extensions then you would get a superclass mismatch as DateTime hasn't been defined yet so it gets set to Object by the acts_like core extension. Fixes #11206 (cherry picked from commit 78f7d5b652000dbb1a11d34fe370c3fa82de840c)
* Return local time for backwards compatibilityAndrew White2013-07-093-10/+27
|
* Retain offset and fraction when using Time.at_with_coercionAndrew White2013-07-093-3/+51
| | | | | | | | | | | | | | | | The standard Ruby behavior for Time.at is to return the same type of time when passing an instance of Time as a single argument. Since the an ActiveSupport::TimeWithZone instance may be a different timezone than the system timezone and DateTime just understands offsets the best we can do is to return an instance of Time with the correct offset. It also maintains the correct fractional second value as well. Fixes #11350. Backports: 484253515c0e05760541dc48946361185c9e6904 1b3873730b96035a238dbff7627bd5942e6dc4e7
* Do not shallow the original exception in exec_cacheRafael Mendonça França2013-07-092-1/+11
| | | | | | | when result_error_field is not defined on result raise the original exception. Fixes #11260
* Remove git dependecyRafael Mendonça França2013-07-081-1/+1
|
* Add license to the gemspecRafael Mendonça França2013-07-088-0/+19
|
* New changelog entries always on the top [ci skip]Rafael Mendonça França2013-07-061-4/+5
|
* Remove warning of assigned but unused variableRafael Mendonça França2013-07-061-1/+1
|
* Skip connection url test when the machine is using socket configuration.Rafael Mendonça França2013-07-061-0/+3
| | | | The connection url parssing don't accept the socket option
* Add missing requireSantiago Pastorino2013-07-021-0/+1
|
* Merge pull request #8881 from carsonreinke/3-2-stableRafael Mendonça França2013-07-013-2/+23
|\ | | | | 3-2-stable ActiveSupport::TaggedLogging logging progname issue
| * Incorrectly providing program name the same as log message even when block ↵Carson Reinke2013-07-013-2/+23
|/ | | | is not provided.
* unify duplicate CHANGELOG entryYves Senn2013-06-271-6/+2
|
* Merge pull request #9173 from senny/backport_perftest_fixYves Senn2013-06-278-8/+23
|\ | | | | Backport rails/rails-perftest#2 to fix rake test:benchmark
| * clear ARGV to prevent mintest autorun errors:Yves Senn2013-06-273-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minitest expects the first argument in `ARGV` to be the path to a test file. Because `rails benchmarker` and `rails profiler` define an on-the-fly test-case, using the first `ARGV` to pass the code to execute this results in: ``` /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:167:in `block in non_options': file not found: 1000.times{"a string"} (ArgumentError) from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:146:in `map!' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:146:in `non_options' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:207:in `non_options' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:52:in `process_args' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/minitest/unit.rb:891:in `_run' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/minitest/unit.rb:884:in `run' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:21:in `run' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:326:in `block (2 levels) in autorun' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:27:in `run_once' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:325:in `block in autorun' ``` clearing ARGV after defining the test-case solves this issue.
| * Backport rails/rails-perftest#2 to fix rake test:benchmarkYves Senn2013-06-277-8/+15
|/
* Merge pull request #11019 from tkhr/test_case_for_issue_10393Yves Senn2013-06-253-1/+29
|\ | | | | Add test case for issue #10393 and fix warning message
| * Allow global override of default STI inheritance columnchapmajs2013-06-263-1/+29
| | | | | | | | | | | | This change fixes a bug by which 3.2-STABLE users can't globally override the default STI inheritance column with `ActiveRecord::Base.inheritance_column = 'some_column'`. 3.2-STABLE users are forced to use a deprecated method or monkey patch it otherwise. Test case written by tkhr <takehiro0740@gmail.com>.
* | build fix, fall back to old hash syntaxYves Senn2013-06-261-3/+3
|/
* Merge pull request #9893 from ↵Yves Senn2013-06-251-0/+13
|\ | | | | | | | | JonRowe/add_test_to_assert_association_doesnt_overwrite Add a test to assert autosaving associations doesn't overwrite id accessor methods
| * test case to assert that associations do not overwrite after create, fixes #9310Jon Rowe2013-03-241-0/+13
| |
* | Move changelog entry to the top [ci skip]Carlos Antonio da Silva2013-06-251-5/+6
| |
* | Merge pull request #10373 from janko-m/fix-store-accessorCarlos Antonio da Silva2013-06-253-1/+13
|\ \ | | | | | | | | | Fix a bug in ActiveRecord::Store accessors
| * | Fix ActiveRecord::Store not tracking changesJanko Marohnić2013-04-293-1/+13
| | |
* | | Revert "Revert "Merge pull request #10901 from ↵Yves Senn2013-06-253-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader"" This reverts commit 5009b078875e596a2fba7827336f7548aa6e35ac. Also updated the CHANGELOG and adjusted the test-case to match the one on master.
* | | Use old style hash syntax for 3-2-stableAndrew White2013-06-251-2/+2
| | |
* | | Fix shorthand routes where controller and action are in the scopeAndrew White2013-06-253-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge `:action` from routing scope and assign endpoint if both `:controller` and `:action` are present. The endpoint assignment only occurs if there is no `:to` present in the options hash so should only affect routes using the shorthand syntax (i.e. endpoint is inferred from the the path). Fixes #9856 Backport of 37b4276
* | | Add CHANGELOG entry for #10971Rafael Mendonça França2013-06-241-0/+14
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #10971 from dtaniwaki/escape_link_to_unlessRafael Mendonça França2013-06-242-1/+6
| | | | | | | | | | | | Always escape the result of link_to_unless method
* | | Fix textile markupRafael Mendonça França2013-06-241-1/+1
| | | | | | | | | | | | | | | Closes #11076 [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-14 18:49:18 +0000