Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #25126 from bquorning/this-is-not-an-alias | Vipul A M | 2016-05-24 | 1 | -2/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [] and read_attribute are not aliases [ci skip] | Benjamin Quorning | 2016-05-24 | 1 | -2/+0 | |
|/ / / / / / | ||||||
* | | | | | | Revert "Add default exceptions affected by suppress (#25099)" | Rafael Mendonça França | 2016-05-23 | 2 | -10/+0 | |
* | | | | | | Add default exceptions affected by suppress (#25099) | Alexey Zapparov | 2016-05-23 | 2 | -0/+10 | |
* | | | | | | Merge pull request #25114 from y-yagi/remove_qualified_const_from_guide | Jon Moss | 2016-05-23 | 1 | -71/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | remove deprecated `Module#qualified_const_` from guide [ci skip] | yuuji.yaginuma | 2016-05-23 | 1 | -71/+0 | |
* | | | | | | | Merge pull request #25110 from andrii/fix_scaffold_css | Rafael França | 2016-05-23 | 1 | -8/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix and optimize scaffold CSS [ci skip] | Andrii Ponomarov | 2016-05-22 | 1 | -8/+4 | |
| |/ / / / / / | ||||||
* / / / / / / | Respect `log_warning_on_csrf_failure` setting for all CSRF failures | Matthew Caruana Galizia | 2016-05-23 | 2 | -1/+34 | |
|/ / / / / / | ||||||
* | | | | | | Remove Blade gem dependency | Vipul A M | 2016-05-21 | 3 | -2/+41 | |
* | | | | | | Merge pull request #25076 from jeroenvisser101/keep-to-max-length | Sean Griffin | 2016-05-21 | 2 | -2/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Change comments to not exceed 80 characters | Jeroen Visser | 2016-05-19 | 2 | -2/+4 | |
* | | | | | | | Merge pull request #25101 from maclover7/jm-rm-space-1 | Kasper Timm Hansen | 2016-05-21 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove space, properly italicize | Jon Moss | 2016-05-21 | 1 | -5/+5 | |
* | | | | | | | | Merge pull request #25100 from maclover7/jm-add-backticks | Kasper Timm Hansen | 2016-05-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Add backticks to `config/secrets.yml` | Jon Moss | 2016-05-21 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #24850 from maclover7/jm-actioncable-docs | Jon Moss | 2016-05-21 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Pass over Action Cable docs | Jon Moss | 2016-05-21 | 2 | -4/+4 | |
* | | | | | | | | Merge pull request #24170 from maclover7/fix-24168 | Rafael França | 2016-05-21 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Un-hide helper and assets options for controller generator | Jon Moss | 2016-03-12 | 1 | -2/+1 | |
* | | | | | | | | | Merge pull request #24862 from maclover7/jm-ar-fixes | Rafael França | 2016-05-21 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add missing `the` | Jon Moss | 2016-05-21 | 1 | -2/+2 | |
* | | | | | | | | | | Merge pull request #25093 from Erol/activerecord-transaction-serialization-error | Rafael França | 2016-05-21 | 6 | -3/+163 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Add AR::TransactionSerializationError for transaction serialization failures ... | Erol Fornoles | 2016-05-21 | 6 | -3/+163 | |
* | | | | | | | | | | Use #distinct instead of #uniq in the guides [ci skip] (#25098) | Junya Ogura | 2016-05-21 | 1 | -1/+1 | |
* | | | | | | | | | | Added a shared section to config/secrets.yml that will be loaded for all envi... | David Heinemeier Hansson | 2016-05-21 | 4 | -3/+46 | |
* | | | | | | | | | | Whitespaces [ci skip] | Rafael Mendonça França | 2016-05-21 | 1 | -0/+1 | |
* | | | | | | | | | | Add CHANGELOG.md reference for #24958 (#25094) | Jon Moss | 2016-05-21 | 1 | -0/+4 | |
* | | | | | | | | | | Fix Hash#from_xml with frozen strings (#24718) | Marek Kirejczyk | 2016-05-21 | 2 | -11/+19 | |
* | | | | | | | | | | Merge pull request #24732 from y-yagi/update_record_specified_in_the_key | Rafael França | 2016-05-21 | 2 | -1/+18 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | update record specified in key | yuuji.yaginuma | 2016-04-27 | 2 | -1/+18 | |
* | | | | | | | | | | | Merge pull request #24918 from prathamesh-sonpatki/cable-assets | Rafael França | 2016-05-21 | 4 | -5/+44 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Cable: Generate .js or .coffee files while generating channel as per the java... | Prathamesh Sonpatki | 2016-05-17 | 4 | -5/+44 | |
* | | | | | | | | | | | | Merge pull request #24923 from vipulnsward/24816-add-label | Rafael França | 2016-05-21 | 3 | -6/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Confirm with the specification when generating emtpy option for select with `... | Vipul A M | 2016-05-21 | 3 | -6/+25 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #25092 from y-yagi/add_23980_to_release_notes | प्रथमेश Sonpatki | 2016-05-21 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | add #23980 to release notes [ci skip] | yuuji.yaginuma | 2016-05-21 | 1 | -0/+3 | |
* | | | | | | | | | | | | Merge pull request #24958 from maclover7/fix-24955 | Rafael França | 2016-05-20 | 2 | -1/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix ActiveRecord::LogSubscriber edge case | Jon Moss | 2016-05-10 | 2 | -1/+11 | |
* | | | | | | | | | | | | | Revert "Make sure the cache is always populated" | Rafael Mendonça França | 2016-05-20 | 2 | -6/+2 | |
* | | | | | | | | | | | | | Merge pull request #24984 from kamipo/remove_magic_comment_in_schema.rb | Rafael França | 2016-05-20 | 2 | -8/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Remove magic comment in generated `schema.rb` | Ryuta Kamizono | 2016-05-12 | 2 | -8/+0 | |
* | | | | | | | | | | | | | | Add more test coverage to layouts | Rafael Mendonça França | 2016-05-20 | 1 | -4/+152 | |
* | | | | | | | | | | | | | | Make sure the cache is always populated | Aaron Patterson | 2016-05-20 | 2 | -2/+6 | |
* | | | | | | | | | | | | | | Merge pull request #25041 from maclover7/jm-actionview | Aaron Patterson | 2016-05-20 | 1 | -9/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | [Action View] Don't create middleman `DetailsKey` instance | Jon Moss | 2016-05-16 | 1 | -9/+3 | |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #25085 from bquorning/update-comment-for-retrieve_connecti... | Arthur Nogueira Neves | 2016-05-20 | 1 | -7/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | [ci skip] Update retrieve_connection_pool comment | Benjamin Quorning | 2016-05-20 | 1 | -7/+1 | |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #25084 from y-yagi/fix_module_name | Vipul A M | 2016-05-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | fix module name [ci skip] | yuuji.yaginuma | 2016-05-20 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / |