"Cant" -> "Can't"

diff --git a/app/models/project.rb b/app/models/project.rb
index de1911f..714953c 100644 (file)
--- 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 0ffbade..1b1376b 100644 (file)
--- 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 b2399ac..abde744 100644 (file)
--- 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 eb09d21..88ec66d 100644 (file)
--- 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 a6c2afb..efd47af 100644 (file)
--- 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"
          
-        %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 2d07921..7229b58 100644 (file)
--- 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 7b80d4a..e82f9e6 100644 (file)
--- 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