Download as
Browse Code »

Commit 5da7424f8dc68a877aafcf8df6d67af28b8b945d

Authored by Dmitriy Zaporozhets
1 parent 22d6ce98
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Gem updated: devise, grape, sidekiq, settingslogic

Showing 2 changed files with 17 additions and 15 deletions   Show diff stats
Gemfile
  Diff comments   View file @5da7424
... ... @@ -15,7 +15,7 @@ gem "mysql2", group: :mysql
15 15 gem "pg", group: :postgres
16 16  
17 17 # Auth
18   -gem "devise", "~> 2.1.0"
  18 +gem "devise"
19 19 gem 'omniauth', "~> 1.1.1"
20 20 gem 'omniauth-google-oauth2'
21 21 gem 'omniauth-twitter'
... ... @@ -86,7 +86,7 @@ gem "draper", "~> 0.18.0"
86 86 # Background jobs
87 87 gem 'slim'
88 88 gem 'sinatra', require: nil
89   -gem 'sidekiq', '2.7.3'
  89 +gem 'sidekiq'
90 90  
91 91 # HTTP requests
92 92 gem "httparty"
... ...
Gemfile.lock
  Diff comments   View file @5da7424
... ... @@ -82,7 +82,7 @@ GEM
82 82 addressable (2.3.2)
83 83 arel (3.0.2)
84 84 awesome_print (1.1.0)
85   - backports (2.6.5)
  85 + backports (2.6.7)
86 86 bcrypt-ruby (3.0.1)
87 87 better_errors (0.3.2)
88 88 coderay (>= 1.0.0)
... ... @@ -128,7 +128,8 @@ GEM
128 128 daemons (1.1.9)
129 129 database_cleaner (0.9.1)
130 130 debug_inspector (0.0.2)
131   - devise (2.1.3)
  131 + descendants_tracker (0.0.1)
  132 + devise (2.2.3)
132 133 bcrypt-ruby (~> 3.0)
133 134 orm_adapter (~> 0.1)
134 135 railties (~> 3.1)
... ... @@ -181,19 +182,19 @@ GEM
181 182 rubyntlm (~> 0.1.1)
182 183 gitlab_yaml_db (1.0.0)
183 184 gon (4.0.2)
184   - grape (0.3.1)
185   - actionpack (>= 2.3.0)
  185 + grape (0.3.2)
186 186 activesupport
187   - grape-entity (~> 0.2.0)
188   - hashie (~> 1.2)
189   - json
  187 + builder
  188 + hashie (>= 1.2.0)
190 189 multi_json (>= 1.3.2)
191   - multi_xml
  190 + multi_xml (>= 0.5.2)
192 191 rack
193 192 rack-accept
194 193 rack-mount
195 194 virtus
196 195 grape-entity (0.2.0)
  196 + activesupport
  197 + multi_json (>= 1.3.2)
197 198 growl (1.0.3)
198 199 guard (1.5.4)
199 200 listen (>= 0.4.2)
... ... @@ -382,11 +383,11 @@ GEM
382 383 multi_json (~> 1.0)
383 384 rubyzip
384 385 websocket (~> 1.0.4)
385   - settingslogic (2.0.8)
  386 + settingslogic (2.0.9)
386 387 sexp_processor (4.1.3)
387 388 shoulda-matchers (1.3.0)
388 389 activesupport (>= 3.0.0)
389   - sidekiq (2.7.3)
  390 + sidekiq (2.7.5)
390 391 celluloid (~> 0.12.0)
391 392 connection_pool (~> 1.0)
392 393 multi_json (~> 1)
... ... @@ -441,8 +442,9 @@ GEM
441 442 kgio (~> 2.6)
442 443 rack
443 444 raindrops (~> 0.7)
444   - virtus (0.5.2)
  445 + virtus (0.5.4)
445 446 backports (~> 2.6.1)
  447 + descendants_tracker (~> 0.0.1)
446 448 warden (1.2.1)
447 449 rack (>= 1.0)
448 450 webmock (1.9.0)
... ... @@ -469,7 +471,7 @@ DEPENDENCIES
469 471 coffee-rails (~> 3.2.2)
470 472 colored
471 473 database_cleaner
472   - devise (~> 2.1.0)
  474 + devise
473 475 draper (~> 0.18.0)
474 476 email_spec
475 477 enumerize
... ... @@ -526,7 +528,7 @@ DEPENDENCIES
526 528 seed-fu
527 529 settingslogic
528 530 shoulda-matchers (= 1.3.0)
529   - sidekiq (= 2.7.3)
  531 + sidekiq
530 532 simplecov
531 533 sinatra
532 534 six
... ...