forked from External/greenlight
minor fixes
This commit is contained in:
parent
d1b81a385f
commit
e1eca134fc
|
@ -14,15 +14,15 @@
|
||||||
# Ignore static assets.
|
# Ignore static assets.
|
||||||
/public/system/**
|
/public/system/**
|
||||||
/public/assets/**
|
/public/assets/**
|
||||||
|
/public/gl/**
|
||||||
|
|
||||||
# Ignore production paths.
|
# Ignore production paths.
|
||||||
/db/production
|
/db/production
|
||||||
|
|
||||||
# Ignore all logfiles and tempfiles.
|
# Ignore all logfiles and tempfiles.
|
||||||
/log/*
|
/log/*
|
||||||
/tmp/*
|
/tmp
|
||||||
!/log/.keep
|
!/log/.keep
|
||||||
!/tmp/.keep
|
|
||||||
|
|
||||||
# Ignore Byebug command history file.
|
# Ignore Byebug command history file.
|
||||||
.byebug_history
|
.byebug_history
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
//@import "tabler/functions";
|
@import "tabler/functions";
|
||||||
|
|
||||||
@import "tabler/core";
|
@import "tabler/core";
|
||||||
@import "tabler/type";
|
@import "tabler/type";
|
||||||
|
|
|
@ -47,7 +47,8 @@ class ApplicationController < ActionController::Base
|
||||||
user_is_moderator: false,
|
user_is_moderator: false,
|
||||||
meeting_logout_url: request.base_url + logout_room_path(@room),
|
meeting_logout_url: request.base_url + logout_room_path(@room),
|
||||||
meeting_recorded: true,
|
meeting_recorded: true,
|
||||||
moderator_message: "To invite someone to the meeting, send them this link:\n\n#{request.base_url + room_path(@room)}"
|
moderator_message: "To invite someone to the meeting, send them this link:\n\n
|
||||||
|
#{request.base_url + Rails.configuration.relative_url_root + room_path(@room)}"
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -10,7 +10,7 @@ module ApplicationHelper
|
||||||
|
|
||||||
# Generates the login URL for a specific provider.
|
# Generates the login URL for a specific provider.
|
||||||
def omniauth_login_url(provider)
|
def omniauth_login_url(provider)
|
||||||
"/auth/#{provider}"
|
"#{Rails.configuration.relative_url_root}/auth/#{provider}"
|
||||||
end
|
end
|
||||||
|
|
||||||
# Determine if Greenlight is configured to allow user signups.
|
# Determine if Greenlight is configured to allow user signups.
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
<span class="input-icon-addon">
|
<span class="input-icon-addon">
|
||||||
<i class="fas fa-at"></i>
|
<i class="fas fa-at"></i>
|
||||||
</span>
|
</span>
|
||||||
<%= f.text_field :email, class: "form-control", placeholder: "Email" %>
|
<%= f.text_field :email, class: "form-control", placeholder: "Email", value: "" %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@
|
||||||
<span class="input-icon-addon">
|
<span class="input-icon-addon">
|
||||||
<i class="fas fa-key"></i>
|
<i class="fas fa-key"></i>
|
||||||
</span>
|
</span>
|
||||||
<%= f.password_field :password, class: "form-control", placeholder: "Password" %>
|
<%= f.password_field :password, class: "form-control", placeholder: "Password", value: "" %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -16,14 +16,14 @@ Rails.application.configure do
|
||||||
|
|
||||||
# Disable serving static files from the `/public` folder by default since
|
# Disable serving static files from the `/public` folder by default since
|
||||||
# Apache or NGINX already handles this.
|
# Apache or NGINX already handles this.
|
||||||
config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
|
config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].blank?
|
||||||
|
|
||||||
# Compress JavaScripts and CSS.
|
# Compress JavaScripts and CSS.
|
||||||
config.assets.js_compressor = Uglifier.new(harmony: true)
|
config.assets.js_compressor = Uglifier.new(harmony: true)
|
||||||
# config.assets.css_compressor = :sass
|
# config.assets.css_compressor = :sass
|
||||||
|
|
||||||
# Do not fallback to assets pipeline if a precompiled asset is missed.
|
# Do not fallback to assets pipeline if a precompiled asset is missed.
|
||||||
config.assets.compile = true
|
config.assets.compile = false
|
||||||
|
|
||||||
# `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
|
# `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
|
||||||
|
|
||||||
|
@ -88,6 +88,6 @@ Rails.application.configure do
|
||||||
if ENV['RELATIVE_URL_ROOT'].present?
|
if ENV['RELATIVE_URL_ROOT'].present?
|
||||||
config.relative_url_root = ENV['RELATIVE_URL_ROOT']
|
config.relative_url_root = ENV['RELATIVE_URL_ROOT']
|
||||||
else
|
else
|
||||||
config.relative_url_root = ""
|
config.relative_url_root = "/"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -8,4 +8,4 @@ Rails.application.config.assets.version = '1.0'
|
||||||
|
|
||||||
# Precompile additional assets.
|
# Precompile additional assets.
|
||||||
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
|
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
|
||||||
Rails.application.config.assets.precompile += %w(application.css)
|
# Rails.application.config.assets.precompile += %w()
|
||||||
|
|
Loading…
Reference in New Issue