<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>actionpack/filler.txt</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,3 +1,8 @@
+*1.2.5* (August 10th, 2006)
+
+* Depend on Action Pack 1.12.5
+
+
 *1.2.4* (August 8th, 2006)
 
 * Backport of documentation enhancements. [Kevin Clark, Marcel Molina Jr]</diff>
      <filename>actionmailer/CHANGELOG</filename>
    </modified>
    <modified>
      <diff>@@ -54,7 +54,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = &quot;actionmailer&quot;
   s.homepage = &quot;http://www.rubyonrails.org&quot;
 
-  s.add_dependency('actionpack', '= 1.12.4' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 1.12.5' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements &lt;&lt; 'none'</diff>
      <filename>actionmailer/Rakefile</filename>
    </modified>
    <modified>
      <diff>@@ -2,7 +2,7 @@ module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 2
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end</diff>
      <filename>actionmailer/lib/action_mailer/version.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,3 +1,8 @@
+*1.12.5* (August 10th, 2006)
+
+* Updated security fix
+
+
 *1.12.4* (August 8th, 2006)
 
 * Documentation fix: integration test scripts don't require integration_test.  #4914 [Frederick Ros &lt;sl33p3r@free.fr&gt;]</diff>
      <filename>actionpack/CHANGELOG</filename>
    </modified>
    <modified>
      <diff>@@ -77,7 +77,7 @@ spec = Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.autorequire = 'action_controller'
 
-  s.files = [ &quot;Rakefile&quot;, &quot;install.rb&quot;, &quot;README&quot;, &quot;RUNNING_UNIT_TESTS&quot;, &quot;CHANGELOG&quot;, &quot;MIT-LICENSE&quot;, &quot;examples/.htaccess&quot; ]
+  s.files = [ &quot;Rakefile&quot;, &quot;install.rb&quot;, &quot;filler.txt&quot;, &quot;README&quot;, &quot;RUNNING_UNIT_TESTS&quot;, &quot;CHANGELOG&quot;, &quot;MIT-LICENSE&quot;, &quot;examples/.htaccess&quot; ]
   dist_dirs.each do |dir|
     s.files = s.files + Dir.glob( &quot;#{dir}/**/*&quot; ).delete_if { |item| item.include?( &quot;\.svn&quot; ) }
   end</diff>
      <filename>actionpack/Rakefile</filename>
    </modified>
    <modified>
      <diff>@@ -273,7 +273,7 @@ module ActionController
             $LOAD_PATH.select do |base|
               base = File.expand_path(base)
               extended_root = File.expand_path(RAILS_ROOT)
-              base.match(/\A#{Regexp.escape(extended_root)}\/*#{file_kinds(:lib) * '|'}/) || base =~ %r{rails-[\d.]+/builtin}
+              base.match(/\A#{Regexp.escape(extended_root)}\/*(#{file_kinds(:lib) * '|'})\/[a-z]/) || base =~ %r{rails-[\d.]+/builtin}
             end
           else
             $LOAD_PATH</diff>
      <filename>actionpack/lib/action_controller/routing.rb</filename>
    </modified>
    <modified>
      <diff>@@ -2,7 +2,7 @@ module ActionPack #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 12
-    TINY  = 4
+    TINY  = 5
     
     STRING = [MAJOR, MINOR, TINY].join('.')
   end</diff>
      <filename>actionpack/lib/action_pack/version.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,3 +1,8 @@
+*1.1.6* (August 10th, 2006)
+
+* Rely on Action Pack 1.12.5
+
+
 *1.1.5* (August 8th, 2006)
 
 * Rely on Action Pack 1.12.4 and Active Record 1.14.4</diff>
      <filename>actionwebservice/CHANGELOG</filename>
    </modified>
    <modified>
      <diff>@@ -71,7 +71,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = &quot;aws&quot;
   s.homepage = &quot;http://www.rubyonrails.org&quot;
 
-  s.add_dependency('actionpack', '= 1.12.4' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 1.12.5' + PKG_BUILD)
   s.add_dependency('activerecord', '= 1.14.4' + PKG_BUILD)
 
   s.has_rdoc = true</diff>
      <filename>actionwebservice/Rakefile</filename>
    </modified>
    <modified>
      <diff>@@ -2,7 +2,7 @@ module ActionWebService
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 1
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end</diff>
      <filename>actionwebservice/lib/action_web_service/version.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,3 +1,8 @@
+*1.1.6* (August 10th, 2006)
+
+* Additional security patch
+
+
 *1.1.5* (August 8th, 2006)
 
 * Mention in docs that config.frameworks doesn't work when getting Rails via Gems.  #4857 [Alisdair McDiarmid]</diff>
      <filename>railties/CHANGELOG</filename>
    </modified>
    <modified>
      <diff>@@ -280,9 +280,9 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('rake', '&gt;= 0.7.1')
   s.add_dependency('activesupport',    '= 1.3.1' + 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.add_dependency('actionpack',       '= 1.12.5' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 1.2.5' + PKG_BUILD)
+  s.add_dependency('actionwebservice', '= 1.1.6' + PKG_BUILD)
 
   s.rdoc_options &lt;&lt; '--exclude' &lt;&lt; '.'
   s.has_rdoc = false</diff>
      <filename>railties/Rakefile</filename>
    </modified>
    <modified>
      <diff>@@ -2,7 +2,7 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 1
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end</diff>
      <filename>railties/lib/rails/version.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>bae267f8e1733b17f6328592f8c7e14c2bccb163</id>
    </parent>
  </parents>
  <author>
    <name>David Heinemeier Hansson</name>
    <email>david@loudthinking.com</email>
  </author>
  <url>http://github.com/rubyruy/rails/commit/ff39a734e52e6c6a66decb9558672f8e211f6037</url>
  <id>ff39a734e52e6c6a66decb9558672f8e211f6037</id>
  <committed-date>2006-08-10T08:45:56-07:00</committed-date>
  <authored-date>2006-08-10T08:45:56-07:00</authored-date>
  <message>Prepare for release of 1.1.6

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4746 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
  <tree>8f78def39941e1cac7245300dd8033a611bfaa15</tree>
  <committer>
    <name>David Heinemeier Hansson</name>
    <email>david@loudthinking.com</email>
  </committer>
</commit>
