aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Delete CTRL-C message as is duplicates PumaSam Ruby2016-03-011-2/+0
* 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
| |/ / / / / /
* | | | | | | Merge pull request #23956 from delftswa2016/fix-documentationप्रथमेश Sonpatki2016-02-291-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix typos in Action View Overview guideBas van IJzendoorn2016-02-291-5/+5
|/ / / / / /
* | | | | | Merge pull request #23951 from teoljungberg/warning-freeKasper Timm Hansen2016-02-292-9/+9
|\ \ \ \ \ \
| * | | | | | Address ruby warningsTeo Ljungberg2016-02-292-9/+9
|/ / / / / /
* | | | | | Merge pull request #22591 from gregmolnar/sslKasper Timm Hansen2016-02-282-2/+13
|\ \ \ \ \ \
| * | | | | | add `constraint_to` option to SSL middlewareGreg Molnar2016-02-282-2/+13
* | | | | | | Merge pull request #23929 from prathamesh-sonpatki/update-deprecation-message...Kasper Timm Hansen2016-02-281-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Update deprecation message shown when tasks from rails namespace are runPrathamesh Sonpatki2016-02-271-2/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #23946 from prathamesh-sonpatki/fix-ac-guideप्रथमेश Sonpatki2016-02-281-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix formatting in Action Cable guide [ci skip]Prathamesh Sonpatki2016-02-281-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #23945 from prathamesh-sonpatki/rm-merge-conflictDavid Heinemeier Hansson2016-02-281-5/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix merge conflict in Action Cable guide [ci skip]Prathamesh Sonpatki2016-02-281-5/+2
|/ / / / / / /
* | | | | | | Further cleanup of the cable guideDavid Heinemeier Hansson2016-02-281-100/+51
* | | | | | | Merge pull request #23943 from y-yagi/remove_rake_wordप्रथमेश Sonpatki2016-02-282-4/+4
|\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 08:46:04 +0000