rails 1.1.4 → 1.1.5

data/CHANGELOG

@@ -1,3 +1,12 @@
+*1.1.5* (August 8th, 2006)
+
+* Mention in docs that config.frameworks doesn't work when getting Rails via Gems.  #4857 [Alisdair McDiarmid]
+
+* Change the scaffolding layout to use yield rather than @content_for_layout. [Marcel Molina Jr.]
+
+* Includes critical security patch
+
+
 *1.1.4* (June 29th, 2006)
 
 * Remove use of opts.on { |options[:name] } style hash assignment. References #4440. [headius@headius.com]

data/README

@@ -124,6 +124,9 @@ application is running. You can inspect domain models, change values, and save t
 database. Starting the script without arguments will launch it in the development environment.
 Passing an argument will specify a different environment, like <tt>script/console production</tt>.
 
+To reload your controllers and models after launching the console run <tt>reload!</tt>
+
+
 
 == Description of contents
 

data/Rakefile

@@ -279,10 +279,10 @@ spec = Gem::Specification.new do |s|
 
   s.add_dependency('rake', '>= 0.7.1')
   s.add_dependency('activesupport',    '= 1.3.1' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 1.14.3' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 1.12.3' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 1.2.3' + PKG_BUILD)
-  s.add_dependency('actionwebservice', '= 1.1.4' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 1.14.4' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 1.12.4' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 1.2.4' + PKG_BUILD)
+  s.add_dependency('actionwebservice', '= 1.1.5' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false

data/environments/environment.rb

@@ -13,7 +13,7 @@ require File.join(File.dirname(__FILE__), 'boot')
 Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence those specified here
   
-  # Skip frameworks you're not going to use
+  # Skip frameworks you're not going to use (only works if using vendor/rails)
   # config.frameworks -= [ :action_web_service, :action_mailer ]
 
   # Add additional load paths for your own custom dirs

data/lib/rails/version.rb

@@ -2,7 +2,7 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 1
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/rails_generator/generators/components/scaffold/templates/layout.rhtml

@@ -7,7 +7,7 @@
 
 <p style="color: green"><%%= flash[:notice] %></p>
 
-<%%= @content_for_layout %>
+<%%= yield  %>
 
 </body>
 </html>

data/lib/rails_generator/scripts.rb

@@ -38,7 +38,7 @@ module Rails
         protected
           # Override with your own script usage banner.
           def banner
-            "Usage: #{$0} [options] generator [args]"
+            "Usage: #{$0} generator [options] [args]"
           end
 
           def usage_message

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 1.1.4
-date: 2006-06-29 00:00:00 -05:00
+  version: 1.1.5
+date: 2006-08-09 00:00:00 -05:00
 summary: Web-application framework with template engine, control-flow layer, and ORM.
 require_paths: 
 - lib
@@ -284,7 +284,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.14.3
+        version: 1.14.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -293,7 +293,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.12.3
+        version: 1.12.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionmailer
@@ -302,7 +302,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.2.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionwebservice
@@ -311,5 +311,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.4
+        version: 1.1.5
     version: