aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23936 from yui-knk/local_constants_to_be_publicRafael Mendonça França2016-03-015-26/+17
|\
| * Deprecate `Module.local_constants`yui-knk2016-03-015-26/+17
* | Merge pull request #23417 from sgringwe/masterRafael Mendonça França2016-03-015-9/+81
|\ \
| * | Add initial support for allowing an error on order or limit of queries being ...Scott Ringwelski2016-02-025-9/+81
* | | Merge pull request #23980 from rails/deprecate-controller-action-segmentsAndrew White2016-03-0132-213/+478
|\ \ \
| * | | Deprecate :controller and :action path parametersAndrew White2016-03-0132-213/+478
* | | | Merge pull request #23981 from y-yagi/do_not_set_action_cable_configRafael França2016-03-011-4/+3
|\ \ \ \
| * | | | do not set Action Cable's config when specify `--skip-action-cable` optionyuuji.yaginuma2016-03-011-4/+3
* | | | | Merge pull request #23986 from rubys/dedup-ctrlc-msgEileen M. Uchitelle2016-03-011-2/+0
|\ \ \ \ \
| * | | | | Delete CTRL-C message as is duplicates PumaSam Ruby2016-03-011-2/+0
* | | | | | Merge pull request #23807 from matthewd/executorMatthew Draper2016-03-0247-337/+897
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Don't reference Rails.application from inside a componentMatthew Draper2016-03-022-10/+8
| * | | | | Use AS::Reloader to support reloading in ActiveJobMatthew Draper2016-03-024-2/+23
| * | | | | Use AS::Executor / AS::Reloader to support reloading in ActionCableMatthew Draper2016-03-029-30/+96
| * | | | | Publish AS::Executor and AS::Reloader APIsMatthew Draper2016-03-0233-307/+782
* | | | | | Merge pull request #23598 from brchristian/activerecord_second_to_lastMatthew Draper2016-03-022-4/+83
|\ \ \ \ \ \
| * | | | | | default second_to_last to primary_key index if no order suppliedBrian Christian2016-02-271-1/+7
| * | | | | | refactor AR second_to_last to use array methodsBrian Christian2016-02-271-1/+6
| * | | | | | comment out failing .second and .third testsBrian Christian2016-02-271-3/+3
| * | | | | | adding additional tests for offset and limit behaviorBrian Christian2016-02-271-0/+8
| * | | | | | additional test assertions (limit and offset)Brian Christian2016-02-271-0/+16
| * | | | | | AR #second_to_last tests and finder methodsBrian Christian2016-02-272-4/+48
* | | | | | | Merge pull request #22170 from samphilipd/sam/properly_deallocate_prepared_st...Matthew Draper2016-03-024-14/+135
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Make tests a bit more beautifulSam Davies2015-11-051-10/+13
| * | | | | | Correctly deallocate prepared statements if we fail inside a transactionSam Davies2015-11-054-14/+132
* | | | | | | Mock fork twiceRafael Mendonça França2016-03-011-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Support `:any` variants lookup in `PathResolver`Godfrey Chan2016-03-012-6/+21
* | | | | | Merge pull request #23966 from jeremy/activejob/pare-down-async-adapter-for-l...Jeremy Daer2016-03-018-133/+110
|\ \ \ \ \ \
| * | | | | | Active Job: smaller footprint for the dev/test async adapterJeremy Daer2016-02-298-133/+110
* | | | | | | Merge pull request #23973 from mohitnatoo/dummy-template-with-rails-commandRafael França2016-02-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | - Updating the dummy app template to have rails_command instead of rakeMohit Natoo2016-03-011-1/+1
* | | | | | | | Merge pull request #23968 from bouk/improve-cable-docsRafael França2016-02-291-6/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Remove inconsistency in the Action Cable README [ci skip]Bouke van der Bijl2016-02-291-6/+2
| |/ / / / / /
* | | | | | | generate config/spring.rb in new applications [closes #18874]Xavier Noria2016-02-294-0/+14
* | | | | | | Respect through association scopes when used with polymorphicSean Griffin2016-02-292-1/+8
|/ / / / / /
* | | | | | Merge pull request #23927 from gaurish/jruby_ci_actionpackRafael França2016-02-291-0/+5
|\ \ \ \ \ \
| * | | | | | Try running CI for ActionPack on JRubyGaurish Sharma2016-02-271-0/+5
* | | | | | | Merge pull request #23948 from ctm/remove_pathological_regexpRafael França2016-02-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Removes potentially quadratic Regexp from ActiveRecord::LogSubscriber#sql_colorClifford T. Matthews2016-02-231-1/+1
* | | | | | | | Merge pull request #18766 from yasyf/issue_17864Sean Griffin2016-02-294-8/+68
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Honour the order of the joining model in a `has_many :through`Yasyf Mohamedali2015-03-025-9/+69
* | | | | | | | Merge pull request #23963 from gsamokovarov/exception-wrapper-no-ac-requireKasper Timm Hansen2016-02-291-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Drop Action Controller require in ActionDispatch::ExceptionWrapperGenadi Samokovarov2016-02-291-1/+0
* | | | | | | | | Merge pull request #23955 from bdewater/doc-13897Sean Griffin2016-02-291-3/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add documentation for #13897 [skip ci]Bart de Water2016-02-291-3/+9
* | | | | | | | | | Merge pull request #23957 from delftswa2016/fix-documentation-stylesheetArthur Nogueira Neves2016-02-291-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix value of CSS background-color property in Rails guideBas van IJzendoorn2016-02-291-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #23962 from mohitnatoo/rails_command_test_semanticsRafael França2016-02-291-9/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | - Made changes to have test cases in actions_test more readable.Mohit Natoo2016-02-291-6/+6
| * | | | | | | | | - Made changes to have test cases in actions_test more readable.Mohit Natoo2016-02-291-5/+5
| |/ / / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 14:24:50 +0000