Download as
Browse Code »

Commit e78b90ab1d3c5831dea8dc04a83ce31b74aac70a

Authored by Takuya Nishigori
1 parent d476ac7d
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix messages typo

Showing 6 changed files with 8 additions and 8 deletions   Show diff stats
app/contexts/files/create_context.rb
  Diff comments   View file @e78b90a
... ... @@ -21,13 +21,13 @@ module Files
21 21 file_path = path
22 22  
23 23 unless file_name =~ Gitlab::Regex.path_regex
24   - return error("Your changes could not be commited, because file name contains not allowed characters")
  24 + return error("Your changes could not be committed, because file name contains not allowed characters")
25 25 end
26 26  
27 27 blob = repository.blob_at(ref, file_path)
28 28  
29 29 if blob
30   - return error("Your changes could not be commited, because file with such name exists")
  30 + return error("Your changes could not be committed, because file with such name exists")
31 31 end
32 32  
33 33 new_file_action = Gitlab::Satellite::NewFileAction.new(current_user, project, ref, file_path)
... ... @@ -39,7 +39,7 @@ module Files
39 39 if created_successfully
40 40 success
41 41 else
42   - error("Your changes could not be commited, because the file has been changed")
  42 + error("Your changes could not be committed, because the file has been changed")
43 43 end
44 44 end
45 45 end
... ...
app/contexts/files/delete_context.rb
  Diff comments   View file @e78b90a
... ... @@ -33,7 +33,7 @@ module Files
33 33 if deleted_successfully
34 34 success
35 35 else
36   - error("Your changes could not be commited, because the file has been changed")
  36 + error("Your changes could not be committed, because the file has been changed")
37 37 end
38 38 end
39 39 end
... ...
app/contexts/files/update_context.rb
  Diff comments   View file @e78b90a
... ... @@ -32,7 +32,7 @@ module Files
32 32 if created_successfully
33 33 success
34 34 else
35   - error("Your changes could not be commited, because the file has been changed")
  35 + error("Your changes could not be committed, because the file has been changed")
36 36 end
37 37 end
38 38 end
... ...
app/controllers/projects/blob_controller.rb
  Diff comments   View file @e78b90a
... ... @@ -16,7 +16,7 @@ class Projects::BlobController < Projects::ApplicationController
16 16 result = Files::DeleteContext.new(@project, current_user, params, @ref, @path).execute
17 17  
18 18 if result[:status] == :success
19   - flash[:notice] = "Your changes have been successfully commited"
  19 + flash[:notice] = "Your changes have been successfully committed"
20 20 redirect_to project_tree_path(@project, @ref)
21 21 else
22 22 flash[:alert] = result[:error]
... ...
app/controllers/projects/edit_tree_controller.rb
  Diff comments   View file @e78b90a
... ... @@ -10,7 +10,7 @@ class Projects::EditTreeController < Projects::BaseTreeController
10 10 result = Files::UpdateContext.new(@project, current_user, params, @ref, @path).execute
11 11  
12 12 if result[:status] == :success
13   - flash[:notice] = "Your changes have been successfully commited"
  13 + flash[:notice] = "Your changes have been successfully committed"
14 14 redirect_to project_blob_path(@project, @id)
15 15 else
16 16 flash[:alert] = result[:error]
... ...
app/controllers/projects/new_tree_controller.rb
  Diff comments   View file @e78b90a
... ... @@ -9,7 +9,7 @@ class Projects::NewTreeController < Projects::BaseTreeController
9 9 result = Files::CreateContext.new(@project, current_user, params, @ref, file_path).execute
10 10  
11 11 if result[:status] == :success
12   - flash[:notice] = "Your changes have been successfully commited"
  12 + flash[:notice] = "Your changes have been successfully committed"
13 13 redirect_to project_blob_path(@project, File.join(@ref, file_path))
14 14 else
15 15 flash[:alert] = result[:error]
... ...