summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'siemens/gitlab-ce-feature/openid-connect'Sean McGivern2017-03-071-3/+11
|\
| * Require explicit scopes on personal access tokensMarkus Koller2017-03-071-1/+4
| * Only use API scopes for personal access tokensMarkus Koller2017-03-071-2/+7
| * Don't allow blocked users to authenticate through other meansMarkus Koller2017-03-071-1/+1
| * Implement OpenID Connect identity providerMarkus Koller2017-03-071-1/+1
* | Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonat...Douwe Maan2017-03-073-12/+98
|\ \ | |/ |/|
| * apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_tokenTiago Botelho2017-03-064-113/+37
| * refactors finder and correlated codeTiago Botelho2017-03-013-25/+28
| * applies relevant changes to the code and code structureTiago Botelho2017-02-284-67/+45
| * refactors documentation and personal access tokens form to not allow admins t...Tiago Botelho2017-02-282-54/+103
| * add impersonation tokenSimon Vocella2017-02-283-14/+13
| * manage personal_access_tokens through apiSimon Vocella2017-02-284-0/+133
* | Merge branch 'feature/runner-jobs-v4-api' into 'master' Kamil Trzciński2017-03-076-1/+410
|\ \
| * | Add minor refactoringfeature/runner-jobs-v4-apiTomasz Maczukin2017-03-073-19/+8
| * | Add some fixes and refactoring after reviewTomasz Maczukin2017-03-025-65/+92
| * | Fix rubocop offensesTomasz Maczukin2017-03-023-14/+12
| * | Add artifacts downloading APITomasz Maczukin2017-03-021-0/+25
| * | Add artifacts uploading APITomasz Maczukin2017-03-021-0/+47
| * | Add artifacts uploading authorize APITomasz Maczukin2017-03-022-0/+34
| * | Add job patch trace APITomasz Maczukin2017-03-022-1/+44
| * | Add job update APITomasz Maczukin2017-03-022-3/+38
| * | Update step data namingTomasz Maczukin2017-03-022-13/+11
| * | Add missing param description for POST /api/v4/jobs/requestTomasz Maczukin2017-03-021-0/+2
| * | Fix rubocop offensesTomasz Maczukin2017-03-023-3/+3
| * | Refactor JobRequest response structureTomasz Maczukin2017-03-025-31/+137
| * | Add jobs requesting APITomasz Maczukin2017-03-023-0/+105
* | | Merge branch '28251-mr-and-issue-iids-for-api-v4' into 'master' Douwe Maan2017-03-0711-65/+277
|\ \ \
| * | | Implement review comments from @dbalexandre28251-mr-and-issue-iids-for-api-v4Timothy Andrew2017-03-072-5/+5
| * | | Fix time tracking endpoints for API v4Timothy Andrew2017-03-072-3/+119
| * | | Migrate the Todos API to use `issuable_iid`Timothy Andrew2017-03-071-4/+4
| * | | Migrate the AwardEmoji API to use `merge_request_iid` and `issue_iid`Timothy Andrew2017-03-072-12/+87
| * | | Migrate the MergeRequestDiffs API to use `merge_request_iid`Timothy Andrew2017-03-071-6/+6
| * | | API routes referencing a specific merge request should use the MR `iid`Timothy Andrew2017-03-073-26/+36
| * | | API routes referencing a specific issue should use the issue `iid`Timothy Andrew2017-03-074-14/+25
* | | | Merge branch 'set-default-cache-key-for-jobs' into 'master' Kamil Trzciński2017-03-074-0/+20
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into set-default-cache-key-for...Lin Jen-Shin2017-03-0762-432/+2009
| |\ \ \ \ | | |/ / /
| * | | | No need to set cache:key if no path was specifiedLin Jen-Shin2017-03-031-4/+0
| * | | | Restore Unspecified and we could discuss laterLin Jen-Shin2017-03-033-20/+26
| * | | | Fix tests for added default cache keyLin Jen-Shin2017-03-031-2/+12
| * | | | Set default cache key for jobs, detail:Lin Jen-Shin2017-03-026-24/+32
* | | | | Merge branch 'add-git-version-to-system-info' into 'master' Rémy Coutable2017-03-071-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add git version to gitlab:env:infoSemyon Pupkov2017-02-281-0/+3
* | | | | Merge branch '23948-assign-to-me' into 'master' Alfredo Sumaran2017-03-071-0/+1
|\ \ \ \ \
| * | | | | re-add Assign to Me link on new MR/Issue formsSimon Knox2017-03-071-0/+1
* | | | | | Merge branch '26371-native-emojis-v3' into 'master' Filipa Lacerda2017-03-075-164/+117
|\ \ \ \ \ \
| * | | | | | Fix up @DouweM reviewEric Eastwood2017-03-063-32/+33
| * | | | | | Fix wrong image src with cached gl-emoji and relative rootEric Eastwood2017-03-062-3/+4
| * | | | | | Use native unicode emojisEric Eastwood2017-03-065-151/+102
* | | | | | | Merge branch '28598-narrow-environment-payload-by-using-basic-project' into '...Rémy Coutable2017-03-071-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Narrow environment payload by using basic project details resource28598-narrow-environment-payload-by-using-basic-projectOswaldo Ferreira2017-03-061-1/+1
View Lorry Controller Status