From 4cab214ca67192dfbd20365f166aada3d26c8a41 Mon Sep 17 00:00:00 2001
From: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Date: Wed, 1 Sep 2010 12:58:01 +0200
Subject: [PATCH] Changelog for 1.1

---
 CHANGES | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/CHANGES b/CHANGES
index 2f5292ee7d..2cb26497c1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,56 @@
+= 1.1 / Not Yet Released
+
+ * Before and after filters now support pattern matching, including the ability
+   to use captures: "before('/user/:name') { |name| ... }". This avoids manual
+   path checking. No performance loss if patterns are avoided. (Konstantin Haase)
+
+ * Setting multiple values now no longer relies on #to_hash and therefore accepts
+   any Enumerable as parameter. (Simon Rozet)
+
+ * It is now possible to access Sinatra's template_cache from the outside.
+   (Nick Sutterer)
+
+ * It is now possible to render SCSS files with the `scss` method, which behaves
+   exactly like `sass` except for the different file extension and assuming the
+   SCSS syntax. (Pedro Menezes, Konstantin Haase)
+
+ * Broken examples for using Erubis and Haml in README have been fixed.
+   (Nick Sutterer, Doug Ireton, Jason Stewart)
+
+ * Sinatra is now able to use Tilt versions including numbers > 9, as in 0.10.
+   (Konstantin Haase)
+
+ * The `last_modified` method now also accepts DateTime instances and makes sure
+   the header will always be set to a string. (Konstantin Haase)
+
+ * `send_file` now always respects the `:type` option if set. Previously it was
+   discarded if no matching mime type was found, which made it impossible to
+   directly pass a mime type. (Konstantin Haase)
+
+ * `redirect` always redirects to an absolute URI, even if a relative URI was passed.
+   Ensures compatibility with RFC 2616 section 14.30. (Jean-Philippe Garcia Ballester)
+
+ * Added ability to handle weighted HTTP_ACCEPT headers. (Davide D'Agostino)
+
+ * README is now available in German. (Bernhard Essl)
+
+ * This release is compatible with Ruby 1.9.2. Sinatra was trying to read
+   none existent files Ruby added to the call stack. (Konstantin Haase)
+
+ * This release is now usable in combination with Rails 3. When mounting
+   a Sinatra application under a subpath in Rails 3, the PATH_INFO is not
+   prefixed with a slash and no routes did match. (José Valim)
+
+ * Sinatra now handles SIGTERM correctly. (Patrick Collison)
+
+ * Fixes an issue with inline templates in modular applications that manually
+   call `run!`. (Konstantin Haase)
+
+ * It's now possible to use Sinatra with different package management
+   systems defining a custom require. (Konstantin Haase)
+
+ * Lighthouse has been dropped in favor of GitHub issues.
+
 = 1.0 / 2010-03-23
 
  * It's now possible to register blocks to run after each request using