Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Fix `NoMethodError: undefined method `fields' for nil:NilClass` | Ryuta Kamizono | 2016-02-29 | 2 | -1/+19 | |
* | | | | | | | Revert "Merge pull request #23927 from gaurish/jruby_ci_actionpack" | Rafael Mendonça França | 2016-03-01 | 1 | -5/+0 | |
* | | | | | | | Merge pull request #23935 from y-yagi/convert_cable_coffee_to_javascript | Rafael França | 2016-03-01 | 6 | -13/+17 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | convert cable.coffee to cable.js | yuuji.yaginuma | 2016-02-28 | 6 | -13/+17 | |
* | | | | | | | | Merge pull request #23936 from yui-knk/local_constants_to_be_public | Rafael Mendonça França | 2016-03-01 | 5 | -26/+17 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Deprecate `Module.local_constants` | yui-knk | 2016-03-01 | 5 | -26/+17 | |
* | | | | | | | | | Merge pull request #23417 from sgringwe/master | Rafael Mendonça França | 2016-03-01 | 5 | -9/+81 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add initial support for allowing an error on order or limit of queries being ... | Scott Ringwelski | 2016-02-02 | 5 | -9/+81 | |
* | | | | | | | | | | Merge pull request #23980 from rails/deprecate-controller-action-segments | Andrew White | 2016-03-01 | 32 | -213/+478 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Deprecate :controller and :action path parameters | Andrew White | 2016-03-01 | 32 | -213/+478 | |
* | | | | | | | | | | | Merge pull request #23981 from y-yagi/do_not_set_action_cable_config | Rafael França | 2016-03-01 | 1 | -4/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | do not set Action Cable's config when specify `--skip-action-cable` option | yuuji.yaginuma | 2016-03-01 | 1 | -4/+3 | |
* | | | | | | | | | | | | Merge pull request #23986 from rubys/dedup-ctrlc-msg | Eileen M. Uchitelle | 2016-03-01 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Delete CTRL-C message as is duplicates Puma | Sam Ruby | 2016-03-01 | 1 | -2/+0 | |
* | | | | | | | | | | | | Merge pull request #23807 from matthewd/executor | Matthew Draper | 2016-03-02 | 47 | -337/+897 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | Merge pull request #23598 from brchristian/activerecord_second_to_last | Matthew Draper | 2016-03-02 | 2 | -4/+83 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | default second_to_last to primary_key index if no order supplied | Brian Christian | 2016-02-27 | 1 | -1/+7 | |
| * | | | | | | | | | | | | refactor AR second_to_last to use array methods | Brian Christian | 2016-02-27 | 1 | -1/+6 | |
| * | | | | | | | | | | | | comment out failing .second and .third tests | Brian Christian | 2016-02-27 | 1 | -3/+3 | |
| * | | | | | | | | | | | | adding additional tests for offset and limit behavior | Brian Christian | 2016-02-27 | 1 | -0/+8 | |
| * | | | | | | | | | | | | additional test assertions (limit and offset) | Brian Christian | 2016-02-27 | 1 | -0/+16 | |
| * | | | | | | | | | | | | AR #second_to_last tests and finder methods | Brian Christian | 2016-02-27 | 2 | -4/+48 | |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #22170 from samphilipd/sam/properly_deallocate_prepared_st... | Matthew Draper | 2016-03-02 | 4 | -14/+135 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Make tests a bit more beautiful | Sam Davies | 2015-11-05 | 1 | -10/+13 | |
| * | | | | | | | | | | | Correctly deallocate prepared statements if we fail inside a transaction | Sam Davies | 2015-11-05 | 4 | -14/+132 | |
* | | | | | | | | | | | | 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 | |
* | | | | | | | | | | | Merge pull request #23966 from jeremy/activejob/pare-down-async-adapter-for-l... | Jeremy Daer | 2016-03-01 | 8 | -133/+110 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Active Job: smaller footprint for the dev/test async adapter | Jeremy Daer | 2016-02-29 | 8 | -133/+110 | |
* | | | | | | | | | | | | 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 | 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 [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 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #23927 from gaurish/jruby_ci_actionpack | Rafael França | 2016-02-29 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Try running CI for ActionPack on JRuby | Gaurish Sharma | 2016-02-27 | 1 | -0/+5 | |
* | | | | | | | | | | | 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#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 the order of the joining model in a `has_many :through` | Yasyf Mohamedali | 2015-03-02 | 5 | -9/+69 | |
* | | | | | | | | | | | | 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 | Genadi Samokovarov | 2016-02-29 | 1 | -1/+0 | |
* | | | | | | | | | | | | | Merge pull request #23955 from bdewater/doc-13897 | Sean Griffin | 2016-02-29 | 1 | -3/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | |