| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Don't reference Rails.application from inside a component | Matthew Draper | 2016-03-02 | 2 | -10/+8 |
| | | |||||
| * | Use AS::Reloader to support reloading in ActiveJob | Matthew Draper | 2016-03-02 | 4 | -2/+23 |
| | | |||||
| * | Use AS::Executor / AS::Reloader to support reloading in ActionCable | Matthew Draper | 2016-03-02 | 9 | -30/+96 |
| | | |||||
| * | Publish AS::Executor and AS::Reloader APIs | Matthew Draper | 2016-03-02 | 33 | -307/+782 |
| | | | | | | | These should allow external code to run blocks of user code to do "work", at a similar unit size to a web request, without needing to get intimate with ActionDipatch. | ||||
| * | Mock fork twice | Rafael Mendonça França | 2016-03-01 | 1 | -1/+1 |
| | | |||||
| * | Support `:any` variants lookup in `PathResolver` | Godfrey Chan | 2016-03-01 | 2 | -6/+21 |
| | | | | | | | | | `OptimizedFileSystemResolver` (which most Rails apps use), but did not implement the feature on the more generic `PathResolver`, which is often used in tests etc. Fixes #23881 | ||||
| * | Merge pull request #23966 from ↵ | Jeremy Daer | 2016-03-01 | 8 | -133/+110 |
| |\ | | | | | | | | | jeremy/activejob/pare-down-async-adapter-for-low-footprint-dev Active Job: pare down async adapter for low footprint dev | ||||
| | * | Active Job: smaller footprint for the dev/test async adapter | Jeremy Daer | 2016-02-29 | 8 | -133/+110 |
| | | | | | | | | | | | Use one shared worker pool for all queues with 0-#CPU workers rather than separate pools per queue with 2-10*#CPU workers each. | ||||
| * | | Merge pull request #23973 from mohitnatoo/dummy-template-with-rails-command | Rafael França | 2016-02-29 | 1 | -1/+1 |
| |\ \ | | | | | | | Updating the dummy app template to have rails_command instead of rake | ||||
| | * | | - Updating the dummy app template to have rails_command instead of rake | Mohit Natoo | 2016-03-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #23968 from bouk/improve-cable-docs | Rafael França | 2016-02-29 | 1 | -6/+2 |
| |\ \ \ | |_|/ |/| | | Remove inconsistency in the Action Cable README | ||||
| | * | | Remove inconsistency in the Action Cable README [ci skip] | Bouke van der Bijl | 2016-02-29 | 1 | -6/+2 |
| | |/ | |||||
| * | | generate config/spring.rb in new applications [closes #18874] | Xavier Noria | 2016-02-29 | 4 | -0/+14 |
| | | | |||||
| * | | Respect through association scopes when used with polymorphic | Sean Griffin | 2016-02-29 | 2 | -1/+8 |
| |/ | | | | | | | | | | | When the `source_type` option is passed to a has_many through, the resulting `Reflection` will be an instance of `PolymorphicReflection` and not `ThroughReflection`, meaning that it will ignore the scopes that it needs to apply from the through reflections. This adds an additional delegation call to remedy this. I've been finding the reflection code completely impenetrable lately, it could use some major love. Fixes #22726 | ||||
| * | Merge pull request #23927 from gaurish/jruby_ci_actionpack | Rafael França | 2016-02-29 | 1 | -0/+5 |
| |\ | | | | | Run CI for ActionPack on JRuby | ||||
| | * | Try running CI for ActionPack on JRuby | Gaurish Sharma | 2016-02-27 | 1 | -0/+5 |
| | | | | | | | | | These are green on local. Checking to see they pass on travis too! | ||||
| * | | Merge pull request #23948 from ctm/remove_pathological_regexp | Rafael França | 2016-02-29 | 1 | -1/+1 |
| |\ \ | | | | | | | Removes potentially quadratic Regexp from ActiveRecord::LogSubscriber… | ||||
| | * | | Removes potentially quadratic Regexp from ActiveRecord::LogSubscriber#sql_color | Clifford T. Matthews | 2016-02-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #18766 from yasyf/issue_17864 | Sean Griffin | 2016-02-29 | 4 | -8/+68 |
| |\ \ \ | | | | | | | | | | | | | | | | | Honour joining model order in `has_many :through` associations when eager loading | ||||
| | * | | | Honour the order of the joining model in a `has_many :through` | Yasyf Mohamedali | 2015-03-02 | 5 | -9/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | association when eager loading. Previously, eager loading a `has_many :through` association with no defined order would return the records in the natural order of the database. Now, these records will be returned in the order that the joining record is returned, in case there is a defined order there. | ||||
| * | | | | Merge pull request #23963 from gsamokovarov/exception-wrapper-no-ac-require | Kasper Timm Hansen | 2016-02-29 | 1 | -1/+0 |
| |\ \ \ \ | | | | | | | | | | | Drop Action Controller require in ActionDispatch::ExceptionWrapper | ||||
| | * | | | | Drop Action Controller require in ActionDispatch::ExceptionWrapper | Genadi Samokovarov | 2016-02-29 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only reference the Action Controller error classes by name in ActionDispatch::ExceptionWrapper, so there is no need to explicitly require them. It drops a tiny coupling between Action Dispatch and Action Controller, so it makes me feel warm inside. We still have a lot of others AC requires in the AD code base, but here, we can save it. [ci skip] | ||||
| * | | | | | Merge pull request #23955 from bdewater/doc-13897 | Sean Griffin | 2016-02-29 | 1 | -3/+9 |
| |\ \ \ \ \ | | | | | | | | | | | | | Add documentation for #13897 [skip ci] | ||||
| | * | | | | | Add documentation for #13897 [skip ci] | Bart de Water | 2016-02-29 | 1 | -3/+9 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #23957 from delftswa2016/fix-documentation-stylesheet | Arthur Nogueira Neves | 2016-02-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Fix value of CSS background-color property in Ruby on Rails guide | ||||
| | * | | | | | Fix value of CSS background-color property in Rails guide | Bas van IJzendoorn | 2016-02-29 | 1 | -1/+1 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Change background-color value to transparent, which is the default value of background-color. [ci skip] | ||||
| * | | | | | Merge pull request #23962 from mohitnatoo/rails_command_test_semantics | Rafael França | 2016-02-29 | 1 | -9/+9 |
| |\ \ \ \ \ | | | | | | | | | | | | | Having more readable test descriptions in railties actions_test.rb | ||||
| | * | | | | | - Made changes to have test cases in actions_test more readable. | Mohit Natoo | 2016-02-29 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Changed description with tests related to rails_command. | ||||
| | * | | | | | - Made changes to have test cases in actions_test more readable. | Mohit Natoo | 2016-02-29 | 1 | -5/+5 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #23956 from delftswa2016/fix-documentation | प्रथमेश Sonpatki | 2016-02-29 | 1 | -5/+5 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Fix typos in Rails guide about Action View Overview | ||||
| | * | | | | Fix typos in Action View Overview guide | Bas van IJzendoorn | 2016-02-29 | 1 | -5/+5 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | This patch fixes some typos in the Action View Overview section of the Rails guide. [ci skip] | ||||
| * | | | | Merge pull request #23951 from teoljungberg/warning-free | Kasper Timm Hansen | 2016-02-29 | 2 | -9/+9 |
| |\ \ \ \ | | | | | | | | | | | Address ruby warnings | ||||
| | * | | | | Address ruby warnings | Teo Ljungberg | 2016-02-29 | 2 | -9/+9 |
| |/ / / / | | | | | | | | | | | | | | | | | - Ambiguous first argument - Mismatched indentation | ||||
| * | | | | Merge pull request #22591 from gregmolnar/ssl | Kasper Timm Hansen | 2016-02-28 | 2 | -2/+13 |
| |\ \ \ \ | | | | | | | | | | | add `constraint_to` option to SSL middleware | ||||
| | * | | | | add `constraint_to` option to SSL middleware | Greg Molnar | 2016-02-28 | 2 | -2/+13 |
| | | | | | | |||||
| * | | | | | Merge pull request #23929 from ↵ | Kasper Timm Hansen | 2016-02-28 | 1 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/update-deprecation-message-for-app-namespace Update deprecation message shown when tasks from rails namespace are run | ||||
| | * | | | | | Update deprecation message shown when tasks from rails namespace are run | Prathamesh Sonpatki | 2016-02-27 | 1 | -2/+2 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | Merge pull request #23946 from prathamesh-sonpatki/fix-ac-guide | प्रथमेश Sonpatki | 2016-02-28 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix formatting in Action Cable guide [ci skip] | ||||
| | * | | | | | Fix formatting in Action Cable guide [ci skip] | Prathamesh Sonpatki | 2016-02-28 | 1 | -0/+1 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #23945 from prathamesh-sonpatki/rm-merge-conflict | David Heinemeier Hansson | 2016-02-28 | 1 | -5/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix merge conflict in Action Cable guide [ci skip] | ||||
| | * | | | | | Fix merge conflict in Action Cable guide [ci skip] | Prathamesh Sonpatki | 2016-02-28 | 1 | -5/+2 |
| |/ / / / / | |||||
| * | | | | | Further cleanup of the cable guide | David Heinemeier Hansson | 2016-02-28 | 1 | -100/+51 |
| | | | | | | |||||
| * | | | | | Merge pull request #23943 from y-yagi/remove_rake_word | प्रथमेश Sonpatki | 2016-02-28 | 2 | -4/+4 |
| |\ \ \ \ \ | | | | | | | | | | | | | remove "rake" word [ci skip] | ||||
| | * | | | | | remove "rake" word [ci skip] | yuuji.yaginuma | 2016-02-28 | 2 | -4/+4 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Merge pull request #23944 from prathamesh-sonpatki/ac-guide-fixes | प्रथमेश Sonpatki | 2016-02-28 | 1 | -25/+25 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix typos in Action Cable guide [ci skip] | ||||
| | * | | | | | Fix typos in Action Cable guide [ci skip] | Prathamesh Sonpatki | 2016-02-28 | 1 | -25/+25 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #23176 from davidkuhta/patch-1 | David Heinemeier Hansson | 2016-02-28 | 1 | -0/+671 |
| |\ \ \ \ \ | | | | | | | | | | | | | Guide for Action Cable | ||||
| | * | | | | | Header Typo | David Kuhta | 2016-02-23 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | `stream_for` example | David Kuhta | 2016-02-23 | 1 | -0/+15 |
| | | | | | | | |||||
| | * | | | | | Explicitly denote that channel.rb is a default file. | David Kuhta | 2016-02-23 | 1 | -2/+2 |
| | | | | | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |