aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-07-0611-162/+451
|\
| * Integrate AMo JSON serializer into ARJoshua Peek2009-07-036-172/+134
| * Initial extraction of AMo xml serializerJoshua Peek2009-07-037-20/+346
| * Ensure JSON serializer includes model naming Joshua Peek2009-07-032-1/+2
* | Merge commit 'rails/master'Emilio Tagua2009-07-0316-35/+345
|\|
| * Revert "Compact the way application paths are defined"Pratik Naik2009-07-031-13/+27
| * Revert "Modify the Rails::Application::Path object to allow for more concise ...Pratik Naik2009-07-032-113/+19
| * Added tests for the :install_gem_spec_stubs initializerYehuda Katz + Carl Lerche2009-07-027-25/+115
| * Wrote tests for the :check_ruby_version initializerYehuda Katz + Carl Lerche2009-07-021-0/+59
| * Adds support for def self.setup in isolation tests for setup that should be r...Yehuda Katz + Carl Lerche2009-07-023-7/+26
| * Compact the way application paths are definedYehuda Katz + Carl Lerche2009-07-021-27/+13
| * Modify the Rails::Application::Path object to allow for more concise path def...Yehuda Katz + Carl Lerche2009-07-022-19/+113
| * Allow symbols on routes declaration (:controller and :action values) [#2828 s...Jesús García Sáez2009-07-022-0/+11
| * Removed unnecessary calls to image_path and hash lookups [#2827 state:resolved]Yehuda Katz + Carl Lerche2009-07-021-3/+3
| * Fixed ActiveSupport::OrderedHash::[] work identically to ::Hash::[] in ruby 1...Brian Abreu2009-07-022-5/+42
| * My suggestion to fix ticket 2401 [#2401 state:resolved]Jarl Friis2009-07-022-4/+98
* | 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
| * make #inspect if zero length duration return '0 seconds' instead of empty str...Levin Alexander2009-07-022-2/+5
| * Fixes a number of tests that inexplicably didn't fail when we committed the o...Yehuda Katz + Carl Lerche2009-07-024-12/+12
| * Adds a video_tag helper for the HTML5 video tag (similar to how the image_tag...Tieg Zaharia2009-07-023-3/+110
| * Only check for built extensions on gem dependencies that are in vendor/gems. ...J.D. Hollis2009-07-022-3/+16
| * Patch FormTagHelper so that when a form tag is created, the div which holds t...Elliot Winkler2009-07-011-2/+2
| * Fixes bug where Memcached connections get corrupted when an invalid expire is...Yehuda Katz + Carl Lerche2009-07-012-2/+30
* | 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
| * 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
| | * Added AR:B#dup method for duplicationg object without frozen attributes [#285...Yehuda Katz + Carl Lerche2009-07-012-0/+11
| | * ensure Inflector.camelize works with symbols [#2856 state:resolved]Yehuda Katz + Carl Lerche2009-07-013-1/+14
| | * Move mocha down below initial T::U require and bump version to 0.9.7 [#2858 s...Yehuda Katz + Carl Lerche2009-07-0111-31/+10
| * | 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
| * | Crazy hacks to get the Isolation testing module to work on non forking enviro...Yehuda Katz + Carl Lerche2009-06-303-10/+73
* | | Merge commit 'rails/master'Emilio Tagua2009-06-3014-39/+57
|\| |
| * | Revert "Revert "Generate proper :counter_sql from :finder_sql when there is a...Pratik Naik2009-07-0114-39/+57
* | | Merge commit 'rails/master'Emilio Tagua2009-06-3043-77/+646
|\| |
| * | Bump up the version to 3.0.preCarl Lerche2009-06-3011-27/+27
| * | Add #concat to Rails::Application::PathCarl Lerche2009-06-303-1/+12