Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-02 | 15 | -25/+176 | |
|\| | ||||||
| * | wycats forgot a +1, so I added it [#2749 state:resolved] | Aaron Patterson | 2009-07-02 | 1 | -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 Alexander | 2009-07-02 | 2 | -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 Lerche | 2009-07-02 | 4 | -12/+12 | |
| | | | | | | | | original patch | |||||
| * | Adds a video_tag helper for the HTML5 video tag (similar to how the ↵ | Tieg Zaharia | 2009-07-02 | 3 | -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. Hollis | 2009-07-02 | 2 | -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 Winkler | 2009-07-01 | 1 | -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 Lerche | 2009-07-01 | 2 | -2/+30 | |
| | | | | | | | | is passed in [#2854 state:resolved] | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-01 | 27 | -53/+85 | |
|\| | ||||||
| * | Fix pattern to match various magic comment formats | Akira Matsuda | 2009-07-01 | 1 | -1/+1 | |
| | | ||||||
| * | JSON.escape returns UTF-8 strings | Jeremy Kemper | 2009-07-01 | 2 | -7/+14 | |
| | | | | | | | | [#2849 state:resolved] | |||||
| * | uses Hash#except/slice | Jeremy Kemper | 2009-07-01 | 1 | -0/+2 | |
| | | ||||||
| * | Forgot to commit the new file. This is slightly embarrassing. | Yehuda Katz + Carl Lerche | 2009-07-01 | 1 | -0/+2 | |
| | | ||||||
| * | Apparently stdlib isn't std enough | Yehuda Katz + Carl Lerche | 2009-07-01 | 1 | -4/+6 | |
| | | ||||||
| * | Modify isolation test to require a file not in use anywhere in Rails | Yehuda Katz + Carl Lerche | 2009-07-01 | 1 | -4/+4 | |
| | | ||||||
| * | Updates CI to use latest mocha | Yehuda Katz + Carl Lerche | 2009-07-01 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-07-01 | 120 | -1254/+3270 | |
| |\ | ||||||
| | * | Original cache objects should not be immutable [#2860 state:resolved] | Yehuda Katz + Carl Lerche | 2009-07-01 | 2 | -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 Lerche | 2009-07-01 | 2 | -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 Lerche | 2009-07-01 | 3 | -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 Lerche | 2009-07-01 | 11 | -31/+10 | |
| | | | | | | | | | | | | state:resolved] | |||||
| * | | Turn on autolist for debugging also | Jeremy Kemper | 2009-06-18 | 1 | -1/+4 | |
| | | | ||||||
| * | | Friendlier runtime exception if delegatee is nil | Jeremy Kemper | 2009-06-18 | 2 | -4/+10 | |
| | | | ||||||
| * | | Delegated methods report the expected file/line in backtraces | Jeremy Kemper | 2009-06-18 | 1 | -2/+3 | |
| | | | ||||||
* | | | Create is now powered by Arel. Removed methods that are no longer used. | Emilio Tagua | 2009-07-01 | 4 | -23/+24 | |
| | | | ||||||
* | | | Small refactor to update_all. | Emilio Tagua | 2009-07-01 | 1 | -3/+3 | |
| | | | ||||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-01 | 5 | -11/+85 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Accept Symbol for contoller name [#2855 state:resolved] | Yehuda Katz + Carl Lerche | 2009-07-01 | 2 | -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 Lerche | 2009-06-30 | 3 | -10/+73 | |
| | | | | | | | | | | | | environments | |||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-30 | 14 | -39/+57 | |
|\| | | ||||||
| * | | Revert "Revert "Generate proper :counter_sql from :finder_sql when there is ↵ | Pratik Naik | 2009-07-01 | 14 | -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 Tagua | 2009-06-30 | 43 | -77/+646 | |
|\| | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb | |||||
| * | | Bump up the version to 3.0.pre | Carl Lerche | 2009-06-30 | 11 | -27/+27 | |
| | | | ||||||
| * | | Add #concat to Rails::Application::Path | Carl Lerche | 2009-06-30 | 3 | -1/+12 | |
| | | | ||||||
| * | | Test that builtin_directories is only used in development mode | Carl Lerche | 2009-06-30 | 1 | -0/+17 | |
| | | | ||||||
| * | | Created AS::Testing::Isolation which runs each test case in a separate process. | Yehuda Katz + Carl Lerche | 2009-06-30 | 3 | -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 Lerche | 2009-06-30 | 1 | -0/+1 | |
| | | | | | | | | | | | | #require_library_or_gem | |||||
| * | | Stop the initializer from blowing up when builtin_directories is empty | Carl Lerche | 2009-06-30 | 1 | -1/+1 | |
| | | | ||||||
| * | | Remove stray checks for Rspec in the testing setup. | Carl Lerche | 2009-06-30 | 2 | -8/+0 | |
| | | | ||||||
| * | | Changed ActiveRecord::Base.human_name to underscore the class name before it ↵ | Justin French | 2009-06-30 | 2 | -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 Mear | 2009-06-27 | 2 | -0/+17 | |
| | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2015 state:committed] | |||||
| * | | Make filter_parameters work correctly with array parameters. | Vicente Mundim | 2009-06-27 | 2 | -1/+6 | |
| | | | ||||||
| * | | Starting to replace scattered path configuration settings with the path object | Yehuda Katz + Carl Lerche | 2009-06-26 | 20 | -31/+186 | |
| | | | ||||||
| * | | Finished a first stab at the Rails application path object. | Yehuda Katz + Carl Lerche | 2009-06-26 | 2 | -64/+125 | |
| | | | ||||||
| * | | Update paths to support an explicit root and multiple paths per category | Yehuda Katz + Carl Lerche | 2009-06-26 | 1 | -29/+91 | |
| | | | ||||||
| * | | Simple initial Paths impl | Yehuda Katz + Carl Lerche | 2009-06-26 | 1 | -0/+68 | |
| | | | ||||||
| * | | Checkpoint. Added a bunch of TODOs and some changes after further going ↵ | Yehuda Katz + Carl Lerche | 2009-06-26 | 1 | -15/+8 | |
| | | | | | | | | | | | | through the initializer | |||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-30 | 34 | -1107/+2336 | |
|\| | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/adapter_test.rb | |||||
| * | | Make sure the wrapped exceptions also have the original exception available. | Michael Koziarski | 2009-06-26 | 4 | -7/+18 | |
| | | | | | | | | | | | | [#2419 state:committed] | |||||
| * | | Translate foreign key violations to ActiveRecord::InvalidForeignKey exceptions. | Michael Schuerig | 2009-06-26 | 4 | -0/+16 | |
| | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> |