aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | Add Action Text to guides [ci skip]bogdanvlviv2019-01-054-60/+122
* | | | | Merge pull request #34879 from bogdanvlviv/add-skip-action-text-option-to-rai...George Claghorn2019-01-054-1/+27
|\ \ \ \ \
| * | | | | Add `--skip-action-text` option to `rails new`bogdanvlviv2019-01-054-1/+27
| |/ / / /
* | | | | Merge pull request #34877 from bogdanvlviv/document-action_text_content-hookGeorge Claghorn2019-01-051-0/+1
|\ \ \ \ \
| * | | | | Add `action_text_content` hook to the guide [ci skip]bogdanvlviv2019-01-051-0/+1
| |/ / / /
* | | | | Merge pull request #34875 from bogdanvlviv/test-actiontext-on-rails-6.0George Claghorn2019-01-056-7/+5
|\ \ \ \ \
| * | | | | Test actiontext on Rails 6.0bogdanvlviv2019-01-056-7/+5
| |/ / / /
* | | | | Merge pull request #34876 from bogdanvlviv/remove-needless-comment-actiontext...George Claghorn2019-01-051-1/+0
|\ \ \ \ \
| * | | | | Remove comment from `actiontext/actiontext.gemspec`bogdanvlviv2019-01-051-1/+0
| |/ / / /
* | | | | Merge pull request #34874 from bogdanvlviv/fix-RichText-api-docsGeorge Claghorn2019-01-051-4/+4
|\ \ \ \ \
| * | | | | Fix API docs of `ActionText::RichText` [ci skip]bogdanvlviv2019-01-051-4/+4
| |/ / / /
* | | | | Merge pull request #34709 from gmcgibbon/action_cable_guides_es6Javan Makhmali2019-01-051-112/+160
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use ES6 and Webpacker in ActionCable guide.Gannon McGibbon2019-01-041-112/+160
* | | | | Generate Action Text's API docsGeorge Claghorn2019-01-042-13/+23
* | | | | Label Action Text PRs [ci skip]George Claghorn2019-01-041-0/+2
* | | | | Merge pull request #34873 from georgeclaghorn/actiontextGeorge Claghorn2019-01-04144-5/+9447
|\ \ \ \ \
| * \ \ \ \ Import Action TextGeorge Claghorn2019-01-04144-5/+9447
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Update tag helper routes for use in engines (#49)Rikki Pitt2019-01-041-2/+2
| | * | | | Fix adding a rich_text_area to a form with no modelGeorge Claghorn2018-12-315-29/+55
| | * | | | Bump Nokogiri for Ruby 2.6 compatibilityGeorge Claghorn2018-12-311-4/+4
| | * | | | Move method definition below callbacksGeorge Claghorn2018-12-211-5/+6
| | * | | | Merge pull request #48 from lsylvester/use-plain-text-for-presenceGeorge Claghorn2018-12-202-2/+14
| | |\ \ \ \
| | | * | | | use plain test to determine present/blank/empty as the html version will alwa...Lachlan Sylvester2018-12-212-2/+14
| | * | | | | Fit Rails’ Ruby requirement in here.Kasper Timm Hansen2018-12-211-1/+1
| | * | | | | Merge pull request #46 from bogdanvlviv/remove-ruby-2_4-from-ciKasper Timm Hansen2018-12-211-1/+0
| | |\ \ \ \ \
| | | * | | | | Remove Ruby 2.4 from the CI matrixbogdanvlviv2018-12-211-1/+0
| | |/ / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 19:23:16 +0000