From 0c4482b3a557ff7cb2657ce3785fd957b3cf9c9b Mon Sep 17 00:00:00 2001 From: Alexander Meindl Date: Mon, 16 Jul 2018 13:31:55 +0200 Subject: [PATCH] Working on Redmine 4 support --- .travis.yml | 2 +- CHANGELOG.md | 6 ++++++ db/migrate/001_create_messenger_settings.rb | 2 +- db/migrate/002_add_default_mentions.rb | 2 +- db/migrate/003_add_private_settings.rb | 2 +- init.rb | 2 +- lib/redmine_messenger/patches/projects_helper_patch.rb | 3 ++- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2856216..aa8f8f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ rvm: env: - REDMINE_VER=3.4-stable DB=postgresql - # - REDMINE_VER=master + - REDMINE_VER=master sudo: true cache: bundler diff --git a/CHANGELOG.md b/CHANGELOG.md index 95ae77a..481746e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Changelog ========= +1.0.3 +----- + +- Redmine 4 support + + 1.0.2 ----- diff --git a/db/migrate/001_create_messenger_settings.rb b/db/migrate/001_create_messenger_settings.rb index f0148b3..0fe489a 100644 --- a/db/migrate/001_create_messenger_settings.rb +++ b/db/migrate/001_create_messenger_settings.rb @@ -1,4 +1,4 @@ -class CreateMessengerSettings < ActiveRecord::Migration +class CreateMessengerSettings < Rails.version < '5.2' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2] def change create_table :messenger_settings do |t| t.references :project, null: false, index: true diff --git a/db/migrate/002_add_default_mentions.rb b/db/migrate/002_add_default_mentions.rb index 232263e..1412e78 100644 --- a/db/migrate/002_add_default_mentions.rb +++ b/db/migrate/002_add_default_mentions.rb @@ -1,4 +1,4 @@ -class AddDefaultMentions < ActiveRecord::Migration +class AddDefaultMentions < Rails.version < '5.2' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2] def change add_column :messenger_settings, :default_mentions, :string end diff --git a/db/migrate/003_add_private_settings.rb b/db/migrate/003_add_private_settings.rb index fd4379f..bd89d42 100644 --- a/db/migrate/003_add_private_settings.rb +++ b/db/migrate/003_add_private_settings.rb @@ -1,4 +1,4 @@ -class AddPrivateSettings < ActiveRecord::Migration +class AddPrivateSettings < Rails.version < '5.2' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2] def change add_column :messenger_settings, :post_private_contacts, :integer, default: 0, null: false add_column :messenger_settings, :post_private_db, :integer, default: 0, null: false diff --git a/init.rb b/init.rb index b28497d..08b93ac 100644 --- a/init.rb +++ b/init.rb @@ -7,7 +7,7 @@ Redmine::Plugin.register :redmine_messenger do url 'https://github.com/alphanodes/redmine_messenger' author_url 'https://alphanodes.com/' description 'Messenger integration for Slack, Discord, Rocketchat and Mattermost support' - version '1.0.2' + version '1.0.3' requires_redmine version_or_higher: '3.0.0' diff --git a/lib/redmine_messenger/patches/projects_helper_patch.rb b/lib/redmine_messenger/patches/projects_helper_patch.rb index 1154f1d..deff6aa 100644 --- a/lib/redmine_messenger/patches/projects_helper_patch.rb +++ b/lib/redmine_messenger/patches/projects_helper_patch.rb @@ -4,7 +4,8 @@ module RedmineMessenger def self.included(base) base.send(:include, InstanceMethods) base.class_eval do - alias_method_chain :project_settings_tabs, :messenger + alias_method :project_settings_tabs_without_additionals, :project_settings_tabs + alias_method :project_settings_tabs, :project_settings_tabs_with_additionals end end