aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* 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-311-5/+5
| | | | | | | | | * 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
|/
* 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.
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-01-265-19/+28
|\
| * Revert "Added Apache configuration for dynamic gzip content"Vijay Dev2012-01-251-24/+1
| | | | | | | | | | | | | | | | | | This reverts commit fce92fd8a7e407b034d189a652af81a06ac98730. Reason: We want any config that goes into the guides to be 100% right and I'm not entirely sure that this one is it. We already had a similar config that was removed in https://github.com/rails/rails/commit/b1c20e37eccdfab7bb94d34f249c5e49256b9980
| * minor text change [ci skip]Vijay Dev2012-01-251-1/+1
| |
| * Fix callbacks order for destroying an object in validations guideCarlos Antonio da Silva2012-01-251-2/+4
| | | | | | | | | | Also add around save to creating/updating callbacks order, and fix save example with no validation
| * Improve field error proc example in validations guideCarlos Antonio da Silva2012-01-251-7/+2
| |
| * Change ActiveRecord::Errors to ActiveModel::Errors in guidesCarlos Antonio da Silva2012-01-253-5/+5
| | | | | | | | | | | | | | Use ActiveModel::Errors in inflection example docs as well. Also fixes wrong information and link to locale file related to Errors#full_messages in I18n guide.
| * Fix custom validation methods section in AR validations and callbacks guideCarlos Antonio da Silva2012-01-251-2/+14
| | | | | | | | | | | | The methods validate_on_create and validate_on_update are not available anymore in Rails, this removes them from the guide and adds an example on how to use validate with the :on option.
| * Added Apache configuration for dynamic gzip contentleprasmurf2012-01-231-1/+24
| |
| * use CamelCase convention for "tag" model nameciastek2012-01-231-1/+1
| |
| * "will be used throughout all the views for posts." could suggest, that ↵ciastek2012-01-231-1/+1
| | | | | | | | code's modification is somehow related to posts, while it's application-wide
| * Fixed typo in 'cast'.Aleksey Gureiev2012-01-211-1/+1
| |
* | fix some examples - method names can't start with a numberVijay Dev2012-01-241-5/+5
| |
* | use rack 1.4.1Sergey Nartimov2012-01-231-2/+0
| |
* | Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fine with ↵José Valim2012-01-222-5/+5
| | | | | | | | | | | | | | | | bash, zsh, etc, closes #4602 Conflicts: railties/test/generators/migration_generator_test.rb
* | Merge pull request #4592 from jviney/masterJosé Valim2012-01-211-2/+1
|\ \ | | | | | | Fix setting $rails_rake_task variable.
| * | Fix `$rails_rake_task` global variable warning without replacing the value ↵Jonathan Viney2012-01-221-2/+1
| |/ | | | | | | | | of $rails_rake_task if it is already set. Fixes #4591.
* / uniformizes the punctuation of comments in some files generated for new appsXavier Noria2012-01-228-82/+82
|/ | | | | | Some end with a full stop, some don't. Let's have attention to detail and make them uniform. I have chosen to add full stops according to our documentation guidelines related to RDoc.
* broadcasting to the console and remove file tailing middlewareAaron Patterson2012-01-201-1/+7
|
* Merge pull request #4528 from j-manu/log-tailer-fixAaron Patterson2012-01-201-3/+7
|\ | | | | Fix for log tailer when the log file doesn't exist.
| * Fix for log tailer when the log file doesn't exist.Manu J2012-01-201-3/+7
| |
* | Merge pull request #4545 from trotter/fix-documentation-bugVijay Dev2012-01-201-1/+1
|\ \ | | | | | | Fix documentation bug in Rails::Engine
| * | Fix documentation bug in Rails::EngineTrotter Cashion2012-01-191-1/+1
| | |
* | | do not do reverse lookups on incoming requests for webrick. fixes #4542Aaron Patterson2012-01-191-0/+1
| | |
* | | update release notes [ci skip]Vijay Dev2012-01-201-2/+0
| | |
* | | add uglifier version info in the 'what to update' sectionVijay Dev2012-01-191-0/+1
| | |
* | | fix duplicate ids for the headers [ci skip]Vijay Dev2012-01-191-7/+7
|/ /
* | document AR::Base#with_lock in release notes [ci skip]Vijay Dev2012-01-191-0/+27
| |
* | update the getting_started guide code [ci skip]Vijay Dev2012-01-199-24/+57
| |
* | Merge pull request #4531 from exviva/pessimistic_with_lockAaron Patterson2012-01-191-0/+11
|\ \ | | | | | | Add ActiveRecord::Base#with_lock
| * | Add ActiveRecord::Base#with_lockOlek Janiszewski2012-01-181-0/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `with_lock` method to ActiveRecord objects, which starts a transaction, locks the object (pessimistically) and yields to the block. The method takes one (optional) parameter and passes it to `lock!`. Before: class Order < ActiveRecord::Base def cancel! transaction do lock! # ... cancelling logic end end end After: class Order < ActiveRecord::Base def cancel! with_lock do # ... cancelling logic end end end
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-01-191-0/+2
|\ \
| * | revising release notes [ci skip]Vijay Dev2012-01-191-2/+2
| | |
| * | update release note: timestamps is non-null as defaultFujimura Daisuke2012-01-191-0/+2
| | |
* | | refactor RAILS_CACHE deprecationSergey Nartimov2012-01-191-29/+8
|/ / | | | | | | that was introduced in 6f8159c4217dc8433a2027ced0c61e7ce94551d3
* | revise wording [ci skip]Vijay Dev2012-01-191-2/+2
| |
* | Adding Action Mailer section to 3.2 release notesGuillermo Iguaran2012-01-181-0/+6
| |
* | Update Release Notes: sprockets-rails section should be inside of ActionPack ↵Guillermo Iguaran2012-01-181-1/+1
|/ | | | section
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-01-192-2/+3
|\
| * Update docs for config.assets.loggerRafael Mendonça França2012-01-181-2/+1
| |
| * Add documentation to config.assets.loggerRafael Mendonça França2012-01-171-0/+2
| |
| * Merge pull request #76 from makoto/masterVijay Dev2012-01-161-2/+2
| |\ | | | | | | UrlEncodedPairParser is deprecated, but still used as an example