aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Adding comma to correct syntax in comment.Jesse Brown2012-03-191-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Updates ActionMailer Base summary and fixes space in code example.Charles Brian Quinn2012-03-191-4/+4
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #5569 from arunagw/warning_remove_masterVijay Dev2012-03-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | removed warning: shadowing outer local variable - exception
| * | | | | | | | | | | removed warning: shadowing outer local variable - exceptionArun Agrawal2012-03-241-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #5567 from tpope/xhr-booleanAaron Patterson2012-03-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Return an actual boolean from xml_http_request?
| * | | | | | | | | | Return an actual boolean from xml_http_request?Tim Pope2012-03-231-1/+1
|/ / / / / / / / / /
* | | | | | | | | | oops, forgot to commit the tests! :bomb:Aaron Patterson2012-03-231-0/+67
| | | | | | | | | |
* | | | | | | | | | chdir before globbing so that we don't need to escape directory names.Aaron Patterson2012-03-231-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #5521
* | | | | | | | | | Merge pull request #5550 from schneems/schneems/server_envAaron Patterson2012-03-234-0/+63
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix environment support for rails server, and match interface of rails console
| * | | | | | | | | | match rails console environment support, to serverschneems2012-03-222-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rails server takes `-e` as an argument to specify RAILS_ENV, rails console currently does not have the same interface. This commit fixes this disparity so developers can manually specify `RAILS_ENV` or can pass in an environment with a `-e`.
| * | | | | | | | | | fix rails server support of RAILS_ENV variableschneems2012-03-202-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When launching rails server from the command line with a rails environment specified such as `rails server RAILS_ENV=production` an error would occur since rails will try to use `RAILS_ENV=production` as it's server. When launching rails with a specified server such as thin `rails server thin RAILS_ENV=production` no error will be thrown, but rails will not start up in the specified environment. This fixes both of those cases
* | | | | | | | | | | Merge pull request #5518 from rafaelfranca/minor-refactorJosé Valim2012-03-231-11/+11
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove code duplication
| * | | | | | | | | | | Remove code duplicationRafael Mendonça França2012-03-191-11/+11
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5556 from rafaelfranca/remove-warningPiotr Sarnacki2012-03-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | use the new scope syntax on the tests to avoid DEPRECATION WARNINGS.
| * | | | | | | | | | | | Use the new scope syntaxRafael Mendonça França2012-03-231-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #5374 from ↵José Valim2012-03-232-28/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nertzy/remove_deprecated_partial_path_from_active_model_naming Remove ActiveModel::Naming#partial_path
| * | | | | | | | | | | Remove ActiveModel::Naming#partial_pathGrant Hutchins2012-03-102-28/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was deprecated in 3.2
* | | | | | | | | | | | Fix tests, when creating rescue handler, we need to check for arity nowPiotr Sarnacki2012-03-231-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before it was handled by Proc.bind, but since Proc.bind has been deprecated, this is no longer the case and returned handler needs to match rescuer.
* | | | | | | | | | | | Merge pull request #5546 from mptre/masterPiotr Sarnacki2012-03-232-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed missing space bug introduces in rails/rails@9299bfd
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 21:16:03 +0000