Commit 6af38f51453d6a59eb983c13efa1e08303c2ec16

Authored by Robert Speicher
1 parent 6ebd360c

"Cant" -> "Can't"

app/models/project.rb
@@ -66,7 +66,7 @@ class Project < ActiveRecord::Base @@ -66,7 +66,7 @@ class Project < ActiveRecord::Base
66 project 66 project
67 rescue => ex 67 rescue => ex
68 project.error_code = :db 68 project.error_code = :db
69 - project.errors.add(:base, "Cant save project. Please try again later") 69 + project.errors.add(:base, "Can't save project. Please try again later")
70 project 70 project
71 end 71 end
72 72
@@ -112,7 +112,7 @@ class Project < ActiveRecord::Base @@ -112,7 +112,7 @@ class Project < ActiveRecord::Base
112 errors[:base] << ("Your own projects limit is #{owner.projects_limit}! Please contact administrator to increase it") 112 errors[:base] << ("Your own projects limit is #{owner.projects_limit}! Please contact administrator to increase it")
113 end 113 end
114 rescue 114 rescue
115 - errors[:base] << ("Cant check your ability to create project") 115 + errors[:base] << ("Can't check your ability to create project")
116 end 116 end
117 117
118 def repo_name 118 def repo_name
app/views/errors/encoding.html.haml
@@ -2,5 +2,5 @@ @@ -2,5 +2,5 @@
2 %h3 Encoding Error 2 %h3 Encoding Error
3 %hr 3 %hr
4 %p 4 %p
5 - Page cant be loaded cause of encoding error 5 + Page can't be loaded cause of encoding error
6 6
app/views/errors/git_not_found.html.haml
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %h3 Git Resource Not found 2 %h3 Git Resource Not found
3 %hr 3 %hr
4 %p 4 %p
5 - Application cant get access to some 5 + Application can't get access to some
6 %span.label branch 6 %span.label branch
7 or 7 or
8 %span.label commit 8 %span.label commit
app/views/errors/gitolite.html.haml
1 .alert-message.block-message.error 1 .alert-message.block-message.error
2 %h3 Gitolite Error 2 %h3 Gitolite Error
3 - %h4 Application cant get access to your gitolite system. 3 + %h4 Application can't get access to your gitolite system.
4 4
5 5
6 6
app/views/merge_requests/show/_mr_accept.html.haml
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 %span 28 %span
29 = link_to "Show how to merge", "#", class: "how_to_merge_link btn small padded", title: "How To Merge" 29 = link_to "Show how to merge", "#", class: "how_to_merge_link btn small padded", title: "How To Merge"
30 &nbsp; 30 &nbsp;
31 - %strong This request cant be merged with GitLab. You should do it manually 31 + %strong This request can't be merged with GitLab. You should do it manually
32 32
33 .automerge_widget.unchecked 33 .automerge_widget.unchecked
34 .alert-message 34 .alert-message
app/views/snippets/index.html.haml
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 .alert-message.block-message 4 .alert-message.block-message
5 = link_to new_project_snippet_path(@project), class: "btn small add_new right", title: "New Snippet" do 5 = link_to new_project_snippet_path(@project), class: "btn small add_new right", title: "New Snippet" do
6 Add new snippet 6 Add new snippet
7 - Share code pastes with others if it cant be in a git repository 7 + Share code pastes with others if it can't be in a git repository
8 %br 8 %br
9 To add new snippet - click on button. 9 To add new snippet - click on button.
10 10
lib/gitlab/gitolite.rb
@@ -137,7 +137,7 @@ module Gitlab @@ -137,7 +137,7 @@ module Gitlab
137 owner_name = repo.permissions[0]["RW+"][""][0] 137 owner_name = repo.permissions[0]["RW+"][""][0]
138 raise StandardError if owner_name.blank? 138 raise StandardError if owner_name.blank?
139 rescue => ex 139 rescue => ex
140 - puts "Cant determine gitolite-admin owner".red 140 + puts "Can't determine gitolite-admin owner".red
141 raise StandardError 141 raise StandardError
142 end 142 end
143 143