summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2012-09-17 11:10:04 -0400
committerRobert Speicher <rspeicher@gmail.com>2012-09-26 16:32:21 -0400
commit2ddb19170624f81ec0cb3da26805a5515878aede (patch)
tree634ec34f47895f4e46e8ccbcba48045647839425
parent6ddb35bd5e27829609e40b8dd87313a01fb6f293 (diff)
downloadgitlab-ce-2ddb19170624f81ec0cb3da26805a5515878aede.tar.gz
Require 'github/markup' in Gemfile
-rw-r--r--Gemfile2
-rw-r--r--app/controllers/refs_controller.rb2
2 files changed, 1 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 71eafabaa91..8e2bdb9cbb5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,7 +57,7 @@ gem "seed-fu"
# Markdown to HTML
gem "redcarpet", "~> 2.1.1"
-gem "github-markup", "~> 0.7.4"
+gem "github-markup", "~> 0.7.4", require: 'github/markup'
# Servers
gem "thin"
diff --git a/app/controllers/refs_controller.rb b/app/controllers/refs_controller.rb
index 9036143779c..3f81a2ca1a3 100644
--- a/app/controllers/refs_controller.rb
+++ b/app/controllers/refs_controller.rb
@@ -1,5 +1,3 @@
-require 'github/markup'
-
class RefsController < ApplicationController
include Gitlab::Encode
before_filter :project