aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added ActiveRecord::Base#(where|join|project|group|order|take|skip) methods.Emilio Tagua2009-07-162-40/+59
|
* Merge commit 'rails/master'Emilio Tagua2009-07-1432-395/+705
|\
| * Use map! instead of map for <association>_idsPratik Naik2009-07-131-2/+2
| |
| * Optimize <association>_ids for hm:t with belongs_to sourcePratik Naik2009-07-132-3/+14
| |
| * Add observing hooks to AResJoshua Peek2009-07-112-2/+62
| |
| * Integrate AMo XML serializer into ARJoshua Peek2009-07-112-131/+31
| |
| * Switch scaffolding templates to HTML 5 doctypeJoshua Peek2009-07-106-89/+80
| |
| * Make it so AR attributes which conflict with object-private methods (e.g. ↵Sam Goldstein2009-07-092-4/+25
| | | | | | | | | | | | | | | | | | system) don't 'randomly' cause NoMethodErrors Previously if you called this attribute before others, you'd get exceptions. But if it was the second-or-subsequent attribute you retrieved you'd get the correct behaviour. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2808 state:committed]
| * Use the i18n gem if present instead of vendor code. [#2871 state:resolved]Lawrence Pit2009-07-071-5/+4
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * Ruby 1.9 style String interpolation support for lower ruby versions. Thanks ↵Lawrence Pit2009-07-073-0/+150
| | | | | | | | | | | | to code from Masao Mutoh's GetText gem. [#2870 state:resolved] Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local>
| * Add support for dumping non-standard primary keys when using the SQLite3 ↵Hongli Lai (Phusion)2009-07-072-8/+12
| | | | | | | | | | | | adapter. Fix unit tests so that this feature is tested for all adapters. [#2868 state:resolved] Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local>
| * Adds a audio_tag helper for the HTML5 audio tag. Fixed video_path docs. HTML ↵Emilio Tagua2009-07-073-9/+72
| | | | | | | | | | | | attributes values should be true or false not attribute's name. [#2864 state:resolved] Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local>
| * Get Initializer tests running without requiring parts of Rails being loaded ↵Yehuda Katz + Carl Lerche2009-07-066-98/+129
| | | | | | | | first
| * Reapply Rails::Application::Path tweaksYehuda Katz + Carl Lerche2009-07-063-46/+126
| | | | | | | | | | Reapplies: a4bdc00fec623f72592e663e6d7830eea0bc6ea4 3c1dab72259d01c6335bf359d7f9b3af69d45bb4
* | 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
| | | | | | | | | | | | This reverts commit 940aad225af0b963f435a0bf015daece2218d502. Reason : The server does not start
| * Revert "Modify the Rails::Application::Path object to allow for more concise ↵Pratik Naik2009-07-032-113/+19
| | | | | | | | | | | | | | | | path definition." This reverts commit 913bb2f4c2feb79dcbc9ed2c0fb1ef6d436f7d02. Reason : The server does not start
| * 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 ↵Yehuda Katz + Carl Lerche2009-07-023-7/+26
| | | | | | | | run only once in the parent
| * 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 ↵Yehuda Katz + Carl Lerche2009-07-022-19/+113
| | | | | | | | definition.
| * Allow symbols on routes declaration (:controller and :action values) [#2828 ↵Jesús García Sáez2009-07-022-0/+11
| | | | | | | | | | | | state:resolved] Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
| * 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 ↵Brian Abreu2009-07-022-5/+42
| | | | | | | | | | | | 1.8.7 [#2832 state:resolved] Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
| * My suggestion to fix ticket 2401 [#2401 state:resolved]Jarl Friis2009-07-022-4/+98
| | | | | | | | Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
* | 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>