diff options
author | Robert Speicher <rspeicher@gmail.com> | 2012-09-06 00:49:59 +0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2012-09-06 00:50:03 +0400 |
commit | b78fd0c13088ce2c19d939a26a26e247ca5047ea (patch) | |
tree | 04f6e6722aa9f0deb59929e49a8af196524c2468 | |
parent | 21bfd1e7fc91ce9a1aa34582381c1dec716607f8 (diff) |
Add github-markup gem
-rw-r--r-- | Gemfile | 1 | ||||
-rw-r--r-- | Gemfile.lock | 2 | ||||
-rw-r--r-- | app/controllers/refs_controller.rb | 2 |
3 files changed, 5 insertions, 0 deletions
@@ -45,6 +45,7 @@ gem "seed-fu" # Markdown to HTML gem "redcarpet", "~> 2.1.1" +gem 'github-markup' # Servers gem "thin" diff --git a/Gemfile.lock b/Gemfile.lock index f350b3fcc0e..fc730802fa5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -178,6 +178,7 @@ GEM gherkin (2.11.0) json (>= 1.4.6) git (1.2.5) + github-markup (0.7.4) gitlab_meta (2.9) grape (0.2.1) hashie (~> 1.2) @@ -396,6 +397,7 @@ DEPENDENCIES ffaker foreman git + github-markup gitlab_meta (= 2.9) gitolite! grack! diff --git a/app/controllers/refs_controller.rb b/app/controllers/refs_controller.rb index 3f81a2ca1a3..9036143779c 100644 --- a/app/controllers/refs_controller.rb +++ b/app/controllers/refs_controller.rb @@ -1,3 +1,5 @@ +require 'github/markup' + class RefsController < ApplicationController include Gitlab::Encode before_filter :project |