summaryrefslogtreecommitdiff
path: root/lib/gitlab.rb
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-06-03 11:17:46 +0200
committerJames Lopez <james@jameslopez.es>2016-06-03 11:17:46 +0200
commit398f0071a6b77a7e26e612b38105ae4bd702ef22 (patch)
treeb64afe0bc7753cebd66e899ae7ecb830ff2f55ea /lib/gitlab.rb
parent721014c92799219d357b1b7c971d4c0b6050ff2a (diff)
parent3f4ac2ff60c9d83ec65b19070e4d054e12e67dd2 (diff)
downloadgitlab-ce-398f0071a6b77a7e26e612b38105ae4bd702ef22.tar.gz
merge hell
Diffstat (limited to 'lib/gitlab.rb')
-rw-r--r--lib/gitlab.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb
index 7479e729db1..37f4c34054f 100644
--- a/lib/gitlab.rb
+++ b/lib/gitlab.rb
@@ -1,4 +1,4 @@
-require 'gitlab/git'
+require_dependency 'gitlab/git'
module Gitlab
def self.com?