diff options
-rw-r--r-- | app/models/project.rb | 4 | ||||
-rw-r--r-- | app/views/errors/access_denied.html.haml | 2 | ||||
-rw-r--r-- | app/views/errors/encoding.html.haml | 3 | ||||
-rw-r--r-- | app/views/errors/git_not_found.html.haml | 3 | ||||
-rw-r--r-- | app/views/errors/gitolite.html.haml | 3 | ||||
-rw-r--r-- | app/views/errors/not_found.html.haml | 2 | ||||
-rw-r--r-- | app/views/merge_requests/show/_mr_accept.html.haml | 2 | ||||
-rw-r--r-- | app/views/snippets/index.html.haml | 2 | ||||
-rw-r--r-- | lib/gitlab/gitolite.rb | 2 |
9 files changed, 11 insertions, 12 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/access_denied.html.haml b/app/views/errors/access_denied.html.haml index 4766ef7bcdd..3b60ed8b0ee 100644 --- a/app/views/errors/access_denied.html.haml +++ b/app/views/errors/access_denied.html.haml @@ -1,4 +1,4 @@ %h1 Access Denied %hr -%h2 You are not allowed to access this page +%h2 You are not allowed to access this page. %p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"} diff --git a/app/views/errors/encoding.html.haml b/app/views/errors/encoding.html.haml index 0ffbadeb08d..4662437f2d2 100644 --- a/app/views/errors/encoding.html.haml +++ b/app/views/errors/encoding.html.haml @@ -2,5 +2,4 @@ %h3 Encoding Error %hr %p - Page cant be loaded cause of encoding error - + Page can't be loaded because of an encoding error. diff --git a/app/views/errors/git_not_found.html.haml b/app/views/errors/git_not_found.html.haml index 7bc6e98026e..cd01ea1b0e6 100644 --- a/app/views/errors/git_not_found.html.haml +++ b/app/views/errors/git_not_found.html.haml @@ -2,4 +2,5 @@ %hr %h2 Git Resource Not found %p - Application cant get access to some branch or commit in your repository. Maybe it was removed + Application can't get access to some branch or commit in your repository. It + may have been moved. diff --git a/app/views/errors/gitolite.html.haml b/app/views/errors/gitolite.html.haml index 44276419bac..4788c2e5237 100644 --- a/app/views/errors/gitolite.html.haml +++ b/app/views/errors/gitolite.html.haml @@ -1,7 +1,6 @@ %h1 Git Error %hr -%h2 Application cant get access to your gitolite system. - +%h2 Gitlab was unable to access your Gitolite system. .git_error_tips %h4 Tips for Administrator: diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml index d3734e07d3c..a4e8d0204a9 100644 --- a/app/views/errors/not_found.html.haml +++ b/app/views/errors/not_found.html.haml @@ -1,4 +1,4 @@ %h1 404 %hr -%h2 Resource you were looking for doesn't exist. +%h2 The resource you were looking for doesn't exist. %p You may have mistyped the address or the page may have moved. 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" - %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 |