Mathias Meyer
729ec6e7fa
Require 'metriks'.
2013-05-09 14:04:25 +02:00
Mathias Meyer
c3249a498c
Fix Metriks reference.
2013-05-09 13:44:08 +02:00
Mathias Meyer
0cd89de38a
Merge branch 'master' into rkh-metrics
...
Conflicts:
Gemfile.lock
2013-05-09 13:37:28 +02:00
Piotr Sarnacki
fc98bf16e5
Merge pull request #63 from travis-ci/ps-expiring-tokens
...
Tokens improvements
2013-05-08 05:18:32 -07:00
Piotr Sarnacki
d276cd5b32
Return Oauth headers even if none scope was matched
...
If an endpoint specifies more than one scope and none of the scopes from
access token matches, return oauth headers for the first of the scopes
2013-05-08 14:11:03 +02:00
Piotr Sarnacki
cdabec540d
Fix scopes and access token specs
2013-05-08 14:11:03 +02:00
Piotr Sarnacki
3b299cfec7
Allow to pass required_params to token
...
required_params will be matched with actual params to check if the token
may be used for authorization. For example if { job_id: 44 } is passed
as a required param, the token will be rejected for GET /jobs/33
2013-05-08 14:11:03 +02:00
Piotr Sarnacki
56d61ed461
Allow to pass extra params for tokens
2013-05-08 14:11:02 +02:00
Piotr Sarnacki
ee64af14d5
Allow to specify more than one scope for an endpoint
2013-05-08 14:11:02 +02:00
Piotr Sarnacki
1340fdb316
Allow to pass additional responders to respond_with
2013-05-08 14:11:02 +02:00
Piotr Sarnacki
01356df26f
Implement expiring access tokens
2013-05-08 14:11:02 +02:00
Piotr Sarnacki
b26349176f
Bump travis-core
2013-05-06 19:34:40 +02:00
Piotr Sarnacki
9092901013
Bump travis-core
2013-05-05 04:22:53 +02:00
Piotr Sarnacki
98d656fdaf
Bump travis-core
2013-05-05 03:47:43 +02:00
Piotr Sarnacki
0b0fca4493
Bump travis-core
2013-05-05 03:40:28 +02:00
Piotr Sarnacki
2c23c413ef
Save branches in lower groups
2013-05-05 02:46:00 +02:00
Piotr Sarnacki
201e7a3176
Add rake task for updating branch value on builds
2013-05-05 02:15:08 +02:00
Piotr Sarnacki
a22ae8a745
Bump travis-core
2013-05-05 01:50:06 +02:00
Piotr Sarnacki
935288e8e9
Don't load octopus if there is no need
2013-05-05 00:27:10 +02:00
Henrik Hodne
be627a68af
Merge pull request #62 from jdennes/doc-fixes
...
s/autorization/authorization/
2013-05-03 03:22:29 -07:00
James Dennes
c5b73b1ecc
s/autorization/authorization/
2013-05-03 12:16:12 +02:00
Josh Kalderimis
cd7cce54b5
add some output when the db follower is setup
2013-05-03 10:31:53 +02:00
Josh Kalderimis
a949b58d98
merging all the things
2013-05-03 10:12:16 +02:00
Josh Kalderimis
407a08f644
only use the db follower if use_database_follower is set in the config
2013-05-03 09:42:07 +02:00
Josh Kalderimis
23f3edc60c
move the db follower usage to a helper
2013-05-03 09:21:48 +02:00
Piotr Sarnacki
79564b9eac
Use octopus from travis-ci's fork
2013-05-03 02:44:31 +02:00
Piotr Sarnacki
3ac6e6286a
Merge branch 'master' into jk_basic_shard_support
2013-05-03 02:16:44 +02:00
Piotr Sarnacki
a6a370b334
Update sinatra
2013-05-03 01:40:34 +02:00
Piotr Sarnacki
f468370a02
Try newer version of newrelic
2013-05-03 01:06:54 +02:00
Piotr Sarnacki
f6d781c248
Enable octopus
2013-05-03 00:43:57 +02:00
Josh Kalderimis
10c8d4b95f
hit my head against a wall
2013-05-03 00:43:22 +02:00
Josh Kalderimis
4ea1079d39
turn on octopus in staging
2013-05-03 00:43:22 +02:00
Josh Kalderimis
135008f1ea
only add the shards info if in prod mode
2013-05-03 00:43:22 +02:00
Josh Kalderimis
e6f1e22ae8
octopus is on in production by default only
2013-05-03 00:43:22 +02:00
Josh Kalderimis
76e55c0125
i don't think this is the best solution
2013-05-03 00:43:20 +02:00
Josh Kalderimis
a0a92b23fa
change the require order
2013-05-03 00:42:30 +02:00
Piotr Sarnacki
546d7b4ad4
Set puma's version to 1.6.3
...
Newest version has problems with logs and newrelic
2013-05-03 00:14:31 +02:00
Josh Kalderimis
22bce30b59
bump newrelic
2013-05-02 20:24:04 +02:00
Josh Kalderimis
48c8e8c2a5
merging stuff and fun
2013-05-02 20:06:19 +02:00
Piotr Sarnacki
cd9e089631
Enable octopus
2013-05-02 19:48:23 +02:00
Josh Kalderimis
6feed54684
hit my head against a wall
2013-05-02 19:16:52 +02:00
Josh Kalderimis
1a8b60cc98
turn on octopus in staging
2013-05-02 18:50:59 +02:00
Josh Kalderimis
69b8dff382
only add the shards info if in prod mode
2013-05-02 18:44:27 +02:00
Josh Kalderimis
d72f6ca02d
octopus is on in production by default only
2013-05-02 18:23:41 +02:00
Josh Kalderimis
f4132786a6
i don't think this is the best solution
2013-05-02 18:05:32 +02:00
Josh Kalderimis
de6cb2c163
change the require order
2013-05-02 17:21:56 +02:00
Josh Kalderimis
ab2714621f
i wonder what i am doing wrong with octopus
2013-05-02 17:08:31 +02:00
Josh Kalderimis
afddbb76ba
require octopus
2013-05-02 16:45:34 +02:00
Josh Kalderimis
fa6ea0692d
use a follower for one of the repos endpoint
2013-05-02 16:38:20 +02:00
Konstantin Haase
f9a1dc9bf3
update core and gh
2013-04-30 17:58:50 +02:00
