Merge branch 'master' into emoji

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)
 

lib/gitlab/markdown.rb

@@ -1,8 +1,8 @@
 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.
+  # GitLab.
   #
   # Supported reference formats are:
   #   * @foo for team members

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

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")