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

#686: updated jbuilder gem

This commit is contained in:
Vokhmin Alexey V 2012-10-17 16:18:05 +04:00
parent 351821912b
commit 36ae61cea0
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -44,7 +44,7 @@ gem 'trinidad', '~> 1.0.2', :platforms => :jruby
gem 'newrelic_rpm', '~> 3.4.1', :platforms => [:mri, :rbx] gem 'newrelic_rpm', '~> 3.4.1', :platforms => [:mri, :rbx]
gem 'whenever', '~> 0.7.3', :require => false gem 'whenever', '~> 0.7.3', :require => false
gem 'jbuilder', '~> 0.4.0' gem 'jbuilder', '~> 0.8.2'
gem 'rails3-jquery-autocomplete', '~> 1.0.7' gem 'rails3-jquery-autocomplete', '~> 1.0.7'
gem 'will_paginate', '~> 3.0.3' gem 'will_paginate', '~> 3.0.3'
gem 'meta-tags', '~> 1.2.5', :require => 'meta_tags' gem 'meta-tags', '~> 1.2.5', :require => 'meta_tags'

5
Gemfile.lock
View File

@ -145,9 +145,8 @@ GEM
hike (1.2.1) hike (1.2.1)
hirb (0.7.0) hirb (0.7.0)
i18n (0.6.0) i18n (0.6.0)
jbuilder (0.4.3) jbuilder (0.8.2)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
blankslate (>= 2.1.2.4)
journey (1.0.4) journey (1.0.4)
jquery-rails (2.0.2) jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0) railties (>= 3.2.0, < 5.0)
@ -381,7 +380,7 @@ DEPENDENCIES
haml-rails (~> 0.3.4) haml-rails (~> 0.3.4)
highline (~> 1.6.11) highline (~> 1.6.11)
hirb hirb
jbuilder (~> 0.4.0) jbuilder (~> 0.8.2)
jquery-rails (~> 2.0.2) jquery-rails (~> 2.0.2)
mailcatcher mailcatcher
meta-tags (~> 1.2.5) meta-tags (~> 1.2.5)