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/features/projects/files/user_creates_files_spec.rb b/spec/features/projects/files/user_creates_files_spec.rb
index d9df4b50621..14b5bd58bd1 100644
--- a/spec/features/projects/files/user_creates_files_spec.rb
+++ b/spec/features/projects/files/user_creates_files_spec.rb
@@ -16,7 +16,7 @@ describe 'Projects > Files > User creates files' do
     sign_in(user)
   end
 
-  context 'without commiting a new file' do
+  context 'without committing a new file' do
     context 'when an user has write access' do
       before do
         visit(project_tree_path_root_ref)
@@ -49,7 +49,7 @@ describe 'Projects > Files > User creates files' do
     end
   end
 
-  context 'with commiting a new file' do
+  context 'with committing a new file' do
     context 'when an user has write access' do
       before do
         visit(project_tree_path_root_ref)