diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2018-11-01 13:34:23 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-11-01 13:34:23 +0300 |
commit | 7f47e13218477c13cc627c2f0664500b72ea18b7 (patch) | |
tree | 077f08ada085795dab3a4ecbcfa0436d67642977 /spec/controllers/projects | |
parent | 1c50200b9aba86d2ba66b81dee7886a51dc38409 (diff) | |
parent | 733ae9492129e835f183902a97ee0886e2dbdc9b (diff) |
Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'
Fix typos in comments and specs
See merge request gitlab-org/gitlab-ce!22683
Diffstat (limited to 'spec/controllers/projects')
-rw-r--r-- | spec/controllers/projects/environments_controller_spec.rb | 2 | ||||
-rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 2 |
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) |