aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Removed a forgotten `with_exclusive_scope` test:Edouard CHIN2016-06-241-6/+0
|/ / / / / / /
* | | | | | | Merge pull request #25478 from maclover7/jm-permitted-falseRafael França2016-06-232-0/+8
|\ \ \ \ \ \ \
| * | | | | | | `params.permitted?` is false by defaultJon Moss2016-06-232-0/+8
* | | | | | | | Merge pull request #25486 from alexcameron89/inheritanceJon Moss2016-06-231-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] Update Documentation on ActiveRecord::InheritanceAlex Kitchens2016-06-231-1/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #25485 from georgemillo/patch-1Jon Moss2016-06-231-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | English fixGeorge Millo2016-06-231-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #25480 from kmcphillips/masterRafael França2016-06-222-0/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update changelog for #25351Kevin McPhillips2016-06-221-0/+5
| * | | | | | Update changelog for #25341Kevin McPhillips2016-06-221-0/+6
|/ / / / / /
* | | | | | Initialize the configuration with a valueRafael Mendonça França2016-06-224-10/+2
* | | | | | Merge pull request #25473 from bquorning/update-documentation-for-strong_para...Jon Moss2016-06-221-19/+18
|\ \ \ \ \ \
| * | | | | | Update ActionController::Parameters documentation [ci skip]Benjamin Quorning2016-06-221-19/+18
|/ / / / / /
* | | | | | Fix failing railties testseileencodes2016-06-223-0/+9
* | | | | | Add option to enable dependency loading in productionRafael Mendonça França2016-06-222-1/+3
* | | | | | Merge pull request #25469 from herminiotorres/update-datetime-to-datetime-loc...Rafael Mendonça França2016-06-226-139/+39
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Change datetime to datetime-local helper tagHerminio Torres2016-06-216-139/+39
* | | | | | Merge pull request #25467 from aarongray/tweak_time_helpers_docs_for_time_zonesVipul A M2016-06-221-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Create times in rails timezone not system timezone [ci skip]aarongray2016-06-211-3/+3
|/ / / / /
* | | | | Merge pull request #25464 from prathamesh-sonpatki/fix-http-requestRafael França2016-06-211-1/+1
|\ \ \ \ \
| * | | | | update_url is not `get` most of the times [ci skip]Prathamesh Sonpatki2016-06-221-1/+1
|/ / / / /
* | | / / Revert "Merge pull request #17973 from maurogeorge/file_field_hidden_field"eileencodes2016-06-213-53/+5
| |_|/ / |/| | |
* | | | Change the raw template handler to render html-safe stringseileencodes2016-06-213-1/+19
* | | | Merge pull request #25458 from taboularasa/taboularasa/update-docs-ActiveReco...Jon Moss2016-06-211-0/+17
|\ \ \ \
| * | | | [ci skip] better docs for ActiveRecord::AttributeSet::YAMLEncoder#decodeDavid Elliott2016-06-211-0/+17
* | | | | Merge pull request #25415 from maclover7/jm-fix-25410Rafael França2016-06-211-0/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add test to better demonstrate `ActiveModel::Errors#added?` behaviorJon Moss2016-06-211-0/+6
* | | | | Merge pull request #25450 from prathamesh-sonpatki/fix-testing-guideKasper Timm Hansen2016-06-211-7/+11
|\ \ \ \ \
| * | | | | Fix the docs for supported keyword args for Rails 5 style integration control...Prathamesh Sonpatki2016-06-211-7/+11
* | | | | | Merge pull request #25452 from taboularasa/taboularasa/update-docs-api_docume...Kasper Timm Hansen2016-06-201-1/+1
|\ \ \ \ \ \
| * | | | | | [ci skip] correction in command for generating api documentationDavid Elliott2016-06-201-1/+1
|/ / / / / /
* | | | | | Merge pull request #25430 from nfm/fix-rails-info-routes-for-apps-with-globbi...Richard Schneeman2016-06-203-1/+27
|\ \ \ \ \ \
| * | | | | | Fix rails/info routes for apps with globbing routeNicholas Firth-McCoy2016-06-203-1/+27
| |/ / / / /
* | | | | | Merge pull request #25449 from alexcameron89/masterप्रथमेश Sonpatki2016-06-201-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ci skip] fix typo in ActiveRecord::ConnectionHandlingAlex Kitchens2016-06-201-1/+1
|/ / / / /
* | | | | Merge pull request #25433 from prathamesh-sonpatki/cleanup-app-generator-codeGuillermo Iguaran2016-06-201-2/+0
|\ \ \ \ \
| * | | | | No need to have conditional based on api options in assetsPrathamesh Sonpatki2016-06-201-2/+0
* | | | | | Merge pull request #25420 from michaeldever/mdever_actioncable_development_portsGuillermo Iguaran2016-06-201-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Allow actioncable connections from any port in developmentMichael Dever2016-06-161-1/+1
* | | | | | Merge pull request #25436 from prathamesh-sonpatki/fix-testsRichard Schneeman2016-06-192-3/+3
|\ \ \ \ \ \
| * | | | | | Fix failing railties testsPrathamesh Sonpatki2016-06-182-3/+3
|/ / / / / /
* | | | | | Merge pull request #25426 from Shopify/fix-activejob-loggerRafael França2016-06-173-2/+16
|\ \ \ \ \ \
| * | | | | | Fix jobs overriding AJ::Base#loggerJean Boussier2016-06-173-2/+16
* | | | | | | Merge pull request #23301 from ppworks/improve_mysqldumpArthur Nogueira Neves2016-06-172-4/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Skip comments when exec mysqldumpNaoto Koshikawa2016-01-282-4/+5
* | | | | | | Merge pull request #25302 from schneems/schneems/evented-file-boot-at-check-t...Sean Griffin2016-06-172-6/+87
|\ \ \ \ \ \ \
| * | | | | | | Lock the whole boot step, get rid of unneeded hashschneems2016-06-131-5/+9
| * | | | | | | Test how evented file checker handles forksschneems2016-06-081-1/+42
| * | | | | | | Listen earlier in EventedFileUpdateCheckerschneems2016-06-061-6/+8
| * | | | | | | [ci skip] document EventedFileUpdateCheckerschneems2016-06-061-0/+28