forked from External/greenlight
clean up for PR
This commit is contained in:
parent
3c11aca1aa
commit
3bb0c26f33
|
@ -5,7 +5,8 @@ RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
|
|||
|
||||
# Set an environment variable for the install location.
|
||||
ENV RAILS_ROOT /usr/src/app
|
||||
RUN bundle config github.com 0e54e86c4228294d867a0831bff53f95a31d4af2:x-oauth-basic
|
||||
#Add token for private gems
|
||||
RUN bundle config github.com ENV['GITHUB_TOKEN']
|
||||
|
||||
# Make the directory and set as working.
|
||||
RUN mkdir -p $RAILS_ROOT
|
||||
|
|
2
Gemfile
2
Gemfile
|
@ -64,7 +64,7 @@ gem 'rubocop', require: false
|
|||
group :production do
|
||||
# Use a postgres database in production.
|
||||
gem 'pg', '~> 0.18'
|
||||
gem "omniauth-bn-launcher", git: "https://github.com/blindsidenetworks/omniauth-bn-launcher.git", branch: "oauth2"
|
||||
gem "omniauth-bn-launcher", git: "https://github.com/blindsidenetworks/omniauth-bn-launcher.git"
|
||||
end
|
||||
|
||||
group :development, :test do
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
GIT
|
||||
remote: https://github.com/blindsidenetworks/omniauth-bn-launcher.git
|
||||
revision: d93b9fa51f920c733618ec4040c93458ff19951f
|
||||
branch: oauth2
|
||||
revision: c272a928c41966ec3f43d841e372838be0465a8d
|
||||
specs:
|
||||
omniauth-bn-launcher (0.1.0)
|
||||
omniauth (~> 1.3, >= 1.3.2)
|
||||
|
|
|
@ -6,7 +6,6 @@ class ApplicationController < ActionController::Base
|
|||
include SessionsHelper
|
||||
|
||||
protect_from_forgery with: :exception
|
||||
skip_before_filter :verify_authenticity_token
|
||||
|
||||
MEETING_NAME_LIMIT = 90
|
||||
USER_NAME_LIMIT = 30
|
||||
|
|
|
@ -5,12 +5,7 @@ class MainController < ApplicationController
|
|||
|
||||
# GET /
|
||||
def index
|
||||
if current_user
|
||||
# Redirect authenticated users to their room.
|
||||
redirect_to room_path(current_user.main_room)
|
||||
else
|
||||
# Redirect unauthenticated users to root.
|
||||
#TODO use env? for launcher login endpoint
|
||||
if Rails.env.production? && !current_user
|
||||
redirect_to "#{Rails.configuration.relative_url_root}/auth/bn_launcher"
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue