aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Not checking for nil is apparently a lot faster.Nat Welch2011-09-211-1/+1
| | | |
| * | | Merge branch 'master' of git://github.com/rails/railsNat Welch2011-09-21349-3121/+6229
| |\ \ \
| * | | | From @dasch's recommendation.Nat Welch2011-08-221-1/+1
| | | | |
| * | | | Fixes bug with schema dumper when using with Padrino.Nat Welch2011-08-211-1/+1
| | | | |
* | | | | Merge pull request #5601 from carlosantoniodasilva/cookie-store-session-hashAaron Patterson2012-03-262-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Cookie store session hash
| * | | | | Remove warning added by my own commit :fire:Carlos Antonio da Silva2012-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Commit: 7a0cf2f5294e8bcef547642435636b394340a3e4
| * | | | | Return the same session data object when setting session idCarlos Antonio da Silva2012-03-261-1/+2
| | | | | |
* | | | | | Merge pull request #5331 from castlerock/remove_unused_requireAaron Patterson2012-03-261-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove unused require from AS/core_ext/class/delegating_att.rb
| * | | | | | remove unused require from AS/core_ext/class/delegating_att.rbVishnu Atrai2012-03-101-2/+0
| | | | | | |
* | | | | | | still need to ensure the path is a directoryAaron Patterson2012-03-261-1/+1
| | | | | | |
* | | | | | | eliminating a branch we do not need. thanks @jeremyAaron Patterson2012-03-261-30/+3
| |/ / / / / |/| | | | |
* | | | | | stop using *args in order to simplify our constructorAaron Patterson2012-03-261-5/+4
| | | | | |
* | | | | | Merge pull request #5592 from nashby/fix-issue-5584Piotr Sarnacki2012-03-262-3/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | String#titleize works properly with smart quotes
| * | | | | | String#titleize works properly with smart quotes, closes #5584Vasiliy Ermolovich2012-03-262-3/+7
| | | | | | |
* | | | | | | Merge pull request #5561 from carlosantoniodasilva/form-builder-block-argAaron Patterson2012-03-262-3/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Properly deprecate the block argument in AV FormBuilder
| * | | | | | | Properly deprecate the block argument in AV FormBuilderCarlos Antonio da Silva2012-03-232-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 56089ca986c767763f29159c8de0aa1ebabfd4d2 introduced a backward incompatible change by changing the method signature of the FormBuilder. This brings back the same method signature warning in case someone gives a block to the builder. More info: https://github.com/rails/rails/commit/56089ca986c767763f29159c8de0aa1ebabfd4d2#commitcomment-1116166
* | | | | | | | Don't depend on ivars. Thanks @fesplugasAaron Patterson2012-03-261-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #5594 from lest/patch-1Piotr Sarnacki2012-03-262-1/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | apply form_for namespace option to date_select
| * | | | | | | | apply form_for namespace option to date_selectSergey Nartimov2012-03-262-1/+12
| | | | | | | | |
* | | | | | | | | ActiveRecord::Coders::YAMLColumn#dump should raise an errorGuten2012-03-262-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #2737 Conflicts: activerecord/lib/active_record/coders/yaml_column.rb
* | | | | | | | | Merge pull request #5595 from guilleiguaran/sprockets-rails-1.0.0Aaron Patterson2012-03-261-2/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | sprockets-rails 1.0.0 was released, remove git dependency from Gemfile
| * | | | | | | | sprockets-rails 1.0.0 was released, remove git dependency from GemfileGuillermo Iguaran2012-03-261-2/+0
| | | | | | | | |
* | | | | | | | | no need to freeze things all the timeAaron Patterson2012-03-261-8/+7
| | | | | | | | |
* | | | | | | | | test against ruby features in order to fix tests on Ruby 2.0Aaron Patterson2012-03-261-1/+9
| | | | | | | | |
* | | | | | | | | Merge pull request #5593 from ↵Aaron Patterson2012-03-262-12/+17
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | lukesarnacki/activemodel_name_composition_over_inheritance ActiveModel::Name does not inherit from string
| * | | | | | | | ActiveModel::Name does not inherit from stringLukasz Sarnacki2012-03-262-12/+17
|/ / / / / / / /
* | | | | | | | Merge pull request #5183 from lest/patch-1José Valim2012-03-261-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | use content_tag in button_to helper
| * | | | | | | | use content_tag in button_to helperSergey Nartimov2012-03-141-2/+3
| | | | | | | | |
* | | | | | | | | Merge pull request #5581 from jamie/custom_param_fieldJosé Valim2012-03-262-4/+23
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Allow a defining custom member field on resources
| * | | | | | | | Allow a defining custom member field on resourcesJamie Macey2012-03-252-4/+23
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, resources routes are created with :resource/:id. A model defining to_param can make prettier urls by using something more readable than an integer ID, but since the route picks it up as :id you wind up with awkward User.find_by_username(params[:id]) calls. By overriding the key to be used in @request.params you can be more obvious in your intent.
* | | | | | | | Merge pull request #5575 from phiggins/remove_conditional_from_statistics_taskXavier Noria2012-03-251-7/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove useless conditional.
| * | | | | | | | Remove useless conditional.Pete Higgins2012-03-251-7/+1
|/ / / / / / / /
* | | | | | | | restores example depicting the use of true or false in regular fontXavier Noria2012-03-251-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an example here that mentioned reload_plugins? but it was deleted. This commit puts another example back.
* | | | | | | | Merge pull request #5566 from lest/patch-3Piotr Sarnacki2012-03-252-0/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix HashWithIndifferentAccess.[] method
| * | | | | | | | fix HashWithIndifferentAccess.[] methodSergey Nartimov2012-03-232-0/+13
| | | | | | | | |
* | | | | | | | | Merge pull request #5570 from avakhov/ac-caching-splitJeremy Kemper2012-03-241-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | ActionController caching small String#split optimization
| * | | | | | | | | ActionController caching small String#split optimizationAlexey Vakhov2012-03-241-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* / | | | | | | | Revert "Return an actual boolean from xml_http_request?"Xavier Noria2012-03-251-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: This commit changes code that was committed some year and a half ago. The original code is an ordinary predicate that delegates straight to a boolean operator with no further unnecessaru adorments, as clearly explained in #5329. This change also may confuse users who may now believe they can rely now on singletons, while predicates in Rails rely on standard Ruby semantics for boolean values and guarantee no singletons whatsover. This reverts commit 6349791d5aaf652631b29f1371701fc2985fda83.
* | | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-2413-99/+133
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/ruby_on_rails_guides_guidelines.textile
| * | | | | | | | spacing fix in guide [ci skip]Vijay Dev2012-03-241-1/+1
| | | | | | | | |
| * | | | | | | | [getting started][ci skip] fix link to the codeFabián Rodríguez2012-03-231-1/+1
| | | | | | | | |
| * | | | | | | | :foreign_key option should be on has_many side of associationMikhail Dieterle2012-03-231-2/+2
| | | | | | | | |
| * | | | | | | | Adding documentation for ActiveRecord::Base.abstract_class to clarify a ↵Joe Goggins2012-03-221-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | particular usecase for this feature (to allow you to use inheritance in ActiveRecord without using the STI table name
| * | | | | | | | Update config.assets.initialize_on_precompile warning to include engine side ↵adman652012-03-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | affects
| * | | | | | | | [engines] [ci-skip] Add example of precompiling engine assetsadman652012-03-221-0/+15
| | | | | | | | |
| * | | | | | | | improvements in "caching_with_rails" guidekucaahbe2012-03-221-8/+10
| | | | | | | | |
| * | | | | | | | Fixed-width font fix for instance variableJuanjo Bazán2012-03-201-1/+1
| | | | | | | | |
| * | | | | | | | [ci skip] Make guides more readable & consistentMark D. Blackwell2012-03-203-82/+83
| | | | | | | | |
| * | | | | | | | Correct description of ['migrated_at > ?', 1.week.ago] from "more than a ↵Dave Burt2012-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | week ago" to "more recently than a week ago."
| * | | | | | | | Merge branch 'master' of github.com:lifo/docrailsCharles Brian Quinn2012-03-191-1/+1
| |\ \ \ \ \ \ \ \