aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* just a testAaron Patterson2013-05-171-6/+2
* Merge branch 'master' into stmtAaron Patterson2013-05-17316-2101/+3207
|\
| * Merge pull request #10657 from AJ-Acevedo/pluginRafael Mendonça França2013-05-161-0/+1
| |\
| | * plugin new missing license specAJ Acevedo2013-05-161-0/+1
| |/
| * let Ruby do the is_a check for usAaron Patterson2013-05-161-3/+4
| * Merge pull request #10656 from zenspider/fix_mocha_backAaron Patterson2013-05-161-1/+1
| |\
| | * Mocha 0.14.0 was released with MT5 support. Switch back to gemRyan Davis2013-05-161-1/+1
| |/
| * Fix named routing regression from 3.2.13schneems2013-05-162-0/+12
| * Revert "just call the class method since we know the callbacks are stored at ...Aaron Patterson2013-05-161-2/+1
| * Merge pull request #10652 from md5/concern-multiple-includedRafael Mendonça França2013-05-163-0/+28
| |\
| | * Raise when multiple included blocks are definedMike Dillon2013-05-163-0/+28
| * | Merge pull request #10527 from zenspider/squishy_minitest5Aaron Patterson2013-05-1613-146/+50
| |\ \
| | * | oops. I should have only required minitest, not minitets/autorun. muscle memory.Ryan Davis2013-05-091-1/+1
| | * | tweak dependenciesRyan Davis2013-05-082-2/+2
| | * | Updates to make rails 4 happy with minitest 5:Ryan Davis2013-05-0611-144/+48
| * | | test refactorAaron Patterson2013-05-161-5/+2
| * | | Add more data to AR::UnknownAttributeErrorBogdan Gusiev2013-05-163-1/+22
| * | | Merge pull request #10594 from shime/rack-debuggerAaron Patterson2013-05-162-4/+4
| |\ \ \
| | * | | exit with non-zero to signal failureHrvoje Šimić2013-05-132-4/+4
| * | | | Merge pull request #10619 from alno/top_level_array_in_postgres_jsonAaron Patterson2013-05-163-1/+17
| |\ \ \ \
| | * | | | Support array as root element in JSONAlexey Noskov2013-05-143-1/+17
| * | | | | Revert "Integration tests support the OPTIONS http method"Rafael Mendonça França2013-05-162-24/+2
| * | | | | Merge pull request #10636 from seanwalbran/fix-asset-host-proc-returning-nilRafael Mendonça França2013-05-162-1/+13
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | restore ability to return nil from asset_host proc, add testSean Walbran2013-05-152-1/+13
| * | | | | restore whitespace in Gemfile between sqlite3 and sprocketsSam Ruby2013-05-161-1/+1
| * | | | | Revert "Add the options method to action_controller testcase."Rafael Mendonça França2013-05-162-11/+0
| * | | | | 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 breakColin Bartlett2013-05-161-1/+1
| * | | | | | Merge pull request #10640 from joelcogen/masterPiotr Sarnacki2013-05-161-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix detection of engine in rake db:load_configJoel Cogen2013-05-161-1/+1
| |/ / / / /
| * | | | | 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
| * | | | | Merge pull request #10591 from acapilleri/cond_callback_testAaron Patterson2013-05-151-0/+13
| |\ \ \ \ \
| | * | | | | 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
| |\ \ \ \ \
| | * | | | | Remove unnecessary code, because this extension is created on demand in hstor...kennyj2013-05-151-2/+0
| | * | | | | Also support extensions in PostgreSQL 9.1, because this has been supported si...kennyj2013-05-152-4/+8
| * | | | | | Revert "Merge pull request #10600 from aditya-kapoor/code_refactor"Rafael Mendonça França2013-05-151-9/+11
| * | | | | | just call the class method since we know the callbacks are stored at theAaron Patterson2013-05-151-1/+2
| * | | | | | 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.kennyj2013-05-162-2/+7