aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add Duration#before and #after as aliases for #ago and #sinceNick Johnstone2017-02-263-0/+31
* Merge pull request #28175 from sevenseacat/patch-1Kasper Timm Hansen2017-02-261-1/+1
|\
| * Fix typo 'affect' -> 'effect' [ci skip]Rebecca Skinner2017-02-261-1/+1
|/
* Fix `change_column` to drop default with `null: false`Ryuta Kamizono2017-02-264-5/+14
* Merge pull request #28173 from vipulnsward/as-ch-passKasper Timm Hansen2017-02-261-3/+3
|\
| * AS CHANGELOG Pass [ci skip]Vipul A M2017-02-261-3/+3
|/
* Merge pull request #28167 from kirs/deprecate-verify-argsMatthew Draper2017-02-262-0/+15
|\
| * Deprecate AbstractAdapter#verify! with argumentsKir Shatrov2017-02-252-0/+15
* | Merge pull request #28169 from kirs/ensure-conn-verifyMatthew Draper2017-02-262-1/+2
|\ \
| * | Use ensure block for things we cleanup in testsKir Shatrov2017-02-252-1/+2
| |/
* | Suppress `DISTINCT` clause outside aggregate functionRyuta Kamizono2017-02-252-2/+13
* | Commit flash changes when using a redirect route.Andrew White2017-02-253-0/+58
* | Merge pull request #28162 from dixpac/update-docs-Rails_AppGeneratorJon Moss2017-02-251-0/+8
|\ \
| * | Imporove docs for Rails::AppGenerator [ci skip]dixpac2017-02-251-0/+8
* | | [ci ckip] Fix example of resolve in CHANGELOG.mdAndrew White2017-02-251-1/+1
|/ /
* | Fix typo `HashWithIndifferentAcces` to `HashWithIndifferentAccess` [ci skip]Ryuta Kamizono2017-02-251-1/+1
* | Order array contents to match Relation#firstMatthew Draper2017-02-251-1/+1
* | Merge pull request #28137 from schneems/schneems/fix-default-puma-portRichard Schneeman2017-02-242-11/+52
|\ \
| * | [close #24435] Send user_supplied_options to serverschneems2017-02-242-11/+52
* | | Use shasum 256 on the releaseRafael Mendonça França2017-02-241-2/+2
* | | Merge branch 'jhawthorn-ruby_2_4_bigdecimal_casting'Rafael Mendonça França2017-02-244-1/+24
|\ \ \
| * | | Match the behavior of bigdecimal after https://github.com/ruby/bigdecimal/pul...Rafael Mendonça França2017-02-241-1/+5
| * | | Fix invalid string Decimal casting under ruby 2.4John Hawthorn2017-02-244-1/+20
* | | | Merge pull request #28157 from robin850/hwia-soft-deprecationMatthew Draper2017-02-255-3/+57
|\ \ \ \ | |/ / / |/| | |
| * | | Add few tests for the top level `HashWithIndifferentAccess`Robin Dupret2017-02-251-0/+24
| * | | Soft-deprecate the top-level HashWithIndifferentAccess classRobin Dupret2017-02-255-3/+34
* | | | Merge pull request #28006 from fareastside/masterRafael Mendonça França2017-02-243-2/+21
|\ \ \ \
| * | | | add optional second argument to ActiveSupport core extension for Marshal#load...Jeff Latz2017-02-243-2/+21
| |/ / /
* | | | Fix CHANGELOG entry position [ci skip]Rafael Mendonça França2017-02-241-2/+3
* | | | Merge pull request #28158 from dylanahsmith/gzip-crc-checkRafael França2017-02-244-2/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Add missing gzip footer check in ActiveSupport::Gzip.decompressDylan Thacker-Smith2017-02-244-2/+16
|/ / /
* | | Merge pull request #28144 from lucasmazza/lm-system-test-driven-byEileen M. Uchitelle2017-02-244-27/+35
|\ \ \
| * | | Change `SystemTestCase.driven_by` to use `setup`/`teardown` hooksLucas Mazza2017-02-244-27/+35
* | | | Merge pull request #28150 from y-yagi/do_not_display_hidden_namespaces_in_gen...Rafael França2017-02-242-0/+10
|\ \ \ \
| * | | | does not show hidden namespaces in generator's helpyuuji.yaginuma2017-02-242-0/+10
* | | | | Merge pull request #28062 from y-yagi/make_adding_gemfile_entry_work_even_if_...Rafael França2017-02-242-1/+16
|\ \ \ \ \
| * | | | | Make adding gemfile entry work even if specify only the plugin nameyuuji.yaginuma2017-02-242-1/+16
* | | | | | Merge pull request #28145 from treiff/update-docs-ActiveRecord__ResultRafael França2017-02-241-1/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Improve docs for ActiveRecord::Result. [ci skip]Trevor Reiff2017-02-241-1/+12
| | |/ / / | |/| | |
* | | | | Merge pull request #28141 from y-yagi/show_correct_help_and_versionRafael França2017-02-233-2/+49
|\ \ \ \ \
| * | | | | Make help short-cut alias to workyuuji.yaginuma2017-02-242-1/+24
| * | | | | Make version short-cut alias to workyuuji.yaginuma2017-02-242-1/+25
* | | | | | Merge pull request #27769 from maclover7/jm-jruby-amoRafael França2017-02-231-1/+1
|\ \ \ \ \ \
| * | | | | | Enable Active Model testing for JRubyJon Moss2017-02-231-1/+1
* | | | | | | Merge pull request #28138 from rwz/rwz/hwia-compactRichard Schneeman2017-02-232-1/+11
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Make HWIA#compact not return nil when no nilsPavel Pravosud2017-02-232-1/+11
| |/ / / / /
* | | | | | Make security policy more prominent in docsJon Moss2017-02-232-0/+7
* | | | | | Merge pull request #25285 from kamipo/fix_remove_reference_to_multiple_foreig...Rafael França2017-02-232-0/+17
|\ \ \ \ \ \
| * | | | | | Fix `remove_reference` to multiple foreign keys in the same tableRyuta Kamizono2017-02-112-0/+17
* | | | | | | Merge pull request #27962 from kamipo/deprecate_quoted_idRafael França2017-02-237-60/+111
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |