summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-10-17 19:22:58 +0000
committerFatih Acet <acetfatih@gmail.com>2016-10-17 19:22:58 +0000
commitc49e152605ad1fe77bea6414c383cf70669ca110 (patch)
tree72588caf777408dbdb1b5257df303114b481f332 /app/assets/javascripts
parent285172c33c6acd66af284d8f1e97a41079fe90de (diff)
parent9ff64b299bdcca767464f26e25c7e0017ec0fc38 (diff)
downloadgitlab-ce-c49e152605ad1fe77bea6414c383cf70669ca110.tar.gz
Merge branch '23358-expand-hide-pipeline-btn-text-doesn-t-match' into 'master'
Fix toggling of expand/hide pipeline graph button ## What does this MR do? Corrects the toggling behaviour given that the pipeline graph now starts in a different state. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Expand/hide toggling UI is buggyyy ## Screenshots (if relevant) ![2016-10-14_18.15.41](/uploads/7cdeef02c0b8aa4266f2878866e4b633/2016-10-14_18.15.41.gif) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23358 See merge request !6898
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/pipelines.js.es62
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/pipelines.js.es6 b/app/assets/javascripts/pipelines.js.es6
index 6bf63ee6979..a7624de6089 100644
--- a/app/assets/javascripts/pipelines.js.es6
+++ b/app/assets/javascripts/pipelines.js.es6
@@ -15,7 +15,7 @@
$($pipelineBtn).add($pipelineGraph).toggleClass('graph-collapsed');
- graphCollapsed ? $btnText.text('Expand') : $btnText.text('Hide')
+ graphCollapsed ? $btnText.text('Hide') : $btnText.text('Expand')
}
addMarginToBuildColumns() {