aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Add the options method to action_controller testcase."Rafael Mendonça França2013-05-162-11/+0
| | | | | | | | | | | | This reverts commit 0303c2325fab253adf5e4a0b738cb469c048f008. Conflicts: actionpack/lib/action_controller/test_case.rb REASON: It will conflict with a lot of test cases. Better to call `process` directly since this is a very uncommon HTTP method. Fixes #10638.
* Check if APP_RAKEFILE is definedPiotr Sarnacki2013-05-161-1/+1
|
* Merge pull request #10639 from cbartlett/masterCarlos Antonio da Silva2013-05-161-1/+1
|\ | | | | Remove trailing line break in template
| * Remove trailing line breakColin Bartlett2013-05-161-1/+1
| | | | | | | | | | | | If you generate a fresh app without ActiverRecord, this template exhibited a lone trailing line break. My watchful pre-commit hook told me about it so I've fixed it here.
* | Merge pull request #10640 from joelcogen/masterPiotr Sarnacki2013-05-161-1/+1
|\ \ | |/ |/| Fix detection of engine in rake db:load_config
| * Fix detection of engine in rake db:load_configJoel Cogen2013-05-161-1/+1
|/ | | | Broken by d1d7c86d0c8dcb7e75a87644b330c4e9e7d6c1c1
* tiny types should only be integers when the length is <= 1. fixes #10620Aaron Patterson2013-05-151-3/+9
|
* add failing test exposing mysql adapter tinyint bugphinze2013-05-151-3/+16
| | | | | | in myself, a column with type TINYINT(N) where N > 1 can be used to represent an integer, but the rails mysql adapter refuses to interpret as anything but a boolean.
* Merge pull request #10591 from acapilleri/cond_callback_testAaron Patterson2013-05-151-0/+13
|\ | | | | add test for skip_before_filter with condition
| * add test for skip_before_filter with conditionAngelo capilleri2013-05-131-0/+13
| |
* | require things we needAaron Patterson2013-05-151-0/+1
| |
* | Merge pull request #10504 from kennyj/support_pg_91Rafael Mendonça França2013-05-153-6/+8
|\ \ | | | | | | Also should supports PostgreSQL 9.1 about extensions.
| * | Remove unnecessary code, because this extension is created on demand in ↵kennyj2013-05-151-2/+0
| | | | | | | | | | | | hstore_test.rb.
| * | Also support extensions in PostgreSQL 9.1, because this has been supported ↵kennyj2013-05-152-4/+8
| | | | | | | | | | | | since 9.1.
* | | Revert "Merge pull request #10600 from aditya-kapoor/code_refactor"Rafael Mendonça França2013-05-151-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8ce3c1e5dde9fb180813e4d89324db03da110b13, reversing changes made to f93da579ce7f77dbd58b9a2165861aee265b8c93. Reason: It slow down the running time. require "diffbench" load 'output_safety.rb' N = 10000 b = ActiveSupport::SafeBuffer.new("hello world") DiffBench.bm do report "capitalize in safe buffer" do N.times do b.capitalize end end end > git checkout 069ea45; diffbench bench.rb; diffbench bench.rb;diffbench bench.rb;diffbench bench.rb;diffbench bench.rb;diffbench bench.rb;diffbench bench.rb; Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.009733) Before patch: 0.010000 0.000000 0.010000 ( 0.007702) Improvement: -26% Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.009768) Before patch: 0.010000 0.000000 0.010000 ( 0.007896) Improvement: -24% Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.009938) Before patch: 0.010000 0.000000 0.010000 ( 0.007768) Improvement: -28% Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.010001) Before patch: 0.010000 0.000000 0.010000 ( 0.007873) Improvement: -27% Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.009670) Before patch: 0.010000 0.000000 0.010000 ( 0.007800) Improvement: -24% Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.009949) Before patch: 0.010000 0.000000 0.010000 ( 0.007752) Improvement: -28%
* | | just call the class method since we know the callbacks are stored at theAaron Patterson2013-05-151-1/+2
| | | | | | | | | | | | class level
* | | this variable is used, so we don't have to use double assignmentsAaron Patterson2013-05-151-1/+1
| | |
* | | remove dead codeAaron Patterson2013-05-151-23/+4
| | |
* | | remove deprecation noticesAaron Patterson2013-05-152-26/+0
| | |
* | | stop keeping a reference to the options hashAaron Patterson2013-05-151-12/+7
| | |
* | | conditions are guaranteed to be arrays by initializeAaron Patterson2013-05-151-2/+2
| | |
* | | simplify the condions lambda generationAaron Patterson2013-05-151-12/+2
| | |
* | | use unless instead of if!Aaron Patterson2013-05-151-3/+3
| | |
* | | Merge pull request #10631 from kennyj/improve_10266Rafael Mendonça França2013-05-152-2/+7
|\ \ \ | | | | | | | | Fix HWIA#to_hash behavior with array of hashes.
| * | | Fix HWIA#to_hash behavior with array of hashes.kennyj2013-05-162-2/+7
| | | |
* | | | Merge pull request #10601 from Ichimonji10/fix-docsRafael Mendonça França2013-05-151-15/+27
|\ \ \ \ | | | | | | | | | | Rewrite `activerecord/RUNNING_UNIT_TESTS.rdoc`
| * | | | Rewrite `activerecord/RUNNING_UNIT_TESTS`Jeremy Audet2013-05-151-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `RUNNING_UNIT_TESTS` is written in an unclear and confusing manner. This commit attempts to correct that. Thanks to zzak and vipulnsward for feedback.
* | | | | Merge pull request #10626 from firedev/masterGuillermo Iguaran2013-05-143-6/+3
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | Removed incorrect warning from application.js templates and replaced it with stub command description
| * | | Removed incorrect warning from application.js templates and replaced it with ↵Nick2013-05-153-6/+3
|/ / / | | | | | | | | | stub command description
* | | only dup the options once, the Callback object does not mutate themAaron Patterson2013-05-141-2/+2
| | |
* | | make the compile method thread safeAaron Patterson2013-05-141-5/+7
| | |
* | | use inject rather than multiple assignmentsAaron Patterson2013-05-141-4/+2
| | |
* | | deprecating string based terminatorsAaron Patterson2013-05-146-9/+23
| | |
* | | inspect the filter when displaying error messagesAaron Patterson2013-05-141-1/+1
| | |
* | | use public api for testing rather than grabbing instance variablesAaron Patterson2013-05-141-1/+1
| | |
* | | halting lambda must be instance execedAaron Patterson2013-05-141-2/+2
| | |
* | | fixing arity2 testAaron Patterson2013-05-141-3/+8
| | |
* | | Merge pull request #10266 from vipulnsward/fix_HIA_to_hashRafael Mendonça França2013-05-142-3/+11
|\ \ \ | | | | | | | | fix HashWithIndifferentAccess#to_hash behaviour
| * | | fix HashWithIndifferentAccess#to_hash behaviourVipul A M2013-04-192-3/+11
| | | |
* | | | Merge branch 'polymorphic'Aaron Patterson2013-05-144-230/+364
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * polymorphic: (41 commits) fix shadowed variable warnings polymorphic around callbacks polymorphic after filter rename terminal to halting, try to keep naming consistent push the before filter lambdas to factory methods polymorphic before callbacks use a singleton end node Revert "we never pass blocks, so remove this" if there is nothing to compile, then do not bother compiling Arrays are no longer supported we never pass blocks, so remove this raise an argument error if the filter arity is greater than 1 pass the actual filter, not a string do not keep a reference to the chain in the callback objects fix deprecation test push merge code to the callback itself dup the callback and set the chain remove klass because it is not used rename instance variables push duplicates? logic to the instance ...
| * | | | fix shadowed variable warningsAaron Patterson2013-05-141-5/+5
| | | | |
| * | | | polymorphic around callbacksAaron Patterson2013-05-141-15/+79
| | | | |
| * | | | polymorphic after filterAaron Patterson2013-05-141-25/+70
| | | | |
| * | | | rename terminal to halting, try to keep naming consistentAaron Patterson2013-05-141-4/+4
| | | | |
| * | | | push the before filter lambdas to factory methodsAaron Patterson2013-05-141-40/+58
| | | | |
| * | | | polymorphic before callbacksAaron Patterson2013-05-141-16/+54
| | | | |
| * | | | Merge branch 'master' into normalizecbAaron Patterson2013-05-142-2/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: private callback methods should work Update mail to minimum version 2.5.4
| * | | | | use a singleton end nodeAaron Patterson2013-05-131-5/+10
| | | | | |
| * | | | | Revert "we never pass blocks, so remove this"Aaron Patterson2013-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9caf0cf9c8c7b42737ae78c470a5dd2f583ada75.
| * | | | | if there is nothing to compile, then do not bother compilingAaron Patterson2013-05-131-3/+8
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 03:37:24 +0000