aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Revert "Merge pull request #36676 from wjessop/change_activestorage_metadata_...Ryuta Kamizono2019-07-171-1/+1
* | | | | | | | | | | | | | | | Merge pull request #36603 from y-yagi/add_skip_collision_check_optionYuji Yaginuma2019-07-182-2/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add `skip-collision-check` option to generatoryuuji.yaginuma2019-07-052-2/+15
* | | | | | | | | | | | | | | | | Merge pull request #36691 from Edouard-chin/ec-system-test-routeRafael França2019-07-172-6/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Don't include routes helpers inside System test class:Edouard CHIN2019-07-162-6/+13
* | | | | | | | | | | | | | | | | | Merge pull request #36700 from cpruitt/revert-36690-make-parameterize-require...Eileen M. Uchitelle2019-07-172-15/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Revert "Make UTF-8 string requirement explicit for `ActiveSupport::Inflector....Cliff Pruitt2019-07-172-15/+2
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #36690 from cpruitt/make-parameterize-requires-utf-8-explicitEileen M. Uchitelle2019-07-172-2/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Make UTF-8 string requirement explicit for `transliterate`Cliff Pruitt2019-07-162-2/+15
* | | | | | | | | | | | | | | | | | Merge pull request #36696 from inopinatus/support_beginless_rangesRyuta Kamizono2019-07-173-2/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Support beginless ranges in hash conditions.Josh Goodall2019-07-173-2/+30
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #36635 from abhaynikam/36332-fix-engine-documentation-to-r...Kasper Timm Hansen2019-07-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fixed the engine documentation to not mention of assets/javascripts in app di...Abhay Nikam2019-07-091-1/+1
* | | | | | | | | | | | | | | | | | Merge pull request #36694 from kirs/timeout-error-superclassRafael França2019-07-163-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | [ActiveRecord] Superclass for aborted queriesKir Shatrov2019-07-163-5/+12
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Add missing period [ci skip]Rafael Mendonça França2019-07-161-1/+1
* | | | | | | | | | | | | | | | | | Merge pull request #36692 from kirs/mysql2-adapter-timeoutRafael França2019-07-163-1/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Raise specific exception on Mysql2::Error::TimeoutErrorKir Shatrov2019-07-163-1/+23
* | | | | | | | | | | | | | | | | | | Merge pull request #36648 from louim/patch-1Rafael França2019-07-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Update message verifier documentation [ci skip]Louis-Michel Couture2019-07-101-2/+2
* | | | | | | | | | | | | | | | | | | Merge pull request #36667 from gmcgibbon/clarify_logger_set_in_log_subscriber...Gannon McGibbon2019-07-161-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Specify log subscribers need a logger set before they can receive eventsGannon McGibbon2019-07-151-0/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #36685 from Shopify/as-depedencies-unhook-fixRafael França2019-07-161-3/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \