diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 03:08:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 03:08:58 +0300 |
| commit | 79216161b305b8d23b34226d45aa92dbae316cfe (patch) | |
| tree | fbedafc415fcfb9970968ac17e94a443ce7ce477 /app | |
| parent | c1924b863ad66503edbaa3325949bce6b023b737 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/ide/components/new_dropdown/index.vue | 2 | ||||
| -rw-r--r-- | app/models/issue_assignee.rb | 2 | ||||
| -rw-r--r-- | app/models/merge_request_assignee.rb | 2 | ||||
| -rw-r--r-- | app/serializers/variable_entity.rb | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/components/new_dropdown/index.vue b/app/assets/javascripts/ide/components/new_dropdown/index.vue index 27d24fa5e1d..b2fa020fb00 100644 --- a/app/assets/javascripts/ide/components/new_dropdown/index.vue +++ b/app/assets/javascripts/ide/components/new_dropdown/index.vue @@ -91,7 +91,7 @@ export default { </template> <li> <item-button - :label="__('Rename')" + :label="__('Rename/Move')" class="d-flex" icon="pencil" icon-classes="mr-2" diff --git a/app/models/issue_assignee.rb b/app/models/issue_assignee.rb index 748f73373e3..8128b8a538e 100644 --- a/app/models/issue_assignee.rb +++ b/app/models/issue_assignee.rb @@ -3,6 +3,8 @@ class IssueAssignee < ApplicationRecord belongs_to :issue belongs_to :assignee, class_name: "User", foreign_key: :user_id + + validates :assignee, uniqueness: { scope: :issue_id } end IssueAssignee.prepend_if_ee('EE::IssueAssignee') diff --git a/app/models/merge_request_assignee.rb b/app/models/merge_request_assignee.rb index f0e6be51b7f..fe642bee8e2 100644 --- a/app/models/merge_request_assignee.rb +++ b/app/models/merge_request_assignee.rb @@ -3,4 +3,6 @@ class MergeRequestAssignee < ApplicationRecord belongs_to :merge_request belongs_to :assignee, class_name: "User", foreign_key: :user_id + + validates :assignee, uniqueness: { scope: :merge_request_id } end diff --git a/app/serializers/variable_entity.rb b/app/serializers/variable_entity.rb index 8b19925f153..017035fa117 100644 --- a/app/serializers/variable_entity.rb +++ b/app/serializers/variable_entity.rb @@ -4,6 +4,7 @@ class VariableEntity < Grape::Entity expose :id expose :key expose :value + expose :variable_type expose :protected?, as: :protected expose :masked?, as: :masked |