Merge pull request #45 from centosadmin/develop

Develop

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.3.4
+
+* Add bot collision check
+
 # 1.3.3
 
 * Fix missing locale 2fa

app/views/settings/_redmine_2fa.html.erb

@@ -23,6 +23,15 @@
 <p>
   <label for="settings_bot_token">Bot Token</label>
   <%= text_field_tag 'settings[bot_token]', @settings['bot_token'], size: 50 %>
+  <% if (bot_collisions = TelegramCommon.bot_collisions).present? %>
+    <br>
+    <strong style="color: red"><%= t 'telegram_common.settings.bot_collision' %></strong>
+    <% bot_collisions.each do |collision| %>
+      <p>
+        <strong><%= collision.join(', ') %><strong>
+      </p>
+    <% end %>
+  <% end %>
 </p>
 <table style="width: 100%">
   <tr>

init.rb

@@ -18,7 +18,7 @@
 
 Redmine::Plugin.register :redmine_2fa do
   name 'Redmine 2FA'
-  version '1.3.3'
+  version '1.3.4'
   url 'https://github.com/centosadmin/redmine_2fa'
   description 'Two-factor authorization for Redmine'
   author 'Southbridge'