htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert stuff

Browse Source
This commit is contained in:
Jan Renz
2015-04-28 16:48:52 +02:00
parent 23ddfaca11
commit c39fd9d6ce
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/application_controller.rb
View File

@ -10,11 +10,8 @@ class ApplicationController < ActionController::Base
rescue_from Pundit::NotAuthorizedError, with: :render_not_authorized rescue_from Pundit::NotAuthorizedError, with: :render_not_authorized
def current_user def current_user
::NewRelic::Agent.add_custom_parameters({ external_user_id: :session[:external_user_id], session_user_id: session[:user_id] }) ::NewRelic::Agent.add_custom_parameters({ external_user_id: session[:external_user_id], session_user_id: session[:user_id] })
@current_user ||= ExternalUser.find_by(id: session[:external_user_id]) || login_from_session || login_from_other_sources @current_user ||= ExternalUser.find_by(id: session[:external_user_id]) || login_from_session || login_from_other_sources
if @current_user == false
@current_user = nil
end
end end
def help def help

4
config/docker.yml.erb
View File

@ -6,7 +6,7 @@ default: &default
development: development:
<<: *default <<: *default
host: tcp://192.168.23.75:2375 host: tcp://192.168.59.104:2376
workspace_root: <%= File.join('/', 'shared', Rails.env) %> workspace_root: <%= File.join('/', 'shared', Rails.env) %>
production: production:
@ -23,5 +23,5 @@ production:
test: test:
<<: *default <<: *default
host: tcp://192.168.23.75:2375 host: tcp://192.168.59.104:2376
workspace_root: <%= File.join('/', 'shared', Rails.env) %> workspace_root: <%= File.join('/', 'shared', Rails.env) %>