lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed conflict with master

Browse Source
This commit is contained in:
jfederico
2017-08-15 20:44:06 +00:00
parent 9db643a533 0719cbd1bf
commit 22d0f4423d
7 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/application_controller.rb
View File

@@ -47,8 +47,13 @@ class ApplicationController < ActionController::Base
end
helper_method :user_name_limit
def qrcode_generation_enabled
def bigbluebutton_endpoint_default?
Rails.configuration.bigbluebutton_endpoint_default == Rails.configuration.bigbluebutton_endpoint
end
helper_method :bigbluebutton_endpoint_default?
def qrcode_generation_enabled?
Rails.configuration.enable_qrcode_generation
end
helper_method :qrcode_generation_enabled
helper_method :qrcode_generation_enabled?
end