Merge 5b73ba3 into 4883a55

gitlabhq · Sep 14, 2014 · 13c37be · 13c37be
2 parents 4883a55 + 5b73ba3
commit 13c37be
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/.hound.yml b/.hound.yml
@@ -0,0 +1,3 @@
+StringLiterals:
+  EnforcedStyle: single_quotes
+  Enabled: true
diff --git a/lib/gitlab_git.rb b/lib/gitlab_git.rb
@@ -16,7 +16,7 @@
 
 # Gitlab::Git
 require_relative "gitlab_git/popen"
-require_relative "gitlab_git/encoding_herlper"
+require_relative 'gitlab_git/encoding_helper'
 require_relative "gitlab_git/blame"
 require_relative "gitlab_git/blob"
 require_relative "gitlab_git/commit"

diff --git a/lib/gitlab_git/encoding_herlper.rb → lib/gitlab_git/encoding_helper.rb b/lib/gitlab_git/encoding_herlper.rb → lib/gitlab_git/encoding_helper.rb
diff --git a/lib/gitlab_git/repository.rb b/lib/gitlab_git/repository.rb
@@ -1,7 +1,7 @@
 # Gitlab::Git::Repository is a wrapper around native Grit::Repository object
 # We dont want to use grit objects inside app/
 # It helps us easily migrate to rugged in future
-require_relative 'encoding_herlper'
+require_relative 'encoding_helper'
 require 'tempfile'
 
 module Gitlab