diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:19:22 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:19:22 +0000 |
| commit | 6848c4f93c7727d6975632135a04c5633c1781f1 (patch) | |
| tree | 79de7b002747e9906e7563a81bba5a1f1979b679 /spec/features/projects/badges | |
| parent | ccd8cd283c4fade866542ea70caed770f675940c (diff) | |
| parent | d3a407d66fa553f3ff8afd1b9e42f01b9912e14a (diff) | |
| download | gitlab-ce-gl-ui-tooltip.tar.gz | |
Merge branch 'master' into 'gl-ui-tooltip'gl-ui-tooltip
# Conflicts:
# app/assets/javascripts/commons/gitlab_ui.js
Diffstat (limited to 'spec/features/projects/badges')
| -rw-r--r-- | spec/features/projects/badges/pipeline_badge_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/projects/badges/pipeline_badge_spec.rb b/spec/features/projects/badges/pipeline_badge_spec.rb index 8c4488b2ca6..dee81898928 100644 --- a/spec/features/projects/badges/pipeline_badge_spec.rb +++ b/spec/features/projects/badges/pipeline_badge_spec.rb @@ -19,7 +19,7 @@ describe 'Pipeline Badge' do let!(:pipeline) { create(:ci_empty_pipeline, project: project, ref: ref, sha: project.commit(ref).sha) } let!(:job) { create(:ci_build, pipeline: pipeline) } - context 'when the pipeline was successfull' do + context 'when the pipeline was successful' do it 'displays so on the badge' do job.success |