Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Check if the SQL is not a prepared statement | Rafael Mendonça França | 2013-09-11 | 10 | -7/+29 |
| | | | | | | | | | When the adapter is with prepared statement disabled and the binds array is not empty the connection adapter will try to set the binds values and will fail. Now we are checking if the adapter has the prepared statement disabled. Fixes #12023 | ||||
* | Merge pull request #12188 from SamSaffron/master | Aaron Patterson | 2013-09-11 | 4 | -12/+16 |
|\ | | | | | Perf: avoid dupes add fallback logic for coders | ||||
| * | Perf: avoid dupes add fallback logic for coders | Sam | 2013-09-11 | 4 | -12/+16 |
| | | |||||
* | | Merge pull request #12200 from dchelimsky/simplify-duration-inspect-even-more | Rafael Mendonça França | 2013-09-11 | 2 | -6/+7 |
|\ \ | | | | | | | Reduce Duration#inspect to a single series of transformations | ||||
| * | | Reduce Duration#inspect to a single series of transformations | David Chelimsky | 2013-09-11 | 2 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * eliminates need for temp Hash Also added a couple of examples to DurationTest to specify: * duration can be defined with units out of order e.g. 1.month + 1.year + 1.second + 1.day * equality with a Fixnum works regardless of which operand is on which side of the operator | ||||
* | | | Merge pull request #12135 from dylanahsmith/avoid_empty_transaction | Rafael Mendonça França | 2013-09-11 | 3 | -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-Smith | 2013-09-11 | 3 | -1/+9 |
| | | | | |||||
* | | | | Whitespaces | Rafael Mendonça França | 2013-09-11 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge pull request #12185 from SamSaffron/join_dep | Rafael Mendonça França | 2013-09-11 | 1 | -1/+13 |
|\ \ \ \ | | | | | | | | | | | Reduce allocations when extracting AR models | ||||
| * | | | | Reduce allocations when extracting AR models | Sam | 2013-09-11 | 1 | -1/+13 |
| | | | | | |||||
* | | | | | Merge pull request #12194 from thedarkone/readonly-merger-fix | Rafael Mendonça França | 2013-09-11 | 3 | -1/+17 |
|\ \ \ \ \ | | | | | | | | | | | | | Relation#merge should not lose readonly(false) flag. | ||||
| * | | | | | Relation#merge should not lose readonly(false) flag. | thedarkone | 2013-09-11 | 3 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | The original code ignores the `false` value because `false.blank? # => true`. | ||||
* | | | | | | Revert "Add meta tag with charset information to application layout." | Aaron Patterson | 2013-09-11 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ba0407337e93c4ef55cef3472143f62e8a984a64. | ||||
* | | | | | | fix deleting join models with no pk | Aaron Patterson | 2013-09-11 | 2 | -6/+62 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #12199 from michaelminter/master | Rafael Mendonça França | 2013-09-11 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | remove sentence err | ||||
| * | | | | | remove sentence err | michaelminter | 2013-09-11 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #12184 from waynn/patch-4 | Steve Klabnik | 2013-09-10 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | "previous version of Rails" is gramatically incorrect | ||||
| * | | | | | [ci skip] 'previous version of Rails' is gramatically incorrect | Waynn Lue | 2013-09-10 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Add meta tag with charset information to application layout. | Steve Klabnik | 2013-09-10 | 1 | -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 come | Aaron Patterson | 2013-09-10 | 1 | -0/+8 |
| | | | | | |||||
* | | | | | ask the association for records rather than calling `send` | Aaron Patterson | 2013-09-10 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Merge pull request #12193 from arunagw/revert-revert | Rafael Mendonça França | 2013-09-10 | 19 | -41/+33 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Revert fixes | ||||
| * | | | | Use Ruby 2.0 caller_locations instead of caller if available | Akira Matsuda | 2013-09-10 | 1 | -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 Varaneckas | 2013-09-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Be sure to restore the default I18n.locale after changed its value in a test | Akira Matsuda | 2013-09-10 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Fixes typo in Object#try! | Jay Hayes | 2013-09-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | More unused associations in AR test models | Akira Matsuda | 2013-09-10 | 8 | -13/+0 |
| | | | | | |||||
| * | | | | :scissors: [ci skip] | Carlos Antonio da Silva | 2013-09-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | change function def self.table_name to self.table_name | Rajarshi Das | 2013-09-10 | 2 | -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 model | Akira Matsuda | 2013-09-10 | 1 | -3/+0 |
| | | | | | |||||
| * | | | | Reset ActionView::Base.logger instead of AC::Base.logger | Akira Matsuda | 2013-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | see: 9b0ac0bc74569db460f87ea6888b3847be0ff5be | ||||
| * | | | | Refactor handling of action normalization | Max Shytikov | 2013-09-10 | 1 | -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 value | Akira Matsuda | 2013-09-10 | 2 | -1/+4 |
|/ / / / | |||||
* | | | | Merge pull request #12189 from rajcybage/test_assert | Santiago Pastorino | 2013-09-10 | 1 | -7/+7 |
|\ \ \ \ | | | | | | | | | | | use assert_empty in activemodel conditional validation test cases | ||||
| * | | | | use assert_empty in activemodel conditional validation test cases | Rajarshi Das | 2013-09-10 | 1 | -7/+7 |
| | | | | | |||||
* | | | | | Merge pull request #12173 from arunagw/fixes_reverted_by_revert_commit | Guillermo Iguaran | 2013-09-10 | 4 | -11/+17 |
|\ \ \ \ \ | | | | | | | | | | | | | Revert fixes | ||||
| * | | | | | Back AV description in gemspec | Arun Agrawal | 2013-09-09 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix order dependent test | Arun Agrawal | 2013-09-09 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | see c48cbb02d7e6f585e31b404c0c363f0d6b586811 | ||||
| * | | | | | grab executable from rubygems | Arun Agrawal | 2013-09-09 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fixed API task file | Arun Agrawal | 2013-09-09 | 1 | -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 work | Santiago Pastorino | 2013-09-10 | 2 | -2/+20 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #12187 from anupamc/master | Carlos Antonio da Silva | 2013-09-10 | 2 | -8/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Removed unnecessary require | ||||
| * | | | | Removed unused modules and classes | Anupam Choudhury | 2013-09-10 | 1 | -7/+0 |
| | | | | | |||||
| * | | | | Removed unnecessary require | Anupam Choudhury | 2013-09-10 | 1 | -1/+0 |
|/ / / / | |||||
* | | | | Merge pull request #12181 from claudiob/remove-unused-helper-fixtures | Carlos Antonio da Silva | 2013-09-09 | 2 | -4/+0 |
|\ \ \ \ | | | | | | | | | | | Remove helper fixtures not used in any test | ||||
| * | | | | Remove helper fixtures not used in any test | claudiob | 2013-09-09 | 2 | -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 input | Aaron Patterson | 2013-09-09 | 1 | -8/+20 |
| | | | | | |||||
* | | | | | make @bitsweat happy. :heart: | Aaron Patterson | 2013-09-09 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | stop using deprecated api in the tests | Aaron Patterson | 2013-09-09 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Remove BasicRendering tests | José Valim | 2013-09-09 | 3 | -72/+1 |
| | | | |