aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #25126 from bquorning/this-is-not-an-aliasVipul A M2016-05-241-2/+0
|\ \ \ \ \ \
| * | | | | | [] and read_attribute are not aliases [ci skip]Benjamin Quorning2016-05-241-2/+0
|/ / / / / /
* | | | | | Revert "Add default exceptions affected by suppress (#25099)"Rafael Mendonça França2016-05-232-10/+0
* | | | | | Add default exceptions affected by suppress (#25099)Alexey Zapparov2016-05-232-0/+10
* | | | | | Merge pull request #25114 from y-yagi/remove_qualified_const_from_guideJon Moss2016-05-231-71/+0
|\ \ \ \ \ \
| * | | | | | remove deprecated `Module#qualified_const_` from guide [ci skip]yuuji.yaginuma2016-05-231-71/+0
* | | | | | | Merge pull request #25110 from andrii/fix_scaffold_cssRafael França2016-05-231-8/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix and optimize scaffold CSS [ci skip]Andrii Ponomarov2016-05-221-8/+4
| |/ / / / / /
* / / / / / / Respect `log_warning_on_csrf_failure` setting for all CSRF failuresMatthew Caruana Galizia2016-05-232-1/+34
|/ / / / / /
* | | | | | Remove Blade gem dependencyVipul A M2016-05-213-2/+41
* | | | | | Merge pull request #25076 from jeroenvisser101/keep-to-max-lengthSean Griffin2016-05-212-2/+4
|\ \ \ \ \ \
| * | | | | | Change comments to not exceed 80 charactersJeroen Visser2016-05-192-2/+4
* | | | | | | Merge pull request #25101 from maclover7/jm-rm-space-1Kasper Timm Hansen2016-05-211-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Remove space, properly italicizeJon Moss2016-05-211-5/+5
* | | | | | | | Merge pull request #25100 from maclover7/jm-add-backticksKasper Timm Hansen2016-05-211-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add backticks to `config/secrets.yml`Jon Moss2016-05-211-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #24850 from maclover7/jm-actioncable-docsJon Moss2016-05-212-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Pass over Action Cable docsJon Moss2016-05-212-4/+4
* | | | | | | | Merge pull request #24170 from maclover7/fix-24168Rafael França2016-05-211-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Un-hide helper and assets options for controller generatorJon Moss2016-03-121-2/+1
* | | | | | | | | Merge pull request #24862 from maclover7/jm-ar-fixesRafael França2016-05-211-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing `the`Jon Moss2016-05-211-2/+2
* | | | | | | | | | Merge pull request #25093 from Erol/activerecord-transaction-serialization-errorRafael França2016-05-216-3/+163
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add AR::TransactionSerializationError for transaction serialization failures ...Erol Fornoles2016-05-216-3/+163
* | | | | | | | | | Use #distinct instead of #uniq in the guides [ci skip] (#25098)Junya Ogura2016-05-211-1/+1
* | | | | | | | | | Added a shared section to config/secrets.yml that will be loaded for all envi...David Heinemeier Hansson2016-05-214-3/+46
* | | | | | | | | | Whitespaces [ci skip]Rafael Mendonça França2016-05-211-0/+1
* | | | | | | | | | Add CHANGELOG.md reference for #24958 (#25094)Jon Moss2016-05-211-0/+4
* | | | | | | | | | Fix Hash#from_xml with frozen strings (#24718)Marek Kirejczyk2016-05-212-11/+19
* | | | | | | | | | Merge pull request #24732 from y-yagi/update_record_specified_in_the_keyRafael França2016-05-212-1/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | update record specified in keyyuuji.yaginuma2016-04-272-1/+18
* | | | | | | | | | | Merge pull request #24918 from prathamesh-sonpatki/cable-assetsRafael França2016-05-214-5/+44
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Cable: Generate .js or .coffee files while generating channel as per the java...Prathamesh Sonpatki2016-05-174-5/+44
* | | | | | | | | | | | Merge pull request #24923 from vipulnsward/24816-add-labelRafael França2016-05-213-6/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Confirm with the specification when generating emtpy option for select with `...Vipul A M2016-05-213-6/+25
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #25092 from y-yagi/add_23980_to_release_notesप्रथमेश Sonpatki2016-05-211-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add #23980 to release notes [ci skip]yuuji.yaginuma2016-05-211-0/+3
* | | | | | | | | | | | Merge pull request #24958 from maclover7/fix-24955Rafael França2016-05-202-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix ActiveRecord::LogSubscriber edge caseJon Moss2016-05-102-1/+11
* | | | | | | | | | | | | Revert "Make sure the cache is always populated"Rafael Mendonça França2016-05-202-6/+2
* | | | | | | | | | | | | Merge pull request #24984 from kamipo/remove_magic_comment_in_schema.rbRafael França2016-05-202-8/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove magic comment in generated `schema.rb`Ryuta Kamizono2016-05-122-8/+0
* | | | | | | | | | | | | | Add more test coverage to layoutsRafael Mendonça França2016-05-201-4/+152
* | | | | | | | | | | | | | Make sure the cache is always populatedAaron Patterson2016-05-202-2/+6
* | | | | | | | | | | | | | Merge pull request #25041 from maclover7/jm-actionviewAaron Patterson2016-05-201-9/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | [Action View] Don't create middleman `DetailsKey` instanceJon Moss2016-05-161-9/+3
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #25085 from bquorning/update-comment-for-retrieve_connecti...Arthur Nogueira Neves2016-05-201-7/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | [ci skip] Update retrieve_connection_pool commentBenjamin Quorning2016-05-201-7/+1
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #25084 from y-yagi/fix_module_nameVipul A M2016-05-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | fix module name [ci skip]yuuji.yaginuma2016-05-201-1/+1
|/ / / / / / / / / / / / /