diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-18 11:01:10 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-18 11:01:10 +0300 |
| commit | 3640248028d1e2a9893a91946ec6a0e66b8d52f8 (patch) | |
| tree | 925b6e32c45ebb2ddd6d3f21cc6290f4f7b2a399 | |
| parent | 59fa031e6f7d5a1b658c370f581c4caaf4493150 (diff) | |
| download | gitlab-ce-3640248028d1e2a9893a91946ec6a0e66b8d52f8.tar.gz | |
Replace 'Delete list' with 'Remove list' in Issue Board view
Delete is a strong word and might lead to confusion (data loss).
| -rw-r--r-- | app/assets/javascripts/boards/components/board_delete.js.es6 | 2 | ||||
| -rw-r--r-- | app/views/projects/boards/components/_board.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/boards/components/board_delete.js.es6 b/app/assets/javascripts/boards/components/board_delete.js.es6 index 34653cd48ef..7e7d31e046e 100644 --- a/app/assets/javascripts/boards/components/board_delete.js.es6 +++ b/app/assets/javascripts/boards/components/board_delete.js.es6 @@ -10,7 +10,7 @@ deleteBoard () { $(this.$el).tooltip('hide'); - if (confirm('Are you sure you want to delete this list?')) { + if (confirm('Are you sure you want to remove this list?')) { this.list.destroy(); } } diff --git a/app/views/projects/boards/components/_board.html.haml b/app/views/projects/boards/components/_board.html.haml index f8ebf397ee2..bdbe1605ea1 100644 --- a/app/views/projects/boards/components/_board.html.haml +++ b/app/views/projects/boards/components/_board.html.haml @@ -19,7 +19,7 @@ %board-delete{ "inline-template" => true, ":list" => "list", "v-if" => "!list.preset && list.id" } - %button.board-delete.has-tooltip.pull-right{ type: "button", title: "Delete list", "aria-label" => "Delete list", data: { placement: "bottom" }, "@click.stop" => "deleteBoard" } + %button.board-delete.has-tooltip.pull-right{ type: "button", title: "Remove list", "aria-label" => "Remove list", data: { placement: "bottom" }, "@click.stop" => "deleteBoard" } = icon("trash") = icon("spinner spin", class: "board-header-loading-spinner pull-right", "v-show" => "list.loadingMore") .board-inner-container.board-search-container{ "v-if" => "list.canSearch()" } |