Skip to content
This repository was archived by the owner on Jan 19, 2022. It is now read-only.

WIP - Update GitHub OAuth support #83

Open
obfuscurity wants to merge 7 commits into
base: master
Choose a base branch
from
Open

WIP - Update GitHub OAuth support #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7700c3d
set our session_secret explicitly
obfuscurity Jan 29, 2013
461d03b
bump sinatra_auth_github to 0.12.0
obfuscurity Jan 29, 2013
2306418
bump to sinatra_auth_github 0.12.1
obfuscurity Jan 29, 2013
0cbb804
Merge branch 'master' into fix_github_oauth_sessions
obfuscurity Mar 5, 2013
5302316
Merge branch 'master' into fix_github_oauth_sessions
obfuscurity Mar 12, 2013
1af0ad7
update sinatra_auth_github
obfuscurity Mar 12, 2013
edefd7a
add SESSION_SECRET for travis
obfuscurity Mar 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
env: SESSION_SECRET=foobar
before_script:
- psql -c 'create database descartes;' -U postgres

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ gem "pg"
gem "sequel"
gem "omniauth"
gem 'omniauth-google-apps'
gem "sinatra_auth_github", "0.9.0"
gem "sinatra_auth_github", "0.13.3"
gem "openid-redis-store"
gem "rack-canonical-host"
gem "rack-ssl-enforcer"
Expand Down
35 changes: 14 additions & 21 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ GEM
daemons (1.1.9)
diff-lcs (1.1.3)
eventmachine (1.0.0)
faraday (0.8.4)
faraday (0.8.6)
multipart-post (~> 1.1)
faraday_middleware (0.8.8)
faraday_middleware (0.9.0)
faraday (>= 0.7.4, < 0.9)
foreman (0.59.0)
thor (>= 0.13.6)
Expand All @@ -17,17 +17,16 @@ GEM
json (1.7.5)
method_source (0.8)
mime-types (1.19)
multi_json (1.3.6)
multipart-post (1.1.5)
oauth2 (0.5.2)
faraday (~> 0.7)
multi_json (~> 1.0)
octokit (1.9.4)
multi_json (1.6.1)
multipart-post (1.2.0)
netrc (0.7.7)
octokit (1.23.0)
addressable (~> 2.2)
faraday (~> 0.8)
faraday_middleware (~> 0.8)
faraday_middleware (~> 0.9)
hashie (~> 1.2)
multi_json (~> 1.3)
netrc (~> 0.7.7)
omniauth (1.1.1)
hashie (~> 1.2)
rack
Expand Down Expand Up @@ -80,10 +79,9 @@ GEM
rack (~> 1.3, >= 1.3.4)
rack-protection (~> 1.1, >= 1.1.2)
tilt (~> 1.3, >= 1.3.3)
sinatra_auth_github (0.9.0)
sinatra_auth_github (0.13.3)
sinatra (~> 1.0)
warden-github (~> 0.9.0)
yajl-ruby (~> 1.1)
warden-github (~> 0.13.1)
slop (3.3.3)
thin (1.2.10)
daemons (>= 1.0.9)
Expand All @@ -94,14 +92,9 @@ GEM
tzinfo (0.3.35)
warden (1.2.1)
rack (>= 1.0)
warden-github (0.9.1)
json (~> 1.5)
oauth2 (~> 0.5.2)
octokit (~> 1.9.4)
rest-client (~> 1.6.1)
warden (~> 1.0)
yajl-ruby (~> 1.1)
yajl-ruby (1.1.0)
warden-github (0.13.2)
octokit (>= 1.22.0)
warden (> 1.0)

PLATFORMS
ruby
Expand All @@ -124,5 +117,5 @@ DEPENDENCIES
rufus-scheduler
sequel
sinatra (= 1.3.1)
sinatra_auth_github (= 0.9.0)
sinatra_auth_github (= 0.13.3)
thin (= 1.2.10)
1 change: 1 addition & 0 deletions lib/descartes/routes/setup.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ class Web < Sinatra::Base
disable :raise_errors if Config.rack_env.eql?("production")
disable :show_exceptions if Config.rack_env.eql?("production")
use Rack::SslEnforcer if Config.force_https
set :session_secret, Config.session_secret
end

before do
Expand Down