diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-08-06 12:40:33 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-08-06 12:40:33 +0000 |
| commit | 26087322713e2949f2bf207798512374757a484c (patch) | |
| tree | 532fd78f0c98c2625fa8669584d8f6994270a58e /app | |
| parent | 9edf06d9c40e9508d405286c71fbc62dccf68299 (diff) | |
| parent | 651e89d29a300f44ac0ef9d59315d2a64a52efa0 (diff) | |
| download | gitlab-ce-26087322713e2949f2bf207798512374757a484c.tar.gz | |
Merge branch 'make-issue-boards-importable' into 'master'
Make issue boards importable
See merge request gitlab-org/gitlab-ce!31434
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/list.rb | 3 | ||||
| -rw-r--r-- | app/views/projects/_export.html.haml | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/list.rb b/app/models/list.rb index d28a9bda82d..ccadd39bda2 100644 --- a/app/models/list.rb +++ b/app/models/list.rb @@ -3,10 +3,11 @@ class List < ApplicationRecord belongs_to :board belongs_to :label + include Importable enum list_type: { backlog: 0, label: 1, closed: 2, assignee: 3, milestone: 4 } - validates :board, :list_type, presence: true + validates :board, :list_type, presence: true, unless: :importing? validates :label, :position, presence: true, if: :label? validates :label_id, uniqueness: { scope: :board_id }, if: :label? validates :position, numericality: { only_integer: true, greater_than_or_equal_to: 0 }, if: :movable? diff --git a/app/views/projects/_export.html.haml b/app/views/projects/_export.html.haml index 1056977886a..e42772c2dd9 100644 --- a/app/views/projects/_export.html.haml +++ b/app/views/projects/_export.html.haml @@ -15,6 +15,7 @@ %li= _('Project configuration, including services') %li= _('Issues with comments, merge requests with diffs and comments, labels, milestones, snippets, and other project entities') %li= _('LFS objects') + %li= _('Issue Boards') %p= _('The following items will NOT be exported:') %ul %li= _('Job traces and artifacts') |