mirror of
https://github.com/discourse/discourse.git
synced 2024-11-22 12:12:26 +08:00
big gem update
This commit is contained in:
parent
341714e270
commit
61650edfd4
4
Gemfile
4
Gemfile
|
@ -83,7 +83,9 @@ gem 'omniauth-twitter'
|
||||||
gem 'omniauth-github-discourse', require: 'omniauth-github'
|
gem 'omniauth-github-discourse', require: 'omniauth-github'
|
||||||
|
|
||||||
gem 'omniauth-oauth2', require: false
|
gem 'omniauth-oauth2', require: false
|
||||||
gem 'omniauth-google-oauth2'
|
|
||||||
|
# see: https://github.com/zquestz/omniauth-google-oauth2/pull/193#issuecomment-170447701
|
||||||
|
gem 'omniauth-google-oauth2', '0.2.6'
|
||||||
gem 'oj'
|
gem 'oj'
|
||||||
gem 'pg'
|
gem 'pg'
|
||||||
gem 'pry-rails', require: false
|
gem 'pry-rails', require: false
|
||||||
|
|
68
Gemfile.lock
68
Gemfile.lock
|
@ -48,7 +48,7 @@ GEM
|
||||||
jmespath (~> 1.0)
|
jmespath (~> 1.0)
|
||||||
aws-sdk-resources (2.2.9)
|
aws-sdk-resources (2.2.9)
|
||||||
aws-sdk-core (= 2.2.9)
|
aws-sdk-core (= 2.2.9)
|
||||||
babel-source (5.8.19)
|
babel-source (5.8.34)
|
||||||
babel-transpiler (0.7.0)
|
babel-transpiler (0.7.0)
|
||||||
babel-source (>= 4.0, < 6)
|
babel-source (>= 4.0, < 6)
|
||||||
execjs (~> 2.0)
|
execjs (~> 2.0)
|
||||||
|
@ -62,7 +62,7 @@ GEM
|
||||||
binding_of_caller (0.7.2)
|
binding_of_caller (0.7.2)
|
||||||
debug_inspector (>= 0.0.1)
|
debug_inspector (>= 0.0.1)
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
byebug (6.0.2)
|
byebug (8.2.1)
|
||||||
certified (1.0.0)
|
certified (1.0.0)
|
||||||
coderay (1.1.0)
|
coderay (1.1.0)
|
||||||
concurrent-ruby (1.0.0)
|
concurrent-ruby (1.0.0)
|
||||||
|
@ -94,10 +94,10 @@ GEM
|
||||||
eventmachine (1.0.8)
|
eventmachine (1.0.8)
|
||||||
excon (0.45.4)
|
excon (0.45.4)
|
||||||
execjs (2.6.0)
|
execjs (2.6.0)
|
||||||
exifr (1.2.3.1)
|
exifr (1.2.4)
|
||||||
fabrication (2.9.8)
|
fabrication (2.9.8)
|
||||||
fakeweb (1.3.0)
|
fakeweb (1.3.0)
|
||||||
faraday (0.9.1)
|
faraday (0.9.2)
|
||||||
multipart-post (>= 1.2, < 3)
|
multipart-post (>= 1.2, < 3)
|
||||||
fast_blank (1.0.0)
|
fast_blank (1.0.0)
|
||||||
fast_stack (0.1.0)
|
fast_stack (0.1.0)
|
||||||
|
@ -115,15 +115,15 @@ GEM
|
||||||
thor (~> 0.19.1)
|
thor (~> 0.19.1)
|
||||||
fspath (2.1.1)
|
fspath (2.1.1)
|
||||||
gctools (0.2.3)
|
gctools (0.2.3)
|
||||||
given_core (3.5.4)
|
given_core (3.7.1)
|
||||||
sorcerer (>= 0.3.7)
|
sorcerer (>= 0.3.7)
|
||||||
globalid (0.3.6)
|
globalid (0.3.6)
|
||||||
activesupport (>= 4.1.0)
|
activesupport (>= 4.1.0)
|
||||||
guess_html_encoding (0.0.11)
|
guess_html_encoding (0.0.11)
|
||||||
hashie (3.4.3)
|
hashie (3.4.3)
|
||||||
highline (1.7.7)
|
highline (1.7.8)
|
||||||
hike (1.2.3)
|
hike (1.2.3)
|
||||||
hiredis (0.6.0)
|
hiredis (0.6.1)
|
||||||
htmlentities (4.3.4)
|
htmlentities (4.3.4)
|
||||||
http-cookie (1.0.2)
|
http-cookie (1.0.2)
|
||||||
domain_name (~> 0.5)
|
domain_name (~> 0.5)
|
||||||
|
@ -142,12 +142,12 @@ GEM
|
||||||
railties (>= 4.2.0)
|
railties (>= 4.2.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
json (1.8.3)
|
json (1.8.3)
|
||||||
jwt (1.5.1)
|
jwt (1.5.2)
|
||||||
kgio (2.10.0)
|
kgio (2.10.0)
|
||||||
librarian (0.1.2)
|
librarian (0.1.2)
|
||||||
highline
|
highline
|
||||||
thor (~> 0.15)
|
thor (~> 0.15)
|
||||||
libv8 (3.16.14.11)
|
libv8 (3.16.14.13)
|
||||||
listen (0.7.3)
|
listen (0.7.3)
|
||||||
logster (1.0.1)
|
logster (1.0.1)
|
||||||
loofah (2.0.3)
|
loofah (2.0.3)
|
||||||
|
@ -166,9 +166,9 @@ GEM
|
||||||
minitest (5.8.3)
|
minitest (5.8.3)
|
||||||
mocha (1.1.0)
|
mocha (1.1.0)
|
||||||
metaclass (~> 0.0.1)
|
metaclass (~> 0.0.1)
|
||||||
mock_redis (0.15.2)
|
mock_redis (0.15.4)
|
||||||
moneta (0.8.0)
|
moneta (0.8.0)
|
||||||
msgpack (0.6.2)
|
msgpack (0.7.4)
|
||||||
multi_json (1.11.2)
|
multi_json (1.11.2)
|
||||||
multi_xml (0.5.5)
|
multi_xml (0.5.5)
|
||||||
multipart-post (2.0.0)
|
multipart-post (2.0.0)
|
||||||
|
@ -176,7 +176,7 @@ GEM
|
||||||
netrc (0.11.0)
|
netrc (0.11.0)
|
||||||
nokogiri (1.6.7.1)
|
nokogiri (1.6.7.1)
|
||||||
mini_portile2 (~> 2.0.0.rc2)
|
mini_portile2 (~> 2.0.0.rc2)
|
||||||
nokogumbo (1.4.1)
|
nokogumbo (1.4.7)
|
||||||
nokogiri
|
nokogiri
|
||||||
oauth (0.4.7)
|
oauth (0.4.7)
|
||||||
oauth2 (1.0.0)
|
oauth2 (1.0.0)
|
||||||
|
@ -186,21 +186,21 @@ GEM
|
||||||
multi_xml (~> 0.5)
|
multi_xml (~> 0.5)
|
||||||
rack (~> 1.2)
|
rack (~> 1.2)
|
||||||
oj (2.14.3)
|
oj (2.14.3)
|
||||||
omniauth (1.2.2)
|
omniauth (1.3.1)
|
||||||
hashie (>= 1.2, < 4)
|
hashie (>= 1.2, < 4)
|
||||||
rack (~> 1.0)
|
rack (>= 1.0, < 3)
|
||||||
omniauth-facebook (2.0.1)
|
omniauth-facebook (3.0.0)
|
||||||
omniauth-oauth2 (~> 1.2)
|
omniauth-oauth2 (~> 1.2)
|
||||||
omniauth-github-discourse (1.1.2)
|
omniauth-github-discourse (1.1.2)
|
||||||
omniauth (~> 1.0)
|
omniauth (~> 1.0)
|
||||||
omniauth-oauth2 (~> 1.1)
|
omniauth-oauth2 (~> 1.1)
|
||||||
omniauth-google-oauth2 (0.2.5)
|
omniauth-google-oauth2 (0.2.6)
|
||||||
omniauth (> 1.0)
|
omniauth (> 1.0)
|
||||||
omniauth-oauth2 (~> 1.1)
|
omniauth-oauth2 (~> 1.1)
|
||||||
omniauth-oauth (1.1.0)
|
omniauth-oauth (1.1.0)
|
||||||
oauth
|
oauth
|
||||||
omniauth (~> 1.0)
|
omniauth (~> 1.0)
|
||||||
omniauth-oauth2 (1.3.1)
|
omniauth-oauth2 (1.4.0)
|
||||||
oauth2 (~> 1.0)
|
oauth2 (~> 1.0)
|
||||||
omniauth (~> 1.2)
|
omniauth (~> 1.2)
|
||||||
omniauth-openid (1.0.1)
|
omniauth-openid (1.0.1)
|
||||||
|
@ -218,7 +218,7 @@ GEM
|
||||||
redis
|
redis
|
||||||
ruby-openid
|
ruby-openid
|
||||||
pg (0.18.4)
|
pg (0.18.4)
|
||||||
progress (3.1.0)
|
progress (3.1.1)
|
||||||
pry (0.10.3)
|
pry (0.10.3)
|
||||||
coderay (~> 1.1.0)
|
coderay (~> 1.1.0)
|
||||||
method_source (~> 0.8.1)
|
method_source (~> 0.8.1)
|
||||||
|
@ -227,10 +227,10 @@ GEM
|
||||||
pry (>= 0.9.10, < 0.11.0)
|
pry (>= 0.9.10, < 0.11.0)
|
||||||
pry-rails (0.3.4)
|
pry-rails (0.3.4)
|
||||||
pry (>= 0.9.10)
|
pry (>= 0.9.10)
|
||||||
puma (2.14.0)
|
puma (2.15.3)
|
||||||
r2 (0.2.5)
|
r2 (0.2.6)
|
||||||
rack (1.6.4)
|
rack (1.6.4)
|
||||||
rack-mini-profiler (0.9.7)
|
rack-mini-profiler (0.9.8)
|
||||||
rack (>= 1.1.3)
|
rack (>= 1.1.3)
|
||||||
rack-openid (1.3.1)
|
rack-openid (1.3.1)
|
||||||
rack (>= 1.1.0)
|
rack (>= 1.1.0)
|
||||||
|
@ -270,7 +270,7 @@ GEM
|
||||||
rake (10.4.2)
|
rake (10.4.2)
|
||||||
rake-compiler (0.9.5)
|
rake-compiler (0.9.5)
|
||||||
rake
|
rake
|
||||||
rb-fsevent (0.9.6)
|
rb-fsevent (0.9.7)
|
||||||
rb-inotify (0.9.5)
|
rb-inotify (0.9.5)
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
rbtrace (0.4.7)
|
rbtrace (0.4.7)
|
||||||
|
@ -296,16 +296,16 @@ GEM
|
||||||
rspec-expectations (3.2.1)
|
rspec-expectations (3.2.1)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.2.0)
|
rspec-support (~> 3.2.0)
|
||||||
rspec-given (3.5.4)
|
rspec-given (3.7.1)
|
||||||
given_core (= 3.5.4)
|
given_core (= 3.7.1)
|
||||||
rspec (>= 2.12)
|
rspec (>= 2.14.0)
|
||||||
rspec-html-matchers (0.7.0)
|
rspec-html-matchers (0.7.0)
|
||||||
nokogiri (~> 1)
|
nokogiri (~> 1)
|
||||||
rspec (~> 3)
|
rspec (~> 3)
|
||||||
rspec-mocks (3.2.1)
|
rspec-mocks (3.2.1)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.2.0)
|
rspec-support (~> 3.2.0)
|
||||||
rspec-rails (3.2.1)
|
rspec-rails (3.2.3)
|
||||||
actionpack (>= 3.0, < 4.3)
|
actionpack (>= 3.0, < 4.3)
|
||||||
activesupport (>= 3.0, < 4.3)
|
activesupport (>= 3.0, < 4.3)
|
||||||
railties (>= 3.0, < 4.3)
|
railties (>= 3.0, < 4.3)
|
||||||
|
@ -319,10 +319,10 @@ GEM
|
||||||
ruby-readability (0.7.0)
|
ruby-readability (0.7.0)
|
||||||
guess_html_encoding (>= 0.0.4)
|
guess_html_encoding (>= 0.0.4)
|
||||||
nokogiri (>= 1.6.0)
|
nokogiri (>= 1.6.0)
|
||||||
sanitize (4.0.0)
|
sanitize (4.0.1)
|
||||||
crass (~> 1.0.2)
|
crass (~> 1.0.2)
|
||||||
nokogiri (>= 1.4.4)
|
nokogiri (>= 1.4.4)
|
||||||
nokogumbo (= 1.4.1)
|
nokogumbo (~> 1.4.1)
|
||||||
sass (3.2.19)
|
sass (3.2.19)
|
||||||
sass-rails (4.0.5)
|
sass-rails (4.0.5)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
|
@ -336,7 +336,7 @@ GEM
|
||||||
shoulda-context (~> 1.0, >= 1.0.1)
|
shoulda-context (~> 1.0, >= 1.0.1)
|
||||||
shoulda-matchers (>= 1.4.1, < 3.0)
|
shoulda-matchers (>= 1.4.1, < 3.0)
|
||||||
shoulda-context (1.2.1)
|
shoulda-context (1.2.1)
|
||||||
shoulda-matchers (2.7.0)
|
shoulda-matchers (2.8.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
sidekiq (4.0.2)
|
sidekiq (4.0.2)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
|
@ -345,7 +345,7 @@ GEM
|
||||||
sidekiq-statistic (1.2.0)
|
sidekiq-statistic (1.2.0)
|
||||||
sidekiq (>= 3.3.4, < 5)
|
sidekiq (>= 3.3.4, < 5)
|
||||||
simple-rss (1.3.1)
|
simple-rss (1.3.1)
|
||||||
simplecov (0.10.0)
|
simplecov (0.11.1)
|
||||||
docile (~> 1.1.0)
|
docile (~> 1.1.0)
|
||||||
json (~> 1.8)
|
json (~> 1.8)
|
||||||
simplecov-html (~> 0.10.0)
|
simplecov-html (~> 0.10.0)
|
||||||
|
@ -381,7 +381,7 @@ GEM
|
||||||
thread_safe (0.3.5)
|
thread_safe (0.3.5)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
timecop (0.8.0)
|
timecop (0.8.0)
|
||||||
trollop (2.1.1)
|
trollop (2.1.2)
|
||||||
tzinfo (1.2.2)
|
tzinfo (1.2.2)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (2.7.2)
|
uglifier (2.7.2)
|
||||||
|
@ -389,8 +389,8 @@ GEM
|
||||||
json (>= 1.8.0)
|
json (>= 1.8.0)
|
||||||
unf (0.1.4)
|
unf (0.1.4)
|
||||||
unf_ext
|
unf_ext
|
||||||
unf_ext (0.0.6)
|
unf_ext (0.0.7.1)
|
||||||
unicorn (4.9.0)
|
unicorn (5.0.1)
|
||||||
kgio (~> 2.6)
|
kgio (~> 2.6)
|
||||||
rack
|
rack
|
||||||
raindrops (~> 0.7)
|
raindrops (~> 0.7)
|
||||||
|
@ -444,7 +444,7 @@ DEPENDENCIES
|
||||||
omniauth
|
omniauth
|
||||||
omniauth-facebook
|
omniauth-facebook
|
||||||
omniauth-github-discourse
|
omniauth-github-discourse
|
||||||
omniauth-google-oauth2
|
omniauth-google-oauth2 (= 0.2.6)
|
||||||
omniauth-oauth2
|
omniauth-oauth2
|
||||||
omniauth-openid
|
omniauth-openid
|
||||||
omniauth-twitter
|
omniauth-twitter
|
||||||
|
|
Loading…
Reference in New Issue
Block a user