summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Only use API scopes for personal access tokensMarkus Koller2017-03-076-3/+64
* Don't allow blocked users to authenticate through other meansMarkus Koller2017-03-076-3/+81
* Make sure scopes are loaded in admin OAuth application formMarkus Koller2017-03-072-1/+66
* Remove duplicated code in Oauth::AuthorizationsControllerMarkus Koller2017-03-071-42/+2
* Implement OpenID Connect identity providerMarkus Koller2017-03-0723-9/+388
* Merge branch 'feature/runner-jobs-v4-api' into 'master' Kamil Trzciński2017-03-0714-9/+1447
|\
| * Add minor refactoringfeature/runner-jobs-v4-apiTomasz Maczukin2017-03-077-47/+63
| * Change artifacts and cache fields to arraysTomasz Maczukin2017-03-062-7/+13
| * Fix spec for Ci::RegisterJobServiceTomasz Maczukin2017-03-061-3/+3
| * Fix rubocop offensesTomasz Maczukin2017-03-063-3/+3
| * Add some fixes and refactoring after reviewTomasz Maczukin2017-03-0210-115/+292
| * Fix rubocop offensesTomasz Maczukin2017-03-024-17/+17
| * Add artifacts downloading APITomasz Maczukin2017-03-022-0/+65
| * Add artifacts uploading APITomasz Maczukin2017-03-022-0/+252
| * Add artifacts uploading authorize APITomasz Maczukin2017-03-023-0/+111
| * Add job patch trace APITomasz Maczukin2017-03-023-1/+178
| * Add job update APITomasz Maczukin2017-03-023-3/+86
| * Update step data namingTomasz Maczukin2017-03-023-15/+13
| * Add missing param description for POST /api/v4/jobs/requestTomasz Maczukin2017-03-021-0/+2
| * Add changelog entryTomasz Maczukin2017-03-021-0/+4
| * Fix rubocop offensesTomasz Maczukin2017-03-024-19/+16
| * Refactor JobRequest response structureTomasz Maczukin2017-03-0210-45/+233
| * Add jobs requesting APITomasz Maczukin2017-03-024-0/+362
* | Merge branch '28251-mr-and-issue-iids-for-api-v4' into 'master' Douwe Maan2017-03-0726-456/+1174
|\ \
| * | Implement review comments from @dbalexandre28251-mr-and-issue-iids-for-api-v4Timothy Andrew2017-03-074-6/+12
| * | Add documentation for !9530.Timothy Andrew2017-03-074-226/+227
| * | Fix time tracking endpoints for API v4Timothy Andrew2017-03-075-5/+249
| * | Migrate the Todos API to use `issuable_iid`Timothy Andrew2017-03-072-7/+7
| * | Migrate the AwardEmoji API to use `merge_request_iid` and `issue_iid`Timothy Andrew2017-03-074-37/+337
| * | Migrate the MergeRequestDiffs API to use `merge_request_iid`Timothy Andrew2017-03-073-19/+36
| * | API routes referencing a specific merge request should use the MR `iid`Timothy Andrew2017-03-074-80/+179
| * | API routes referencing a specific issue should use the issue `iid`Timothy Andrew2017-03-076-83/+134
* | | Merge branch 'sort-builds-in-stage' into 'master' Sean McGivern2017-03-074-4/+29
|\ \ \
| * | | Sort builds in stage dropdownKamil Trzcinski2017-03-074-4/+29
* | | | Merge branch 'feature/gb/add-blocked-pipeline-mr-widget-state' into 'master' Kamil Trzciński2017-03-075-2/+35
|\ \ \ \
| * | | | Add feature specs for new MR widget blocked statefeature/gb/add-blocked-pipeline-mr-widget-stateGrzegorz Bizon2017-03-071-1/+26
| * | | | Add new merge request widget state for blocked pipelineGrzegorz Bizon2017-03-074-1/+9
| |/ / /
* | | | Merge branch 'add-pipeline-triggers' into 'master' Sean McGivern2017-03-0714-41/+489
|\ \ \ \
| * | | | Improve pipeline triggers UIKamil Trzciński2017-03-0714-41/+489
|/ / / /
* | | | Merge branch 'feature/syshook_commits' into 'master' Sean McGivern2017-03-078-14/+41
|\ \ \ \
| * | | | Moved call of SystemHooksService from UpdateMergeRequestsWorker to GitPushSer...gpongelli2017-03-078-14/+41
|/ / / /
* | | | Merge branch 'set-default-cache-key-for-jobs' into 'master' Kamil Trzciński2017-03-0710-7/+60
|\ \ \ \
| * | | | Make cache:key bold, feedback:Lin Jen-Shin2017-03-071-1/+1
| * | | | Merge remote-tracking branch 'upstream/master' into set-default-cache-key-for...Lin Jen-Shin2017-03-072648-30096/+27854
| |\ \ \ \
| * | | | | Update for document feedback:set-default-cache-key-for-jobsLin Jen-Shin2017-03-061-4/+4
| * | | | | No need to set cache:key if no path was specifiedLin Jen-Shin2017-03-034-19/+9
| * | | | | Update cache:key documentLin Jen-Shin2017-03-031-4/+13
| * | | | | Only test against the default key, feedback:Lin Jen-Shin2017-03-031-3/+2
| * | | | | Restore Unspecified and we could discuss laterLin Jen-Shin2017-03-034-20/+58
| * | | | | Fix tests for added default cache keyLin Jen-Shin2017-03-032-8/+21
View Lorry Controller Status