diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-10-07 02:43:09 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-10-07 02:43:09 +0300 |
commit | 8068d3e164800cdc0c61195009f1e6fc02e796d1 (patch) | |
tree | ae66b6ca556d108c5386b179393f86041059f689 /app | |
parent | a625757cb469612409d47326241818ddf4fca982 (diff) | |
parent | 35e231b5cce463c793a76cf1961e23bf63f82c7c (diff) |
Merge branch '23025-issue-boards-defaults' into 'master'
Change issue board defaults
#### What does this MR do?
Changes the issue board default list from `Development`, `Testing`, `Production`, `Ready` to `To Do` and `Doing`
#### Screenshots (if relevant)
![Screen_Shot_2016-10-06_at_8.46.48_AM](/uploads/6e73e03f5749f18b95bd7e23c676603d/Screen_Shot_2016-10-06_at_8.46.48_AM.png)
![Screen_Shot_2016-10-06_at_9.07.06_AM](/uploads/cadd3af74e3adb73fe854478ce95120e/Screen_Shot_2016-10-06_at_9.07.06_AM.png)
#### What are the relevant issue numbers?
Closes #23025
See merge request !6716
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/boards/components/board_blank_state.js.es6 | 6 | ||||
-rw-r--r-- | app/services/boards/lists/generate_service.rb | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/app/assets/javascripts/boards/components/board_blank_state.js.es6 b/app/assets/javascripts/boards/components/board_blank_state.js.es6 index 63d72d857d9..ff90f2d6d75 100644 --- a/app/assets/javascripts/boards/components/board_blank_state.js.es6 +++ b/app/assets/javascripts/boards/components/board_blank_state.js.es6 @@ -8,10 +8,8 @@ data () { return { predefinedLabels: [ - new ListLabel({ title: 'Development', color: '#5CB85C' }), - new ListLabel({ title: 'Testing', color: '#F0AD4E' }), - new ListLabel({ title: 'Production', color: '#FF5F00' }), - new ListLabel({ title: 'Ready', color: '#FF0000' }) + new ListLabel({ title: 'To Do', color: '#F0AD4E' }), + new ListLabel({ title: 'Doing', color: '#5CB85C' }) ] } }, diff --git a/app/services/boards/lists/generate_service.rb b/app/services/boards/lists/generate_service.rb index 1c48b9786e4..830e386c98b 100644 --- a/app/services/boards/lists/generate_service.rb +++ b/app/services/boards/lists/generate_service.rb @@ -25,10 +25,8 @@ module Boards def label_params [ - { name: 'Development', color: '#5CB85C' }, - { name: 'Testing', color: '#F0AD4E' }, - { name: 'Production', color: '#FF5F00' }, - { name: 'Ready', color: '#FF0000' } + { name: 'To Do', color: '#F0AD4E' }, + { name: 'Doing', color: '#5CB85C' } ] end end |