Merge branch 'master' into webhooks

This commit is contained in:
Joshua Arts
2017-06-14 09:08:33 -04:00
committed by GitHub
16 changed files with 264 additions and 6 deletions

View File

@ -7,5 +7,5 @@ Rails.application.config.omniauth_twitter = ENV['TWITTER_ID'].present?
Rails.application.config.middleware.use OmniAuth::Builder do
provider :twitter, ENV['TWITTER_ID'], ENV['TWITTER_SECRET']
provider :google_oauth2, ENV['GOOGLE_OAUTH2_ID'], ENV['GOOGLE_OAUTH2_SECRET'],
scope: ['profile', 'email'], access_type: 'online', name: 'google'
scope: ['profile', 'email', 'youtube', 'youtube.upload'], access_type: 'online', name: 'google'
end

View File

@ -0,0 +1,21 @@
# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
#
# Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
#
# This program is free software; you can redistribute it and/or modify it under the
# terms of the GNU Lesser General Public License as published by the Free Software
# Foundation; either version 3.0 of the License, or (at your option) any later
# version.
#
# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License along
# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
Yt.configure do |config|
config.log_level = :debug
config.client_id = ENV['GOOGLE_OAUTH2_ID']
config.client_secret = ENV['GOOGLE_OAUTH2_SECRET']
end