Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of https://github.com/SciMed/temptd

  • Loading branch information...
commit e4b4ab6c74ab4190a537bc97b31aa7a1301acac8 2 parents c7e3247 + 6d0ce52
Joe Peck authored
1  Gemfile
View
@@ -66,4 +66,5 @@ gem 'will_paginate', '~> 3.0'
gem 'omniauth'
gem 'omniauth-github'
+gem 'thin'
gem 'activerecord-postgresql-adapter'
1  Gemfile.lock
View
@@ -318,6 +318,7 @@ DEPENDENCIES
rspec-rails (~> 2.0)
sass-rails (~> 3.2.3)
spork
+ thin
uglifier (>= 1.0.3)
whenever
will_paginate (~> 3.0)
2  config/application.rb
View
@@ -64,5 +64,7 @@ class Application < Rails::Application
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
+
+ config.assets.initialize_on_precompile = false
end
end
4 config/environments/production.rb
View
@@ -1,8 +1,8 @@
Temptd::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
- CLIENT_ID="4ed181654f694955a301"
- CLIENT_SECRET="7b251ce80b9f09c93423d615ae0ffff4b7523b4f"
+ CLIENT_ID="1b4178c96cf318336c8a"
+ CLIENT_SECRET="423652db2ef05aec2c6bbede4b05c95660a50780"
# Code is not reloaded between requests
config.cache_classes = true
Please sign in to comment.
Something went wrong with that request. Please try again.