diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-20 07:26:01 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-20 07:26:01 +0000 |
| commit | 8f67a2604775b32b76fd2bec8e7a920be6429be3 (patch) | |
| tree | d8c9380e991ff3fa219abbe105b03ec98bbfce94 | |
| parent | 3a43b55a80e5e5f928b3cc02c52cf210361e16c7 (diff) | |
| parent | f8ceee24686bb5ed680de00c47f5dab08072e026 (diff) | |
| download | gitlab-ce-8f67a2604775b32b76fd2bec8e7a920be6429be3.tar.gz | |
Merge branch 'rename_all_issues' into 'master'
Rename 'All issues' to 'Open issues' in Add issues modal
Closes #29617
See merge request !10042
| -rw-r--r-- | app/assets/javascripts/boards/components/modal/empty_state.js | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/boards/components/modal/tabs.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/rename_all_issues.yml | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/boards/components/modal/empty_state.js b/app/assets/javascripts/boards/components/modal/empty_state.js index 9538f5b69e9..e6973c3fd59 100644 --- a/app/assets/javascripts/boards/components/modal/empty_state.js +++ b/app/assets/javascripts/boards/components/modal/empty_state.js @@ -30,7 +30,7 @@ if (this.activeTab === 'selected') { obj.title = 'You haven\'t selected any issues yet'; obj.content = ` - Go back to <strong>All issues</strong> and select some issues + Go back to <strong>Open issues</strong> and select some issues to add to your board. `; } @@ -59,7 +59,7 @@ class="btn btn-default" @click="changeTab('all')" v-if="activeTab === 'selected'"> - All issues + Open issues </button> </div> </div> diff --git a/app/assets/javascripts/boards/components/modal/tabs.js b/app/assets/javascripts/boards/components/modal/tabs.js index e8cb43f3503..1cd6ca0ee88 100644 --- a/app/assets/javascripts/boards/components/modal/tabs.js +++ b/app/assets/javascripts/boards/components/modal/tabs.js @@ -23,7 +23,7 @@ href="#" role="button" @click.prevent="changeTab('all')"> - All issues + Open issues <span class="badge"> {{ issuesCount }} </span> diff --git a/changelogs/unreleased/rename_all_issues.yml b/changelogs/unreleased/rename_all_issues.yml new file mode 100644 index 00000000000..d3109bdb17e --- /dev/null +++ b/changelogs/unreleased/rename_all_issues.yml @@ -0,0 +1,4 @@ +--- +title: Rename 'All issues' to 'Open issues' in Add issues modal +merge_request: 10042 +author: blackst0ne |