aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove an unused require in ActiveSupport::TestCaseGenadi Samokovarov2016-06-131-2/+0
* Merge pull request #25378 from nikhilthombare/patch-1प्रथमेश Sonpatki2016-06-121-11/+11
|\
| * Changed ActiveJob::Base to ApplicationJob in the Active Job guide [ci skip] Nikhil Thombare2016-06-131-11/+11
|/
* Merge pull request #25362 from maclover7/jm-rm-ar-requireEileen M. Uchitelle2016-06-121-2/+0
|\
| * Remove unnecessary model requiresJon Moss2016-06-101-2/+0
* | Merge pull request #25371 from kamipo/remove_outdated_commentEileen M. Uchitelle2016-06-121-12/+0
|\ \
| * | Remove outdated comments [ci skip]Ryuta Kamizono2016-06-121-12/+0
* | | Merge pull request #25004 from y-yagi/generate_mailer_layout_files_if_it_does...Eileen M. Uchitelle2016-06-125-0/+44
|\ \ \ | |/ / |/| |
| * | generate mailer layout files if it does not already existyuuji.yaginuma2016-05-155-0/+44
* | | Merge pull request #25366 from prathamesh-sonpatki/update-release-notes-2Rafael França2016-06-111-1/+19
|\ \ \
| * | | Add missing things to Rails 5.0 release notes [ci skip]Prathamesh Sonpatki2016-06-111-1/+19
| | |/ | |/|
* | | Merge pull request #25367 from stephenminded/active_job_test_helper_custom_qu...Rafael França2016-06-112-1/+26
|\ \ \
| * | | Provide the ability to override the queue adapter used by jobs underSteve Lounsbury2016-06-112-1/+26
* | | | Merge pull request #25368 from frodsan/patch-1Rafael França2016-06-111-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typoFrancesco Rodriguez2016-06-121-1/+1
|/ / /
* | | Merge pull request #25363 from kamipo/fix_or_result_sqlVipul A M2016-06-111-1/+1
|\ \ \ | |/ / |/| |
| * | Fix `or` result SQL [ci skip]Ryuta Kamizono2016-06-111-1/+1
|/ /
* | Merge pull request #25361 from maclover7/jm-rm-stuffSean Griffin2016-06-101-11/+0
|\ \
| * | Remove `_run_class_setup`Jon Moss2016-06-101-11/+0
* | | Merge pull request #25321 from prathamesh-sonpatki/update-release-notes-1Rafael França2016-06-101-10/+33
|\ \ \ | |/ / |/| |
| * | Add missing things to release notes [ci skip]Prathamesh Sonpatki2016-06-071-10/+33
* | | Make sure the yielded variable is the loggerRafael Mendonça França2016-06-102-4/+6
* | | Merge pull request #25351 from kmcphillips/asset-default-config-quietRafael França2016-06-101-0/+3
|\ \ \
| * | | Add config.assets.quiet = true as default valueKevin McPhillips2016-06-101-0/+3
* | | | Merge pull request #25341 from kmcphillips/masterRafael França2016-06-103-34/+124
|\ \ \ \
| * | | | Be explicit about what Logger class is expectedKevin McPhillips2016-06-091-3/+3
| * | | | Broadcast #silence on logger. Rewrite tests.Kevin McPhillips2016-06-092-31/+121
* | | | | Merge pull request #25352 from Shopify/optimized-delegateRafael França2016-06-101-2/+2
|\ \ \ \ \
| * | | | | Replace Kernel#caller by the faster Kernel#caller_locationsJean Boussier2016-06-101-2/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #25342 from Edouard-chin/callbacks-wrong-method-nameVipul A M2016-06-101-1/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ci skip] `define_model_callbacks` only exist in active model:Edouard CHIN2016-06-101-1/+6
| |/ / /
* | | | Merge pull request #25348 from alexcameron89/masterJon Moss2016-06-101-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typo in ActionController::Renderer [ci skip]Alex Kitchens2016-06-101-1/+1
|/ / /
* | | Merge pull request #25338 from jwworth/fix_typo_sucker_punch_1465507047Jon Moss2016-06-091-1/+1
|\ \ \
| * | | Fix typo, `of of` -> `of` [ci skip]Jake Worth2016-06-091-1/+1
|/ / /
* | | Remove dead code from testsSean Griffin2016-06-091-17/+0
* | | render_to_string Regression Outside of Real Requests in Rails 5.0.0.rc1 (#25308)Brandon Medenwald2016-06-092-1/+8
* | | Merge pull request #25329 from yahonda/allow_oracle_bind_value_syntax_in_loj_...Sean Griffin2016-06-091-1/+1
|\ \ \
| * | | Allow Oracle bind parameter syntax `:a1`Yasuo Honda2016-06-081-1/+1
* | | | Merge pull request #25334 from abhishekjain16/doc_fixSean Griffin2016-06-091-2/+2
|\ \ \ \
| * | | | Fix typoAbhishek Jain2016-06-091-2/+2
* | | | | Merge pull request #25335 from y-yagi/remove_deprecated_prefix_optionVipul A M2016-06-081-2/+0
|\ \ \ \ \
| * | | | | remove deprecated `:prefix` option from doc [ci skip]yuuji.yaginuma2016-06-091-2/+0
| | |_|/ / | |/| | |
* | | | | Merge pull request #25332 from abhishekjain16/test_fixRafael França2016-06-092-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | existant => existentAbhishek Jain2016-06-092-3/+3
|/ / / /
* | | | Merge pull request #25315 from schneems/schneems/inclusion-docRichard Schneeman2016-06-081-3/+9
|\ \ \ \
| * | | | [ci skip] Expand information on message optionsschneems2016-06-081-3/+9
* | | | | Merge pull request #25327 from prathamesh-sonpatki/add-5-0-notes-to-the-indexXavier Noria2016-06-081-0/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add Rails 5.0 release notes to the index page of guides [ci skip]Prathamesh Sonpatki2016-06-081-0/+5
| | |/ / | |/| |
* | | | Merge pull request #25323 from vipulnsward/ac-release-notesDavid Heinemeier Hansson2016-06-081-2/+13
|\ \ \ \