Browse Source

Merge branch 'standalone_develop' into pre_trustie_server

pull/330/head
xxq250 3 years ago
parent
commit
46cf275a81
2 changed files with 5 additions and 1 deletions
  1. +2
    -0
      app/models/issue_tag.rb
  2. +3
    -1
      config/locales/zh-CN.yml

+ 2
- 0
app/models/issue_tag.rb View File

@@ -28,6 +28,8 @@ class IssueTag < ApplicationRecord
belongs_to :project, optional: true, counter_cache: true
belongs_to :user, optional: true

validates :name, uniqueness: { message: "已存在" }

def self.init_data(project_id)
data = [
["缺陷", "表示存在意外问题或错误", "#d92d4c"],


+ 3
- 1
config/locales/zh-CN.yml View File

@@ -18,7 +18,7 @@ zh-CN:
Issue: 疑修(Issue)
PullRequest: 合并请求(PR)
VersionRelease: 版本发布
CommitLog: 代码(Commit)
CommitLog: 代码提交(Commit)
create: 创建了
journal: 回复了
close: 关闭了
@@ -234,6 +234,8 @@ zh-CN:
content: 'git忽略文件内容'
feedback_message_history:
title: ''
issue_tag:
name: '项目标记'
close_pr: 合并请求
roles:
Developer: 开发者


Loading…
Cancel
Save