Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop

app/models/issue.rb

@@ -42,7 +42,7 @@ class Issue < ApplicationRecord
         new_attachment_name = self.attachments.select(:filename,:id).where(id: issue_files).pluck(:filename).join(",")
         journal.journal_details.create(property: "attachment", prop_key: "#{issue_files.size}", old_value: old_attachment_names, value: new_attachment_name)
       end
-      change_values = %w(subject description is_private assigned_to_id tracker_id status_id priority_id fixed_version_id start_date due_date estimated_hours done_ratio issue_tags_value issue_type token)
+      change_values = %w(subject description is_private assigned_to_id tracker_id status_id priority_id fixed_version_id start_date due_date estimated_hours done_ratio issue_tags_value issue_type token branch_name)
       change_values.each do |at|
         if self.send("saved_change_to_#{at}?")
           journal.journal_details.create(property: "attr", prop_key: "#{at}", old_value: self.send("#{at}_before_last_save"), value: self.send(at))

config/locales/zh-CN.yml

@@ -28,6 +28,7 @@ zh-CN:
     draft: 草稿
 
   journal_detail:
+    branch_name: 分支
     close_pr: 合并
     merge: 合并
     issue_tags_value: 标签

public/react/build/asset-manifest.json

@@ -20,7 +20,7 @@
   "./static/js/114.7d362873.chunk.js": "./static/js/114.7d362873.chunk.js",
   "./static/js/115.7104a66c.chunk.js": "./static/js/115.7104a66c.chunk.js",
   "./static/js/116.0092d139.chunk.js": "./static/js/116.0092d139.chunk.js",
-  "./static/js/117.83be1f63.chunk.js": "./static/js/117.83be1f63.chunk.js",
+  "./static/js/117.260c9259.chunk.js": "./static/js/117.260c9259.chunk.js",
   "./static/js/118.215e7054.chunk.js": "./static/js/118.215e7054.chunk.js",
   "./static/js/119.0b5cd6ca.chunk.js": "./static/js/119.0b5cd6ca.chunk.js",
   "./static/js/12.e2bce25c.chunk.js": "./static/js/12.e2bce25c.chunk.js",
@@ -29,7 +29,7 @@
   "./static/js/122.799a3e5f.chunk.js": "./static/js/122.799a3e5f.chunk.js",
   "./static/js/123.0ea63163.chunk.js": "./static/js/123.0ea63163.chunk.js",
   "./static/js/124.9dbc5538.chunk.js": "./static/js/124.9dbc5538.chunk.js",
-  "./static/js/125.2b92d903.chunk.js": "./static/js/125.2b92d903.chunk.js",
+  "./static/js/125.12d1e2cc.chunk.js": "./static/js/125.12d1e2cc.chunk.js",
   "./static/js/126.543ebf93.chunk.js": "./static/js/126.543ebf93.chunk.js",
   "./static/js/127.def2de8a.chunk.js": "./static/js/127.def2de8a.chunk.js",
   "./static/js/128.81acd2f9.chunk.js": "./static/js/128.81acd2f9.chunk.js",
@@ -79,7 +79,7 @@
   "./static/js/168.3c1a6b2a.chunk.js": "./static/js/168.3c1a6b2a.chunk.js",
   "./static/js/169.d6dac83c.chunk.js": "./static/js/169.d6dac83c.chunk.js",
   "./static/js/17.2e92bbbf.chunk.js": "./static/js/17.2e92bbbf.chunk.js",
-  "./static/js/170.8cb1506f.chunk.js": "./static/js/170.8cb1506f.chunk.js",
+  "./static/js/170.16dcefc2.chunk.js": "./static/js/170.16dcefc2.chunk.js",
   "./static/js/171.253e4ed6.chunk.js": "./static/js/171.253e4ed6.chunk.js",
   "./static/js/172.06a08759.chunk.js": "./static/js/172.06a08759.chunk.js",
   "./static/js/173.d29fdee2.chunk.js": "./static/js/173.d29fdee2.chunk.js",
@@ -241,7 +241,7 @@
   "./static/js/60.23d5ade7.chunk.js": "./static/js/60.23d5ade7.chunk.js",
   "./static/js/61.cb0a9253.chunk.js": "./static/js/61.cb0a9253.chunk.js",
   "./static/js/62.bfa8e48e.chunk.js": "./static/js/62.bfa8e48e.chunk.js",
-  "./static/js/63.bda9fea6.chunk.js": "./static/js/63.bda9fea6.chunk.js",
+  "./static/js/63.b478866b.chunk.js": "./static/js/63.b478866b.chunk.js",
   "./static/js/64.7f2872d8.chunk.js": "./static/js/64.7f2872d8.chunk.js",
   "./static/js/65.de7e42db.chunk.js": "./static/js/65.de7e42db.chunk.js",
   "./static/js/66.fb800b9d.chunk.js": "./static/js/66.fb800b9d.chunk.js",
@@ -282,7 +282,7 @@
   "./static/js/98.8396e4ed.chunk.js": "./static/js/98.8396e4ed.chunk.js",
   "./static/js/99.579e89a3.chunk.js": "./static/js/99.579e89a3.chunk.js",
   "main.css": "./static/css/main.fd229636.css",
-  "main.js": "./static/js/main.38c1bb85.js",
+  "main.js": "./static/js/main.b84fc3b5.js",
   "static/media/KaTeX_AMS-Regular.ttf": "static/media/KaTeX_AMS-Regular.aaf4eee9.ttf",
   "static/media/KaTeX_AMS-Regular.woff": "static/media/KaTeX_AMS-Regular.7f06b4e3.woff",
   "static/media/KaTeX_AMS-Regular.woff2": "static/media/KaTeX_AMS-Regular.e78e28b4.woff2",

public/react/build/index.html

@@ -24,7 +24,7 @@
                 _host = 'https://ali-cdn.educoder.net/react/build/'
             }
             document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\/script>');
-            document.write('<script type="text/javascript" src="' + _host + 'static/js/main.38c1bb85.js"><\/script>');
+            document.write('<script type="text/javascript" src="' + _host + 'static/js/main.b84fc3b5.js"><\/script>');
          })()
       </script>
     <script>!function(){var t=location.href;"3007"===window.location.port?-1!=t.indexOf("/tasks/")?(document.write('<script type="text/javascript" src="https://newweb.educoder.net/assets/kindeditor/kindeditor.js"><\/script>'),document.write('<script type="text/javascript" src="/react/build/js/create_kindeditor.js?v=1.1.1"><\/script>'),document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>')):-1!=t.indexOf("/paths/")&&document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>'):-1!=t.indexOf("/tasks/")?(document.write('<script type="text/javascript" src="/assets/kindeditor/kindeditor.js"><\/script>'),document.write('<script type="text/javascript" src="/react/build/js/create_kindeditor.js?v=1.1.1"><\/script>'),document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>')):-1!=t.indexOf("/paths/")&&document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>')}()</script><script type="text/javascript" src="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.js"></script></body></html>