diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-01-18 22:08:40 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-01-18 22:08:40 +0000 |
| commit | 561374ac12ba53acb30ee8caa1b9ff1c2e00ead6 (patch) | |
| tree | b06b7a793625178c3ea7012d64d91017d9a8076c /app/assets | |
| parent | 5746cc02d3058ba28efb3ff156ac096a3a8a8fbd (diff) | |
| parent | c5caf947893de77c811852a5a1c8ab9a19e0695a (diff) | |
| download | gitlab-ce-561374ac12ba53acb30ee8caa1b9ff1c2e00ead6.tar.gz | |
Merge branch '42190-make-edit-labels-in-the-issuable-sidebar-consistent' into 'master'
Resolve ""Edit" labels in the issuable sidebar are not consistent"
Closes #42190
See merge request gitlab-org/gitlab-ce!16565
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/sidebar/components/assignees/assignee_title.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/sidebar/components/assignees/assignee_title.js b/app/assets/javascripts/sidebar/components/assignees/assignee_title.js index 77f070d48cc..129ba2e4e89 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignee_title.js +++ b/app/assets/javascripts/sidebar/components/assignees/assignee_title.js @@ -39,7 +39,7 @@ export default { class="js-sidebar-dropdown-toggle edit-link pull-right" href="#" > - Edit + {{ __('Edit') }} </a> <a v-if="showToggle" diff --git a/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue b/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue index 839f9ec88b9..02153fb86a5 100644 --- a/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue +++ b/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue @@ -65,7 +65,7 @@ href="#" @click.prevent="toggleForm" > - Edit + {{ __('Edit') }} </a> </div> <div class="value sidebar-item-value hide-collapsed"> |