aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Fixed the typo in the deprecation error messages. Followup #36738Abhay Nikam2019-07-231-1/+1
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* / | | | | | | | | | | | | Fix broken rdoc for UrlHelper [ci skip]Ryuta Kamizono2019-07-241-6/+6
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #36370 from ptoomey3/masterRafael França2019-07-232-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update activesupport/test/parameter_filter_test.rb Patrick Toomey2019-07-231-1/+0
| * | | | | | | | | | | | | Use style consistent with surrounding codePatrick Toomey2019-05-311-3/+1
| * | | | | | | | | | | | | Fix typoPatrick Toomey2019-05-311-1/+1
| * | | | | | | | | | | | | Recursively process arrays consistentlyPatrick Toomey2019-05-311-1/+8
| * | | | | | | | | | | | | Add failing test for array values and procsPatrick Toomey2019-05-311-0/+8
* | | | | | | | | | | | | | Merge pull request #36738 from Edouard-chin/ec-errors-to_hash-stringRafael França2019-07-232-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Modify behaviour of `AM::Errors#to_h`:Edouard CHIN2019-07-232-4/+9
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #36665 from jmschneider/masterRafael Mendonça França2019-07-233-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Make currency symbols optional for money column type in PostgreSQLJoel Schneider2019-07-123-2/+10
* | | | | | | | | | | | | | Merge pull request #36542 from spk/add-pidfile-option-to-puma-confRafael França2019-07-231-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add pidfile option to puma config templateLaurent Arnoud2019-06-231-0/+3
* | | | | | | | | | | | | | | Merge pull request #36642 from wagenet/fix-disk-service-hostRafael França2019-07-232-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix host for ActiveStorage DiskServicePeter Wagenet2019-07-092-3/+13
* | | | | | | | | | | | | | | Merge pull request #36733 from ch3rub1m/fix-cache-timestamp-format-guideRafael França2019-07-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix cache_timestamp_format default value in guidesch3rub1m2019-07-231-1/+1
* | | | | | | | | | | | | | | | Merge pull request #36724 from Edouard-chin/ec-to-h-errorsRafael França2019-07-232-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Deprecated `AM::Errors#to_h`:Edouard CHIN2019-07-232-0/+16
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Improve changelog entry, remove extraneous word [ci skip]Carlos Antonio da Silva2019-07-231-2/+2
* | | | | | | | | | | | | | | | Merge pull request #36666 from gmcgibbon/allow_disabling_active_storage_routesGannon McGibbon2019-07-226-1/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Make Active Storage routes optionalGannon McGibbon2019-07-226-1/+24
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Remove changelog entry for backported changeGeorge Claghorn2019-07-221-7/+0
* | | | | | | | | | | | | | | | Merge pull request #36726 from Edouard-chin/ec-source-annotation-extractor-de...Rafael França2019-07-221-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Move the deprecation call after the new class has been defined:Edouard CHIN2019-07-221-5/+5
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #36623 from alipman88/exclude_marshal_dump_from_delegate_m...George Claghorn2019-07-223-2/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Omit marshal_dump & _dump from delegate_missing_toAaron Lipman2019-07-173-2/+44
* | | | | | | | | | | | | | | | Merge pull request #36723 from masakazutakewaka/fix_create_newline_between_bl...Ryuta Kamizono2019-07-222-12/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | create a newline between blocks when gem_group, github and add_source was cal...masakazutakewaka2019-07-212-12/+51
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #36721 from Edouard-chin/ec-errors-eachCarlos Antonio da Silva2019-07-212-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix deprecation on `AM::Errors` when each is called indirectly:Edouard CHIN2019-07-202-1/+9
* | | | | | | | | | | | | | | | | Merge pull request #35285 from masakazutakewaka/fix_railtie_add_newline_to_ge...y-yagi2019-07-212-16/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Append a newline to the Gemfile if it doesn't end with a newlinemasakazutakewaka2019-07-192-16/+63
* | | | | | | | | | | | | | | | | Preserve existing attachment assignment behavior for upgraded appsGeorge Claghorn2019-07-209-15/+117
* | | | | | | | | | | | | | | | | Fix argument in doc sample of new `sms_to` helper [ci skip]Carlos Antonio da Silva2019-07-191-1/+1
* | | | | | | | | | | | | | | | | Merge pull request #36511 from aantix/sms_link_helperGuillermo Iguaran2019-07-192-0/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Doc changes.Jim Jones2019-06-181-4/+4
| * | | | | | | | | | | | | | | | | Helper method to create an sms link - when clicked it opens the phone/desktop...Jim Jones2019-06-182-0/+110
* | | | | | | | | | | | | | | | | | Merge pull request #36713 from Shopify/fix-type-in-templateKasper Timm Hansen2019-07-191-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix a minor typo in ActionView::UnboundTemplateJean Boussier2019-07-191-3/+3
* | | | | | | | | | | | | | | | | | | Merge pull request #36706 from kirs/dedup-optimizer-hintsRyuta Kamizono2019-07-192-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | [ActiveRecord] Deduplicate optimizer hintsKir Shatrov2019-07-192-1/+8
* | | | | | | | | | | | | | | | | | | | Merge pull request #36712 from tekin/include-more-commands-in-rails-help-outputEileen M. Uchitelle2019-07-191-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Include common commands in rails help outputTekin Suleyman2019-07-191-4/+4
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #36710 from ypresto/patch-1Ryuta Kamizono2019-07-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | [ActionController] Fix send_file example for 404Yuya Tanaka2019-07-191-1/+1
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #36703 from y-yagi/script-src-xxx_and_style-src-xxxy-yagi2019-07-192-0/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Add support for script-src-attr / elem and style-src-attr / elem directivesyuuji.yaginuma2019-07-182-0/+28
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #36695 from kamipo/revert_unnecessary_changeRyuta Kamizono2019-07-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |