Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove outdated docs | Michael Hoy | 2013-09-12 | 1 | -4/+0 |
* | Merge pull request #12196 from h-lame/fix-activesupport-cache-filestore-cleanup | Rafael Mendonça França | 2013-09-12 | 3 | -1/+18 |
|\ | |||||
| * | Fix FileStore#cleanup to no longer rely on missing each_key method | Murray Steele | 2013-09-11 | 3 | -1/+18 |
* | | Merge pull request #12207 from chancancode/fix_json_load | Rafael Mendonça França | 2013-09-12 | 2 | -2/+14 |
|\ \ | |||||
| * | | Enabled quirks mode on JSON.parse, fixes broken test in af9caae | Godfrey Chan | 2013-09-12 | 2 | -2/+14 |
|/ / | |||||
* | | Write the right CHANGELOG entry for #11603 | Rafael Mendonça França | 2013-09-12 | 1 | -1/+1 |
* | | Merge pull request #11603 from jetthoughts/join_strings_instead_of_contactina... | Rafael Mendonça França | 2013-09-12 | 3 | -2/+10 |
|\ \ | |||||
| * | | Cleanup of excerpt helper | Paul Nikitochkin | 2013-09-06 | 3 | -2/+10 |
* | | | Merge pull request #12206 from harshadsabne/master | Rafael Mendonça França | 2013-09-12 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | Update 4_0_release_notes.md | Harshad Sabne | 2013-09-12 | 1 | -3/+3 |
|/ / / | |||||
* | | | Disable prepared statements in the unprepared_statement block | Rafael Mendonça França | 2013-09-12 | 1 | -2/+3 |
* | | | Fix typo on instance variable get call | Carlos Antonio da Silva | 2013-09-12 | 1 | -1/+1 |
* | | | Merge pull request #12205 from claudiob/remove-unused-raw-email-fixtures | Carlos Antonio da Silva | 2013-09-12 | 15 | -736/+0 |
|\ \ \ | |||||
| * | | | Remove unused raw email fixtures | claudiob | 2013-09-12 | 15 | -736/+0 |
|/ / / | |||||
* | | | Merge pull request #12201 from chancancode/json_load | Jeremy Kemper | 2013-09-11 | 2 | -3/+16 |
|\ \ \ | |||||
| * | | | Replace JSON.load with JSON.parse, also removed the proc parameter | Godfrey Chan | 2013-09-11 | 2 | -3/+16 |
* | | | | these are not real developer objects, so counting them doesn't make | Aaron Patterson | 2013-09-11 | 1 | -1/+1 |
* | | | | Remove conditional adding a new method | Rafael Mendonça França | 2013-09-11 | 2 | -6/+6 |
* | | | | Fix inverted conditional | Rafael Mendonça França | 2013-09-11 | 1 | -1/+1 |
* | | | | Remove invalid comment | Rafael Mendonça França | 2013-09-11 | 1 | -4/+0 |
* | | | | Check if the SQL is not a prepared statement | Rafael Mendonça França | 2013-09-11 | 10 | -7/+29 |
|/ / / | |||||
* | | | Merge pull request #12188 from SamSaffron/master | Aaron Patterson | 2013-09-11 | 4 | -12/+16 |
|\ \ \ | |||||
| * | | | 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 | David Chelimsky | 2013-09-11 | 2 | -6/+7 |
* | | | | | 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. | 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 | 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. | thedarkone | 2013-09-11 | 3 | -1/+17 |
* | | | | | | | | Revert "Add meta tag with charset information to application layout." | Aaron Patterson | 2013-09-11 | 1 | -1/+0 |
* | | | | | | | | 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 | michaelminter | 2013-09-11 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #12184 from waynn/patch-4 | Steve Klabnik | 2013-09-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [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 |
* | | | | | | 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 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Use Ruby 2.0 caller_locations instead of caller if available | Akira Matsuda | 2013-09-10 | 1 | -2/+7 |
| * | | | | | 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 |
| * | | | | | Clean up unused associations in AR test model | Akira Matsuda | 2013-09-10 | 1 | -3/+0 |