aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Use Symbol#to_proc in rails plugin internalsJeremy Kemper2009-04-241-0/+1
|
* Removed rest of Symbol#to_proc from railties testsJeremy Kemper2009-04-222-3/+3
|
* Missed oneJeremy Kemper2009-04-221-1/+1
|
* Remove Symbol#to_proc dependencyJeremy Kemper2009-04-221-2/+2
|
* Opt in to DependenciesJeremy Kemper2009-04-221-0/+1
|
* No more free lunchJeremy Kemper2009-04-224-12/+17
|
* Update rails:template task to expand file paths [#2528 state:resolved]Stephen Celis2009-04-211-1/+3
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Merge docrailslifo2009-04-176-26/+115
|
* Makes rails-dev-boost work againCarl Lerche & Yehuda Katz2009-04-141-1/+1
|
* Fix requires so tests runJeremy Kemper2009-04-141-2/+2
|
* Rails server boots againCarl Lerche & Yehuda Katz2009-04-132-2/+2
|
* Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-13261-35493/+15694
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46c04970b5e7684998d09405648ecbd4 3942cb406e1d5db0ac00e03153809cc8dc4cc4db f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690 e3b166aab37ddc2fbab030b146eb61713b91bf55 ae9f258e03c9fd5088da12c1c6cd216cc89a01f7 44423126c6f6133a1d9cf1d0832b527e8711d40f 0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.
| * Improve tests and code for Rails::InfoController and Rails::Info [#2411 ↵Manfred Stienstra2009-04-073-32/+41
| | | | | | | | | | | | | | | | | | | | state:resolved] - Refactor Rails::InfoController tests. - Return forbidden status from the InfoController for remote requests instead of a 500. - Add tests for displaying middleware in Rails::Info. Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Merge docrailsPratik Naik2009-04-056-151/+143
| |
| * Show installed middleware in builtin rails info (/rails/info/properties) ↵Michael Schuerig2009-04-022-2/+16
| | | | | | | | | | | | [#2396 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Merge docrailsPratik Naik2009-03-248-3/+67
| |
| * Ensure script/plugin doesn't show error message when svn externals are not therePratik Naik2009-03-181-4/+7
| |
| * Remove outdated script/plugin optionsPratik Naik2009-03-182-432/+5
| |
| * Try to use actionpack gem to generate guide when Rails is not vendoredPratik Naik2009-03-173-155/+19
| |
| * Merge docrailsPratik Naik2009-03-1639-847/+1874
| |
| * update metal fixtures to be ruby 1.9 compatJoshua Peek2009-03-156-6/+6
| |
| * Prepare for final 2.3 releaseDavid Heinemeier Hansson2009-03-153-10/+7
| |
| * Make sure Metal use ActionController class name conventions [#2242 ↵Luca Guidi2009-03-153-1/+12
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Add Rack version to Rails infoJoshua Peek2009-03-141-0/+4
| |
| * Makes the gem system understand development vs. runtime dependencies [#2195 ↵David Dollar2009-03-135-152/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] The patch also fixes: * Fixes the chicken/egg problem present in the current gem system when gems are defined in the config that are not yet installed. * Remove the need to have hoe as a dependency of your production app. * Makes the gem 'unpacking' system a lot less fragile. Signed-off-by: Matt Jones <al2o3cr@gmail.com> Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Execute the appropriate gem command when using JRuby [#2215 state:resolved]Zack Hobson2009-03-131-1/+8
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Vendored gem paths now being loaded if they exist [#2204 state:resolved]John Dzak2009-03-132-0/+3
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fixed that template runner gem method to output :lib => false correctly ↵Damian Terentiev2009-03-122-1/+6
| | | | | | | | | | | | [#1940 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fixed an incompatibility with Ruby 1.9.Jeff Schwab2009-03-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | Ruby 1.8 strings are Enumerable, but there is no String#lines method. In Ruby 1.9, the situation is reversed. To work around this disparity, the RailsEnvironment#externals method now explicitly checks whether a String responds_to? :lines. [#2130 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Ensure public folder structure is setup correctly if the tests are ran out ↵Joshua Peek2009-03-104-0/+8
| | | | | | | | of order, fixes tests in 0c9bbf8
| * Fix serving index files with rack static file server [#2180 state:resolved]Joshua Peek2009-03-095-4/+54
| |
| * Ensure TemplateRunner#ask? works with the rake task to apply a template ↵Andrew Timberlake2009-03-091-1/+1
| | | | | | | | | | | | [#1655 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Correctly clean backtraces from vendor/gems and gems in alternate install ↵Matt Jones2009-03-092-4/+45
| | | | | | | | | | | | locations Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Ruby 1.9 compat: rename deprecated assert_raises to assert_raise.Jeremy Kemper2009-03-084-9/+9
| | | | | | | | [#1617 state:resolved]
| * Raise LoadError instead of a runtime exception [#1498 state:resolved]karmi2009-03-071-1/+1
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * script/plugin install should remove .gitignore too. [#1306 state:resolved] ↵Pratik Naik2009-03-061-2/+2
| | | | | | | | [Esad Hajdarevic]
| * Ensure that loading metals from the main app and engines works on older Ruby ↵Simon Jefford2009-03-052-3/+14
| | | | | | | | | | | | versions [#2143 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Make sure that Rails frameworks are silenced when running in gem mode tooDavid Heinemeier Hansson2009-03-051-0/+3
| |
| * Push the guidesDavid Heinemeier Hansson2009-03-051-3/+6
| |
| * Release RC2 todayDavid Heinemeier Hansson2009-03-051-1/+1
| |
| * stray character in railties testJoshua Peek2009-03-041-1/+1
| |
| * Enhanced Rails Metal - the load order of metals can now be configured [#2057 ↵Simon Jefford2009-03-038-3/+105
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Revert "Speed up script/console by launching IRB directly."Jeremy Kemper2009-03-011-10/+11
| | | | | | | | | | | | [#2104 state:open] This reverts commit 3b169cd693f45911ee71e26708fb9267811c8d83.
| * Display gem dependencies correctly and unpack exactly once [#2097 ↵Matt Jones2009-03-013-9/+11
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Speed up script/console by launching IRB directly.Charles Nutter2009-02-281-11/+10
| | | | | | | | | | | | [#2104 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Merge docrails and update the release notesPratik Naik2009-02-2818-714/+631
| |
| * Use Array.wrap() instead of Array() and handle ↵Pratik Naik2009-02-281-1/+1
| | | | | | | | action_view.cache_template_loading being false
| * Ensure 16b3d2b621b1682f249209097c31b0a10f0f87ef works with Ruby 1.9Pratik Naik2009-02-281-1/+1
| |
| * Added :env option for gem in template runner [#1983 state:resolved]Andrew Vit2009-02-282-4/+35
| | | | | | | | | | | | | | | | | | For installing gems that are only needed in the test environment, specify the :env option so the dependency is written to config/environments/test.rb: gem 'rspec', :env => 'test' gem 'quietbacktrace', :env => %w[development test] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * So it didnt happen yesterday, but very soon! Just need the final details ↵David Heinemeier Hansson2009-02-281-1/+1
| | | | | | | | ironed out