diff options
| author |   Alex Legler <alex@a3li.li> | 2011-08-14 14:35:09 +0200 |
|---|---|---|
| committer | Alex Legler <alex@a3li.li> | 2011-08-14 14:35:09 +0200 |
| commit | 2504a90a05f83eaede3bf2d888fce48ae715f920 (patch) | |
| tree | e5b8b96c4b305b78f5e55ea74882ea1a35d4ef5c /lib | |
| parent | Update to rails 2.3.12 and use Bundler (diff) | |
| download | glsamaker-2504a90a05f83eaede3bf2d888fce48ae715f920.tar.gz glsamaker-2504a90a05f83eaede3bf2d888fce48ae715f920.tar.bz2 glsamaker-2504a90a05f83eaede3bf2d888fce48ae715f920.zip | |
First set of rails3 updates
.rails2 backups are still there, to be merged and removed on completion.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/assets/.gitkeep | 0 | ||||
| -rw-r--r-- | lib/authentication.rb | 2 | ||||
| -rw-r--r-- | lib/tasks/.gitkeep | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/lib/assets/.gitkeep b/lib/assets/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/lib/assets/.gitkeep diff --git a/lib/authentication.rb b/lib/authentication.rb index 5982201..ea0a2b4 100644 --- a/lib/authentication.rb +++ b/lib/authentication.rb @@ -15,7 +15,7 @@ module Authentication # Login filter to be applied to *all* pages on GLSAMaker def login_required # Production authentication via REMOTE_USER - if RAILS_ENV == "production" or GLSAMAKER_FORCE_PRODUCTION_AUTH + if Rails.env.production? or GLSAMAKER_FORCE_PRODUCTION_AUTH # REMOTE_USER should be there in FCGI or Passenger env_user_name = user_name diff --git a/lib/tasks/.gitkeep b/lib/tasks/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/lib/tasks/.gitkeep |