Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Implement replace method so key? works correctly. | David Graham | 2012-10-26 | 3 | -0/+22 | |
|/ / | ||||||
* | | remove unused config option | Jon Leighton | 2012-10-26 | 1 | -3/+0 | |
| | | ||||||
* | | Remove ActiveRecord::Model entry from 4.0 Release Notes [ci skip] | Carlos Antonio da Silva | 2012-10-26 | 1 | -8/+0 | |
| | | ||||||
* | | Remove ActiveRecord::Model consant from AS::TestCase | Carlos Antonio da Silva | 2012-10-26 | 1 | -1/+1 | |
| | | | | | | | | Fixing the build. | |||||
* | | Remove REE GC stats since master is 1.9.3 | Jeremy Kemper | 2012-10-26 | 1 | -17/+5 | |
| | | ||||||
* | | Remove ActiveRecord::Model | Jon Leighton | 2012-10-26 | 40 | -642/+232 | |
| | | | | | | | | | | | | | | | | | | | | In the end I think the pain of implementing this seamlessly was not worth the gain provided. The intention was that it would allow plain ruby objects that might not live in your main application to be subclassed and have persistence mixed in. But I've decided that the benefit of doing that is not worth the amount of complexity that the implementation introduced. | |||||
* | | Add missing require for minitest assertions. Breaks calling 'app' in console ↵ | Jeremy Kemper | 2012-10-25 | 1 | -0/+1 | |
| | | | | | | | | otherwise. See 94248ffe1e6f815b8ffab4eb752b60c1e4459d25. | |||||
* | | Merge pull request #8031 from gbchaosmaster/redcarpet-2.2.2 | Carlos Antonio da Silva | 2012-10-25 | 1 | -2/+2 | |
|\ \ | | | | | | | Update redcarpet dependency | |||||
| * | | Update redcarpet dependency | Vinny Diehl | 2012-10-25 | 1 | -2/+2 | |
| |/ | | | | | | | | | "~> 2.2.2" from "~> 2.1.1". Also converted all hash rockets in the Gemfile to the 1.9 syntax. | |||||
* | | Merge pull request #8030 from calebthompson/fix-ternary | Rafael Mendonça França | 2012-10-25 | 1 | -2/+5 | |
|\ \ | |/ |/| | Fix gratuitous use of ternary operator | |||||
| * | Fix gratuitous use of ternary operator | Caleb Thompson | 2012-10-25 | 1 | -2/+5 | |
| | | ||||||
* | | remain backwards compatible, exception can be constructed with no arguments | Aaron Patterson | 2012-10-25 | 1 | -1/+3 | |
|/ | ||||||
* | give access to the original exception raised in case of a parse error | Aaron Patterson | 2012-10-25 | 3 | -2/+23 | |
| | ||||||
* | do not lose backtrace information from the raised exception | Aaron Patterson | 2012-10-25 | 2 | -14/+11 | |
| | ||||||
* | fix uninitialized ivar warnings | Aaron Patterson | 2012-10-25 | 1 | -0/+10 | |
| | ||||||
* | Merge pull request #8013 from noahhendrix/master | Aaron Patterson | 2012-10-25 | 2 | -7/+17 | |
|\ | | | | | Pass key to block in cache.fetch on miss | |||||
| * | make the cache test more @tenderlove(ing) and not depend on internal ↵ | Noah Hendrix | 2012-10-23 | 1 | -2/+7 | |
| | | | | | | | | implentation | |||||
| * | pass the key to the block in cache.fetch on misses | Noah Hendrix | 2012-10-23 | 2 | -7/+12 | |
| | | ||||||
* | | Merge pull request #8021 from ugisozols/master | Rafael Mendonça França | 2012-10-24 | 1 | -1/+1 | |
|\ \ | | | | | | | Fix incorrect markdown by removing extra space. [ci skip] | |||||
| * | | Fix incorrect markdown by removing extra space. | Uģis Ozols | 2012-10-24 | 1 | -1/+1 | |
|/ / | ||||||
* | | JS guide: applies guides casing guidelines for titles [ci skip] | Xavier Noria | 2012-10-23 | 1 | -6/+6 | |
| | | ||||||
* | | registers the JS guide in the CHANGELOG [ci skip] | Xavier Noria | 2012-10-23 | 1 | -0/+2 | |
| | | ||||||
* | | JS guide: AJAX -> Ajax | Xavier Noria | 2012-10-23 | 1 | -17/+17 | |
| | | | | | | | | We discussed this on Twitter, seems to be the best option. | |||||
* | | renames the JS guide file name to match the new title [ci skip] | Xavier Noria | 2012-10-23 | 1 | -0/+0 | |
| | | ||||||
* | | adds Rails to the title of the JS guide [ci skip] | Xavier Noria | 2012-10-23 | 1 | -2/+2 | |
| | | ||||||
* | | Merge pull request #8014 from insside/task-test-typos | Rafael Mendonça França | 2012-10-23 | 1 | -1/+1 | |
|\ \ | |/ |/| | changed test case name | |||||
| * | changed test case name | Tima Maslyuchenko | 2012-10-23 | 1 | -1/+1 | |
|/ | ||||||
* | frozen state should be restored after txn is aborted | Aaron Patterson | 2012-10-22 | 2 | -2/+18 | |
| | ||||||
* | Add tests to make sure that the I18n taken message can be overrided in the | Rafael Mendonça França | 2012-10-22 | 1 | -0/+14 | |
| | | | | | | activerecord scope. Related with 5341b84936d93ec90e6252af437a3871101c115a | |||||
* | Merge pull request #8006 from GRoguelon/master | Rafael Mendonça França | 2012-10-21 | 1 | -1/+1 | |
|\ | | | | | Remove extra line in Gemfile generated | |||||
| * | Remove extra line in Gemfile under turbolinks. | Geoffrey Roguelon | 2012-10-21 | 1 | -1/+1 | |
|/ | ||||||
* | fix a couple of typos in the js guide [ci skip] | Vijay Dev | 2012-10-21 | 1 | -5/+3 | |
| | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-21 | 52 | -482/+674 | |
|\ | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/slice.rb guides/source/active_support_core_extensions.md | |||||
| * | copy edits [ci skip] | Vijay Dev | 2012-10-21 | 1 | -14/+7 | |
| | | ||||||
| * | minor edits in AM documentation [ci skip] | Francesco Rodriguez | 2012-10-21 | 22 | -32/+32 | |
| | | ||||||
| * | update AR::AttributeMethods documentation [ci skip] | Francesco Rodriguez | 2012-10-21 | 1 | -23/+124 | |
| | | ||||||
| * | nodoc AR::Generators [ci skip] | Francesco Rodriguez | 2012-10-20 | 4 | -10/+10 | |
| | | ||||||
| * | Hash Syntax changes to 1.9 format | AvnerCohen | 2012-10-20 | 5 | -9/+9 | |
| | | ||||||
| * | ActiveRecord Callbacks ordering examples | Pablo Ifran | 2012-10-19 | 1 | -0/+43 | |
| | | ||||||
| * | include serializers in ActiveModel::Serialization example | Hrvoje Šimić | 2012-10-19 | 1 | -0/+12 | |
| | | ||||||
| * | better examples in ActiveModel readme | Hrvoje Šimić | 2012-10-19 | 1 | -1/+15 | |
| | | ||||||
| * | Corrected the logic in production.rb comment. | Robb Shecter | 2012-10-18 | 1 | -1/+1 | |
| | | ||||||
| * | remove assert_valid method from testing guide [ci skip] | Francesco Rodriguez | 2012-10-18 | 1 | -3/+0 | |
| | | ||||||
| * | Change 'branches' to 'branch' [ci skip] | Adam Coffman | 2012-10-18 | 1 | -1/+1 | |
| | | ||||||
| * | add a nested attributes example into Strong Parameters documentation [ci skip] | Francesco Rodriguez | 2012-10-18 | 1 | -6/+31 | |
| | | ||||||
| * | remove some non-breaking spaces [ci skip] | Francesco Rodriguez | 2012-10-18 | 1 | -13/+13 | |
| | | ||||||
| * | remove non-breaking spaces [ci skip] | Francesco Rodriguez | 2012-10-18 | 1 | -3/+3 | |
| | | ||||||
| * | Revert "Change with start of translation in internationalization, this time ↵ | Rafael Mendonça França | 2012-10-17 | 67 | -36402/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | with pt_br." This reverts commit 09682e9e7328b1c1466ae87af08f1785a0b5d7e3. Conflicts: guides/source/en/association_basics.md REASON: Translation work can not be done in the docrails repository | |||||
| * | Revert "divided into folder with the language" | Rafael Mendonça França | 2012-10-17 | 56 | -0/+35064 | |
| | | | | | | | | | | | | This reverts commit f5b9ed4fbc3215a5fce48985ea372ad3f1182252. REASON: Translation work can not be done in the docrails repository | |||||
| * | Fix typos in Association Basics guide | Jaime Iniesta | 2012-10-17 | 1 | -5/+5 | |
| | |