summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDJ Mountney <dj@gitlab.com>2019-06-28 16:28:45 +0000
committerDJ Mountney <dj@gitlab.com>2019-06-28 16:28:45 +0000
commitaf28465556c71428f865d1062bbb3931d7d9daff (patch)
treef598a63432be7fae1370caba7962415b5337bddd /lib
parentc1b1a1fb5e648d44286e6312daa9fa7980202914 (diff)
downloadgitlab-ce-af28465556c71428f865d1062bbb3931d7d9daff.tar.gz
Fix extra newline left by conflict resolutioncheck-min-schema-migrate
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/database.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb
index a9aa0bb36f2..34c1e6ad8ca 100644
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
@@ -22,7 +22,6 @@ module Gitlab
docstring "Time spent in database transactions, in seconds"
end
-
def self.config
ActiveRecord::Base.configurations[Rails.env]
end