aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12135 from dylanahsmith/avoid_empty_transactionRafael Mendonça França2013-09-113-1/+10
|\ | | | | | | | | | | | | Avoid empty transaction from setting has_one association on new record. Conflicts: activerecord/CHANGELOG.md
| * Avoid empty transaction from setting has_one association on new record.Dylan Thacker-Smith2013-09-113-1/+9
| |
* | WhitespacesRafael Mendonça França2013-09-111-1/+2
| |
* | Merge pull request #12185 from SamSaffron/join_depRafael Mendonça França2013-09-111-1/+13
|\ \ | | | | | | Reduce allocations when extracting AR models
| * | Reduce allocations when extracting AR modelsSam2013-09-111-1/+13
| | |
* | | Merge pull request #12194 from thedarkone/readonly-merger-fixRafael Mendonça França2013-09-113-1/+17
|\ \ \ | | | | | | | | Relation#merge should not lose readonly(false) flag.
| * | | Relation#merge should not lose readonly(false) flag.thedarkone2013-09-113-1/+17
| | | | | | | | | | | | | | | | The original code ignores the `false` value because `false.blank? # => true`.
* | | | Revert "Add meta tag with charset information to application layout."Aaron Patterson2013-09-111-1/+0
| | | | | | | | | | | | | | | | This reverts commit ba0407337e93c4ef55cef3472143f62e8a984a64.
* | | | fix deleting join models with no pkAaron Patterson2013-09-112-6/+62
| |_|/ |/| |
* | | Merge pull request #12199 from michaelminter/masterRafael Mendonça França2013-09-111-1/+1
|\ \ \ | | | | | | | | remove sentence err
| * | | remove sentence errmichaelminter2013-09-111-1/+1
|/ / /
* | | Merge pull request #12184 from waynn/patch-4Steve Klabnik2013-09-101-1/+1
|\ \ \ | | | | | | | | "previous version of Rails" is gramatically incorrect
| * | | [ci skip] 'previous version of Rails' is gramatically incorrectWaynn Lue2013-09-101-1/+1
| | |/ | |/|
* | | Add meta tag with charset information to application layout.Steve Klabnik2013-09-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, our default HTML would validate properly, but would generate a warning: it doesn't declare a character encoding. According to [the spec][encoding-spec], if you don't specify an encoding, a 7 step algorithm happens, with a toooon of sub-steps. Or, we could just actually specify it. Since everything else in Rails assumes UTF-8, we should make sure pages are served with that encoding too. This meta tag is the simplest way to accomplish this. More resources: * http://blog.whatwg.org/the-road-to-html-5-character-encoding * http://www.w3.org/International/tutorials/tutorial-char-enc/ * http://validator.w3.org/ [encoding-spec]: http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#determining-the-character-encoding
* | | add a comment for sanity of other people to comeAaron Patterson2013-09-101-0/+8
| | |
* | | ask the association for records rather than calling `send`Aaron Patterson2013-09-101-1/+2
| | |
* | | Merge pull request #12193 from arunagw/revert-revertRafael Mendonça França2013-09-1019-41/+33
|\ \ \ | |_|/ |/| | Revert fixes
| * | Use Ruby 2.0 caller_locations instead of caller if availableAkira Matsuda2013-09-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | * we no more have to manipulate the each caller strings by ourselves using caller_locations * caller_locations runs slightly faster, and creates less objects than good old caller Benchmark (loading an Engine 1000 times): caller: 262.89 ms caller_locations: 186.068 ms
| * | Update Rails 3.2.x guide link [ci skip]Tomas Varaneckas2013-09-101-1/+1
| | |
| * | Be sure to restore the default I18n.locale after changed its value in a testAkira Matsuda2013-09-101-3/+3
| | |
| * | Fixes typo in Object#try!Jay Hayes2013-09-101-1/+1
| | |
| * | More unused associations in AR test modelsAkira Matsuda2013-09-108-13/+0
| | |
| * | :scissors: [ci skip]Carlos Antonio da Silva2013-09-101-1/+1
| | |
| * | change function def self.table_name to self.table_nameRajarshi Das2013-09-102-5/+3
| | | | | | | | | | | | | | | | | | change def self.primary_key to self.primary_key change def self.primary_key to self.primary_key
| * | Clean up unused associations in AR test modelAkira Matsuda2013-09-101-3/+0
| | |
| * | Reset ActionView::Base.logger instead of AC::Base.loggerAkira Matsuda2013-09-101-1/+1
| | | | | | | | | | | | see: 9b0ac0bc74569db460f87ea6888b3847be0ff5be
| * | Refactor handling of action normalizationMax Shytikov2013-09-101-11/+13
| | | | | | | | | | | | | | | | | | Reference: Bloody mess internals http://gusiev.com/slides/rails_contribution/static/#40
| * | Don't mutate the Base settings by merge!ing the given valueAkira Matsuda2013-09-102-1/+4
|/ /
* | Merge pull request #12189 from rajcybage/test_assertSantiago Pastorino2013-09-101-7/+7
|\ \ | | | | | | use assert_empty in activemodel conditional validation test cases
| * | use assert_empty in activemodel conditional validation test casesRajarshi Das2013-09-101-7/+7
| | |
* | | Merge pull request #12173 from arunagw/fixes_reverted_by_revert_commitGuillermo Iguaran2013-09-104-11/+17
|\ \ \ | | | | | | | | Revert fixes
| * | | Back AV description in gemspecArun Agrawal2013-09-091-1/+1
| | | |
| * | | Fix order dependent testArun Agrawal2013-09-091-2/+10
| | | | | | | | | | | | | | | | see c48cbb02d7e6f585e31b404c0c363f0d6b586811
| * | | grab executable from rubygemsArun Agrawal2013-09-091-1/+1
| | | |
| * | | Fixed API task fileArun Agrawal2013-09-091-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | 1. As we have vendor in AV only 2. No more vendor in AC 3. No vendor folder in AR
* | | | Make AC standalone rendering workSantiago Pastorino2013-09-102-2/+20
| |/ / |/| |
* | | Merge pull request #12187 from anupamc/masterCarlos Antonio da Silva2013-09-102-8/+0
|\ \ \ | |_|/ |/| | Removed unnecessary require
| * | Removed unused modules and classesAnupam Choudhury2013-09-101-7/+0
| | |
| * | Removed unnecessary requireAnupam Choudhury2013-09-101-1/+0
|/ /
* | Merge pull request #12181 from claudiob/remove-unused-helper-fixturesCarlos Antonio da Silva2013-09-092-4/+0
|\ \ | | | | | | Remove helper fixtures not used in any test
| * | Remove helper fixtures not used in any testclaudiob2013-09-092-4/+0
| | | | | | | | | | | | | | | | | | The fixture for module AbcHelper defines three functions bare_a, bare_b and bare_c, but only bare_a is used in the code that tests helper functions.
* | | let the class cache object clean up user inputAaron Patterson2013-09-091-8/+20
| | |
* | | make @bitsweat happy. :heart:Aaron Patterson2013-09-091-0/+6
| | |
* | | stop using deprecated api in the testsAaron Patterson2013-09-091-1/+1
|/ /
* | Remove BasicRendering testsJosé Valim2013-09-093-72/+1
| |
* | Remove remaining coupling with AV in MimeRespondsJosé Valim2013-09-094-5/+20
| |
* | Remove BasicRendering and remove template functionality from AbsC::RenderingJosé Valim2013-09-095-47/+24
| |
* | Merge pull request #12167 from hannesfostie/grammar-improvementSteve Klabnik2013-09-091-1/+1
|\ \ | |/ |/| [ci skip] Improves a sentence in guides/security
| * Improves a sentence in guides/securityHannes Fostie2013-09-091-1/+1
| | | | | | | | Changed "... books make this wrong" to "... books get this wrong"
* | Merge pull request #12157 from robin850/patch-9Yves Senn2013-09-091-1/+1
|\ \ | | | | | | Use MiniTest::Unit::TestCase instead of Minitest::Test [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 05:00:16 +0000