Merge branch 'master' into rs-sign_in

2 files changed, 2 insertions, 6 deletions

diff --git a/spec/features/projects/files/creating_a_file_spec.rb b/spec/features/projects/files/creating_a_file_spec.rb
index 1367077c4cf..55350db4c34 100644
--- a/spec/features/projects/files/creating_a_file_spec.rb
+++ b/spec/features/projects/files/creating_a_file_spec.rb
@@ -30,11 +30,6 @@ feature 'User wants to create a file', feature: true do
     expect(page).to have_content 'The file has been successfully created'
   end
 
-  scenario 'file name contains invalid characters' do
-    submit_new_file(file_name: '\\')
-    expect(page).to have_content 'Path can contain only'
-  end
-
   scenario 'file name contains directory traversal' do
     submit_new_file(file_name: '../README.md')
     expect(page).to have_content 'Path cannot include directory traversal'
diff --git a/spec/features/projects/files/editing_a_file_spec.rb b/spec/features/projects/files/editing_a_file_spec.rb
index f93647b2d7e..c295380dfc9 100644
--- a/spec/features/projects/files/editing_a_file_spec.rb
+++ b/spec/features/projects/files/editing_a_file_spec.rb
@@ -18,7 +18,8 @@ feature 'User wants to edit a file', feature: true do
   background do
     project.team << [user, :master]
     sign_in user
-    visit project_edit_blob_path(project, File.join(project.default_branch, '.gitignore'))
+    visit project_edit_blob_path(project,
+                                           File.join(project.default_branch, '.gitignore'))
   end
 
   scenario 'file has been updated since the user opened the edit page' do