aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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.
* | Remove ruby_debugger_gemfile_entry from app_base, we can just put ↵Guillermo Iguaran2012-02-012-5/+1
| | | | | | | | ruby-debug19 commented directly in Gemfile
* | Don't run bundle install when passed with --pretend optionkennyj2012-02-012-1/+6
| |
* | Only add ActiveRecord configuration if it is presentRafael Mendonça França2012-01-312-1/+2
| |
* | Merge pull request #4727 from railsaholic/dependent_restrict_should_add_errorJon Leighton2012-01-312-0/+10
|\ \ | | | | | | has_many/has_one, :dependent => :restrict, deprecation added
| * | has_many/has_one, :dependent => :restrict, deprecation added.Manoj2012-01-292-0/+10
| | |
* | | fix assets testSergey Nartimov2012-01-311-1/+1
| | |
* | | Fix failing test from [7619bcf2]Prem Sichanugrist2012-01-301-1/+1
| | |
* | | rewrites a couple of alternations in regexps as character classesXavier Noria2012-01-301-1/+1
| | | | | | | | | | | | | | | Character classes are the specific regexp construct to express alternation of individual characters.
* | | Fixes #4764 - remove generated new line in routes.rb on scaffold generationVijay Dev2012-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | As explained in #4764, when destroying a scaffold, routes.rb loses a new line. This seems to happen because a new line is added while generating the route and the destroy generator removes it. However, this causes a problem if the routes file is manually edited to remove such new lines. This commit just removes that extra new line from added in the first place.
* | | Used block to make sure file get auto closed after useRahul P. Chaudhari2012-01-301-14/+16
| | |
* | | remove ruby 1.8 support codeSergey Nartimov2012-01-291-6/+2
| | |
* | | Replaced all 'for' loops with Enumerable#eachNathan Broadbent2012-01-301-1/+1
|/ /
* | Reverted build_original_fullpath method, as per discussion at ↵Nathan Broadbent2012-01-281-1/+9
| | | | | | | | https://github.com/rails/rails/pull/4470/files#r393461
* | Merge pull request #4726 from rafaelfranca/create_join_tableAaron Patterson2012-01-271-0/+30
|\ \ | | | | | | Add create_join_table migration helper to create HABTM join tables
| * | Add `create_join_table` migration helper to create HABTM join tablesRafael Mendonça França2012-01-271-0/+30
| | |
* | | fix a small typo [ci skip]Vijay Dev2012-01-271-1/+1
|/ /
* | Remove redundant instance_variables (@colorize_logging)kennyj2012-01-272-2/+6
| |
* | Disagree with @spastorino, @jonleighton, @tenderlove on ↵Jeremy Kemper2012-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | 51ccb7f59c83120bf6869f1febfebaec44bcface Same-level method visibility disappears into the syntax. Indent (and outdent) emphasize the state change that accompanies the declaration. All methods following 'private' are private: that's a natural hierarchy worthy of visual reinforcement. Outdent, represent! :trollface:
* | Revert "Merge pull request #4690 from jdutil/filter_password_confirmation"José Valim2012-01-261-1/+1
| | | | | | | | | | This reverts commit eafa1c429835e099897a0da90bc39d9dbbb7ed4e, reversing changes made to f251437415f7b803f7a84118fcc970a111ace266.
* | Merge pull request #4690 from jdutil/filter_password_confirmationJosé Valim2012-01-261-1/+1
|\ \ | | | | | | Add :password_confirmation as a filtered param by default.
| * | Add :password_confirmation as a filtered param by default.Jeff Dutil2012-01-261-1/+1
| | |
* | | disable automatic explain if there is no logger [closes #4671]Xavier Noria2012-01-261-0/+3
|/ /
* | Add release date of Rails 3.2.0 to documentationclaudiob2012-01-261-1/+1
| |
* | Merge pull request #4684 from rossmeissl/patch-1Xavier Noria2012-01-251-1/+1
|\ \ | | | | | | Use `:rubygems` shortcut as standard Gemfile's `source` instead of explicit URL
| * | Use `:rubygems` shortcut as standard Gemfile's `source` instead of explicit ↵Andy Rossmeissl2012-01-251-1/+1
| |/ | | | | | | | | | | URL. Theoretically this would future-proof Gemfiles against possible (albeit unlikely) change in the rubygems URL.
* | Merge pull request #4685 from brainopia/fix_contribute_guideXavier Noria2012-01-251-1/+1
|\ \ | | | | | | Fix contributing guide to reflect preferred position on indentation
| * | Fix contributing guide to reflect preferred position on indentationbrainopia2012-01-261-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | Fix incorrect recommendation from indenting after private/protected to not. Based on opinions of @spastorino, @jonleighton, @tenderlove https://github.com/rails/rails/pull/1838#issuecomment-1440281 https://en.twitter.com/#!/spastorino/status/142054749351575552 https://en.twitter.com/#!/tenderlove/status/142014046445641728 https://en.twitter.com/#!/jonleighton/status/142021813415841794
* / Use content_tag_for with array by default on scaffold.José Valim2012-01-262-5/+5
|/
* 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