Download as
Browse Code »

Commit 86da625f1dc99ef57e554f1c39cb0db20f45a5b6

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

Updated gems: omniauth, sinatra, foreman

Showing 2 changed files with 12 additions and 12 deletions   Show diff stats
@@ -16,7 +16,7 @@ gem "pg", group: :postgres @@ -16,7 +16,7 @@ gem "pg", group: :postgres
16 16
17 # Auth 17 # Auth
18 gem "devise" 18 gem "devise"
19 -gem 'omniauth', "~> 1.1.1" 19 +gem 'omniauth', "~> 1.1.3"
20 gem 'omniauth-google-oauth2' 20 gem 'omniauth-google-oauth2'
21 gem 'omniauth-twitter' 21 gem 'omniauth-twitter'
22 gem 'omniauth-github' 22 gem 'omniauth-github'
@@ -155,7 +155,7 @@ GEM @@ -155,7 +155,7 @@ GEM
155 factory_girl_rails (4.1.0) 155 factory_girl_rails (4.1.0)
156 factory_girl (~> 4.1.0) 156 factory_girl (~> 4.1.0)
157 railties (>= 3.0.0) 157 railties (>= 3.0.0)
158 - faraday (0.8.4) 158 + faraday (0.8.6)
159 multipart-post (~> 1.1) 159 multipart-post (~> 1.1)
160 faye-websocket (0.4.7) 160 faye-websocket (0.4.7)
161 eventmachine (>= 0.12.0) 161 eventmachine (>= 0.12.0)
@@ -164,7 +164,7 @@ GEM @@ -164,7 +164,7 @@ GEM
164 font-awesome-sass-rails (3.0.0.1) 164 font-awesome-sass-rails (3.0.0.1)
165 railties (>= 3.1.1) 165 railties (>= 3.1.1)
166 sass-rails (>= 3.1.1) 166 sass-rails (>= 3.1.1)
167 - foreman (0.60.2) 167 + foreman (0.61.0)
168 thor (>= 0.13.6) 168 thor (>= 0.13.6)
169 gemoji (1.2.1) 169 gemoji (1.2.1)
170 gherkin-ruby (0.2.1) 170 gherkin-ruby (0.2.1)
@@ -255,21 +255,21 @@ GEM @@ -255,21 +255,21 @@ GEM
255 sprockets (~> 2.0) 255 sprockets (~> 2.0)
256 multi_json (1.6.1) 256 multi_json (1.6.1)
257 multi_xml (0.5.3) 257 multi_xml (0.5.3)
258 - multipart-post (1.1.5) 258 + multipart-post (1.2.0)
259 mysql2 (0.3.11) 259 mysql2 (0.3.11)
260 net-ldap (0.2.2) 260 net-ldap (0.2.2)
261 nokogiri (1.5.6) 261 nokogiri (1.5.6)
262 oauth (0.4.7) 262 oauth (0.4.7)
263 - oauth2 (0.8.0) 263 + oauth2 (0.8.1)
264 faraday (~> 0.8) 264 faraday (~> 0.8)
265 httpauth (~> 0.1) 265 httpauth (~> 0.1)
266 jwt (~> 0.1.4) 266 jwt (~> 0.1.4)
267 multi_json (~> 1.0) 267 multi_json (~> 1.0)
268 rack (~> 1.2) 268 rack (~> 1.2)
269 - omniauth (1.1.1) 269 + omniauth (1.1.3)
270 hashie (~> 1.2) 270 hashie (~> 1.2)
271 rack 271 rack
272 - omniauth-github (1.0.3) 272 + omniauth-github (1.1.0)
273 omniauth (~> 1.0) 273 omniauth (~> 1.0)
274 omniauth-oauth2 (~> 1.1) 274 omniauth-oauth2 (~> 1.1)
275 omniauth-google-oauth2 (0.1.13) 275 omniauth-google-oauth2 (0.1.13)
@@ -309,7 +309,7 @@ GEM @@ -309,7 +309,7 @@ GEM
309 rack (>= 1.1.3) 309 rack (>= 1.1.3)
310 rack-mount (0.8.3) 310 rack-mount (0.8.3)
311 rack (>= 1.0.0) 311 rack (>= 1.0.0)
312 - rack-protection (1.3.2) 312 + rack-protection (1.4.0)
313 rack 313 rack
314 rack-ssl (1.3.3) 314 rack-ssl (1.3.3)
315 rack 315 rack
@@ -400,9 +400,9 @@ GEM @@ -400,9 +400,9 @@ GEM
400 multi_json (~> 1.0) 400 multi_json (~> 1.0)
401 simplecov-html (~> 0.7.1) 401 simplecov-html (~> 0.7.1)
402 simplecov-html (0.7.1) 402 simplecov-html (0.7.1)
403 - sinatra (1.3.3)  
404 - rack (~> 1.3, >= 1.3.6)  
405 - rack-protection (~> 1.2) 403 + sinatra (1.3.5)
  404 + rack (~> 1.4)
  405 + rack-protection (~> 1.3)
406 tilt (~> 1.3, >= 1.3.3) 406 tilt (~> 1.3, >= 1.3.3)
407 six (0.2.0) 407 six (0.2.0)
408 slim (1.3.6) 408 slim (1.3.6)
@@ -508,7 +508,7 @@ DEPENDENCIES @@ -508,7 +508,7 @@ DEPENDENCIES
508 letter_opener 508 letter_opener
509 modernizr (= 2.6.2) 509 modernizr (= 2.6.2)
510 mysql2 510 mysql2
511 - omniauth (~> 1.1.1) 511 + omniauth (~> 1.1.3)
512 omniauth-github 512 omniauth-github
513 omniauth-google-oauth2 513 omniauth-google-oauth2
514 omniauth-twitter 514 omniauth-twitter