Merge branch 'master' into emoji

2012-09-06 15:23:42 -04:00 · 2012-09-06 15:23:42 -04:00 · 8808c5fa8d
commit 8808c5fa8d
parent b3bbf53e9b a595f8944a
54 changed files with 393 additions and 458 deletions
--- 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)

--- a/lib/gitlab/markdown.rb
+++ b/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