add support for deploying to a subdirectory

This commit is contained in:
Josh
2018-06-18 10:28:47 -04:00
parent ce6ec0acfb
commit b2b2c641da
10 changed files with 74 additions and 54 deletions

View File

@ -21,7 +21,7 @@ class Room < ApplicationRecord
# Determines the invite URL for the room.
def invite_path
"/r/#{uid}"
"#{Rails.configuration.relative_url_root}/#{uid}"
end
# Creates a meeting on the BigBlueButton server.

View File

@ -13,7 +13,7 @@ class User < ApplicationRecord
uniqueness: { case_sensitive: false },
format: {with: /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i }
validates :password, length: { minimum: 6 }, presence: true, confirmation: true, allow_blank: true, if: :greenlight_account?
validates :password, length: { minimum: 6 }, confirmation: true, if: :greenlight_account?
# We don't want to require password validations on all accounts.
has_secure_password(validations: false)
@ -57,7 +57,7 @@ class User < ApplicationRecord
end
def twitter_image(auth)
auth['info']['image'].gsub!("_normal", "")
auth['info']['image'].gsub("_normal", "")
end
def google_name(auth)