Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16920 from seuros/aj | Jeremy Kemper | 2014-09-14 | 1 | -43/+4 |
|\ | | | | | simplify test_adapter | ||||
| * | simplify test_adapter | Abdelkader Boudih | 2014-09-14 | 1 | -43/+4 |
| | | |||||
* | | Merge pull request #16918 from kiuru/master | Abdelkader Boudih | 2014-09-14 | 1 | -1/+1 |
|\ \ | |/ |/| | Singular credit_card controller name changed to plural [ci skip] | ||||
| * | Singular credit_card controller name changed to plural | Niko Kiuru | 2014-09-14 | 1 | -1/+1 |
| | | |||||
* | | Tighten up AJ::Arguments and its tests | Jeremy Kemper | 2014-09-14 | 3 | -85/+90 |
| | | | | | | | | | | * Disallow deserialization of non-primitive objects * Broaden coverage; remove superfluous tests | ||||
* | | Pare down and simplify Active Job's rake tasks | Jeremy Kemper | 2014-09-14 | 2 | -59/+34 |
| | | |||||
* | | Stop nil checking on safe_append= | Aaron Patterson | 2014-09-14 | 1 | -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-error | Jeremy Kemper | 2014-09-13 | 2 | -5/+5 |
|\ | | | | | Rescue `Rack::Utils::ParameterTypeError` instead of `TypeError` | ||||
| * | Rescue Rack::Utils::ParameterTypeError instead of TypeError | Yuki Nishijima | 2014-09-13 | 2 | -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-nsec | Jeremy Kemper | 2014-09-13 | 3 | -6/+25 |
|\ \ | | | | | | | Add support for `:nsec` option to `Time#change` | ||||
| * | | Time#change can now change nanoseconds (:nsec) | Agis- | 2014-09-14 | 3 | -6/+25 |
| | | | | | | | | | | | | Closes #16392. | ||||
* | | | Merge pull request #16910 from kuldeepaggarwal/use-rails-options | Santiago Pastorino | 2014-09-13 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | use `allow_blank` option instead of custom condition | ||||
| * | | | use `allow_blank` option instead | Kuldeep Aggarwal | 2014-09-14 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #13656 from chanks/rollback_transactions_in_killed_threads | Matthew Draper | 2014-09-14 | 3 | -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 Hanks | 2014-08-22 | 2 | -1/+36 |
| | | | | |||||
* | | | | Revert "Merge pull request #15312 from JuanitoFatas/action_view/asset_path" | Matthew Draper | 2014-09-14 | 2 | -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_dir | Abdelkader Boudih | 2014-09-13 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Change ActiveJob test directory to "test/jobs" [ci skip] | ||||
| * | | | Change ActiveJob test directory to "test/jobs" | yuuji.yaginuma | 2014-09-13 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #16669 from aantix/dangerous_attribute_error_better_message | Rafael Mendonça França | 2014-09-12 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Improved the error messaging for the DangerousAttributeError exception | ||||
| * | | | Changed the DangerousAttributeError exception message to include messaging ↵ | Jim Jones | 2014-09-10 | 1 | -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ça | 2014-09-12 | 1 | -3/+3 |
| | | | | |||||
* | | | | Se the test order of activejob tests | Rafael Mendonça França | 2014-09-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | Change gid calls to to_gid | Rafael Mendonça França | 2014-09-12 | 1 | -8/+8 |
| | | | | |||||
* | | | | Merge pull request #16897 from ↵ | Rafael Mendonça França | 2014-09-12 | 3 | -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 MessageVerfier | Kostiantyn Kahanskyi | 2014-09-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | MessageVerifier raises an appropriate exception if the secret is nil | Kostiantyn Kahanskyi | 2014-09-12 | 3 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise this will lead to another error later on when generating a signature: TypeError (no implicit conversion of nil into String). | ||||
* | | | | | Globalid was released | Rafael Mendonça França | 2014-09-12 | 1 | -2/+0 |
| | | | | | |||||
* | | | | | Use latest globalid | Rafael Mendonça França | 2014-09-12 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Merge pull request #16890 from seuros/globalid | Rafael Mendonça França | 2014-09-12 | 2 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Bump globalid version | ||||
| * | | | | | Bump globalid version | Abdelkader Boudih | 2014-09-12 | 2 | -2/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #16896 from seuros/revert-16895-suck1-1 | Santiago Pastorino | 2014-09-12 | 0 | -0/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Revert "lock suckerpunch version to 1.1" | ||||
| * | | | | | Revert "lock suckerpunch version to 1.1" | Abdelkader Boudih | 2014-09-12 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #16898 from brandonhilkert/master | Santiago Pastorino | 2014-09-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Remove version. No longer using Celluloid 0.16. | ||||
| * | | | | | Remove version. No longer using Celluloid 0.16. | Brandon Hilkert | 2014-09-12 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #16895 from seuros/suck1-1 | Jeremy Kemper | 2014-09-12 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | lock suckerpunch version to 1.1 | ||||
| * | | | | lock suckerpunch version to 1.1 | Abdelkader Boudih | 2014-09-12 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #16893 from tanmay3011/docs | Matthew Draper | 2014-09-12 | 1 | -4/+2 |
|\ \ \ \ | |/ / / |/| | | | [ci skip] #find_in_batches doesn't support :include option | ||||
| * | | | [ci skip] #find_in_batches doesn't support :include option | tanmay3011 | 2014-09-12 | 1 | -4/+2 |
|/ / / | |||||
* | | | pg, add test cases for updateable views. | Yves Senn | 2014-09-11 | 1 | -0/+45 |
| | | | |||||
* | | | reuse view test-cases for pg materialized view tests. | Yves Senn | 2014-09-11 | 2 | -67/+36 |
| | | | |||||
* | | | Merge pull request #16874 from Bartuz/patch-1 | Rafael Mendonça França | 2014-09-11 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | [docs] Changes puts to logger.info [ci skip] | ||||
| * | | | Changes puts to logger.info | Filip Bartuzi | 2014-09-11 | 1 | -2/+2 |
|/ / / | |||||
* | | | switch `assert_operator` arguments as discussed in #16860. | Yves Senn | 2014-09-11 | 1 | -1/+1 |
| | | | | | | | | | | | | Working with two different machines is hard :sweat: | ||||
* | | | A `NullRelation` should represent nothing. Closes #15176. | Yves Senn | 2014-09-11 | 4 | -2/+18 |
|/ / | | | | | | | | | | | [Matthew Draper & Yves Senn] Closes #16860. (pull request to discuss the implementation) | ||||
* | | Always define capture to remove the deprecation message | Rafael Mendonça França | 2014-09-11 | 1 | -17/+15 |
| | | |||||
* | | Define the configuration at Active Support | Rafael Mendonça França | 2014-09-11 | 4 | -10/+19 |
| | | |||||
* | | Set test order in ActiveSupport::TestCase of isolation/abstract_unit | Rafael Mendonça França | 2014-09-10 | 1 | -0/+2 |
| | | |||||
* | | Set the test order to be random in the generated app | Rafael Mendonça França | 2014-09-10 | 1 | -0/+1 |
| | | | | | | | | | | | | This will avoid the warning in our tests. We delete all the config/environments/ files in the test app so our default code will not work. | ||||
* | | Fix typo | Rafael Mendonça França | 2014-09-10 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #16839 from chancancode/default_test_order | Rafael Mendonça França | 2014-09-10 | 14 | -17/+120 |
|\ \ | | | | | | | | | | Default to sorting user's test cases for now |