Commit 6af38f51453d6a59eb983c13efa1e08303c2ec16
1 parent
6ebd360c
Exists in
master
and in
4 other branches
"Cant" -> "Can't"
Showing
7 changed files
with
8 additions
and
8 deletions
Show diff stats
app/models/project.rb
| ... | ... | @@ -66,7 +66,7 @@ class Project < ActiveRecord::Base |
| 66 | 66 | project |
| 67 | 67 | rescue => ex |
| 68 | 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 | 70 | project |
| 71 | 71 | end |
| 72 | 72 | |
| ... | ... | @@ -112,7 +112,7 @@ class Project < ActiveRecord::Base |
| 112 | 112 | errors[:base] << ("Your own projects limit is #{owner.projects_limit}! Please contact administrator to increase it") |
| 113 | 113 | end |
| 114 | 114 | rescue |
| 115 | - errors[:base] << ("Cant check your ability to create project") | |
| 115 | + errors[:base] << ("Can't check your ability to create project") | |
| 116 | 116 | end |
| 117 | 117 | |
| 118 | 118 | def repo_name | ... | ... |
app/views/errors/encoding.html.haml
app/views/errors/git_not_found.html.haml
app/views/errors/gitolite.html.haml
app/views/merge_requests/show/_mr_accept.html.haml
| ... | ... | @@ -28,7 +28,7 @@ |
| 28 | 28 | %span |
| 29 | 29 | = link_to "Show how to merge", "#", class: "how_to_merge_link btn small padded", title: "How To Merge" |
| 30 | 30 | |
| 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 | 33 | .automerge_widget.unchecked |
| 34 | 34 | .alert-message | ... | ... |
app/views/snippets/index.html.haml
| ... | ... | @@ -4,7 +4,7 @@ |
| 4 | 4 | .alert-message.block-message |
| 5 | 5 | = link_to new_project_snippet_path(@project), class: "btn small add_new right", title: "New Snippet" do |
| 6 | 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 | 8 | %br |
| 9 | 9 | To add new snippet - click on button. |
| 10 | 10 | ... | ... |
lib/gitlab/gitolite.rb
| ... | ... | @@ -137,7 +137,7 @@ module Gitlab |
| 137 | 137 | owner_name = repo.permissions[0]["RW+"][""][0] |
| 138 | 138 | raise StandardError if owner_name.blank? |
| 139 | 139 | rescue => ex |
| 140 | - puts "Cant determine gitolite-admin owner".red | |
| 140 | + puts "Can't determine gitolite-admin owner".red | |
| 141 | 141 | raise StandardError |
| 142 | 142 | end |
| 143 | 143 | ... | ... |