wip #4472 @1

diff --git a/Gemfile b/Gemfile
index 1c52dc66f91ebf06ded31c02d45e8aa617b8893c..e7117a892946a9d32bc241b2c0be963aeb372da7 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,2 @@
 gem 'slim-rails'
 gem 'validate_url'
-
-group :test do
-  gem 'rubocop', '~> 0.76.0', require: false
-  gem 'rubocop-performance', '~> 1.5.0', require: false
-  gem 'rubocop-rails', '~> 2.3.0', require: false
-end

diff --git a/Gemfile.save b/Gemfile.save
new file mode 100644 (file)
index 0000000..11454a8
--- /dev/null
+++ b/Gemfile.save
@@ -0,0 +1,7 @@
+gem 'slim-rails'
+gem 'validate_url'
+
+group :test do
+  gem 'rubocop', '~> 0.76.0', require: false
+  gem 'rubocop-performance', '~> 1.5.0', require: false
+  gem 'rubocop-rails', '~

diff --git a/lib/redmine_slack/patches/issue_patch.rb b/lib/redmine_slack/patches/issue_patch.rb
index d31b7aac7f8729328779357ea08daeaba2b6efbf..86dcbda36931f61e386b8af3163eeee38ec83d76 100644 (file)
--- a/lib/redmine_slack/patches/issue_patch.rb
+++ b/lib/redmine_slack/patches/issue_patch.rb
@@ -9,8 +9,9 @@ module RedmineSlack
       def self.included(base)
         base.send(:include, InstanceMethods)
         base.class_eval do
+          unloadable
           after_create :send_redmine_slack_create
-          after_commit :send_redmine_slack_update, :on => :update
+          after_save :send_redmine_slack_update
         end
       end
 
@@ -65,14 +66,14 @@ module RedmineSlack
         end
 
         def send_redmine_slack_update
-          return if current_journal.nil?
-          return if RequestStore.store[:redmine_slack_silent].nil?
+          #return if current_journal.nil?
+          # return if RequestStore.store[:redmine_slack_silent].nil?
 
           channels = Slack.channels_for_project project
 
-          return unless channels.present? && Slack.setting_for_project(project, :post_updates)
-          return if is_private? && !Slack.setting_for_project(project, :post_private_issues)
-          return if current_journal.private_notes? && !Slack.setting_for_project(project, :post_private_notes)
+          #return unless channels.present? && Slack.setting_for_project(project, :post_updates)
+          #return if is_private? && !Slack.setting_for_project(project, :post_private_issues)
+          #return if current_journal.private_notes? && !Slack.setting_for_project(project, :post_private_notes)
 
           set_language_if_valid Setting.default_language
 
@@ -139,12 +140,12 @@ module RedmineSlack
 
           attachment[:fields] = fields if fields.any?
 
-          send_message = true
-          if Slack.setting_for_project(project, :supress_empty_messages)
-            send_message = false unless (attachment.any? && attachment.key?(:text)) || !text_diff.empty?
-          end
-
-          return unless send_message
+          # send_message = true
+          # if Slack.setting_for_project(project, :supress_empty_messages)
+          #   send_message = false unless (attachment.any? && attachment.key?(:text)) || !text_diff.empty?
+          # end
+          #
+          # return unless send_message
 
           attachment[:color] = Slack.textfield_for_project(project, :color_update_notifications)
 

diff --git a/lib/redmine_slack/patches/issues_controller_patch.rb b/lib/redmine_slack/patches/issues_controller_patch.rb
index 4af19392dee0f27d890979035135c8455826145d..cb1c6add9ea1044eb5d5edb4d3f9e227b5811f7a 100644 (file)
--- a/lib/redmine_slack/patches/issues_controller_patch.rb
+++ b/lib/redmine_slack/patches/issues_controller_patch.rb
@@ -9,7 +9,7 @@ module RedmineSlack
       def self.included(base)
         base.send(:include, InstanceMethods)
         base.class_eval do
-          before_action :handle_silent_update, :only => [:create, :update]
+          #before_action :handle_silent_update, :only => [:create, :update]
         end
       end