Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Capture parsing errors for ActionController::ParamsWrapper#process_action | Haroon Ahmed | 2019-01-08 | 1 | -16/+17 | |
* | | | | | | Merge pull request #34885 from y-yagi/fixes_34780 | Yuji Yaginuma | 2019-01-09 | 2 | -4/+16 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Allow using combine the Cache-Control `public` and `no-cache` headers | yuuji.yaginuma | 2019-01-07 | 2 | -4/+16 | |
* | | | | | | | Preserve Bundle configuration during app generation (#34755) | Marco Costa | 2019-01-09 | 3 | -9/+33 | |
| |_|/ / / / |/| | | | | | ||||||
* | | | | | | Revert "Merge pull request #34387 from yhirano55/rails_info_properties_json" | Kasper Timm Hansen | 2019-01-08 | 5 | -37/+2 | |
* | | | | | | Revert "Revert "Merge pull request #34387 from yhirano55/rails_info_propertie... | Kasper Timm Hansen | 2019-01-08 | 13 | -0/+50 | |
* | | | | | | Revert "Merge pull request #34387 from yhirano55/rails_info_properties_json" | Kasper Timm Hansen | 2019-01-08 | 13 | -50/+0 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | The frameworks list is order dependent. | Kasper Timm Hansen | 2019-01-08 | 1 | -6/+7 | |
* | | | | | Merge pull request #34890 from rosa/test-exceptions-with-all-adapters | Rafael França | 2019-01-08 | 4 | -91/+88 | |
|\ \ \ \ \ | ||||||
| * | | | | | Ensure 0 is always the default for the individual exception counters in Activ... | Rosa Gutierrez | 2019-01-08 | 2 | -3/+3 | |
| * | | | | | Rewrite ActiveJob exception tests so it runs with the real adapters | Rosa Gutierrez | 2019-01-08 | 2 | -88/+85 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #34132 from ConfusedVorlon/enable_fragment_cache_log_in_dev | Rafael França | 2019-01-08 | 2 | -0/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | enable_fragment_cache_logging | Rob Jonson | 2018-10-09 | 2 | -0/+2 | |
* | | | | | | Merge pull request #34898 from ksolo/update-raketasks-for-new-frameworks | Aaron Patterson | 2019-01-08 | 3 | -1/+18 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | add new frameworks to tasks/release.rb | Kevin Solorio | 2019-01-08 | 3 | -1/+18 | |
* | | | | | | | Consolidate the duplicated code that building range predicate | Ryuta Kamizono | 2019-01-08 | 5 | -36/+21 | |
* | | | | | | | Merge pull request #34896 from bannzai/fix/active_record/mysql/enum_type_map | Ryuta Kamizono | 2019-01-08 | 2 | -2/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | :recycle: Fix mysql type map for enum and set | bannzai | 2019-01-08 | 2 | -2/+6 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Add load hook for ActionText::RichText | George Claghorn | 2019-01-07 | 2 | -0/+3 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #34700 from gmcgibbon/fetch_multi_key_order | Rafael França | 2019-01-07 | 3 | -10/+24 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Preserve key order passed to ActiveSupport::CacheStore#fetch_multi | Gannon McGibbon | 2018-12-27 | 3 | -10/+24 | |
* | | | | | | Merge pull request #34886 from lsylvester/attachments-for-actionmailbox | George Claghorn | 2019-01-06 | 5 | -1/+44 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | add attachments to the new inbound mail | Lachlan Sylvester | 2019-01-07 | 5 | -1/+44 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #34882 from bogdanvlviv/revert-129f8ac6ff | Guillermo Iguaran | 2019-01-05 | 2 | -0/+9 | |
|\ \ \ \ \ | ||||||
| * | | | | | Revert "Remove node_modules path from assets load paths since we use webpack ... | bogdanvlviv | 2019-01-06 | 2 | -0/+9 | |
|/ / / / / | ||||||
* | | | | | Reset ActionText::Content.renderer before and after each request | George Claghorn | 2019-01-05 | 1 | -3/+6 | |
* | | | | | Merge pull request #34865 from cbandy/node_rails_env | George Claghorn | 2019-01-05 | 1 | -2/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Respect Rails.env when running `rails yarn:install` | Chris Bandy | 2019-01-04 | 1 | -2/+1 | |
* | | | | | | Merge pull request #34878 from bogdanvlviv/action_text-guides-docs | George Claghorn | 2019-01-05 | 4 | -60/+122 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add Action Text to guides [ci skip] | bogdanvlviv | 2019-01-05 | 4 | -60/+122 | |
* | | | | | | | Merge pull request #34879 from bogdanvlviv/add-skip-action-text-option-to-rai... | George Claghorn | 2019-01-05 | 4 | -1/+27 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add `--skip-action-text` option to `rails new` | bogdanvlviv | 2019-01-05 | 4 | -1/+27 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #34877 from bogdanvlviv/document-action_text_content-hook | George Claghorn | 2019-01-05 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add `action_text_content` hook to the guide [ci skip] | bogdanvlviv | 2019-01-05 | 1 | -0/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #34875 from bogdanvlviv/test-actiontext-on-rails-6.0 | George Claghorn | 2019-01-05 | 6 | -7/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Test actiontext on Rails 6.0 | bogdanvlviv | 2019-01-05 | 6 | -7/+5 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #34876 from bogdanvlviv/remove-needless-comment-actiontext... | George Claghorn | 2019-01-05 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove comment from `actiontext/actiontext.gemspec` | bogdanvlviv | 2019-01-05 | 1 | -1/+0 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #34874 from bogdanvlviv/fix-RichText-api-docs | George Claghorn | 2019-01-05 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix API docs of `ActionText::RichText` [ci skip] | bogdanvlviv | 2019-01-05 | 1 | -4/+4 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #34709 from gmcgibbon/action_cable_guides_es6 | Javan Makhmali | 2019-01-05 | 1 | -112/+160 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Use ES6 and Webpacker in ActionCable guide. | Gannon McGibbon | 2019-01-04 | 1 | -112/+160 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Generate Action Text's API docs | George Claghorn | 2019-01-04 | 2 | -13/+23 | |
* | | | | | | Label Action Text PRs [ci skip] | George Claghorn | 2019-01-04 | 1 | -0/+2 | |
* | | | | | | Merge pull request #34873 from georgeclaghorn/actiontext | George Claghorn | 2019-01-04 | 144 | -5/+9447 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Import Action Text | George Claghorn | 2019-01-04 | 144 | -5/+9447 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | Update tag helper routes for use in engines (#49) | Rikki Pitt | 2019-01-04 | 1 | -2/+2 | |
| | * | | | | | Fix adding a rich_text_area to a form with no model | George Claghorn | 2018-12-31 | 5 | -29/+55 | |
| | * | | | | | Bump Nokogiri for Ruby 2.6 compatibility | George Claghorn | 2018-12-31 | 1 | -4/+4 | |
| | * | | | | | Move method definition below callbacks | George Claghorn | 2018-12-21 | 1 | -5/+6 |