Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into rails-4.1.10

This commit is contained in:
Alexander Machehin 2015-04-24 16:29:09 +05:00
parent 4de3c7edc5 f0f257505c
commit a4ca058922
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -36,7 +36,7 @@ gem 'diff-display'
# Wiki # Wiki
gem 'gollum-lib', '~> 3.0' gem 'gollum-lib', '~> 3.0'
gem 'redcarpet', '~> 3.1' gem 'redcarpet', '~> 3.2'
gem 'creole' gem 'creole'
gem 'rdiscount' gem 'rdiscount'
# gem 'org-ruby' # gem 'org-ruby'

4
Gemfile.lock
View File

@ -393,7 +393,7 @@ GEM
rb-inotify (0.9.5) rb-inotify (0.9.5)
ffi (>= 0.5.0) ffi (>= 0.5.0)
rdiscount (2.1.8) rdiscount (2.1.8)
redcarpet (3.2.2) redcarpet (3.2.3)
redis (3.0.7) redis (3.0.7)
redis-actionpack (4.0.0) redis-actionpack (4.0.0)
actionpack (~> 4) actionpack (~> 4)
@ -645,7 +645,7 @@ DEPENDENCIES
rails3-jquery-autocomplete rails3-jquery-autocomplete
rake rake
rdiscount rdiscount
redcarpet (~> 3.1) redcarpet (~> 3.2)
redis-rails redis-rails
resque resque
resque-scheduler (~> 2.5.4) resque-scheduler (~> 2.5.4)