aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove useless argument in #columns.Sebastian Martinez2012-02-026-7/+7
|
* Merge pull request #4849 from carlosantoniodasilva/checkbox-hidden-formJosé Valim2012-02-023-4/+18
|\ | | | | Replicate :form html5 attribute to hidden field for check_box
| * Replicate :form html5 attribute to hidden field for check_boxCarlos Antonio da Silva2012-02-023-4/+18
|/ | | | | When the new html5 attribute :form is given to the check_box helper, it should be replicated to the hidden field as well. Closes #4848
* Merge pull request #3892 from arunagw/verbose_rake_testJosé Valim2012-02-023-3/+0
|\ | | | | No Verbose the output for test.
| * No verbose the output for tests.Arun Agrawal2012-02-013-3/+0
| |
* | Merge pull request #4842 from jamesarosen/masterJosé Valim2012-02-011-8/+5
|\ \ | | | | | | Update documentation for register_template_handler
| * | updating documentation for register_template_handlerJames A. Rosen2012-02-011-8/+5
| | |
* | | use the class method to (un)escape binary valuesAaron Patterson2012-02-011-2/+2
|/ /
* | Merge pull request #4543 from jdelStrother/find_or_initJon Leighton2012-02-012-2/+13
|\ \ | | | | | | Don't instantiate two objects in collection proxy / find_or_instantiate_by
| * | Don't instantiate two objects in collection proxy / find_or_instantiator_byJonathan del Strother2012-01-192-2/+13
| | |
* | | Merge pull request #4832 from guilleiguaran/https-gemfileJosé Valim2012-02-011-1/+1
|\ \ \ | | | | | | | | Use https://rubygems.org source for default Gemfile
| * | | Use https://rubygems.org source for default GemfileGuillermo Iguaran2012-02-011-1/+1
|/ / / | | | | | | | | | See https://github.com/rails/rails/pull/4684#commitcomment-920313
* | | Merge pull request #4830 from rafaelfranca/restrict-fixAaron Patterson2012-02-012-3/+3
|\ \ \ | | | | | | | | Fix typo
| * | | Fix typoRafael Mendonça França2012-02-012-3/+3
|/ / /
* | | Merge pull request #4829 from rafaelfranca/restrict-fixAaron Patterson2012-02-015-5/+29
|\ \ \ | | | | | | | | Use human attribute name to show the dependent destroy message
| * | | Remove the dependent_restrict_raises configuration if activerecord isRafael Mendonça França2012-02-012-2/+1
| | | | | | | | | | | | | | | | not preset
| * | | Use human attribute name to show the dependent destroy messageRafael Mendonça França2012-02-013-3/+28
|/ / /
* | | 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
| | | | | | | |