FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix services integration after omniauth bump (#173)

This commit is contained in:
Erik 2021-04-25 15:56:37 -04:00 committed by GitHub
parent 86c940c226
commit ff6f619756
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -97,3 +97,5 @@ group :development, :test do
end end
gem "webpacker", "~> 5.2" gem "webpacker", "~> 5.2"
gem "omniauth-rails_csrf_protection", "~> 1.0"

4
Gemfile.lock
View File

@ -327,6 +327,9 @@ GEM
omniauth-oauth (1.2.0) omniauth-oauth (1.2.0)
oauth oauth
omniauth (>= 1.0, < 3) omniauth (>= 1.0, < 3)
omniauth-rails_csrf_protection (1.0.0)
actionpack (>= 4.2)
omniauth (~> 2.0)
omniauth-tumblr (1.2) omniauth-tumblr (1.2)
multi_json multi_json
omniauth-oauth (~> 1.0) omniauth-oauth (~> 1.0)
@ -596,6 +599,7 @@ DEPENDENCIES
mini_magick mini_magick
newrelic_rpm newrelic_rpm
omniauth omniauth
omniauth-rails_csrf_protection (~> 1.0)
omniauth-tumblr omniauth-tumblr
omniauth-twitter omniauth-twitter
pg pg

2
app/views/settings/_services.haml
View File

@ -7,7 +7,7 @@
- APP_CONFIG['sharing'].each do |service, service_options| - APP_CONFIG['sharing'].each do |service, service_options|
- if service_options['enabled'] && @services.none? { |x| x.provider == service.to_s } - if service_options['enabled'] && @services.none? { |x| x.provider == service.to_s }
%p= link_to t('views.settings.service.connect', service: service.capitalize), "/auth/#{service}" %p= link_to t('views.settings.service.connect', service: service.capitalize), "/auth/#{service}", method: :post
- if @services.count.positive? - if @services.count.positive?
%ul.list-group %ul.list-group