Merge branch 'master' into 'gl-ui-tooltip'gl-ui-tooltip

# Conflicts:
#   app/assets/javascripts/commons/gitlab_ui.js

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/javascripts/pipelines/pipelines_spec.js b/spec/javascripts/pipelines/pipelines_spec.js
index 37908153e0e..97ded16db69 100644
--- a/spec/javascripts/pipelines/pipelines_spec.js
+++ b/spec/javascripts/pipelines/pipelines_spec.js
@@ -372,7 +372,7 @@ describe('Pipelines', () => {
     });
   });
 
-  describe('successfull request', () => {
+  describe('successful request', () => {
     describe('with pipelines', () => {
       beforeEach(() => {
         mock.onGet('twitter/flight/pipelines.json').reply(200, pipelines);
@@ -667,7 +667,7 @@ describe('Pipelines', () => {
         });
       });
 
-      it('returns false when state is emtpy state', done => {
+      it('returns false when state is empty state', done => {
         vm.isLoading = false;
         vm.hasMadeRequest = true;
         vm.hasGitlabCi = false;