Commit Graph

345 Commits

Author SHA1 Message Date
Konstantin Haase
01fe983a0c pass if scope does not match 2013-01-13 20:08:56 +01:00
Konstantin Haase
cc2a1cd50e do not require user scope for /auth/github 2013-01-11 17:48:30 +01:00
Konstantin Haase
3d6defe3b1 do not store token from /auth/github 2013-01-11 16:49:08 +01:00
Konstantin Haase
ada6ee0f2c fix scope check 2013-01-11 16:20:53 +01:00
Piotr Sarnacki
6cb512be30 Update AR to 3.2.11 2013-01-10 19:57:34 +01:00
Sven Fuchs
f7d9993090 Merge branch 'sf-log-aggregation'
Conflicts:
	Gemfile.lock
2013-01-09 12:49:34 +01:00
Konstantin Haase
761b9996d7 switch back to master for travis-core 2013-01-08 13:35:26 +01:00
Konstantin Haase
94d8a3cd2e fix failing spec 2013-01-07 21:02:00 +01:00
Konstantin Haase
9e0021e649 update core 2013-01-07 20:45:18 +01:00
Konstantin Haase
eb74d17d7b point to core branch 2013-01-07 20:18:13 +01:00
Sven Fuchs
0e55337548 comment out debugger since it does not compile on travis 2013-01-03 14:05:21 +01:00
Sven Fuchs
3f09d97f11 bump travis-core/sf-log-aggregation 2013-01-03 13:58:03 +01:00
Sven Fuchs
0cfb379499 bump travis-core 2012-12-23 15:15:04 +01:00
Sven Fuchs
eb9d133eec bump travis-core 2012-12-23 14:53:45 +01:00
Sven Fuchs
cbe5654ce5 use sf-log-aggregation 2012-12-22 18:49:56 +01:00
Konstantin Haase
11116119d9 bundle update 2012-12-19 13:28:50 +01:00
Piotr Sarnacki
dffe06e140 Bump travis-core 2012-12-18 01:25:59 +01:00
Piotr Sarnacki
da20e30d83 Update travis-support and travis-core 2012-12-18 00:37:38 +01:00
Piotr Sarnacki
f21987f19a Bump travis-core 2012-12-18 00:10:56 +01:00
Konstantin Haase
0bf14e417c update things 2012-12-17 21:06:21 +01:00
Konstantin Haase
e7be49dcb1 fix the payload 2012-12-17 20:22:51 +01:00
Konstantin Haase
f878eee987 fix logging 2012-12-17 20:06:45 +01:00
Konstantin Haase
b3b5476076 first think, then commit 2012-12-17 19:26:58 +01:00
Konstantin Haase
9a1988d586 fix template 2012-12-17 19:22:33 +01:00
Konstantin Haase
0ac45a6582 Merge branch 'rkh-token-in-user' 2012-12-17 16:10:16 +01:00
Konstantin Haase
f5fdcc41c6 fix token logic 2012-12-17 15:35:35 +01:00
Konstantin Haase
8c8f031259 have travis token added to user payload on the server 2012-12-17 15:13:38 +01:00
Sven Fuchs
c44445d8e2 use the api serializer to serialize a user record 2012-12-17 01:40:16 +01:00
Konstantin Haase
b005047d95 rename token parameter to github_token for /auth/github 2012-12-12 18:30:55 +01:00
Konstantin Haase
ea183ee620 upgrade sinatra and sinatra-contrib 2012-12-12 18:21:43 +01:00
Konstantin Haase
bc1c960c20 add travis_token scope 2012-12-12 17:11:25 +01:00
Sven Fuchs
8669420f04 need to use https:// protocol for gist gems now 2012-12-12 15:45:32 +01:00
Sven Fuchs
0e58055a0e Merge branch 'master' of github.com:travis-ci/travis-api 2012-12-12 15:19:41 +01:00
Sven Fuchs
de16fb07f8 test result images based on the content-disposition header, fix content-disposition header 2012-12-12 15:19:27 +01:00
Konstantin Haase
44d6c02591 actually check if github sent a token 2012-12-10 15:49:37 +01:00
Konstantin Haase
3d8c9ed914 use localStorage after handshake 2012-12-10 14:03:31 +01:00
Piotr Sarnacki
88363423f4 Fix whitelist auth check for localhost 2012-12-09 23:46:18 +01:00
Piotr Sarnacki
65775bbc59 Revert "Bump travis-support"
This version of travis-support contains commit that disables default
to_json for AR records, in order to make it work, User model in travis
core needs this method implemented.

This reverts commit 4ddec4a351.
2012-12-09 22:30:26 +01:00
Sven Fuchs
a9bf43c1fd always use etag for caching when cache_key or updated_at are present, add the deploy_sha as a cache buster 2012-12-09 19:22:33 +01:00
Sven Fuchs
44521014a8 use simple_states branch for now 2012-12-09 16:12:40 +01:00
Sven Fuchs
d113833e9a fix xml responder and result image specs 2012-12-09 16:02:00 +01:00
Sven Fuchs
a78e9d26cf remove branch 2012-12-09 15:26:18 +01:00
Sven Fuchs
f19f5f9879 check redis for :use_rack_cache 2012-12-09 15:16:50 +01:00
Sven Fuchs
85e67b6094 bump travis-core 2012-12-09 15:16:50 +01:00
Sven Fuchs
751e88411b adapt most specs for new states api, some stuff still failing 2012-12-09 15:16:50 +01:00
Sven Fuchs
f29577e225 use branch, bump deps 2012-12-09 15:16:50 +01:00
Sven Fuchs
6d12070fba use Repository::StatusImage 2012-12-09 15:16:50 +01:00
Piotr Sarnacki
4ddec4a351 Bump travis-support 2012-12-08 00:44:32 +01:00
Konstantin Haase
85b6c08372 Merge pull request #27 from travis-ci/rkh-better-login
better login
2012-12-06 08:45:41 -08:00
Konstantin Haase
83e42adc65 that did not work 2012-12-06 16:55:58 +01:00