Permalink
Browse files

Minor changes:

- using bundler in bin/rubycas-server
- bringing config.ru in line with recent main repository changes
- not saving renew parameter in session anymore, its effect is immediate, not delayed, unlike service
  • Loading branch information...
1 parent c863d1a commit b9240e1d05205ea2951be6162ec3ee34bb4899fa @Slotos committed Jul 4, 2012
Showing with 2 additions and 11 deletions.
  1. +1 −0 bin/rubycas-server
  2. +1 −10 config.ru
  3. +0 −1 lib/casserver/server.rb
View
@@ -4,6 +4,7 @@
$KCODE = 'u' if RUBY_VERSION < '1.9'
require 'rubygems'
+require 'bundler/setup'
$:.unshift File.dirname(__FILE__) + "/../lib"
View
@@ -1,14 +1,5 @@
require 'rubygems'
-
-
-# Assume all necessary gems are in place if bundler is not installed.
-begin
- require 'bundler'
- Bundler.require
- #require 'bundler/setup'
-rescue LoadError => e
- raise e unless e.message =~ /no such file to load -- bundler/
-end
+require 'bundler/setup'
$:.unshift "#{File.dirname(__FILE__)}/lib"
require "casserver"
View
@@ -379,7 +379,6 @@ def self.init_database!
@gateway = params['gateway'] == 'true' || params['gateway'] == '1'
session[:service] = @service
- session[:renew] = @renew
if tgc = request.cookies['tgt']
tgt, tgt_error = validate_ticket_granting_ticket(tgc)

0 comments on commit b9240e1

Please sign in to comment.