Commit c49e1526 authored by Fatih Acet's avatar Fatih Acet

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
parents 285172c3 9ff64b29
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
$($pipelineBtn).add($pipelineGraph).toggleClass('graph-collapsed'); $($pipelineBtn).add($pipelineGraph).toggleClass('graph-collapsed');
graphCollapsed ? $btnText.text('Expand') : $btnText.text('Hide') graphCollapsed ? $btnText.text('Hide') : $btnText.text('Expand')
} }
addMarginToBuildColumns() { addMarginToBuildColumns() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment