summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2012-08-10 19:47:54 -0400
committerRobert Speicher <rspeicher@gmail.com>2012-08-13 21:02:40 -0400
commit6af38f51453d6a59eb983c13efa1e08303c2ec16 (patch)
tree511ca17a1df315d1698ffb9efe0b2efb8f910e05
parent6ebd360cf2627f874532db6b6fa7f14d4b23984b (diff)
downloadgitlab-ce-6af38f51453d6a59eb983c13efa1e08303c2ec16.tar.gz
"Cant" -> "Can't"
-rw-r--r--app/models/project.rb4
-rw-r--r--app/views/errors/encoding.html.haml2
-rw-r--r--app/views/errors/git_not_found.html.haml2
-rw-r--r--app/views/errors/gitolite.html.haml2
-rw-r--r--app/views/merge_requests/show/_mr_accept.html.haml2
-rw-r--r--app/views/snippets/index.html.haml2
-rw-r--r--lib/gitlab/gitolite.rb2
7 files changed, 8 insertions, 8 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index de1911f13b9..714953c64c7 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -66,7 +66,7 @@ class Project < ActiveRecord::Base
project
rescue => ex
project.error_code = :db
- project.errors.add(:base, "Cant save project. Please try again later")
+ project.errors.add(:base, "Can't save project. Please try again later")
project
end
@@ -112,7 +112,7 @@ class Project < ActiveRecord::Base
errors[:base] << ("Your own projects limit is #{owner.projects_limit}! Please contact administrator to increase it")
end
rescue
- errors[:base] << ("Cant check your ability to create project")
+ errors[:base] << ("Can't check your ability to create project")
end
def repo_name
diff --git a/app/views/errors/encoding.html.haml b/app/views/errors/encoding.html.haml
index 0ffbadeb08d..1b1376be578 100644
--- a/app/views/errors/encoding.html.haml
+++ b/app/views/errors/encoding.html.haml
@@ -2,5 +2,5 @@
%h3 Encoding Error
%hr
%p
- Page cant be loaded cause of encoding error
+ Page can't be loaded cause of encoding error
diff --git a/app/views/errors/git_not_found.html.haml b/app/views/errors/git_not_found.html.haml
index b2399ac51dc..abde7441a40 100644
--- a/app/views/errors/git_not_found.html.haml
+++ b/app/views/errors/git_not_found.html.haml
@@ -2,7 +2,7 @@
%h3 Git Resource Not found
%hr
%p
- Application cant get access to some
+ Application can't get access to some
%span.label branch
or
%span.label commit
diff --git a/app/views/errors/gitolite.html.haml b/app/views/errors/gitolite.html.haml
index eb09d2141b9..88ec66d5df6 100644
--- a/app/views/errors/gitolite.html.haml
+++ b/app/views/errors/gitolite.html.haml
@@ -1,6 +1,6 @@
.alert-message.block-message.error
%h3 Gitolite Error
- %h4 Application cant get access to your gitolite system.
+ %h4 Application can't get access to your gitolite system.
diff --git a/app/views/merge_requests/show/_mr_accept.html.haml b/app/views/merge_requests/show/_mr_accept.html.haml
index a6c2afb117c..efd47af0cda 100644
--- a/app/views/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/merge_requests/show/_mr_accept.html.haml
@@ -28,7 +28,7 @@
%span
= link_to "Show how to merge", "#", class: "how_to_merge_link btn small padded", title: "How To Merge"
&nbsp;
- %strong This request cant be merged with GitLab. You should do it manually
+ %strong This request can't be merged with GitLab. You should do it manually
.automerge_widget.unchecked
.alert-message
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 2d07921e879..7229b587bc8 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -4,7 +4,7 @@
.alert-message.block-message
= link_to new_project_snippet_path(@project), class: "btn small add_new right", title: "New Snippet" do
Add new snippet
- Share code pastes with others if it cant be in a git repository
+ Share code pastes with others if it can't be in a git repository
%br
To add new snippet - click on button.
diff --git a/lib/gitlab/gitolite.rb b/lib/gitlab/gitolite.rb
index 7b80d4a836a..e82f9e62307 100644
--- a/lib/gitlab/gitolite.rb
+++ b/lib/gitlab/gitolite.rb
@@ -137,7 +137,7 @@ module Gitlab
owner_name = repo.permissions[0]["RW+"][""][0]
raise StandardError if owner_name.blank?
rescue => ex
- puts "Cant determine gitolite-admin owner".red
+ puts "Can't determine gitolite-admin owner".red
raise StandardError
end