aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move all npm packages to @rails scopeJavan Makhmali2019-01-1021-53/+48
* Tweak Postmark ingress docs [ci skip]George Claghorn2019-01-091-5/+5
* Merge pull request #34909 from davidalee/patch-2Prem Sichanugrist2019-01-101-3/+3
|\
| * Specify the type for the auto-generated primary keyDavid A. Lee2019-01-091-3/+3
* | Merge pull request #34908 from robzolkos/fix-actionmailbox-jsonGeorge Claghorn2019-01-091-1/+1
|\ \
| * | Bring in all of aws-sdk-sns if using Amazon ingressRob Zolkos2019-01-091-1/+1
| |/
* | Merge pull request #34907 from wildbit/actionmailbox-postmarkGeorge Claghorn2019-01-096-33/+197
|\ \ | |/ |/|
| * Added Postmark ingress supportTomek Maszkowski2019-01-096-33/+197
* | Merge pull request #34900 from gmcgibbon/fix_test_find_only_some_columnsEileen M. Uchitelle2019-01-091-2/+11
|\ \
| * | Reset column info on original Topic in serialized attr testGannon McGibbon2019-01-091-2/+11
* | | Merge pull request #34692 from gmcgibbon/use_mail_delivery_job_in_6.0_defaultsRafael França2019-01-098-7/+58
|\ \ \
| * | | Fix legacy fallback for parameterized mailersGannon McGibbon2019-01-073-6/+13
| * | | Move MailDeliveryJob default to 6.0 defaultsGannon McGibbon2019-01-075-1/+45
* | | | Merge pull request #34899 from rails/speed-up-stepAaron Patterson2019-01-091-1/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Duration#coerce should always return a ScalarAaron Patterson2019-01-081-1/+4
* | | | Enable `Lint/UselessAssignment` cop to avoid unused variable warnings (#34904)Ryuta Kamizono2019-01-0915-25/+27
* | | | Merge pull request #34860 from toshimaru/make-guides-sns-friendlyRyuta Kamizono2019-01-093-4/+18
|\ \ \ \
| * | | | Add OG tags to layout.html.erbtoshimaru2019-01-093-4/+18
|/ / / /
* | | | Merge pull request #34903 from y-yagi/enable_deprecated_class_methods_copYuji Yaginuma2019-01-092-1/+4
|\ \ \ \
| * | | | Enable `Lint/DeprecatedClassMethods` cop to avoid using deprecated methodsyuuji.yaginuma2019-01-092-1/+4
|/ / / /
* | | | Merge pull request #34894 from hahmed/tames-params-wrapper-errorsKasper Timm Hansen2019-01-091-16/+17
|\ \ \ \
| * | | | Capture parsing errors for ActionController::ParamsWrapper#process_actionHaroon Ahmed2019-01-081-16/+17
* | | | | Merge pull request #34885 from y-yagi/fixes_34780Yuji Yaginuma2019-01-092-4/+16
|\ \ \ \ \
| * | | | | Allow using combine the Cache-Control `public` and `no-cache` headersyuuji.yaginuma2019-01-072-4/+16
* | | | | | Preserve Bundle configuration during app generation (#34755)Marco Costa2019-01-093-9/+33
| |_|/ / / |/| | | |
* | | | | Revert "Merge pull request #34387 from yhirano55/rails_info_properties_json"Kasper Timm Hansen2019-01-085-37/+2
* | | | | Revert "Revert "Merge pull request #34387 from yhirano55/rails_info_propertie...Kasper Timm Hansen2019-01-0813-0/+50
* | | | | Revert "Merge pull request #34387 from yhirano55/rails_info_properties_json"Kasper Timm Hansen2019-01-0813-50/+0
| |_|_|/ |/| | |
* | | | The frameworks list is order dependent.Kasper Timm Hansen2019-01-081-6/+7
* | | | Merge pull request #34890 from rosa/test-exceptions-with-all-adaptersRafael França2019-01-084-91/+88
|\ \ \ \
| * | | | Ensure 0 is always the default for the individual exception counters in Activ...Rosa Gutierrez2019-01-082-3/+3
| * | | | Rewrite ActiveJob exception tests so it runs with the real adaptersRosa Gutierrez2019-01-082-88/+85
| | |_|/ | |/| |
* | | | Merge pull request #34132 from ConfusedVorlon/enable_fragment_cache_log_in_devRafael França2019-01-082-0/+2
|\ \ \ \
| * | | | enable_fragment_cache_loggingRob Jonson2018-10-092-0/+2
* | | | | Merge pull request #34898 from ksolo/update-raketasks-for-new-frameworksAaron Patterson2019-01-083-1/+18
|\ \ \ \ \
| * | | | | add new frameworks to tasks/release.rbKevin Solorio2019-01-083-1/+18
* | | | | | Consolidate the duplicated code that building range predicateRyuta Kamizono2019-01-085-36/+21
* | | | | | Merge pull request #34896 from bannzai/fix/active_record/mysql/enum_type_mapRyuta Kamizono2019-01-082-2/+6
|\ \ \ \ \ \
| * | | | | | :recycle: Fix mysql type map for enum and setbannzai2019-01-082-2/+6
| | |_|/ / / | |/| | | |
* | | | | | Add load hook for ActionText::RichTextGeorge Claghorn2019-01-072-0/+3
| |/ / / / |/| | | |
* | | | | Merge pull request #34700 from gmcgibbon/fetch_multi_key_orderRafael França2019-01-073-10/+24
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Preserve key order passed to ActiveSupport::CacheStore#fetch_multiGannon McGibbon2018-12-273-10/+24
* | | | | Merge pull request #34886 from lsylvester/attachments-for-actionmailboxGeorge Claghorn2019-01-065-1/+44
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | add attachments to the new inbound mailLachlan Sylvester2019-01-075-1/+44
|/ / / /
* | | | Merge pull request #34882 from bogdanvlviv/revert-129f8ac6ffGuillermo Iguaran2019-01-052-0/+9
|\ \ \ \
| * | | | Revert "Remove node_modules path from assets load paths since we use webpack ...bogdanvlviv2019-01-062-0/+9
|/ / / /
* | | | Reset ActionText::Content.renderer before and after each requestGeorge Claghorn2019-01-051-3/+6
* | | | Merge pull request #34865 from cbandy/node_rails_envGeorge Claghorn2019-01-051-2/+1
|\ \ \ \
| * | | | Respect Rails.env when running `rails yarn:install`Chris Bandy2019-01-041-2/+1
* | | | | Merge pull request #34878 from bogdanvlviv/action_text-guides-docsGeorge Claghorn2019-01-054-60/+122
|\ \ \ \ \