diff --git a/CHANGELOG.md b/CHANGELOG.md index bd763c5..51254f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.2.2 + +- Re-licensed as LGPL, as I lifted Sidekiq-web code to power Zhong web (thanks Mike Perham for the great gem and the code!) + ## 0.2.1 - Fix manually specifying a Redis connection (thanks, Richard Adams!) diff --git a/LICENSE.txt b/LICENSE.txt index 937ae6c..52552f8 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,22 +1,5 @@ -Copyright (c) 2015 Nick Elser +Copyright (c) Nick Elser -MIT License - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +Zhong is an Open Source project licensed under the terms of +the LGPLv3 license. Please see +for license text. diff --git a/lib/zhong/version.rb b/lib/zhong/version.rb index 2e6c7d4..2b30b81 100644 --- a/lib/zhong/version.rb +++ b/lib/zhong/version.rb @@ -1,3 +1,3 @@ module Zhong - VERSION = "0.2.1".freeze + VERSION = "0.2.2".freeze end diff --git a/lib/zhong/web.rb b/lib/zhong/web.rb index f00f656..3f44bbc 100644 --- a/lib/zhong/web.rb +++ b/lib/zhong/web.rb @@ -6,6 +6,8 @@ require "zhong/web_helpers" module Zhong + # Most of the following helpers are copied from a previous version of the Sidekiq project + # available here: https://github.com/mperham/sidekiq/blob/2c9f7662fcdcb52d59b72ba0fe7dc5f963de4904/lib/sidekiq/web.rb class Web < Sinatra::Base enable :sessions use ::Rack::Protection, use: :authenticity_token unless ENV["RACK_ENV"] == "test" diff --git a/lib/zhong/web_helpers.rb b/lib/zhong/web_helpers.rb index a10c7a9..f18b4a0 100644 --- a/lib/zhong/web_helpers.rb +++ b/lib/zhong/web_helpers.rb @@ -2,6 +2,8 @@ require "uri" module Zhong + # Most of the following helpers are copied from a previous version of the Sidekiq project + # available here: https://github.com/mperham/sidekiq/blob/2c9f7662fcdcb52d59b72ba0fe7dc5f963de4904/lib/sidekiq/web_helpers.rb module WebHelpers # Simple capture method for erb templates. The origin was # capture method from sinatra-contrib library. diff --git a/web/views/index.erb b/web/views/index.erb index 684c34b..c15c2fb 100644 --- a/web/views/index.erb +++ b/web/views/index.erb @@ -1,4 +1,5 @@ + <%= environment_title_prefix %>Zhong