aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit 'rails/master'Emilio Tagua2009-07-0215-25/+176
|\|
| * wycats forgot a +1, so I added it [#2749 state:resolved]Aaron Patterson2009-07-021-1/+1
| | | | | | | | Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
| * make #inspect if zero length duration return '0 seconds' instead of empty ↵Levin Alexander2009-07-022-2/+5
| | | | | | | | | | | | string [#2838 state:resolved] Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
| * Fixes a number of tests that inexplicably didn't fail when we committed the ↵Yehuda Katz + Carl Lerche2009-07-024-12/+12
| | | | | | | | original patch
| * Adds a video_tag helper for the HTML5 video tag (similar to how the ↵Tieg Zaharia2009-07-023-3/+110
| | | | | | | | | | | | image_tag works) (tests included); removes a duplicate test line for image_tag; adds boolean attributes for video tag to tag()'s boolean attributes Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
| * Only check for built extensions on gem dependencies that are in vendor/gems. ↵J.D. Hollis2009-07-022-3/+16
| | | | | | | | | | | | [#2825 state:resolved] Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
| * Patch FormTagHelper so that when a form tag is created, the div which holds ↵Elliot Winkler2009-07-011-2/+2
| | | | | | | | | | | | the form authenticity token is set to display:inline [#2846 state:resolved] Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
| * Fixes bug where Memcached connections get corrupted when an invalid expire ↵Yehuda Katz + Carl Lerche2009-07-012-2/+30
| | | | | | | | is passed in [#2854 state:resolved]
* | Merge commit 'rails/master'Emilio Tagua2009-07-0127-53/+85
|\|
| * Fix pattern to match various magic comment formatsAkira Matsuda2009-07-011-1/+1
| |
| * JSON.escape returns UTF-8 stringsJeremy Kemper2009-07-012-7/+14
| | | | | | | | [#2849 state:resolved]
| * uses Hash#except/sliceJeremy Kemper2009-07-011-0/+2
| |
| * Forgot to commit the new file. This is slightly embarrassing.Yehuda Katz + Carl Lerche2009-07-011-0/+2
| |
| * Apparently stdlib isn't std enoughYehuda Katz + Carl Lerche2009-07-011-4/+6
| |
| * Modify isolation test to require a file not in use anywhere in RailsYehuda Katz + Carl Lerche2009-07-011-4/+4
| |
| * Updates CI to use latest mochaYehuda Katz + Carl Lerche2009-07-011-1/+1
| |
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-07-01120-1254/+3270
| |\
| | * Original cache objects should not be immutable [#2860 state:resolved]Yehuda Katz + Carl Lerche2009-07-012-1/+7
| | | | | | | | | Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
| | * Added AR:B#dup method for duplicationg object without frozen attributes ↵Yehuda Katz + Carl Lerche2009-07-012-0/+11
| | | | | | | | | | | | | | | [#2859 state:resolved] Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
| | * ensure Inflector.camelize works with symbols [#2856 state:resolved]Yehuda Katz + Carl Lerche2009-07-013-1/+14
| | | | | | | | | Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
| | * Move mocha down below initial T::U require and bump version to 0.9.7 [#2858 ↵Yehuda Katz + Carl Lerche2009-07-0111-31/+10
| | | | | | | | | | | | state:resolved]
| * | Turn on autolist for debugging alsoJeremy Kemper2009-06-181-1/+4
| | |
| * | Friendlier runtime exception if delegatee is nilJeremy Kemper2009-06-182-4/+10
| | |
| * | Delegated methods report the expected file/line in backtracesJeremy Kemper2009-06-181-2/+3
| | |
* | | Create is now powered by Arel. Removed methods that are no longer used.Emilio Tagua2009-07-014-23/+24
| | |
* | | Small refactor to update_all.Emilio Tagua2009-07-011-3/+3
| | |
* | | Merge commit 'rails/master'Emilio Tagua2009-07-015-11/+85
|\ \ \ | | |/ | |/|
| * | Accept Symbol for contoller name [#2855 state:resolved]Yehuda Katz + Carl Lerche2009-07-012-1/+12
| | | | | | | | | Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
| * | Crazy hacks to get the Isolation testing module to work on non forking ↵Yehuda Katz + Carl Lerche2009-06-303-10/+73
| | | | | | | | | | | | environments
* | | Merge commit 'rails/master'Emilio Tagua2009-06-3014-39/+57
|\| |
| * | Revert "Revert "Generate proper :counter_sql from :finder_sql when there is ↵Pratik Naik2009-07-0114-39/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | a newline character immediately following 'SELECT' [#2118 state:resolved]"" This reverts commit 80f1f863cd0f9cba89079511282de5710a2e1832. The feature doesn't work on Postgres, so don't test it on Postgres. Also, Postgres compatibility is irrelevant to the ticket/patch in question.
* | | Merge commit 'rails/master'Emilio Tagua2009-06-3043-77/+646
|\| | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb
| * | Bump up the version to 3.0.preCarl Lerche2009-06-3011-27/+27
| | |
| * | Add #concat to Rails::Application::PathCarl Lerche2009-06-303-1/+12
| | |
| * | Test that builtin_directories is only used in development modeCarl Lerche2009-06-301-0/+17
| | |
| * | Created AS::Testing::Isolation which runs each test case in a separate process.Yehuda Katz + Carl Lerche2009-06-303-0/+181
| | | | | | | | | | | | | | | This allows for testing rails bootup (files are required, correct constants are set, etc...). Currently, this is implemented via forking only, but we will add support for jruby and windows shortly.
| * | Require core_ext/kernel/requires in test_help to providing ↵Carl Lerche2009-06-301-0/+1
| | | | | | | | | | | | #require_library_or_gem
| * | Stop the initializer from blowing up when builtin_directories is emptyCarl Lerche2009-06-301-1/+1
| | |
| * | Remove stray checks for Rspec in the testing setup.Carl Lerche2009-06-302-8/+0
| | |
| * | Changed ActiveRecord::Base.human_name to underscore the class name before it ↵Justin French2009-06-302-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | humanizes it This gives you 'Post comment' rather than 'Postcomment' by default. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2120 state:committed]
| * | Make text_area_tag escape contents by default.Chris Mear2009-06-272-0/+17
| | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2015 state:committed]
| * | Make filter_parameters work correctly with array parameters.Vicente Mundim2009-06-272-1/+6
| | |
| * | Starting to replace scattered path configuration settings with the path objectYehuda Katz + Carl Lerche2009-06-2620-31/+186
| | |
| * | Finished a first stab at the Rails application path object.Yehuda Katz + Carl Lerche2009-06-262-64/+125
| | |
| * | Update paths to support an explicit root and multiple paths per categoryYehuda Katz + Carl Lerche2009-06-261-29/+91
| | |
| * | Simple initial Paths implYehuda Katz + Carl Lerche2009-06-261-0/+68
| | |
| * | Checkpoint. Added a bunch of TODOs and some changes after further going ↵Yehuda Katz + Carl Lerche2009-06-261-15/+8
| | | | | | | | | | | | through the initializer
* | | Merge commit 'rails/master'Emilio Tagua2009-06-3034-1107/+2336
|\| | | | | | | | | | | | | | Conflicts: activerecord/test/cases/adapter_test.rb
| * | Make sure the wrapped exceptions also have the original exception available.Michael Koziarski2009-06-264-7/+18
| | | | | | | | | | | | [#2419 state:committed]
| * | Translate foreign key violations to ActiveRecord::InvalidForeignKey exceptions.Michael Schuerig2009-06-264-0/+16
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>