diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-21 02:44:15 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-21 02:44:15 +0400 |
| commit | 9cb51c6ea29660bfd3cca8fd4e64090cf2d5ac6e (patch) | |
| tree | b49dcab12fb154963a54addd41728465c38ba29e /Gemfile.lock | |
| parent | 9c76bd95402dfb4fa49cca4876c9714f408c5122 (diff) | |
| parent | c437e2d7d416dae73efdea248a34b452d912986e (diff) | |
Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-use_redcarpet_for_markdown
Conflicts:
Gemfile
Gemfile.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c852a8bd420..12d0ddd609f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -211,9 +211,9 @@ GEM thor (~> 0.14.6) raindrops (0.8.0) rake (0.9.2.2) - rdiscount (1.6.8) rdoc (3.12) json (~> 1.4) + redcarpet (2.1.1) redis (2.2.2) redis-namespace (1.0.3) redis (< 3.0.0) @@ -346,7 +346,7 @@ DEPENDENCIES rails (= 3.2.1) rails-footnotes rake - rdiscount + redcarpet (~> 2.1.1) resque (~> 1.20.0) rspec-rails sass-rails (= 3.2.3) |