zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-03 00:12:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:internetee/registry

Browse source 
Conflicts:
	app/views/layouts/application.haml
	config/locales/en.yml
This commit is contained in:
Martin Lensment 2014-11-26 15:06:44 +02:00
commit 3bb80b20d2
26 changed files with 328 additions and 409 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/sessions_controller.rb
View file

@ -3,7 +3,10 @@ class SessionsController < Devise::SessionsController
# TODO: Create ID Card login here:
# this is just testing config
# if Rails.env.development? || Rails.env.test?
@user = User.find_by(username: 'gitlab') if params[:gitlab]
@user = User.first if params[:user1]
@user = User.second if params[:user2]
return redirect_to :back, alert: 'No user' if @user.blank?
session[:current_user_registrar_id] = Registrar.first.id if @user.admin?