diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-11 16:16:07 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-11 16:16:07 +0100 |
| commit | 22999a6fa6b44a835536307da8e5d6a6b349cb49 (patch) | |
| tree | 548d14cb639012185c405edc24655e652c8c121e /Gemfile.lock | |
| parent | a2a68858c88151ce0d77f602dbae59d595495ac6 (diff) | |
| download | gitlab-ce-22999a6fa6b44a835536307da8e5d6a6b349cb49.tar.gz | |
Revert "Merge branch 'remove-redcloth' into 'master'
"revert-2037
This reverts commit e426c027b0a2a3aa0dea1d833008f2bfd814f483, reversing
changes made to c3676aa156981092b7f03f1a3e74bb819cfa2fc3.
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0db1c6760f8..ff57460f5bb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,6 +2,7 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (2.3.2) + RedCloth (4.2.9) ace-rails-ap (2.0.1) actionmailer (4.2.4) actionpack (= 4.2.4) @@ -826,6 +827,7 @@ PLATFORMS ruby DEPENDENCIES + RedCloth (~> 4.2.9) ace-rails-ap (~> 2.0.1) activerecord-deprecated_finders (~> 1.0.3) activerecord-session_store (~> 0.1.0) |