Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Delegate action_name to controller inside views. | Pratik Naik | 2008-05-06 | 2 | -1/+10 |
| | |||||
* | Add class to deprecate instance variables | Pratik Naik | 2008-05-06 | 2 | -0/+24 |
| | | | | | Add ActiveSupport::Deprecation::DeprecatedInstanceVariable class to deprecate instance variables of primitive types such as stings. | ||||
* | Refactored and fixed Resources.map_member_actions to make use of custom ↵ | Marcos Arias | 2008-05-06 | 2 | -9/+29 |
| | | | | | | | ActionController::Base.resources_path_names when the option :path_names is not directly specified. Added a specific test for this functionality and fixed assert_restful_routes_for test helper to make use of ActionController::Base.resources_path_names instead of just "new" or "edit". Signed-off-by: Michael Koziarski <michael@koziarski.com> [#111 state:resolved] | ||||
* | Added logic to associations.rb to make sure select_for_limited_ids | John Devine | 2008-05-06 | 2 | -1/+33 |
| | | | | | | | | | includes joins that are needed to reach tables listed in the :order or :conditions options if they are not joined directly to the main active_record table. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#109 state:resolved] | ||||
* | Ensure correct record is returned when preloading has_one where more than ↵ | Frederick Cheung | 2008-05-06 | 3 | -1/+12 |
| | | | | | | | one row exists Signed-off-by: Michael Koziarski <michael@koziarski.com> [#73 state:closed] | ||||
* | Merge branch 'master' of git@github.com:rails/rails | Michael Koziarski | 2008-05-06 | 16 | -241/+320 |
|\ | |||||
| * | Fixed form helper's name attribute for question methods | Andrew Vit | 2008-05-06 | 2 | -5/+18 |
| | | |||||
| * | Fix bug where plugin init.rb files from frozen gem specs weren't being run. ↵ | rick | 2008-05-06 | 1 | -0/+2 |
| | | | | | | | | (pjb3) [#122 state:resolved] | ||||
| * | Merge commit 'e792d4ab70448f79142fdf492390682ff5ea6398' | rick | 2008-05-05 | 1 | -1/+2 |
| |\ | |||||
| | * | Added code to make initialization process call rails/init.rb for unpacked gems | Paul Barry | 2008-05-06 | 1 | -1/+2 |
| | | | |||||
| * | | regression test for bug introduced in ↵ | rick | 2008-05-05 | 1 | -0/+13 |
| | | | | | | | | | | | | [6a6b4392c16c665eb713705f2b38e959a658eeef] [Ian White] [#22 state:resolved] | ||||
| * | | Allow ActionController::Base#default_url_options to have a default options ↵ | Cheah Chu Yeow | 2008-05-05 | 3 | -5/+5 |
| | | | | | | | | | | | | | | | | | | argument of nil. This fixes a bug introduced in [6a6b4392c16c665eb713705f2b38e959a658eeef] which was breaking routing in ActionController::UrlWriter. | ||||
| * | | Restore dump_schema_information connection adapter method | Kyle Hargraves | 2008-05-05 | 1 | -0/+6 |
| | | | |||||
| * | | Merge commit 'core/master' | rick | 2008-05-05 | 163 | -1150/+2333 |
| |\| | |||||
| | * | Added Ruby 1.8 implementation of Process.daemon | Joshua Peek | 2008-05-05 | 4 | -10/+30 |
| | | | |||||
| | * | Added OrderedHash#delete [#113 state:resolved] | Sean Ouimet | 2008-05-05 | 2 | -0/+19 |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| | * | Preload TimeZone zones for thread safety. | Joshua Peek | 2008-05-04 | 1 | -217/+222 |
| | | | |||||
| | * | Replaced unnecessary class variable with a constant in whiny nil. | Joshua Peek | 2008-05-04 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' of git@github.com:rails/rails | rick | 2008-04-23 | 146 | -3858/+1696 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of git@github.com:rails/rails | rick | 2008-04-17 | 7 | -8/+34 |
| |\ \ \ | |||||
| * \ \ \ | Merge commit 'stephencelis/master' into asset_shit | rick | 2008-04-13 | 4 | -11/+13 |
| |\ \ \ \ | |||||
* | | | | | | PostgreSQL: update rake tasks to use full settings from database.yml | Pete Deffendol | 2008-05-04 | 1 | -8/+3 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | | | | | Ensure that default_url_options, if defined, are used in named routes. | Cheah Chu Yeow | 2008-05-04 | 3 | -5/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#22 state:resolved] | ||||
* | | | | | Allow custom loggers to work with script/server. | Michael Koziarski | 2008-05-04 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of requiring the initializer and initializing the logger, create the file manually before tailing it. [atnan] Closes #8665 (trac) | ||||
* | | | | | PostgreSQL: Connect to template1 database when creating or dropping db | Pete Deffendol | 2008-05-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The template1 database is always available on a PostgreSQL install * The previous behavior expected a database with the same name as the connecting user, which may not be available Signed-off-by: Michael Koziarski <michael@koziarski.com> [#38 state:resolved] | ||||
* | | | | | Added change_table for migrations (Jeff Dean) [#71 state:resolved] | David Heinemeier Hansson | 2008-05-03 | 7 | -9/+507 |
| | | | | | |||||
* | | | | | Improve documentation coverage and markup | Xavier Noria | 2008-05-02 | 75 | -659/+811 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | | | | Improve PartialTemplate tests | Pratik Naik | 2008-05-02 | 4 | -7/+13 |
| | | | | | |||||
* | | | | | Capture view errors in ActionView::Template. | Nathan Weizenbaum | 2008-05-02 | 4 | -13/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means that errors raised by partials are caught by ActionView::PartialTemplate, which in turn means they have the proper filename and line number information. Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | | | | Fixed that TextHelper#text_field would corrypt when raw HTML was used as the ↵ | David Heinemeier Hansson | 2008-05-01 | 3 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | value (mchenryc, Kevin Glowacz) [#80 state:resolved] | ||||
* | | | | | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-05-01 | 3 | -7/+17 |
|\ \ \ \ \ | |||||
| * | | | | | Accept header mime parser can now deal with empty fields | Tobias Lütke | 2008-05-01 | 2 | -3/+13 |
| | | | | | | |||||
| * | | | | | Ruby 1.9 compat: don't shadow local with block var | Jeremy Kemper | 2008-05-01 | 1 | -4/+4 |
| | | | | | | |||||
* | | | | | | Made the location of the routes file configurable with ↵ | David Heinemeier Hansson | 2008-05-01 | 4 | -6/+28 |
|/ / / / / | | | | | | | | | | | | | | | | config.routes_configuration_file (Scott Fleckenstein) [#88 state:resolved] | ||||
* | | | | | Fix failing associate_with_create tests inserting null first_name | Jeremy Kemper | 2008-05-01 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-05-01 | 3 | -15/+24 |
|\ \ \ \ \ | |||||
| * | | | | | Ruby 1.9 compat: compatibility wrapper for new Module#const_defined? behavior | Jeremy Kemper | 2008-05-01 | 2 | -13/+18 |
| | | | | | | |||||
| * | | | | | Prevent AssetTagHelper from crashing if RAILS_ROOT is not defined. Fixes ↵ | Hongli Lai (Phusion | 2008-05-01 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatibility with Passenger. [#84 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | | | | | Added missing files | David Heinemeier Hansson | 2008-05-01 | 3 | -0/+18 |
|/ / / / / | |||||
* | | | | | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-05-01 | 18 | -88/+228 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed render :template for templates in top level of view path. [#54 ↵ | Pratik Naik | 2008-05-01 | 4 | -3/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] | ||||
| * | | | | | Fixed AssociationsPreload such that it doesnt require foreign keys to be ↵ | David Heinemeier Hansson | 2008-04-30 | 4 | -12/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | integers (fcheung) [#33 state:resolved] | ||||
| * | | | | | Cheaper Dependencies#log_call to resolve irritating error message w/ rake ↵ | David Heinemeier Hansson | 2008-04-30 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | db:create (Sven) [#56 state:resolved] | ||||
| * | | | | | Added block-setting of attributes for Base.create like Base.new already has ↵ | David Heinemeier Hansson | 2008-04-30 | 5 | -4/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | (Adam Meehan) [#39 state:resolved] | ||||
| * | | | | | Fixed labels that have a bracketed name and an index [#68 state:resolved] | Kevin Glowacz | 2008-04-30 | 2 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | | | | | FormHelper#label_tag accepts :for option [encoded] [#38 state:resolved] | Joshua Peek | 2008-04-30 | 2 | -62/+72 |
| | | | | | | |||||
| * | | | | | Fixed fixture caching with prefixed or suffixed tables. | Rhett Sutphin | 2008-04-30 | 2 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | | | | | best solution? | Steven Soroka | 2008-05-01 | 2 | -2/+14 |
|/ / / / / | | | | | | | | | | | | | | | | Signed-off-by: Steven Soroka <ssoroka78@gmail.com> | ||||
* | | | | | Fixed that pessimistic locking you reference the quoted table name (Josh ↵ | David Heinemeier Hansson | 2008-04-30 | 4 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | Susser) [#67 state:resolved] | ||||
* | | | | | Forgot these | David Heinemeier Hansson | 2008-04-30 | 3 | -0/+8 |
| | | | | |