Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' into erbout | Jeremy Kemper | 2008-06-03 | 45 | -1551/+1750 | |
|\| | ||||||
| * | Dependencies move to ActiveSupport::Dependencies missed a few spots | David Heinemeier Hansson | 2008-06-03 | 2 | -9/+9 | |
| | | ||||||
| * | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-06-03 | 2 | -4/+21 | |
| |\ | ||||||
| | * | Fix assert_redirected_to for nested controllers and named routes | Gabe da Silveira | 2008-06-04 | 2 | -4/+21 | |
| | | | | | | | | | | | | | | | | | | [#308 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
| | * | Merge branch 'master' into patches | Michael Koziarski | 2008-06-04 | 77 | -1626/+2509 | |
| | |\ | ||||||
| | * | | Remove dead code, and the tests for it. | Michael Koziarski | 2008-05-31 | 2 | -261/+0 | |
| | | | | ||||||
| | * | | Substitute value into validates_format_of message | John D. Hume | 2008-05-31 | 2 | -1/+7 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
| * | | | Fixed Request#remote_ip to only raise hell if the HTTP_CLIENT_IP and ↵ | David Heinemeier Hansson | 2008-06-03 | 3 | -4/+12 | |
| | |/ | |/| | | | | | | | HTTP_X_FORWARDED_FOR doesnt match (not just if theyre both present) [Mark Imbriaco, Bradford Folkens] | |||||
| * | | Wrapped Rails.env in StringQuestioneer so you can do Rails.env.development? ↵ | David Heinemeier Hansson | 2008-06-03 | 6 | -1/+31 | |
| | | | | | | | | | | | | [DHH] | |||||
| * | | Add more standard Hash methods to ActiveSupport::OrderedHash [#314 ↵ | Steve Purcell | 2008-06-03 | 3 | -0/+37 | |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | Allow caches_action to accept a layout option [#198 state:resolved] | josevalim | 2008-06-03 | 3 | -3/+34 | |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | Callbacks fire before notifying observers [#230 state:resolved] | Craig Demyanovich | 2008-06-03 | 2 | -2/+40 | |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | Fixed ambiguous first argument warning in ArrayExtTest. | Joshua Peek | 2008-06-03 | 1 | -14/+12 | |
| | | | ||||||
| * | | Namespace Inflector, Dependencies, OrderedOptions, and TimeZone under ↵ | Joshua Peek | 2008-06-03 | 27 | -1514/+1554 | |
| | | | | | | | | | | | | ActiveSupport [#238 state:resolved] | |||||
* | | | Stack @output_buffer for nested rendering | Jeremy Kemper | 2008-06-03 | 2 | -3/+3 | |
| | | | ||||||
* | | | Don't pass block binding to concat | Jeremy Kemper | 2008-06-02 | 8 | -31/+21 | |
| | | | ||||||
* | | | Work with @output_buffer instead of _erbout | Jeremy Kemper | 2008-06-02 | 13 | -206/+220 | |
| | | | ||||||
* | | | Try replacing _erbout with @output_buffer | Jeremy Kemper | 2008-06-02 | 6 | -54/+25 | |
|/ / | ||||||
* | | Added tests [#279 state:resolved] (Nicholas Schlueter) | David Heinemeier Hansson | 2008-06-02 | 3 | -0/+10 | |
| | | ||||||
* | | Fixed Date#end_of_quarter to not blow up on May 31st [#289 state:resolved] ↵ | David Heinemeier Hansson | 2008-06-02 | 3 | -1/+7 | |
| | | | | | | | | (Danger) | |||||
* | | Fixed Base#exists? to check status code as integer [#299 state:resolved] ↵ | David Heinemeier Hansson | 2008-06-02 | 2 | -1/+6 | |
| | | | | | | | | (Wes Oldenbeuving) | |||||
* | | Fixed that RailsInfoController wasnt considering all requests local in ↵ | David Heinemeier Hansson | 2008-06-02 | 2 | -1/+6 | |
| | | | | | | | | development mode (Edgard Castro) [#310 state:resolved] | |||||
* | | Ensure Rack processor reads CGI output_cookies for the session cookie. | Joshua Peek | 2008-06-02 | 3 | -8/+60 | |
| | | ||||||
* | | Fixed the brokeness from 952ec79bec313e0001adfc8c86f7970448d32db9 | David Heinemeier Hansson | 2008-06-02 | 1 | -1/+1 | |
| | | ||||||
* | | AR can be disabled, new_rails_defaults.rb should check [#303 state:resolved] ↵ | David Heinemeier Hansson | 2008-06-02 | 1 | -4/+6 | |
| | | | | | | | | (Jesper Hvirring Henriksen) | |||||
* | | Added a test for Gzip | David Heinemeier Hansson | 2008-06-02 | 1 | -0/+7 | |
| | | ||||||
* | | Ensure AR#sum result is typecasted properly | Pratik Naik | 2008-06-02 | 2 | -2/+8 | |
| | | ||||||
* | | Faster Hash#slice that doesn't use Enumerable#include?. | Cheah Chu Yeow | 2008-06-02 | 1 | -1/+3 | |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | | Fixed initializer tests by stubbing out gems dependencies check. | Joshua Peek | 2008-06-02 | 2 | -20/+25 | |
| | | ||||||
* | | In 9c4f003, gem installation quotes versions. Do the same for unpack and ↵ | Joshua Peek | 2008-06-02 | 2 | -16/+16 | |
| | | | | | | | | update tests to reflect the change. | |||||
* | | Fixed changelog merge. | Marcos Tapajos | 2008-06-02 | 1 | -1/+0 | |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
* | | Ensure Associations#sum returns 0 when no rows are returned. [#295 ↵ | Jonathan Viney | 2008-06-02 | 2 | -4/+5 | |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | | Added Rack middleware to handle static files. | Joshua Peek | 2008-06-01 | 3 | -0/+41 | |
| | | ||||||
* | | Added Rack processor | Ezra Zygmuntowicz | 2008-06-01 | 6 | -1/+515 | |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
* | | Added SQL escaping for :limit and :offset in MySQL [Jonathan Wiess] | David Heinemeier Hansson | 2008-06-01 | 3 | -2/+8 | |
| | | ||||||
* | | Previously we only added the "lib" subdirectory to the load path when | rick | 2008-05-31 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | setting up gem dependencies for frozen gems. Now we add the "ext" subdirectory as well for those gems which have compiled C extensions as well. [Wincent Colaiuta] [#268 state:resolved] | |||||
* | | fix changelog conflict | rick | 2008-05-31 | 24 | -304/+69 | |
|\ \ | ||||||
| * | | revert mysql test credential change | Jeremy Kemper | 2008-05-31 | 1 | -2/+2 | |
| | | | ||||||
| * | | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-05-31 | 4 | -262/+7 | |
| |\ \ | ||||||
| | * | | Remove dead code, and the tests for it. | Michael Koziarski | 2008-05-31 | 2 | -261/+0 | |
| | | | | ||||||
| | * | | Substitute value into validates_format_of message | John D. Hume | 2008-05-31 | 2 | -1/+7 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
| * | | | Making ready for release of 2.1 | David Heinemeier Hansson | 2008-05-31 | 19 | -43/+36 | |
| |/ / | ||||||
| * / | Added SQL escaping for :limit and :offset [#288 state:closed] (Aaron Bedra, ↵ | David Heinemeier Hansson | 2008-05-31 | 2 | -2/+27 | |
| |/ | | | | | | | Steven Bristol, Jonathan Wiess) | |||||
* / | Add ActiveRecord::Base.sti_name that checks ↵ | rick | 2008-05-31 | 4 | -6/+32 | |
|/ | | | | ActiveRecord::Base#store_full_sti_class? and returns either the full or demodulized name. [rick] [#114 state:resolved] | |||||
* | fix doc typos | rick | 2008-05-31 | 1 | -2/+1 | |
| | ||||||
* | Expose GemPlugin load_paths so they can be added to Dependencies.load_paths. ↵ | Dmitriy Timokhin | 2008-05-31 | 1 | -10/+6 | |
| | | | | Also use full_gem_path as root of GemPlugin to make things compatible. [#213 state:resolved] | |||||
* | Consolidate error messages for missing gems, and skip them when running rake ↵ | rick | 2008-05-31 | 4 | -16/+42 | |
| | | | | gems:* tasks. [rick] | |||||
* | Merge branch 'master' of git@github.com:rails/rails | rick | 2008-05-31 | 6 | -19/+34 | |
|\ | ||||||
| * | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-05-31 | 9 | -36/+83 | |
| |\ | ||||||
| | * | Ruby 1.8.7 compat: work around broken DelegateClass#respond_to? | Jeremy Kemper | 2008-05-31 | 1 | -0/+6 | |
| | | |