diff options
| author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-13 17:04:57 +0000 |
|---|---|---|
| committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-13 17:04:57 +0000 |
| commit | 82199c6c844dd2d78fb0ca414a2cb1ac44e7b87f (patch) | |
| tree | 64be88ada577a2c61c1f453c3dbd2c181ed10e34 | |
| parent | 018a7c6a550494a7dd386450b464d5692413f319 (diff) | |
| parent | f2aa9b463086697771e2bf936a7d272307bcbd67 (diff) | |
| download | gitlab-ce-82199c6c844dd2d78fb0ca414a2cb1ac44e7b87f.tar.gz | |
Merge branch '27939-fix-current-build-arrow' into 'master'
Fix current build arrow
Closes #27939
See merge request !9154
| -rw-r--r-- | app/helpers/builds_helper.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/27939-fix-current-build-arrow.yml | 4 | ||||
| -rw-r--r-- | spec/features/projects/builds_spec.rb | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/app/helpers/builds_helper.rb b/app/helpers/builds_helper.rb index 9fc69e12266..ff937b5ebd2 100644 --- a/app/helpers/builds_helper.rb +++ b/app/helpers/builds_helper.rb @@ -1,7 +1,7 @@ module BuildsHelper def sidebar_build_class(build, current_build) build_class = '' - build_class += ' active' if build == current_build + build_class += ' active' if build.id === current_build.id build_class += ' retried' if build.retried? build_class end diff --git a/changelogs/unreleased/27939-fix-current-build-arrow.yml b/changelogs/unreleased/27939-fix-current-build-arrow.yml new file mode 100644 index 00000000000..280ab090f2c --- /dev/null +++ b/changelogs/unreleased/27939-fix-current-build-arrow.yml @@ -0,0 +1,4 @@ +--- +title: Fix current build arrow indicator +merge_request: +author: diff --git a/spec/features/projects/builds_spec.rb b/spec/features/projects/builds_spec.rb index f7e0115643e..f1036b275f7 100644 --- a/spec/features/projects/builds_spec.rb +++ b/spec/features/projects/builds_spec.rb @@ -109,6 +109,10 @@ feature 'Builds', :feature do expect(page).to have_content pipeline.git_commit_message expect(page).to have_content pipeline.git_author_name end + + it 'shows active build' do + expect(page).to have_selector('.build-job.active') + end end context "Job from other project" do |