Commit 4227f6ed authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #5856 from nishigori/fix-typo

Fix messages typo
parents 3f709e0a e78b90ab
......@@ -21,13 +21,13 @@ module Files
file_path = path
unless file_name =~ Gitlab::Regex.path_regex
return error("Your changes could not be commited, because file name contains not allowed characters")
return error("Your changes could not be committed, because file name contains not allowed characters")
end
blob = repository.blob_at(ref, file_path)
if blob
return error("Your changes could not be commited, because file with such name exists")
return error("Your changes could not be committed, because file with such name exists")
end
new_file_action = Gitlab::Satellite::NewFileAction.new(current_user, project, ref, file_path)
......@@ -39,7 +39,7 @@ module Files
if created_successfully
success
else
error("Your changes could not be commited, because the file has been changed")
error("Your changes could not be committed, because the file has been changed")
end
end
end
......
......@@ -33,7 +33,7 @@ module Files
if deleted_successfully
success
else
error("Your changes could not be commited, because the file has been changed")
error("Your changes could not be committed, because the file has been changed")
end
end
end
......
......@@ -32,7 +32,7 @@ module Files
if created_successfully
success
else
error("Your changes could not be commited, because the file has been changed")
error("Your changes could not be committed, because the file has been changed")
end
end
end
......
......@@ -16,7 +16,7 @@ class Projects::BlobController < Projects::ApplicationController
result = Files::DeleteContext.new(@project, current_user, params, @ref, @path).execute
if result[:status] == :success
flash[:notice] = "Your changes have been successfully commited"
flash[:notice] = "Your changes have been successfully committed"
redirect_to project_tree_path(@project, @ref)
else
flash[:alert] = result[:error]
......
......@@ -10,7 +10,7 @@ class Projects::EditTreeController < Projects::BaseTreeController
result = Files::UpdateContext.new(@project, current_user, params, @ref, @path).execute
if result[:status] == :success
flash[:notice] = "Your changes have been successfully commited"
flash[:notice] = "Your changes have been successfully committed"
redirect_to project_blob_path(@project, @id)
else
flash[:alert] = result[:error]
......
......@@ -9,7 +9,7 @@ class Projects::NewTreeController < Projects::BaseTreeController
result = Files::CreateContext.new(@project, current_user, params, @ref, file_path).execute
if result[:status] == :success
flash[:notice] = "Your changes have been successfully commited"
flash[:notice] = "Your changes have been successfully committed"
redirect_to project_blob_path(@project, File.join(@ref, file_path))
else
flash[:alert] = result[:error]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment