Merge branch '2.x' into 3.x

Author: Lobster

lib/redmine_zulip/issue_patch.rb

@@ -95,6 +95,10 @@ def subject_without_punctuation
       subject.end_with?(".") ? subject[0..-1] : subject
     end
 
+    def zulip_settings
+      @_zulip_settings ||= RedmineZulip::Settings.new(self)
+    end
+
     private
 
     def zulip_api
@@ -105,10 +109,6 @@ def zulip_api
       )
     end
 
-    def zulip_settings
-      @_zulip_settings ||= RedmineZulip::Settings.new(self)
-    end
-
     def notify_assignment
       locale = assigned_to.language
       message = I18n.t("zulip_notify_assignment", {

lib/redmine_zulip/settings.rb

@@ -51,7 +51,7 @@ def version_updates_subject
     private
 
     def evaluate_expression(expression)
-      return nil if pattern.nil?
+      return nil if expression.nil?
       expression.gsub("${issue_id}", "#{@issue.id}")
                 .gsub("${issue_subject}", @issue.subject_without_punctuation)
                 .gsub("${project_name}", @issue.project.name)