Skip to content

Commit

Permalink
Merge pull request #126 from southbridgeio/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
vladislav-yashin committed Jan 28, 2020
2 parents 5c60285 + 1044f57 commit c5d955c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ language: ruby
rvm:
- 2.4.9
- 2.6.5
- 2.7.0

#branches:
# only:
Expand All @@ -16,11 +15,6 @@ env:
- REDMINE_VER=3.4-stable
- REDMINE_VER=4.1-stable

matrix:
exclude:
- env: REDMINE_VER=3.4-stable
rvm: 2.7.0

install: "echo skip bundle install"

before_script:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 1.5.1

* Remove sidekiq-rate-limiter from gemfile
* Remove ruby 2.7.0 from build matrix

# 1.5.0

* Add plugins deprecation warning
Expand Down
3 changes: 0 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
gem 'pidfile', git: 'https://github.com/arturtr/pidfile.git'
gem 'sidekiq-failures', git: 'https://github.com/mhfs/sidekiq-failures.git', branch: 'master'
gem 'sidekiq-cron'
gem 'sidekiq-rate-limiter', git: 'https://github.com/centosadmin/sidekiq-rate-limiter', branch: 'master',
require: 'sidekiq-rate-limiter/server'

group :test do
gem 'minitest-reporters', '<= 1.3.0'
gem 'mocha', '>= 1.4.0'
end
4 changes: 2 additions & 2 deletions init.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
name 'Redmine Intouch plugin'
url 'https://github.com/southbridgeio/redmine_intouch'
description 'This is a plugin for Redmine which sends a reminder email and Telegram messages to the assignee workign on a task, whose status is not updated with-in allowed duration'
version '1.5.0'
version '1.5.1'
author 'Southbridge'
author_url 'https://github.com/southbridgeio'

requires_redmine version_or_higher: '3.0'

requires_redmine_plugin :redmine_bots, '0.4.0'
requires_redmine_plugin :redmine_bots, '0.4.1'

settings(
default: {
Expand Down

0 comments on commit c5d955c

Please sign in to comment.