merge from develop

This commit is contained in:
yystopf 2023-04-18 09:45:56 +08:00
commit 95018c80a7
2 changed files with 4 additions and 0 deletions

View File

@ -28,6 +28,8 @@ class IssueTag < ApplicationRecord
belongs_to :project, optional: true, counter_cache: true belongs_to :project, optional: true, counter_cache: true
belongs_to :user, optional: true belongs_to :user, optional: true
validates :name, uniqueness: { message: "已存在" }
def self.init_data(project_id) def self.init_data(project_id)
data = [ data = [
["缺陷", "表示存在意外问题或错误", "#d92d4c"], ["缺陷", "表示存在意外问题或错误", "#d92d4c"],

View File

@ -234,6 +234,8 @@ zh-CN:
content: 'git忽略文件内容' content: 'git忽略文件内容'
feedback_message_history: feedback_message_history:
title: '' title: ''
issue_tag:
name: '项目标记'
close_pr: 合并请求 close_pr: 合并请求
roles: roles:
Developer: 开发者 Developer: 开发者