aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16929 from ↵Rafael Mendonça França2014-09-171-0/+2
|\ | | | | | | | | kongregate/fix-activerecord-deprecated_finders-find-symbol ActiveRecord deprecated finders are broken in 4.2
| * Backwards compat for activerecord-deprecated_findersstopdropandrew2014-09-161-0/+2
| | | | | | | | | | | | | | Maintain compatibility for: * ActiveRecord::Base#find(:all) * ActiveRecord::Base#find(:first) * ActiveRecord::Base#find(:last)
* | OMG mysql!Rafael Mendonça França2014-09-171-0/+2
| |
* | ruby-head should be greenRafael Mendonça França2014-09-171-1/+0
| | | | | | | | Ruby 2.2 is near to be released so we should support it properly
* | do not dump foreign keys for ignored tables.Yves Senn2014-09-173-1/+8
| |
* | unify wording in Active Record CHANGELOG. [ci skip]Yves Senn2014-09-171-1/+1
| |
* | pg, correctly dump foreign keys targeting tables in a different schema.Yves Senn2014-09-173-1/+35
| | | | | | | | | | | | Closes #16907. [Matthew Draper & Yves Senn]
* | Merge pull request #16844 from zerothabhishek/masterRafael Mendonça França2014-09-161-4/+33
|\ \ | | | | | | [guides] 4.2 release notes: added technical details for Adequate Record
| * | [guides] 4.2 release notes: added technical details for Adequate Recordabhishek2014-09-161-4/+33
| |/
* | Merge pull request #16841 from tjouan/environment-config-consistencyRafael Mendonça França2014-09-161-3/+4
|\ \ | |/ |/| | | Improve environment config templates consistency
| * Improve environment config templates consistency:Thibault Jouan2014-09-161-3/+4
|/ | | | | * Fix long lines; * Use simple quotes for string literals when interpolation is not used.
* Merge pull request #16790 from cirosantilli/explain-erb-space-removalRafael Mendonça França2014-09-161-1/+3
|\ | | | | | | | | Explain ERB space removal. [ci skip]
| * Explain ERB space removal. [ci skip]Ciro Santilli2014-09-111-1/+3
| |
* | Merge pull request #16914 from untidy-hair/fix_plugin_dummy_path_errorRafael Mendonça França2014-09-163-2/+10
|\ \ | | | | | | Use dynamic path for dummy app location in plugin's test_helper.rb
| * | Use dynamic path for dummy app location in plugin's test_helper.rbYukio Mizuta2014-09-143-2/+10
| | |
* | | Make explicit 4.1 is being maintained by a special situationRafael Mendonça França2014-09-161-1/+4
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #16927 from akshay-vishnoi/fix-typoRafael Mendonça França2014-09-151-1/+1
|\ \ \ | | | | | | | | [ci skip] Fix typo `equals to` --> `equal to`
| * | | [ci skip] Fix typo `equals to` --> `equal to`Akshay Vishnoi2014-09-161-1/+1
|/ / /
* | | As of Unicode 6.3, Mongolian Vowel Separator is not whitespaceMatthew Draper2014-09-154-6/+5
| | | | | | | | | | | | | | | Ruby 2.2 knows this, and no longer matches it with [[:space:]], so it's not a good candidate for testing String#squish.
* | | Merge pull request #16574 from lsylvester/duration-respond_toJeremy Kemper2014-09-143-2/+19
|\ \ \ | | | | | | | | add implementation of respond_to? for ActiveSupport::Duration
| * | | add implementation of respond_to? for ActiveSupport::Durationlsylvester2014-09-153-2/+19
|/ / /
* | | Merge pull request #16922 from y-yagi/add_test_jobs_taskGodfrey Chan2014-09-152-6/+17
|\ \ \ | | | | | | | | Add test jobs task
| * | | Add `test:jobs` taskyuuji.yaginuma2014-09-152-6/+17
| | | |
* | | | handle <%== nil %> casesAaron Patterson2014-09-144-2/+12
| | | | | | | | | | | | | | | | | | | | This is much less common than string literal appends, so add a special case method for it. Maybe fixes bug reported by @jeremy on 97ef636191933f1d4abc92fc10871e6d1195285c
* | | | Merge pull request #16920 from seuros/ajJeremy Kemper2014-09-141-43/+4
|\ \ \ \ | | | | | | | | | | simplify test_adapter
| * | | | simplify test_adapterAbdelkader Boudih2014-09-141-43/+4
| | | | |
* | | | | Merge pull request #16918 from kiuru/masterAbdelkader Boudih2014-09-141-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Singular credit_card controller name changed to plural [ci skip]
| * | | | Singular credit_card controller name changed to pluralNiko Kiuru2014-09-141-1/+1
| |/ / /
* | | | Tighten up AJ::Arguments and its testsJeremy Kemper2014-09-143-85/+90
| | | | | | | | | | | | | | | | | | | | * Disallow deserialization of non-primitive objects * Broaden coverage; remove superfluous tests
* | | | Pare down and simplify Active Job's rake tasksJeremy Kemper2014-09-142-59/+34
| | | |
* | | | Stop nil checking on safe_append=Aaron Patterson2014-09-141-4/+0
|/ / / | | | | | | | | | | | | | | | ERB compiler guarantees safe_append= will be called with a string, so nil checks don't make sense. Anything else calling this method should check for nil themselves before calling
* | | Merge pull request #16912 from yuki24/rescue-rack-parameter-type-errorJeremy Kemper2014-09-132-5/+5
|\ \ \ | | | | | | | | Rescue `Rack::Utils::ParameterTypeError` instead of `TypeError`
| * | | Rescue Rack::Utils::ParameterTypeError instead of TypeErrorYuki Nishijima2014-09-132-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of rack/rack@167b6480235ff00ed5f355698bf00ec2f250f72e, Rack raises Rack::Utils::ParameterTypeError which inherits TypeError. In terms of the behavior, Rescuing TypeError still works but this method shouldn't rescue if TypeError is raised for other reasons.
* | | | Merge pull request #16758 from Agis-/time-change-nsecJeremy Kemper2014-09-133-6/+25
|\ \ \ \ | |_|/ / |/| | | Add support for `:nsec` option to `Time#change`
| * | | Time#change can now change nanoseconds (:nsec)Agis-2014-09-143-6/+25
| | | | | | | | | | | | | | | | Closes #16392.
* | | | Merge pull request #16910 from kuldeepaggarwal/use-rails-optionsSantiago Pastorino2014-09-131-1/+1
|\ \ \ \ | | | | | | | | | | use `allow_blank` option instead of custom condition
| * | | | use `allow_blank` option insteadKuldeep Aggarwal2014-09-141-1/+1
| |/ / /
* | | | Merge pull request #13656 from chanks/rollback_transactions_in_killed_threadsMatthew Draper2014-09-143-5/+50
|\ \ \ \ | | | | | | | | | | | | | | | Data corruption risk: Roll back open transactions when the running thread is killed.
| * | | | Roll back open transactions when the running thread is killed.Chris Hanks2014-08-222-1/+36
| | | | |
* | | | | Revert "Merge pull request #15312 from JuanitoFatas/action_view/asset_path"Matthew Draper2014-09-142-1/+12
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | This reverts commit 21ec7fefea5a1b823cb88733b019b3d52240801d. Per #16911, there's actually a good reason for a "blank" value to have a useful `to_s` here. So let's also add some tests to prove that.
* | | | Merge pull request #16908 from y-yagi/change_activejob_test_dirAbdelkader Boudih2014-09-131-1/+1
|\ \ \ \ | | | | | | | | | | Change ActiveJob test directory to "test/jobs" [ci skip]
| * | | | Change ActiveJob test directory to "test/jobs"yuuji.yaginuma2014-09-131-1/+1
|/ / / /
* | | | Merge pull request #16669 from aantix/dangerous_attribute_error_better_messageRafael Mendonça França2014-09-121-1/+1
|\ \ \ \ | | | | | | | | | | Improved the error messaging for the DangerousAttributeError exception
| * | | | Changed the DangerousAttributeError exception message to include messaging ↵Jim Jones2014-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | that the conflict could be because of a conflicting attribute.
* | | | | Prepare maintenance policy for 4.2 release [ci skip]Rafael Mendonça França2014-09-121-3/+3
| | | | |
* | | | | Se the test order of activejob testsRafael Mendonça França2014-09-121-1/+1
| | | | |
* | | | | Change gid calls to to_gidRafael Mendonça França2014-09-121-8/+8
| | | | |
* | | | | Merge pull request #16897 from ↵Rafael Mendonça França2014-09-123-0/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kostia/message-varifier-raises-exception-on-nil-secret MessageVerifier.new raises an appropriate exception if the secret is nil
| * | | | | Changes "if secret.nil?" to unless secret in MessageVerfierKostiantyn Kahanskyi2014-09-121-1/+1
| | | | | |
| * | | | | MessageVerifier raises an appropriate exception if the secret is nilKostiantyn Kahanskyi2014-09-123-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise this will lead to another error later on when generating a signature: TypeError (no implicit conversion of nil into String).
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 23:03:45 +0000