aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove ActiveRecord::Model consant from AS::TestCaseCarlos Antonio da Silva2012-10-261-1/+1
| | | | Fixing the build.
* Remove REE GC stats since master is 1.9.3Jeremy Kemper2012-10-261-17/+5
|
* Remove ActiveRecord::ModelJon Leighton2012-10-2640-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 Kemper2012-10-251-0/+1
| | | | otherwise. See 94248ffe1e6f815b8ffab4eb752b60c1e4459d25.
* Merge pull request #8031 from gbchaosmaster/redcarpet-2.2.2Carlos Antonio da Silva2012-10-251-2/+2
|\ | | | | Update redcarpet dependency
| * Update redcarpet dependencyVinny Diehl2012-10-251-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-ternaryRafael Mendonça França2012-10-251-2/+5
|\ \ | |/ |/| Fix gratuitous use of ternary operator
| * Fix gratuitous use of ternary operatorCaleb Thompson2012-10-251-2/+5
| |
* | remain backwards compatible, exception can be constructed with no argumentsAaron Patterson2012-10-251-1/+3
|/
* give access to the original exception raised in case of a parse errorAaron Patterson2012-10-253-2/+23
|
* do not lose backtrace information from the raised exceptionAaron Patterson2012-10-252-14/+11
|
* fix uninitialized ivar warningsAaron Patterson2012-10-251-0/+10
|
* Merge pull request #8013 from noahhendrix/masterAaron Patterson2012-10-252-7/+17
|\ | | | | Pass key to block in cache.fetch on miss
| * make the cache test more @tenderlove(ing) and not depend on internal ↵Noah Hendrix2012-10-231-2/+7
| | | | | | | | implentation
| * pass the key to the block in cache.fetch on missesNoah Hendrix2012-10-232-7/+12
| |
* | Merge pull request #8021 from ugisozols/masterRafael Mendonça França2012-10-241-1/+1
|\ \ | | | | | | Fix incorrect markdown by removing extra space. [ci skip]
| * | Fix incorrect markdown by removing extra space.Uģis Ozols2012-10-241-1/+1
|/ /
* | JS guide: applies guides casing guidelines for titles [ci skip]Xavier Noria2012-10-231-6/+6
| |
* | registers the JS guide in the CHANGELOG [ci skip]Xavier Noria2012-10-231-0/+2
| |
* | JS guide: AJAX -> AjaxXavier Noria2012-10-231-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 Noria2012-10-231-0/+0
| |
* | adds Rails to the title of the JS guide [ci skip]Xavier Noria2012-10-231-2/+2
| |
* | Merge pull request #8014 from insside/task-test-typosRafael Mendonça França2012-10-231-1/+1
|\ \ | |/ |/| changed test case name
| * changed test case nameTima Maslyuchenko2012-10-231-1/+1
|/
* frozen state should be restored after txn is abortedAaron Patterson2012-10-222-2/+18
|
* Add tests to make sure that the I18n taken message can be overrided in theRafael Mendonça França2012-10-221-0/+14
| | | | | | activerecord scope. Related with 5341b84936d93ec90e6252af437a3871101c115a
* Merge pull request #8006 from GRoguelon/masterRafael Mendonça França2012-10-211-1/+1
|\ | | | | Remove extra line in Gemfile generated
| * Remove extra line in Gemfile under turbolinks.Geoffrey Roguelon2012-10-211-1/+1
|/
* fix a couple of typos in the js guide [ci skip]Vijay Dev2012-10-211-5/+3
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-2152-482/+674
|\ | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/slice.rb guides/source/active_support_core_extensions.md
| * copy edits [ci skip]Vijay Dev2012-10-211-14/+7
| |
| * minor edits in AM documentation [ci skip]Francesco Rodriguez2012-10-2122-32/+32
| |
| * update AR::AttributeMethods documentation [ci skip]Francesco Rodriguez2012-10-211-23/+124
| |
| * nodoc AR::Generators [ci skip]Francesco Rodriguez2012-10-204-10/+10
| |
| * Hash Syntax changes to 1.9 formatAvnerCohen2012-10-205-9/+9
| |
| * ActiveRecord Callbacks ordering examplesPablo Ifran2012-10-191-0/+43
| |
| * include serializers in ActiveModel::Serialization exampleHrvoje Šimić2012-10-191-0/+12
| |
| * better examples in ActiveModel readmeHrvoje Šimić2012-10-191-1/+15
| |
| * Corrected the logic in production.rb comment.Robb Shecter2012-10-181-1/+1
| |
| * remove assert_valid method from testing guide [ci skip]Francesco Rodriguez2012-10-181-3/+0
| |
| * Change 'branches' to 'branch' [ci skip]Adam Coffman2012-10-181-1/+1
| |
| * add a nested attributes example into Strong Parameters documentation [ci skip]Francesco Rodriguez2012-10-181-6/+31
| |
| * remove some non-breaking spaces [ci skip]Francesco Rodriguez2012-10-181-13/+13
| |
| * remove non-breaking spaces [ci skip]Francesco Rodriguez2012-10-181-3/+3
| |
| * Revert "Change with start of translation in internationalization, this time ↵Rafael Mendonça França2012-10-1767-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ça2012-10-1756-0/+35064
| | | | | | | | | | | | This reverts commit f5b9ed4fbc3215a5fce48985ea372ad3f1182252. REASON: Translation work can not be done in the docrails repository
| * Fix typos in Association Basics guideJaime Iniesta2012-10-171-5/+5
| |
| * divided into folder with the languageRodrigo Martins2012-10-1756-35064/+0
| |
| * Change with start of translation in internationalization, this time with pt_br.Rodrigo Martins2012-10-1766-3/+36397
| |
| * Moving code base to 1.9 hash syntaxAvnerCohen2012-10-163-7/+7
| |