aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove args from assert_nothing_raised in testsTara Scherner de la Fuente2016-02-2225-54/+54
* Merge pull request #23821 from dgynn/actionmailer_lazy_loadingRafael França2016-02-231-10/+12
|\
| * Prevent ActionMailer initializer from triggering load of ActionMailerDave Gynn2016-02-221-10/+12
* | Merge pull request #23419 from prathamesh-sonpatki/fix-showing-of-deprecation...Matthew Draper2016-02-232-2/+14
|\ \ | |/ |/|
| * Fix random failures of tests on TravisPrathamesh Sonpatki2016-02-121-1/+1
| * Correctly show deprecation warning for incompatible migrationsPrathamesh Sonpatki2016-02-122-1/+13
* | Merge pull request #23819 from meinac/actioncable_doc_fixRafael França2016-02-221-4/+4
|\ \
| * | Action Cable readme fix [ci skip]Mehmet Emin İNAÇ2016-02-231-4/+4
* | | Merge pull request #23669 from maclover7/internal-routesRafael França2016-02-226-10/+36
|\ \ \ | |/ / |/| |
| * | Add `internal` attribute to routesJon Moss2016-02-226-10/+36
* | | Merge pull request #23668 from maclover7/cable-docsRafael França2016-02-2216-70/+67
|\ \ \
| * | | Full Action Cable documentation read throughJon Moss2016-02-1716-70/+67
* | | | Merge pull request #23600 from maclover7/actioncable-workRafael França2016-02-228-0/+64
|\ \ \ \ | |_|/ / |/| | |
| * | | Add notes for future selvesJon Moss2016-02-222-0/+2
| * | | Generate ApplicationCable files if they do not already existJon Moss2016-02-224-0/+38
| * | | Generate ApplicationRecord if it does not already existJon Moss2016-02-223-0/+19
| * | | Generate `config/cable.yml` in `rails:update` commandJon Moss2016-02-221-0/+5
|/ / /
* | | Merge pull request #23816 from rails/params_parser_apiRafael França2016-02-225-9/+47
|\ \ \
| * | | Make sure we unregister the mime type before registeringRafael Mendonça França2016-02-221-10/+22
| * | | Transform the mime object to symbol when registering the parsersRafael Mendonça França2016-02-223-5/+15
| * | | Use symbol of mime type instead of object to get correct parserMehmet Emin İNAÇ2016-02-224-6/+22
* | | | make sure `rake test` respects TESTOPTSAaron Patterson2016-02-222-1/+15
|/ / /
* | | We are calling `to_s` in the method so we can call downcase nowRafael Mendonça França2016-02-221-3/+3
* | | Make per form token work when method is not providedRafael Mendonça França2016-02-222-3/+18
* | | Do not pass more options that are needed.Rafael Mendonça França2016-02-221-1/+1
* | | Merge pull request #23752 from vipulnsward/23524-fix-button_to_deleteRafael Mendonça França2016-02-222-49/+61
|\ \ \
| * | | Refactored Request Forgery CSRF PerFormTokensController tests and DRY'ed them...Vipul A M2016-02-222-71/+39
| * | | Fixed passing of delete method on button_to tag, creating wrong form csrf tokenVipul A M2016-02-212-2/+46
* | | | Merge pull request #23521 from kamipo/fix_assert_in_delta_failureRafael França2016-02-221-3/+8
|\ \ \ \
| * | | | Fix `assert_in_delta` test failureRyuta Kamizono2016-02-061-3/+8
* | | | | Merge pull request #22748 from Azzurrio/masterMatthew Draper2016-02-222-1/+23
|\ \ \ \ \
| * | | | | Fix NoMethodError preparable for Arel::Visitors in case prepared statements i...Azzurrio2016-02-222-1/+23
* | | | | | Merge pull request #23751 from chezou/add-test-case-order-by-fieldAndrew White2016-02-221-0/+6
|\ \ \ \ \ \
| * | | | | | Add assertions order by field with empty dataMichiaki Ariga2016-02-181-0/+6
* | | | | | | Merge pull request #23808 from gfvcastro/typographical-errorप्रथमेश Sonpatki2016-02-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typographical errorGustavo Villa2016-02-221-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #23769 from kamipo/remove_alias_exec_without_stmt_exec_querySantiago Pastorino2016-02-211-2/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove `alias exec_without_stmt exec_query`Ryuta Kamizono2016-02-191-2/+0
* | | | | | | | Merge pull request #23682 from ShikChen/fast_strxorSantiago Pastorino2016-02-211-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve the performance of string xor operationshik2016-02-151-1/+2
* | | | | | | | | Merge pull request #23776 from chi6rag/masterSantiago Pastorino2016-02-211-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adding test to verify the last week when the year is leapChirag Aggarwal2016-02-201-0/+4
* | | | | | | | | | Merge pull request #23803 from kamipo/reduce_attribute_to_sSantiago Pastorino2016-02-211-6/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Reduce `attribute.to_s`Ryuta Kamizono2016-02-221-6/+5
* | | | | | | | | | | Merge pull request #23743 from maclover7/rm-unused-parameterSantiago Pastorino2016-02-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove unused parameter from methodJon Moss2016-02-171-2/+2
* | | | | | | | | | | | Merge pull request #23805 from ianfleeton/validates-length-of-virtualSantiago Pastorino2016-02-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Match test name to test (typo)Ian Fleeton2016-02-211-1/+1
* | | | | | | | | | | | | Merge pull request #23806 from sgringwe/patch-1Santiago Pastorino2016-02-211-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add a note about downcasing submit tagScott Ringwelski2016-02-211-0/+3
|/ / / / / / / / / / / /