aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Missing require for strip_heredocAkira Matsuda2017-01-171-0/+1
|/ / / / / /
* | | | | | Add CHANGELOG entry for #27701Andrew White2017-01-161-0/+4
* | | | | | Merge pull request #27701 from kamipo/translate_foreign_key_violationAndrew White2017-01-162-45/+74
|\ \ \ \ \ \
| * | | | | | Translate Foreign Key violation to the specific exception for SQLite3 adapterRyuta Kamizono2017-01-162-45/+74
* | | | | | | Merge pull request #27692 from y-yagi/make_render_work_with_ac_paramsEileen M. Uchitelle2017-01-162-2/+5
|\ \ \ \ \ \ \
| * | | | | | | make `render` work with AC::Paramsyuuji.yaginuma2017-01-152-2/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #27695 from metaskills/sqlserver-testparticipationEileen M. Uchitelle2017-01-163-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Allow SQLServerAdapter to opt into a few tests.Ken Collins2017-01-163-4/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #27699 from kenta-s/update-comment-for-scrubber-usageKasper Timm Hansen2017-01-161-6/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update comment for Scrubber usage [ci skip]kenta-s2017-01-161-6/+4
| | |/ / / / | |/| | | |
* | | | | | Added test to ensure that we dont break #to_h again when trying to restore th...David Heinemeier Hansson2017-01-161-0/+5
* | | | | | Revert "significant speedup of AC::Parameters#permit" [26dd9b26ab7317f94fd285...David Heinemeier Hansson2017-01-162-8/+1
* | | | | | Add missing requireDavid Heinemeier Hansson2017-01-161-0/+1
|/ / / / /
* | | | | Should do nothing hereAkira Matsuda2017-01-161-1/+1
* | | | | Merge pull request #27683 from eugeneius/update_counters_empty_touch_testKasper Timm Hansen2017-01-151-0/+9
|\ \ \ \ \
| * | | | | Add test for update_counters with empty touchEugene Kenny2017-01-151-0/+9
| |/ / / /
* | | | | Revert "Don't guard against `touch: []`."Kasper Timm Hansen2017-01-151-1/+2
* | | | | Merge pull request #27601 from y-yagi/make_work_all_commands_from_engineKasper Timm Hansen2017-01-1510-54/+124
|\ \ \ \ \
| * | | | | improve server default options testyuuji.yaginuma2017-01-091-3/+3
| * | | | | make all rails commands work in engineyuuji.yaginuma2017-01-099-51/+121
* | | | | | Merge pull request #27618 from kamipo/fix_uuid_default_nilKasper Timm Hansen2017-01-152-20/+37
|\ \ \ \ \ \
| * | | | | | Fix UUID primary key with default nil in legacy migrationRyuta Kamizono2017-01-092-1/+20
| * | | | | | Should test uuid legacy migration without `supports_pgcrypto_uuid?`Ryuta Kamizono2017-01-091-19/+17
| |/ / / / /
* | | | | | Revert "Merge pull request #27686 from koic/friendly_bigdecimal_inspect"Kasper Timm Hansen2017-01-152-16/+1
* | | | | | Don't guard against `touch: []`.Kasper Timm Hansen2017-01-151-2/+1
* | | | | | Merge pull request #27690 from y-yagi/remove_unused_requireKasper Timm Hansen2017-01-151-1/+0
|\ \ \ \ \ \
| * | | | | | remove unused requireyuuji.yaginuma2017-01-151-1/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #27686 from koic/friendly_bigdecimal_inspectJon Moss2017-01-152-1/+16
|\ \ \ \ \ \
| * | | | | | Several representation of BigDecimal has changed in Ruby 2.4.0+ [ci skip]Koichi ITO2017-01-152-1/+16
| |/ / / / /
* | | | | | Revert "bundle u mocha"Akira Matsuda2017-01-162-3/+3
* | | | | | bundle u mochaAkira Matsuda2017-01-152-3/+3
* | | | | | Allow render locals to be assigned to instance variablesAndrew White2017-01-154-1/+12
* | | | | | Merge pull request #27684 from y-yagi/remove_ununnecessary_addition_of_libKasper Timm Hansen2017-01-151-1/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | remove unnecessary addition of `lib`yuuji.yaginuma2017-01-151-1/+0
| |/ / / /
* | | | | Merge pull request #27687 from kenta-s/fix-broken-example-code-in-output_safe...Ryuta Kamizono2017-01-151-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix broken sample code in action_view/helpers/output_safety_helper.rb [ci skip]kenta-s2017-01-151-1/+1
|/ / / /
* | | | ZOMG worst typo in my life :scream:Akira Matsuda2017-01-151-1/+1
* | | | It would be safer not to totally undef core classes' respond_to_missing?Akira Matsuda2017-01-152-2/+12
* | | | `respond_to_missing?` should fallback to `super` where method_missing could c...Akira Matsuda2017-01-152-2/+2
* | | | AS::StringInquirer#respond_to_missing? should fallback to superAkira Matsuda2017-01-153-3/+19
* | | | This test wasn't actually an effective regression testAkira Matsuda2017-01-151-4/+5
* | | | Merge pull request #27660 from akihiro17/updates-timestampKasper Timm Hansen2017-01-144-7/+32
|\ \ \ \
| * | | | Add the touch option to ActiveRecord#increment! and decrement!akihiro172017-01-144-7/+32
* | | | | Unused &block parameterAkira Matsuda2017-01-151-1/+1
* | | | | AS::ArrayInquirer#respond_to_missing? should fallback to superAkira Matsuda2017-01-153-1/+20
* | | | | Merge pull request #27680 from kamipo/fix_scope_for_createKasper Timm Hansen2017-01-141-1/+1
|\ \ \ \ \
| * | | | | `type_condition` should be overwritten by `create_with_value` in `scope_for_c...Ryuta Kamizono2017-01-151-1/+1
|/ / / / /
* | | | | Merge pull request #27679 from lcpriest/patch-1Arthur Nogueira Neves2017-01-131-4/+4
|\ \ \ \ \
| * | | | | Small spelling errorLachlan Priest2017-01-141-4/+4
|/ / / / /
* | | | | Fix pool_from_any_process to use most recent speceileencodes2017-01-132-1/+36