aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #4828 from railsaholic/fix_error_messageJosé Valim2012-02-014-4/+7
|\ \ \ | | | | | | | | fix has_one, has_many restrict error message
| * | | fix has_one, has_many restrict error messageManoj2012-02-014-4/+7
| | | |
* | | | Merge pull request #4806 from KL-7/do-not-serialize-nilAaron Patterson2012-02-012-2/+15
|\ \ \ \ | | | | | | | | | | Do not serialize nil in serialized attribute.
| * | | | Do not serialize nil in serialized attribute.Kirill Lashuk2012-01-312-2/+15
| | | | |
* | | | | Merge pull request #4809 from cfeist/feist-sqlite-binary-corruptionAaron Patterson2012-02-013-17/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix for SQLite binary data corrupter (to master branch)
| * | | | | Fixed issue with SQLite adapter corrupting binary dataChris Feist2012-01-311-16/+1
| | | | | |
| * | | | | Added test to illustrate bad binary blobs.Chris Feist2012-01-312-1/+2
| | | | | |
* | | | | | Merge pull request #4784 from semaperepelitsa/constantizeAaron Patterson2012-02-012-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | A little constantize update
| * | | | | Dont do underscore and camelize, only camelize is fineSemyon Perepelitsa2012-01-311-1/+1
| | | | | |
| * | | | | There is an "inherit" option on const_get too, why not use it?Semyon Perepelitsa2012-01-311-1/+1
| | | | | |
* | | | | | Merge pull request #4804 from rafaelfranca/check_box-fixJosé Valim2012-02-012-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | check_box with nil as unchecked value should be HTML safe
| * | | | | | check_box with nil as unchecked value should be HTML safeRafael Mendonça França2012-01-312-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França]
* | | | | | | revise docs [ci skip]Vijay Dev2012-02-012-4/+4
| | | | | | |
* | | | | | | document the AR none method [ci skip]Vijay Dev2012-02-012-7/+31
| | | | | | |
* | | | | | | fix a typo [ci skip]Vijay Dev2012-02-011-1/+1
| | | | | | |
* | | | | | | Merge pull request #4825 from sikachu/master-fix-plugin-newJosé Valim2012-02-011-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix broken test introduced from #4814
| * | | | | | | Fix broken test introduced from #4814Prem Sichanugrist2012-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ruby_debugger_gemfile_entry was removed from the generator. Please make sure to run `grep` or `ack` to make sure it was removed in every places.
* | | | | | | | Merge pull request #4826 from kennyj/fix_4737-2José Valim2012-02-012-8/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix GH #4737. Missing helper file (LoadError) in mountable plugin.
| * | | | | | | Fix GH #4737. Missing helper file (LoadError) in mountable plugin.kennyj2012-02-022-8/+11
|/ / / / / / /
* | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-0111-24/+37
|\ \ \ \ \ \ \
| * | | | | | | fixes the plus sign properly [ci skip]Vijay Dev2012-02-011-1/+1
| | | | | | | |
| * | | | | | | Revert "fixing text to match what is being displayed"Vijay Dev2012-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5be94cedce3f80923661a2f1fee02c9bfc2e95b2. Reason: This commit is incorrect.
| * | | | | | | escape plus sign in "Rails 2.3+" to fix markupdaniely2012-02-011-1/+1
| | | | | | | |
| * | | | | | | Improve readonly examples and optimistic locking docsCarlos Antonio da Silva2012-01-312-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Relation#order can receive order attributes as different arguments, add example; * Readonly does not handle deletion of records, only modification; * locking_version column does not need to default to 0, Rails handles nil values; * Change references from "set_locking_column" to "self.locking_column".
| * | | | | | | Improve ar associations habtm docs a bitCarlos Antonio da Silva2012-01-311-5/+2
| | | | | | | |
| * | | | | | | Merge branch 'master' of github.com:lifo/docrailsPatrick Davey2012-01-311-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed typo. "from" should be "form".Ying Tsen Hong2012-01-301-1/+1
| | | | | | | | |
| * | | | | | | | fixing text to match what is being displayedPatrick Davey2012-01-311-1/+1
| |/ / / / / / /
| * | | | | | | Fixing some double quotes that should be single quotesCarol Nichols2012-01-291-2/+2
| | | | | | | |
| * | | | | | | Update .travis.ymlben2012-01-301-1/+0
| | | | | | | |
| * | | | | | | https://github.com/lifo/docrails/blob/master/.travis.ymlben2012-01-301-0/+1
| | | | | | | |
| * | | | | | | Sorry for editing this file.Meck2012-01-301-1/+1
| | | | | | | |
| * | | | | | | Update README.rdocMeck2012-01-301-1/+1
| | | | | | | |
| * | | | | | | Improve active record associations guide a bitCarlos Antonio da Silva2012-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use right example for has_many :find method; * Reword has_many :counter_sql doc notes.
| * | | | | | | Whitespace only: Use single newline at end of file.Brook Riggio2012-01-273-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring these files into accordance with the prevailing convention.
| * | | | | | | Updates documentaton to indicate that :expires_in can be used with all cache ↵dev2012-01-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stores.
| * | | | | | | [ci skip] More docs for ActiveSupport::MessageEncryptorDaniel Fone2012-01-261-0/+14
| | | | | | | |
* | | | | | | | Merge pull request #4814 from guilleiguaran/remove-ruby-debugger-methodSantiago Pastorino2012-02-012-5/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove ruby_debugger_gemfile_entry from app_base
| * | | | | | | | Remove ruby_debugger_gemfile_entry from app_base, we can just put ↵Guillermo Iguaran2012-02-012-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ruby-debug19 commented directly in Gemfile
* | | | | | | | | Merge pull request #4821 from carlosantoniodasilva/strict-validationJosé Valim2012-02-013-11/+19
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Generate strict validation error messages with attribute name
| * | | | | | | | Generate strict validation error messages with attribute nameCarlos Antonio da Silva2012-02-013-11/+19
|/ / / / / / / /
* | | | | | | | Merge pull request #4818 from arunagw/build_fix_isolatedJosé Valim2012-02-011-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Build fix when running isolated test
| * | | | | | | | Build fix when running isolated testArun Agrawal2012-02-011-0/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #4433 from carlosantoniodasilva/html-escape-onceJosé Valim2012-02-014-2/+35
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Html escape once
| * | | | | | | | Move escaping regexps to constantsCarlos Antonio da Silva2012-02-011-2/+4
| | | | | | | | |
| * | | | | | | | Move escape_once logic to ERB::Util, where it belongs toCarlos Antonio da Silva2012-02-014-1/+32
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the logic is based on the HTML_ESCAPE constant available in ERB::Util, so it seems more logic to have the entire method there and just delegate the helper to use it.
* | | | | | | | Merge pull request #4672 from carlosantoniodasilva/av-url-helperJosé Valim2012-02-012-31/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improvements on some url helper methods and tests
| * | | | | | | | Refactor button_to to avoid calling method#to_s twiceCarlos Antonio da Silva2012-01-251-23/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganize button_to implementation a bit. Also small refactor on current_page? method.
| * | | | | | | | Change OrderedHash with array options to simple hash usageCarlos Antonio da Silva2012-01-251-8/+8
| | | | | | | | |
* | | | | | | | | Merge pull request #4808 from route/mb_chars_as_jsonJosé Valim2012-01-312-0/+7
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Added as_json method for multibyte strings