codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-02-17 04:01:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

UPDATE: omniauth gem and some others

Browse source 
needed to update omniauth for security issues
This commit is contained in:
Sam 2014-02-24 10:11:16 +11:00
parent 0679c668b0
commit b74675e153
2 changed files with 32 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -113,7 +113,9 @@ gem 'email_reply_parser-discourse', require: 'email_reply_parser'
# note: for image_optim to correctly work you need # note: for image_optim to correctly work you need
# sudo apt-get install -y advancecomp gifsicle jpegoptim libjpeg-progs optipng pngcrush # sudo apt-get install -y advancecomp gifsicle jpegoptim libjpeg-progs optipng pngcrush
gem 'image_optim' #
# Sam: held back, getting weird errors in latest
gem 'image_optim', '0.9.1'
# note: for image_sorcery to correctly work you need # note: for image_sorcery to correctly work you need
# sudo apt-get install -y imagemagick # sudo apt-get install -y imagemagick
gem 'image_sorcery' gem 'image_sorcery'

56
Gemfile.lock
View file

@ -88,7 +88,7 @@ GEM
exifr (1.1.3) exifr (1.1.3)
fabrication (2.9.8) fabrication (2.9.8)
fakeweb (1.3.0) fakeweb (1.3.0)
faraday (0.8.8) faraday (0.9.0)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
fast_blank (0.0.2) fast_blank (0.0.2)
fast_stack (0.1.0) fast_stack (0.1.0)
@ -114,9 +114,9 @@ GEM
nokogiri (~> 1.5) nokogiri (~> 1.5)
ruby-hmac ruby-hmac
formatador (0.2.4) formatador (0.2.4)
fspath (2.1.0) fspath (2.0.6)
gctools (0.2.3) gctools (0.2.3)
given_core (3.5.3) given_core (3.5.4)
sorcerer (>= 0.3.7) sorcerer (>= 0.3.7)
guess_html_encoding (0.0.9) guess_html_encoding (0.0.9)
handlebars-source (1.1.2) handlebars-source (1.1.2)
@ -125,15 +125,14 @@ GEM
highline (1.6.20) highline (1.6.20)
hike (1.2.3) hike (1.2.3)
hiredis (0.4.5) hiredis (0.4.5)
httpauth (0.2.0)
i18n (0.6.9) i18n (0.6.9)
image_optim (0.9.1) image_optim (0.9.1)
exifr (~> 1.1.3) exifr (~> 1.1.3)
fspath (~> 2.1.0) fspath (~> 2.0.5)
image_size (~> 1.2.0) image_size (~> 1.1.2)
in_threads (~> 1.2.0) in_threads (~> 1.2.0)
progress (~> 3.0.0) progress (~> 3.0.0)
image_size (1.2.0) image_size (1.1.5)
image_sorcery (1.1.0) image_sorcery (1.1.0)
in_threads (1.2.0) in_threads (1.2.0)
jquery-rails (3.1.0) jquery-rails (3.1.0)
@ -156,7 +155,7 @@ GEM
eventmachine eventmachine
rack (>= 1.1.3) rack (>= 1.1.3)
redis redis
metaclass (0.0.2) metaclass (0.0.4)
method_source (0.8.2) method_source (0.8.2)
mime-types (1.25.1) mime-types (1.25.1)
mini_portile (0.5.2) mini_portile (0.5.2)
@ -167,6 +166,7 @@ GEM
moneta (0.7.20) moneta (0.7.20)
msgpack (0.5.8) msgpack (0.5.8)
multi_json (1.8.4) multi_json (1.8.4)
multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
mustache (0.99.5) mustache (0.99.5)
net-scp (1.1.2) net-scp (1.1.2)
@ -175,27 +175,29 @@ GEM
nokogiri (1.6.1) nokogiri (1.6.1)
mini_portile (~> 0.5.0) mini_portile (~> 0.5.0)
oauth (0.4.7) oauth (0.4.7)
oauth2 (0.8.1) oauth2 (0.9.3)
faraday (~> 0.8) faraday (>= 0.8, < 0.10)
httpauth (~> 0.1) jwt (~> 0.1.8)
jwt (~> 0.1.4) multi_json (~> 1.3)
multi_json (~> 1.0) multi_xml (~> 0.5)
rack (~> 1.2) rack (~> 1.2)
oj (2.5.4) oj (2.5.5)
omniauth (1.1.4) omniauth (1.2.1)
hashie (>= 1.2, < 3) hashie (>= 1.2, < 3)
rack rack (~> 1.0)
omniauth-facebook (1.4.1) omniauth-facebook (1.6.0)
omniauth-oauth2 (~> 1.1.0) omniauth-oauth2 (~> 1.1)
omniauth-github (1.1.1) omniauth-github (1.1.1)
omniauth (~> 1.0) omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1) omniauth-oauth2 (~> 1.1)
omniauth-oauth (1.0.1) omniauth-oauth (1.0.1)
oauth oauth
omniauth (~> 1.0) omniauth (~> 1.0)
omniauth-oauth2 (1.1.1) omniauth-oauth2 (1.1.2)
oauth2 (~> 0.8.0) faraday (>= 0.8, < 0.10)
omniauth (~> 1.0) multi_json (~> 1.3)
oauth2 (~> 0.9.3)
omniauth (~> 1.2)
omniauth-openid (1.0.1) omniauth-openid (1.0.1)
omniauth (~> 1.0) omniauth (~> 1.0)
rack-openid (~> 1.3.1) rack-openid (~> 1.3.1)
@ -256,7 +258,7 @@ GEM
activesupport (= 4.0.3) activesupport (= 4.0.3)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
raindrops (0.12.0) raindrops (0.13.0)
rake (10.1.1) rake (10.1.1)
rake-compiler (0.9.2) rake-compiler (0.9.2)
rake rake
@ -267,7 +269,7 @@ GEM
ffi (>= 1.0.6) ffi (>= 1.0.6)
msgpack (>= 0.4.3) msgpack (>= 0.4.3)
trollop (>= 1.16.2) trollop (>= 1.16.2)
redcarpet (3.1.0) redcarpet (3.1.1)
redis (3.0.7) redis (3.0.7)
redis-namespace (1.4.1) redis-namespace (1.4.1)
redis (~> 3.0.4) redis (~> 3.0.4)
@ -282,10 +284,10 @@ GEM
rspec-core (2.14.7) rspec-core (2.14.7)
rspec-expectations (2.14.5) rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0) diff-lcs (>= 1.1.3, < 2.0)
rspec-given (3.5.3) rspec-given (3.5.4)
given_core (= 3.5.3) given_core (= 3.5.4)
rspec (>= 2.12) rspec (>= 2.12)
rspec-mocks (2.14.5) rspec-mocks (2.14.6)
rspec-rails (2.14.1) rspec-rails (2.14.1)
actionpack (>= 3.0) actionpack (>= 3.0)
activemodel (>= 3.0) activemodel (>= 3.0)
@ -411,7 +413,7 @@ DEPENDENCIES
handlebars-source (~> 1.1.2) handlebars-source (~> 1.1.2)
highline highline
hiredis hiredis
image_optim image_optim (= 0.9.1)
image_sorcery image_sorcery
librarian (>= 0.0.25) librarian (>= 0.0.25)
listen (= 0.7.3) listen (= 0.7.3)