Merge branch 'hotfix/rubycritic_travis_error'

hicknhack-software · Mar 5, 2019 · e47abb4 · e47abb4
2 parents ff3cf36 + b95dfe4
commit e47abb4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 gem 'uglifier'
 gem 'coffee-script', '~> 2.4.1'
 gem 'sass', '~> 3.5.1'
+gem 'rb-inotify', '<0.10' # required for ruby 2.0 support
 
 # access control
 gem 'pundit', '~> 1.1.0'
@@ -22,7 +23,8 @@ gem 'rspec-core'
 gem 'rqrcode', '~> 0.10.1'
 
 group :development, :test do
-  gem 'rubycritic', require: false
+  gem 'rubycritic', '<4.0.0', require: false
+  gem 'rainbow', '<3.0.0' # required for ruby 2.0 support
   gem 'rspec-rails', '~> 3.5', '>= 3.5.2'
   gem 'factory_bot_rails', '< 5.0'
   gem 'zonebie'

diff --git a/lib/hourglass.rb b/lib/hourglass.rb
@@ -3,7 +3,7 @@ module Hourglass
   PLUGIN_NAME = "redmine_#{NAMESPACE}".to_sym
   PLUGIN_ROOT = Pathname.new(File.join File.dirname(__FILE__), '..').cleanpath
 
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   def self.redmine_has_advanced_queries?
     Redmine::VERSION::MAJOR > 3 || (Redmine::VERSION::MAJOR == 3 && Redmine::VERSION::MINOR >= 4)