Skip to content

Commit 82d71a1

Browse files
committed
update gems
1 parent c590ec3 commit 82d71a1

File tree

2 files changed

+57
-59
lines changed

2 files changed

+57
-59
lines changed

Gemfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
ruby '2.2.2'
22

33
source 'https://rubygems.org' do
4-
gem 'rails', '~> 4.2'
4+
gem 'rails', '~> 4.2.1'
55

66
gem 'sass'
77
gem 'coffee-rails'
88
gem 'sass-rails'
99
gem 'uglifier'
1010
# Assets
1111
gem 'autoprefixer-rails'
12-
gem 'jquery-rails', '= 2.0.3'
12+
gem 'jquery-rails'
1313
gem 'selectize-rails'
1414

1515
# Load environment variables first
@@ -31,11 +31,11 @@ source 'https://rubygems.org' do
3131
gem 'clockwork'
3232

3333
# Authentication
34-
gem 'omniauth', '~> 1.1.0'
34+
gem 'omniauth'
3535
gem 'omniauth-facebook'
3636
gem 'omniauth-github'
37-
gem 'omniauth-linkedin', '~> 0.0.6'
38-
gem 'omniauth-twitter', '~> 0.0.16'
37+
gem 'omniauth-linkedin'
38+
gem 'omniauth-twitter'
3939

4040
# Markdown
4141
gem 'redcarpet' #markdown processing
@@ -85,7 +85,7 @@ source 'https://rubygems.org' do
8585
# Tagging
8686
gem 'acts-as-taggable-on', '~> 3.4'
8787

88-
gem 'faraday', '~> 0.8.1'
88+
gem 'faraday'
8989
gem 'metamagic'
9090

9191
# ----------------

Gemfile.lock

+51-53
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,14 @@ GEM
133133
crack (0.4.2)
134134
safe_yaml (~> 1.0.0)
135135
crass (1.0.2)
136-
createsend (4.0.1)
137-
hashie (>= 1.2, < 3)
136+
createsend (4.0.2)
137+
hashie (~> 3.0)
138138
httparty (~> 0.10)
139-
json
139+
json (~> 1.0)
140140
curb (0.8.8)
141141
dante (0.2.0)
142142
database_cleaner (1.4.1)
143143
debug_inspector (0.0.2)
144-
descendants_tracker (0.0.4)
145-
thread_safe (~> 0.3, >= 0.3.1)
146144
diff-lcs (1.2.5)
147145
docile (1.1.5)
148146
domain_name (0.5.24)
@@ -183,8 +181,8 @@ GEM
183181
fabrication-rails (0.0.1)
184182
fabrication
185183
railties (>= 3.0)
186-
faraday (0.8.9)
187-
multipart-post (~> 1.2.0)
184+
faraday (0.9.1)
185+
multipart-post (>= 1.2, < 3)
188186
faraday_middleware (0.9.1)
189187
faraday (>= 0.7.4, < 0.10)
190188
feedjira (1.6.0)
@@ -336,22 +334,21 @@ GEM
336334
rspec (>= 2.99.0, < 4.0)
337335
haml (4.0.6)
338336
tilt
339-
hashie (2.1.2)
337+
hashie (3.4.1)
340338
hashr (0.0.22)
341339
heroku-deflater (0.5.3)
342340
rack (>= 1.4.5)
343341
highline (1.7.2)
344342
hike (1.2.3)
345343
hitimes (1.2.2)
346-
http (0.5.1)
347-
http_parser.rb
344+
http (0.6.4)
345+
http_parser.rb (~> 0.6.0)
348346
http-cookie (1.0.2)
349347
domain_name (~> 0.5)
350348
http_parser.rb (0.6.0)
351349
httparty (0.13.3)
352350
json (~> 1.8)
353351
multi_xml (>= 0.5.2)
354-
httpauth (0.2.1)
355352
i18n (0.7.0)
356353
inflecto (0.0.2)
357354
ipaddress (0.8.0)
@@ -363,20 +360,20 @@ GEM
363360
multi_json (~> 1.0)
364361
rack (~> 1.4)
365362
rest-client (~> 1.0)
366-
jquery-rails (2.0.3)
367-
railties (>= 3.1.0, < 5.0)
368-
thor (~> 0.14)
363+
jquery-rails (4.0.3)
364+
rails-dom-testing (~> 1.0)
365+
railties (>= 4.2.0)
366+
thor (>= 0.14, < 2.0)
369367
json (1.8.2)
370-
jwt (0.1.13)
371-
multi_json (>= 1.5)
368+
jwt (1.4.1)
372369
kaminari (0.16.3)
373370
actionpack (>= 3.0.0)
374371
activesupport (>= 3.0.0)
375372
kramdown (1.7.0)
376373
launchy (2.4.3)
377374
addressable (~> 2.3)
378-
linkedin (0.4.7)
379-
hashie (~> 2.0)
375+
linkedin (1.0.0)
376+
hashie (~> 3.0)
380377
multi_json (~> 1.0)
381378
oauth (~> 0.4)
382379
listen (2.10.0)
@@ -405,7 +402,8 @@ GEM
405402
rack
406403
multi_json (1.11.0)
407404
multi_xml (0.5.5)
408-
multipart-post (1.2.0)
405+
multipart-post (2.0.0)
406+
naught (1.0.0)
409407
nenv (0.2.0)
410408
net-http-persistent (2.9.4)
411409
net-http-pipeline (1.0.1)
@@ -425,34 +423,34 @@ GEM
425423
nenv (~> 0.1)
426424
shellany (~> 0.0)
427425
oauth (0.4.7)
428-
oauth2 (0.8.1)
429-
faraday (~> 0.8)
430-
httpauth (~> 0.1)
431-
jwt (~> 0.1.4)
432-
multi_json (~> 1.0)
426+
oauth2 (1.0.0)
427+
faraday (>= 0.8, < 0.10)
428+
jwt (~> 1.0)
429+
multi_json (~> 1.3)
430+
multi_xml (~> 0.5)
433431
rack (~> 1.2)
434432
octokit (3.8.0)
435433
sawyer (~> 0.6.0, >= 0.5.3)
436-
oj (2.12.5)
437-
omniauth (1.1.4)
438-
hashie (>= 1.2, < 3)
439-
rack
440-
omniauth-facebook (1.6.0)
441-
omniauth-oauth2 (~> 1.1)
434+
oj (2.12.6)
435+
omniauth (1.2.2)
436+
hashie (>= 1.2, < 4)
437+
rack (~> 1.0)
438+
omniauth-facebook (2.0.1)
439+
omniauth-oauth2 (~> 1.2)
442440
omniauth-github (1.1.2)
443441
omniauth (~> 1.0)
444442
omniauth-oauth2 (~> 1.1)
445-
omniauth-linkedin (0.0.8)
443+
omniauth-linkedin (0.2.0)
446444
omniauth-oauth (~> 1.0)
447445
omniauth-oauth (1.1.0)
448446
oauth
449447
omniauth (~> 1.0)
450-
omniauth-oauth2 (1.1.1)
451-
oauth2 (~> 0.8.0)
452-
omniauth (~> 1.0)
453-
omniauth-twitter (0.0.18)
454-
multi_json (~> 1.3)
455-
omniauth-oauth (~> 1.0)
448+
omniauth-oauth2 (1.3.0)
449+
oauth2 (~> 1.0)
450+
omniauth (~> 1.2)
451+
omniauth-twitter (1.2.0)
452+
json (~> 1.3)
453+
omniauth-oauth (~> 1.1)
456454
parser (2.2.2.2)
457455
ast (>= 1.1, < 3.0)
458456
pg (0.18.1)
@@ -480,7 +478,7 @@ GEM
480478
querystring (0.1.0)
481479
quiet_assets (1.1.0)
482480
railties (>= 3.1, < 5.0)
483-
rack (1.6.0)
481+
rack (1.6.1)
484482
rack-protection (1.5.3)
485483
rack
486484
rack-test (0.6.3)
@@ -630,7 +628,7 @@ GEM
630628
simple_form (3.1.0)
631629
actionpack (~> 4.0)
632630
activemodel (~> 4.0)
633-
simple_oauth (0.2.0)
631+
simple_oauth (0.3.1)
634632
simplecov (0.10.0)
635633
docile (~> 1.1.0)
636634
json (~> 1.8)
@@ -689,32 +687,32 @@ GEM
689687
multi_json (~> 1.3)
690688
rake
691689
rest-client (~> 1.6)
692-
travis (1.6.9)
690+
travis (1.6.11)
693691
addressable (~> 2.3)
694692
backports
695-
faraday (~> 0.8.7)
693+
faraday (~> 0.9)
696694
faraday_middleware (~> 0.9)
697695
gh (~> 0.13)
698696
highline (~> 1.6)
699697
launchy (~> 2.1)
700698
pry (~> 0.9)
701699
pusher-client (~> 0.4)
702-
typhoeus (~> 0.6)
700+
typhoeus (~> 0.6, >= 0.6.8)
703701
turnip (1.3.0)
704702
gherkin (>= 2.5)
705703
rspec (>= 2.14.0, < 4.0)
706704
tweet-button (0.1.0)
707-
twitter (5.5.1)
705+
twitter (5.14.0)
708706
addressable (~> 2.3)
709707
buftok (~> 0.2.0)
710-
descendants_tracker (~> 0.0.3)
711708
equalizer (~> 0.0.9)
712-
faraday (>= 0.8, < 0.10)
713-
http (~> 0.5.0)
709+
faraday (~> 0.9.0)
710+
http (~> 0.6.0)
714711
http_parser.rb (~> 0.6.0)
715712
json (~> 1.8)
716713
memoizable (~> 0.4.0)
717-
simple_oauth (~> 0.2.0)
714+
naught (~> 1.0)
715+
simple_oauth (~> 0.3.0)
718716
typhoeus (0.7.1)
719717
ethon (>= 0.7.1)
720718
tzinfo (1.2.2)
@@ -765,7 +763,7 @@ DEPENDENCIES
765763
elasticsearch-model!
766764
elasticsearch-rails!
767765
fabrication-rails!
768-
faraday (~> 0.8.1)!
766+
faraday!
769767
feedjira!
770768
ffaker!
771769
flog!
@@ -782,7 +780,7 @@ DEPENDENCIES
782780
hashie!
783781
heroku-deflater!
784782
jbuilder!
785-
jquery-rails (= 2.0.3)!
783+
jquery-rails!
786784
kaminari!
787785
kramdown!
788786
launchy!
@@ -797,11 +795,11 @@ DEPENDENCIES
797795
nokogiri!
798796
octokit!
799797
oj!
800-
omniauth (~> 1.1.0)!
798+
omniauth!
801799
omniauth-facebook!
802800
omniauth-github!
803-
omniauth-linkedin (~> 0.0.6)!
804-
omniauth-twitter (~> 0.0.16)!
801+
omniauth-linkedin!
802+
omniauth-twitter!
805803
pg!
806804
poltergeist!
807805
pry-byebug!
@@ -810,7 +808,7 @@ DEPENDENCIES
810808
querystring!
811809
quiet_assets!
812810
rack_session_access!
813-
rails (~> 4.2)!
811+
rails (~> 4.2.1)!
814812
rails-assets-font-awesome!
815813
rails-assets-jquery-cookie (= 1.4.0)!
816814
rails-assets-jquery-dropdown!

0 commit comments

Comments
 (0)