Merge pull request #718 from consul/gem-versions

updates gem versions
This commit is contained in:
Juanjo Bazán
2015-11-20 18:50:51 +01:00
2 changed files with 7 additions and 7 deletions

View File

@@ -34,7 +34,7 @@ gem 'foundation-rails'
gem 'foundation_rails_helper' gem 'foundation_rails_helper'
gem 'acts_as_votable' gem 'acts_as_votable'
gem 'simple_captcha2', require: 'simple_captcha' gem 'simple_captcha2', require: 'simple_captcha'
gem 'ckeditor' gem 'ckeditor', '~> 4.1.5'
gem 'cancancan' gem 'cancancan'
gem 'social-share-button', git: 'https://github.com/huacnlee/social-share-button.git', ref: 'e46a6a3e82b86023bc' gem 'social-share-button', git: 'https://github.com/huacnlee/social-share-button.git', ref: 'e46a6a3e82b86023bc'
gem 'initialjs-rails', '0.2.0.1' gem 'initialjs-rails', '0.2.0.1'
@@ -43,7 +43,7 @@ gem 'paranoia'
gem 'rinku', require: 'rails_rinku' gem 'rinku', require: 'rails_rinku'
gem 'savon' gem 'savon'
gem 'dalli' gem 'dalli'
gem 'rollbar', '~> 2.6.0' gem 'rollbar', '~> 2.6.1'
gem 'delayed_job_active_record', '~> 4.1.0' gem 'delayed_job_active_record', '~> 4.1.0'
gem 'daemons' gem 'daemons'
gem 'devise-async' gem 'devise-async'

View File

@@ -98,13 +98,13 @@ GEM
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
xpath (~> 2.0) xpath (~> 2.0)
chronic (0.10.2) chronic (0.10.2)
ckeditor (4.1.4) ckeditor (4.1.5)
cocaine cocaine
orm_adapter (~> 0.5.0) orm_adapter (~> 0.5.0)
climate_control (0.0.3) climate_control (0.0.3)
activesupport (>= 3.0) activesupport (>= 3.0)
cliver (0.3.2) cliver (0.3.2)
cocaine (0.5.7) cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0) climate_control (>= 0.0.3, < 1.0)
coffee-rails (4.1.0) coffee-rails (4.1.0)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
@@ -318,7 +318,7 @@ GEM
mime-types (>= 1.16, < 3.0) mime-types (>= 1.16, < 3.0)
netrc (~> 0.7) netrc (~> 0.7)
rinku (1.7.3) rinku (1.7.3)
rollbar (2.6.0) rollbar (2.6.1)
multi_json multi_json
rspec (3.4.0) rspec (3.4.0)
rspec-core (~> 3.4.0) rspec-core (~> 3.4.0)
@@ -436,7 +436,7 @@ DEPENDENCIES
capistrano-rvm capistrano-rvm
capistrano3-delayed-job (~> 1.0) capistrano3-delayed-job (~> 1.0)
capybara capybara
ckeditor ckeditor (~> 4.1.5)
coffee-rails (~> 4.1.0) coffee-rails (~> 4.1.0)
coveralls coveralls
daemons daemons
@@ -471,7 +471,7 @@ DEPENDENCIES
rails (= 4.2.5) rails (= 4.2.5)
responders responders
rinku rinku
rollbar (~> 2.6.0) rollbar (~> 2.6.1)
rspec-rails (~> 3.3) rspec-rails (~> 3.3)
sass-rails (~> 5.0) sass-rails (~> 5.0)
savon savon