Commit 5da7424f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Gem updated: devise, grape, sidekiq, settingslogic

parent 22d6ce98
...@@ -15,7 +15,7 @@ gem "mysql2", group: :mysql ...@@ -15,7 +15,7 @@ gem "mysql2", group: :mysql
gem "pg", group: :postgres gem "pg", group: :postgres
# Auth # Auth
gem "devise", "~> 2.1.0" gem "devise"
gem 'omniauth', "~> 1.1.1" gem 'omniauth', "~> 1.1.1"
gem 'omniauth-google-oauth2' gem 'omniauth-google-oauth2'
gem 'omniauth-twitter' gem 'omniauth-twitter'
...@@ -86,7 +86,7 @@ gem "draper", "~> 0.18.0" ...@@ -86,7 +86,7 @@ gem "draper", "~> 0.18.0"
# Background jobs # Background jobs
gem 'slim' gem 'slim'
gem 'sinatra', require: nil gem 'sinatra', require: nil
gem 'sidekiq', '2.7.3' gem 'sidekiq'
# HTTP requests # HTTP requests
gem "httparty" gem "httparty"
......
...@@ -82,7 +82,7 @@ GEM ...@@ -82,7 +82,7 @@ GEM
addressable (2.3.2) addressable (2.3.2)
arel (3.0.2) arel (3.0.2)
awesome_print (1.1.0) awesome_print (1.1.0)
backports (2.6.5) backports (2.6.7)
bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1)
better_errors (0.3.2) better_errors (0.3.2)
coderay (>= 1.0.0) coderay (>= 1.0.0)
...@@ -128,7 +128,8 @@ GEM ...@@ -128,7 +128,8 @@ GEM
daemons (1.1.9) daemons (1.1.9)
database_cleaner (0.9.1) database_cleaner (0.9.1)
debug_inspector (0.0.2) debug_inspector (0.0.2)
devise (2.1.3) descendants_tracker (0.0.1)
devise (2.2.3)
bcrypt-ruby (~> 3.0) bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (~> 3.1) railties (~> 3.1)
...@@ -181,19 +182,19 @@ GEM ...@@ -181,19 +182,19 @@ GEM
rubyntlm (~> 0.1.1) rubyntlm (~> 0.1.1)
gitlab_yaml_db (1.0.0) gitlab_yaml_db (1.0.0)
gon (4.0.2) gon (4.0.2)
grape (0.3.1) grape (0.3.2)
actionpack (>= 2.3.0)
activesupport activesupport
grape-entity (~> 0.2.0) builder
hashie (~> 1.2) hashie (>= 1.2.0)
json
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
multi_xml multi_xml (>= 0.5.2)
rack rack
rack-accept rack-accept
rack-mount rack-mount
virtus virtus
grape-entity (0.2.0) grape-entity (0.2.0)
activesupport
multi_json (>= 1.3.2)
growl (1.0.3) growl (1.0.3)
guard (1.5.4) guard (1.5.4)
listen (>= 0.4.2) listen (>= 0.4.2)
...@@ -382,11 +383,11 @@ GEM ...@@ -382,11 +383,11 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip rubyzip
websocket (~> 1.0.4) websocket (~> 1.0.4)
settingslogic (2.0.8) settingslogic (2.0.9)
sexp_processor (4.1.3) sexp_processor (4.1.3)
shoulda-matchers (1.3.0) shoulda-matchers (1.3.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
sidekiq (2.7.3) sidekiq (2.7.5)
celluloid (~> 0.12.0) celluloid (~> 0.12.0)
connection_pool (~> 1.0) connection_pool (~> 1.0)
multi_json (~> 1) multi_json (~> 1)
...@@ -441,8 +442,9 @@ GEM ...@@ -441,8 +442,9 @@ GEM
kgio (~> 2.6) kgio (~> 2.6)
rack rack
raindrops (~> 0.7) raindrops (~> 0.7)
virtus (0.5.2) virtus (0.5.4)
backports (~> 2.6.1) backports (~> 2.6.1)
descendants_tracker (~> 0.0.1)
warden (1.2.1) warden (1.2.1)
rack (>= 1.0) rack (>= 1.0)
webmock (1.9.0) webmock (1.9.0)
...@@ -469,7 +471,7 @@ DEPENDENCIES ...@@ -469,7 +471,7 @@ DEPENDENCIES
coffee-rails (~> 3.2.2) coffee-rails (~> 3.2.2)
colored colored
database_cleaner database_cleaner
devise (~> 2.1.0) devise
draper (~> 0.18.0) draper (~> 0.18.0)
email_spec email_spec
enumerize enumerize
...@@ -526,7 +528,7 @@ DEPENDENCIES ...@@ -526,7 +528,7 @@ DEPENDENCIES
seed-fu seed-fu
settingslogic settingslogic
shoulda-matchers (= 1.3.0) shoulda-matchers (= 1.3.0)
sidekiq (= 2.7.3) sidekiq
simplecov simplecov
sinatra sinatra
six six
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment