Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Begin unifying the interface between ActionController and ActionView | Yehuda Katz | 2009-01-22 | 51 | -556/+759 | |
| | | ||||||
| * | Merge branch 'master' into 3-0-unstable | Joshua Peek | 2009-01-22 | 273 | -16821/+17130 | |
| |\ | | | | | | | | | | | | | Conflicts: ci/cruise_config.rb | |||||
| * | | Update CI configuration to reflect latest gems. | Mike Gunderloy | 2009-01-07 | 4 | -9/+28 | |
| | | | ||||||
* | | | Merge branch 'master' of git@github.com:wycats/rails | Yehuda Katz | 2009-01-30 | 0 | -0/+0 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'master' of git://github.com/rails/rails | lholden | 2009-01-21 | 151 | -14775/+12855 | |
| |\ \ \ | ||||||
* | \ \ \ | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-30 | 205 | -14977/+14070 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Ensure constant_watch_stack is protected by a mutex, so concurrent requires ↵ | Charles Nutter | 2009-01-30 | 1 | -5/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not corrupt it. [#1816 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | | | Controller, response, and request should all refer to same session, even ↵ | Scott Taylor | 2009-01-29 | 2 | -4/+42 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after a call to session_reset [#1823 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | | | Deprecation tests for f17c876 [#1801 state:resolved] | Mike Gaffney | 2009-01-29 | 1 | -0/+58 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | | | Digest#validate_digest_response should accept request instead of controller | Pratik Naik | 2009-01-29 | 1 | -6/+6 | |
| | | | | | ||||||
| * | | | | Added grouped_options_for_select helper method for wrapping option tags in ↵ | Jon Crawford | 2009-01-29 | 3 | -0/+84 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | optgroups. [#977 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | | | Implement HTTP Digest authentication. [#1230 state:resolved] [Gregg Kellogg, ↵ | Gregg Kellogg | 2009-01-29 | 4 | -25/+326 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pratik Naik] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | | | Sqlite adapter's copy_table incorrectly attempts to recreate a primary key ↵ | Jacob Dunphy | 2009-01-29 | 3 | -1/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | id (:id => true in the create_table) if an :id column is present, even if it isn't a primary_key. This fix sets :id => false if there is an :id column, but it's not the primary_key. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1766 state:committed] | |||||
| * | | | | Move to use pg instead of postgres on the CI server | Michael Koziarski | 2009-01-29 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Only dup local cache values if duplicable [#1653 state:resolved] | Joshua Peek | 2009-01-28 | 2 | -1/+13 | |
| | | | | | ||||||
| * | | | | Move basic auth test controller inside the test class | Pratik Naik | 2009-01-29 | 1 | -21/+21 | |
| | | | | | ||||||
| * | | | | Improve exception handling when Location header is invalid. [#1192 ↵ | Bob Aman | 2009-01-28 | 2 | -2/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | | | Using the highlight helper on text with html shouldn't highlight text inside ↵ | Dan Weinand | 2009-01-28 | 2 | -1/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | html attributes. [#1302 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | | | Ensure whitespaces are stripped when merging string joins. [#1297 ↵ | Filip H.F. "FiXato" Slagter | 2009-01-28 | 2 | -1/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | | | Added options to script/dbconsole to sqlite3 console in various different ↵ | Bryan Ray | 2009-01-28 | 1 | -1/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modes. [#607 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | | | ActiveResource#eqls? and == should not take into account object identity and ↵ | Rasik Pandey | 2009-01-28 | 2 | -2/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prefix options should be considered. [#1098 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | | | Ensure selected option is not ignored for collection_select. [#1037 ↵ | Daniel Rodríguez Troitiño | 2009-01-28 | 2 | -1/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | | | Ensure that when UrlWriter is included in multiple classes, the ↵ | Nathan de Vries | 2009-01-28 | 2 | -7/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default_url_options of one don't affect the other. [#1277 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | | | Add array id support to Model.update_counters. [#1254 state:resolved] ↵ | Pratik Naik | 2009-01-28 | 2 | -2/+24 | |
| | | | | | | | | | | | | | | | | | | | | [Carlos Júnior] | |||||
| * | | | | Session cookie header should always be set if :expire_after option is specified | Pratik Naik | 2009-01-28 | 3 | -8/+40 | |
| | | | | | ||||||
| * | | | | Use toplevel reference to ::StringIO since we're in a BasicObject. | Jeremy Kemper | 2009-01-27 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2009-01-27 | 3 | -3/+5 | |
| |\ \ \ \ | ||||||
| | * | | | | Disable eager loading for all rake tasks [#802 state:resolved] | Joshua Peek | 2009-01-27 | 3 | -3/+5 | |
| | | | | | | ||||||
| * | | | | | Fix for sweepers method_missing missing &block argument [#1581 status:committed] | Tys von Gaza | 2009-01-27 | 1 | -2/+2 | |
| |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | |||||
| * | | | | Restore implicit rendering for XHR requests that want a HTML template [#1590 ↵ | Joshua Peek | 2009-01-27 | 3 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | state:resolved] | |||||
| * | | | | Fixed deprecated methods on TestSession [#1801 state:resolved] | Joshua Peek | 2009-01-27 | 2 | -17/+21 | |
| | | | | | ||||||
| * | | | | Dont use Memoizable for ActionController::Request | Pratik Naik | 2009-01-27 | 4 | -76/+65 | |
| | | | | | ||||||
| * | | | | Improve i18n support for number_to_human_size helper: | Yaroslav Markin | 2009-01-27 | 4 | -23/+72 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * now using pluralization properly * storage unit translations moved to number.human.storage_units.units * introduced number.human.storage_units.format for languages that do not follow "{{number}} {{unit}}" format (Japanese) NOTE: I18n table changed, you will need to update your translations. [#1634 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | | | Ensure the full path is used when searching for layouts [#1803 state:resolved] | Joshua Peek | 2009-01-27 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Mysql#reconnect is set according to the 'reconnect' key in the connection spec. | Dov Murik | 2009-01-27 | 2 | -2/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'reconenct' boolean option is read from the connection specification and is used to set the reconnect attribute of Mysql. The default is false in order not to change existing application behaviour. Also, reconnect is set AFTER real_connect is called, so its value sticks (the mysql gem sets reconnect to false inside real_connect). Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1797 state:committed] | |||||
| * | | | | Fix for failing ActionMailer multipart tests | Joshua Peek | 2009-01-26 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Add localized templates | Joshua Peek | 2009-01-25 | 5 | -15/+67 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Default locale app/views/messages/index.html.erb # I18n.locale is set to :da (Danish) app/views/messages/index.da.html.erb | |||||
| * | | | | add #available_locales to I18n and I18n::SimpleBackend, flatten translations ↵ | Sven Fuchs | 2009-01-25 | 3 | -1/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | load_path when loading translations [#1714 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | | | add an inspect method to OrderedHash to make it clear that it is not a ↵ | Greg Borenstein | 2009-01-26 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | species of Array Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1782 state:committed] | |||||
| * | | | | Adding AR tests for JDBC connections | Stephen Bannasch | 2009-01-26 | 7 | -2/+137 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New connections: jdbcmysql jdbcpostgresql jdbcsqlite3 jdbcderby jdbch2 jdbchsqldb jdbcpostgresql To test you will need the native database installed (if one is required), activerecord-jdbc-adapter and the specific activerecord-jdbc<database>-adapter for the database you are testing. Run the tests like this: jruby -S rake test_jdbcmysql Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1685 state:committed] | |||||
| * | | | | Remove the irrelevant fixture added in fe6ffce51dc16285094be49244b26591956c2dd6 | Pratik Naik | 2009-01-24 | 1 | -8/+0 | |
| | | | | | ||||||
| * | | | | Make sure inner scope conditions get a preference over the outer ones | Pratik Naik | 2009-01-24 | 5 | -3/+43 | |
| | | | | | ||||||
| * | | | | Fix the changelog entry | Pratik Naik | 2009-01-23 | 1 | -2/+2 | |
| | |_|/ | |/| | | ||||||
| * | | | Minor refactoring of validates_associated to replace #inject with #collect + ↵ | Josh Susser | 2009-01-22 | 1 | -1/+1 | |
| |/ / | | | | | | | | | | | | | | | | #all? [#1686 state:committed] | |||||
| * | | Setup ActiveRecord QueryCache middleware in the initializer | Joshua Peek | 2009-01-21 | 2 | -5/+4 | |
| | | | ||||||
| * | | Only insert metal middleware if any exist | Joshua Peek | 2009-01-21 | 1 | -1/+3 | |
| | | | ||||||
| * | | Missed RequestParser in ff0a267 | Joshua Peek | 2009-01-21 | 1 | -1/+0 | |
| | | | ||||||
| * | | Allow empty files to be uploaded | Joshua Peek | 2009-01-20 | 4 | -4/+22 | |
| | | | ||||||
| * | | Add MiddlewareStack#swap | Joshua Peek | 2009-01-20 | 2 | -5/+16 | |
| | | | | | | | | | | | | config.middleware.swap ActionController::Session::CookieStore, MySessionStore | |||||
| * | | Don't let empty Tempfiles come through as uploaded files [#1785 state:resolved] | Mislav Marohnić | 2009-01-20 | 3 | -1/+17 | |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> |