summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/backend/gitolite.rb2
-rw-r--r--lib/gitlab/markdown.rb2
-rwxr-xr-xlib/hooks/post-receive2
-rw-r--r--lib/tasks/gitlab/write_hook.rake2
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/backend/gitolite.rb b/lib/gitlab/backend/gitolite.rb
index b69f4663c35..3dfb574c4d5 100644
--- a/lib/gitlab/backend/gitolite.rb
+++ b/lib/gitlab/backend/gitolite.rb
@@ -170,7 +170,7 @@ module Gitlab
def push
Dir.chdir(File.join(@local_dir, "gitolite"))
`git add -A`
- `git commit -am "Gitlab"`
+ `git commit -am "GitLab"`
`git push`
Dir.chdir(Rails.root)
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 9a07133d0b3..a387b503ccb 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -1,5 +1,5 @@
module Gitlab
- # Custom parser for Gitlab-flavored Markdown
+ # Custom parser for GitLab-flavored Markdown
#
# It replaces references in the text with links to the appropriate items in Gitlab.
#
diff --git a/lib/hooks/post-receive b/lib/hooks/post-receive
index d38bd13e19d..a4fa9f1c234 100755
--- a/lib/hooks/post-receive
+++ b/lib/hooks/post-receive
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# This file was placed here by Gitlab. It makes sure that your pushed commits
+# This file was placed here by GitLab. It makes sure that your pushed commits
# will be processed properly.
while read oldrev newrev ref
diff --git a/lib/tasks/gitlab/write_hook.rake b/lib/tasks/gitlab/write_hook.rake
index 9ec9c8383e2..5e9fc8eb3d1 100644
--- a/lib/tasks/gitlab/write_hook.rake
+++ b/lib/tasks/gitlab/write_hook.rake
@@ -1,6 +1,6 @@
namespace :gitlab do
namespace :gitolite do
- desc "GITLAB | Write GITLAB hook for gitolite"
+ desc "GITLAB | Write GitLab hook for gitolite"
task :write_hooks => :environment do
gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common")
gitlab_hooks_path = Rails.root.join("lib", "hooks")