Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix compatibility with Ruby 1.8 that also has the Miniunit gem installed. | Hongli Lai (Phusion) | 2008-11-17 | 1 | -3/+7 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Explicitly require AS::Duration | Jeremy Kemper | 2008-11-17 | 1 | -0/+2 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-11-17 | 1 | -5/+1 |
|\ | |||||
| * | BACKWARDS INCOMPATIBLE: Renamed application.rb to application_controller.rb ↵ | David Heinemeier Hansson | 2008-11-17 | 1 | -5/+1 |
| | | | | | | | | and removed all the special casing that was in place to support the former. You must do this rename in your own application when you upgrade to this version [DHH] | ||||
* | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-11-17 | 1 | -2/+0 |
|\| | |||||
| * | The inflector is meant to work on words not phrases -- dont confuse people ↵ | David Heinemeier Hansson | 2008-11-16 | 1 | -2/+0 |
| | | | | | | | | with a phrase example | ||||
* | | Require callbacks so AS::TestCase may be required in isolation | Jeremy Kemper | 2008-11-15 | 1 | -0/+2 |
|/ | |||||
* | Switch to AS::TestCase for assert_deprecated | Jeremy Kemper | 2008-11-15 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-15 | 6 | -8/+28 |
|\ | |||||
| * | Wrong reference | David Heinemeier Hansson | 2008-11-15 | 1 | -1/+1 |
| | | |||||
| * | Added lambda merging to OptionMerger (especially useful with named_scope and ↵ | David Heinemeier Hansson | 2008-11-15 | 2 | -1/+15 |
| | | | | | | | | with_options) [#740 state:committed] (Paweł Kondzior) | ||||
| * | Added lambda merging to OptionMerger (especially useful with named_scope and ↵ | David Heinemeier Hansson | 2008-11-15 | 1 | -0/+5 |
| | | | | | | | | with_options) [#740 state:commited] (Paweł Kondzior) | ||||
| * | Missing changelog for memcache-client changes | Michael Koziarski | 2008-11-14 | 1 | -0/+2 |
| | | |||||
| * | Prepare for RC2 | David Heinemeier Hansson | 2008-11-14 | 2 | -8/+2 |
| | | |||||
| * | TimeZone: fix base offset for Sri Jayawardenepura. Anchor tests for zone ↵ | gbuesing | 2008-11-13 | 3 | -3/+5 |
| | | | | | | | | offsets to more current date | ||||
| * | TimeZone: Caracas GMT offset changed to -4:30 [#1361 state:resolved] | Phil Ross | 2008-11-12 | 2 | -1/+4 |
| | | |||||
* | | Prefer a feature check to a version check | Jeremy Kemper | 2008-11-12 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-11 | 2 | -7/+15 |
|\| | |||||
| * | Only track new constant definitions when we're reloading dependencies | Jeremy Kemper | 2008-11-10 | 2 | -7/+15 |
| | | |||||
* | | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-08 | 1 | -1/+2 |
|\| | |||||
| * | Move sshpublisher require into the rake tasks that use it so ruby 1.9 and ↵ | Jeremy Kemper | 2008-11-08 | 1 | -1/+2 |
| | | | | | | | | macruby don't need the rake gem installed | ||||
* | | Set AS::TestCase::Assertion to the underlying test exception for either ↵ | Jeremy Kemper | 2008-11-07 | 1 | -1/+4 |
| | | | | | | | | miniunit or test/unit | ||||
* | | Extract test method declaration | Jeremy Kemper | 2008-11-07 | 1 | -0/+21 |
| | | |||||
* | | Just rescue exception rather than checking for both miniunit and test/unit | Jeremy Kemper | 2008-11-07 | 2 | -7/+3 |
| | | |||||
* | | Subclass AS::TestCase to get custom assertions | Jeremy Kemper | 2008-11-07 | 1 | -1/+1 |
| | | |||||
* | | Safer but hacky minitest autorun override | Jeremy Kemper | 2008-11-07 | 1 | -4/+5 |
| | | |||||
* | | Rework testing extensions to reflect the recent miniunit upheaval | Jeremy Kemper | 2008-11-07 | 6 | -52/+64 |
| | | |||||
* | | Remove direct TestCase mixins. Add miniunit compatibility. | Jeremy Kemper | 2008-11-07 | 5 | -19/+91 |
|/ | |||||
* | Don't shadow local with black arg | Jeremy Kemper | 2008-11-07 | 1 | -4/+4 |
| | |||||
* | Fix indentation mismatch | Jeremy Kemper | 2008-11-07 | 1 | -1/+1 |
| | |||||
* | Mark utf-8 encoding | Jeremy Kemper | 2008-11-07 | 1 | -0/+1 |
| | |||||
* | Increment the version of our modified memcache_client code to prevent users ↵ | Luca Guidi | 2008-11-06 | 3 | -5/+11 |
| | | | | | | | | with the gem installed not seeing our changes. The changes will be submitted upstream. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1239 state:committed] | ||||
* | Check first for git repository before using git branch | Pratik Naik | 2008-11-02 | 1 | -1/+1 |
| | |||||
* | Merge with docrails | Pratik Naik | 2008-11-02 | 5 | -10/+152 |
| | |||||
* | Added render :js for people who want to render inline JavaScript replies ↵ | David Heinemeier Hansson | 2008-11-01 | 1 | -0/+2 |
| | | | | without using RJS [DHH] | ||||
* | Fixed the option merging in Array#to_xml [#1126 state:resolved] | David Heinemeier Hansson | 2008-10-31 | 2 | -1/+3 |
| | |||||
* | Don't rely on string CoreExtensions in StringInquirer since it is sometimes ↵ | Tarmo Tänav | 2008-10-30 | 1 | -1/+1 |
| | | | | | | expected to work before the core extension are loaded Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Update the default deprecation message to not promise that theres more info ↵ | David Heinemeier Hansson | 2008-10-30 | 1 | -2/+2 |
| | | | | at the Rails site [#776 state:resolved] | ||||
* | Proper API for reloading translations | David Heinemeier Hansson | 2008-10-29 | 3 | -2/+10 |
| | |||||
* | Remove reload call from vendored gem. Breaks a bunch of stuff as Dispatcher ↵ | Michael Koziarski | 2008-10-28 | 1 | -4/+0 |
| | | | | | | isn't always defined. This call will be moved into Dispatcher in a bit. | ||||
* | A few more style changes | David Heinemeier Hansson | 2008-10-28 | 1 | -4/+4 |
| | |||||
* | Make I18n::Backend::Simple reload its translations in development mode [DHH] | David Heinemeier Hansson | 2008-10-28 | 2 | -2/+14 |
| | |||||
* | Follow style conventions | David Heinemeier Hansson | 2008-10-28 | 1 | -14/+14 |
| | |||||
* | Update CHANGELOGs with the last few fixes, set date for today | David Heinemeier Hansson | 2008-10-24 | 1 | -1/+1 |
| | |||||
* | Proper update call for gem server | David Heinemeier Hansson | 2008-10-23 | 1 | -1/+1 |
| | |||||
* | Push to new gem server | David Heinemeier Hansson | 2008-10-23 | 1 | -2/+2 |
| | |||||
* | Prepare for Rails 2.2.0 [RC1] | David Heinemeier Hansson | 2008-10-23 | 1 | -1/+1 |
| | |||||
* | Merge with docrails. Also add a rake task to generate guides in your rails ↵ | Pratik Naik | 2008-10-21 | 1 | -2/+2 |
| | | | | | | | | application : rake doc:guides The rake task will generate guides inside doc/guides directory of your application. Open index.html to browse. | ||||
* | Remove stuff that was deprecated in 2-1-stable | Pratik Naik | 2008-10-21 | 2 | -5/+0 |
| | |||||
* | Bump active_support/vendor.rb tzinfo version number [#1237 state:resolved] | Geoff Garside | 2008-10-20 | 1 | -1/+1 |
| |