summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRegis Boudinot <boudinot.regis@yahoo.com>2017-05-19 17:53:12 +0000
committerRegis Boudinot <boudinot.regis@yahoo.com>2017-05-19 17:53:12 +0000
commit485bf6bf6216b20c84e39d16d5b90da8955a34ab (patch)
tree6dc6540fe2339bbdc3227649a0969af5f8f8b1af
parent5bf678075ca7b6803c5fda94f01138f6e2fad35d (diff)
parent1098020d2dd301e18c0b68a814ebe15bffb56ba4 (diff)
downloadgitlab-ce-485bf6bf6216b20c84e39d16d5b90da8955a34ab.tar.gz
Merge branch 'tab-title-blank' into '9-2-stable'
Correctly set title_text with API data See merge request !11554
-rw-r--r--app/assets/javascripts/issue_show/issue_title_description.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/issue_show/issue_title_description.vue b/app/assets/javascripts/issue_show/issue_title_description.vue
index 920fbdfea6b..8a7a813efd8 100644
--- a/app/assets/javascripts/issue_show/issue_title_description.vue
+++ b/app/assets/javascripts/issue_show/issue_title_description.vue
@@ -84,7 +84,7 @@ export default {
},
elementsToVisualize(noTitleChange, noDescriptionChange) {
if (!noTitleChange) {
- this.titleText = this.apiData.title_text;
+ this.setTabTitle();
this.updateFlag('titleFlag', true);
}
@@ -104,7 +104,6 @@ export default {
animate(title, description) {
this.title = title;
this.description = description;
- this.setTabTitle();
this.$nextTick(() => {
this.updateFlag('titleFlag', false);
@@ -117,6 +116,7 @@ export default {
const { title, description } = this.apiData;
this.descriptionText = this.apiData.description_text;
+ this.titleText = this.apiData.title_text;
const noTitleChange = this.title === title;
const noDescriptionChange = this.description === description;