Merge branch 'master' into 0.5.x

hanami · Jan 7, 2016 · ce80e1a · ce80e1a
2 parents bcfcaab + 2fe9373
commit ce80e1a
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,10 +20,13 @@ rvm:
   - 2.1.5
   - 2.1.6
   - 2.1.7
+  - 2.1.8
   - 2.2.0
   - 2.2.1
   - 2.2.2
   - 2.2.3
+  - 2.2.4
+  - 2.3.0
   - jruby-9000
   - jruby-head
   - rbx-2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Lotus::View
 View layer for Lotus
 
-## v0.5.0 - (unreleased)
+## v0.5.0 - 2016-01-12
 ### Added
 - [Luca Guidi] Added `Lotus::View::Configuration#default_encoding` to set the encoding for templates
 

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2014 Luca Guidi
+Copyright (c) 2014-2016 Luca Guidi
 
 MIT License
 

diff --git a/README.md b/README.md
@@ -850,4 +850,4 @@ __Lotus::View__ uses [Semantic Versioning 2.0.0](http://semver.org)
 
 ## Copyright
 
-Copyright 2014-2015 Luca Guidi – Released under MIT License
+Copyright 2014-2016 Luca Guidi – Released under MIT License
diff --git a/lib/lotus/view/configuration.rb b/lib/lotus/view/configuration.rb
@@ -31,7 +31,7 @@ class Configuration
 
       # Default encoding
       #
-      # @since x.x.x
+      # @since 0.5.0
       # @api private
       DEFAULT_ENCODING = 'utf-8'.freeze
 

diff --git a/lib/lotus/view/errors.rb b/lib/lotus/view/errors.rb
@@ -1,6 +1,6 @@
 module Lotus
   module View
-    # @since x.x.x
+    # @since 0.5.0
     class Error < ::StandardError
     end
 
@@ -37,7 +37,7 @@ class MissingFormatError < Error
     #
     # This is raised at the runtime when Lotus::Layout cannot find it's template.
     #
-    # @since x.x.x
+    # @since 0.5.0
     class MissingTemplateLayoutError < Error
       def initialize(template)
         super("Can't find layout template '#{ template }'")

diff --git a/lib/lotus/view/rendering/template.rb b/lib/lotus/view/rendering/template.rb
@@ -53,7 +53,7 @@ def scope
           Scope.new(@view, @options[:locals])
         end
 
-        # @since x.x.x
+        # @since 0.5.0
         # @api private
         def raise_missing_template_error
           raise MissingTemplateError.new(