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

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

2 files changed, 2 insertions, 2 deletions

diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb
index b86029a4baf..bc17331f531 100644
--- a/spec/controllers/projects/environments_controller_spec.rb
+++ b/spec/controllers/projects/environments_controller_spec.rb
@@ -216,7 +216,7 @@ describe Projects::EnvironmentsController do
         expect(response).to have_gitlab_http_status(200)
       end
 
-      it 'loads the terminals for the enviroment' do
+      it 'loads the terminals for the environment' do
         expect_any_instance_of(Environment).to receive(:terminals)
 
         get :terminal, environment_params
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 7b0459e0325..7463586621c 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -786,7 +786,7 @@ describe Projects::MergeRequestsController do
             merge_request.mark_as_merged!
           end
 
-          it 'returns the enviroment on the source project' do
+          it 'returns the environment on the source project' do
             get_ci_environments_status(environment_target: 'merge_commit')
 
             expect(response).to have_gitlab_http_status(:ok)