Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Integrate AMo JSON serializer into AR | Joshua Peek | 2009-07-03 | 6 | -172/+134 | |
| | | ||||||
| * | Initial extraction of AMo xml serializer | Joshua Peek | 2009-07-03 | 7 | -20/+346 | |
| | | ||||||
| * | Ensure JSON serializer includes model naming | Joshua Peek | 2009-07-03 | 2 | -1/+2 | |
| | | ||||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-03 | 16 | -35/+345 | |
|\| | ||||||
| * | Revert "Compact the way application paths are defined" | Pratik Naik | 2009-07-03 | 1 | -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 Naik | 2009-07-03 | 2 | -113/+19 | |
| | | | | | | | | | | | | | | | | path definition." This reverts commit 913bb2f4c2feb79dcbc9ed2c0fb1ef6d436f7d02. Reason : The server does not start | |||||
| * | Added tests for the :install_gem_spec_stubs initializer | Yehuda Katz + Carl Lerche | 2009-07-02 | 7 | -25/+115 | |
| | | ||||||
| * | Wrote tests for the :check_ruby_version initializer | Yehuda Katz + Carl Lerche | 2009-07-02 | 1 | -0/+59 | |
| | | ||||||
| * | Adds support for def self.setup in isolation tests for setup that should be ↵ | Yehuda Katz + Carl Lerche | 2009-07-02 | 3 | -7/+26 | |
| | | | | | | | | run only once in the parent | |||||
| * | Compact the way application paths are defined | Yehuda Katz + Carl Lerche | 2009-07-02 | 1 | -27/+13 | |
| | | ||||||
| * | Modify the Rails::Application::Path object to allow for more concise path ↵ | Yehuda Katz + Carl Lerche | 2009-07-02 | 2 | -19/+113 | |
| | | | | | | | | definition. | |||||
| * | Allow symbols on routes declaration (:controller and :action values) [#2828 ↵ | Jesús García Sáez | 2009-07-02 | 2 | -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 Lerche | 2009-07-02 | 1 | -3/+3 | |
| | | ||||||
| * | Fixed ActiveSupport::OrderedHash::[] work identically to ::Hash::[] in ruby ↵ | Brian Abreu | 2009-07-02 | 2 | -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 Friis | 2009-07-02 | 2 | -4/+98 | |
| | | | | | | | | Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | |||||
* | | 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 | |
| | | |