summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '28447-hybrid-repository-storages' into 'master' Sean McGivern2017-03-0728-65/+178
|\
| * Update storage settings to allow extra values per shard28447-hybrid-repository-storagesAlejandro Rodríguez2017-03-0328-65/+178
* | Merge branch 'rfr-20170307-change-default-project-number-limit' into 'master' James Lopez2017-03-073-4/+8
|\ \
| * | Change project count limit from 10 to 100000rfr-20170307-change-default-project-number-limitRegis Freyd2017-03-073-4/+8
* | | Merge branch 'fix/gb/deprecate-ci-config-types' into 'master' Kamil Trzciński2017-03-072-1/+7
|\ \ \
| * | | Add Changelog entry for CI/CD types deprecationfix/gb/deprecate-ci-config-typesGrzegorz Bizon2017-03-071-0/+4
| * | | Deprecate usage of `types` CI/CD configuration entryGrzegorz Bizon2017-03-071-1/+3
* | | | Merge branch 'siemens/gitlab-ce-feature/openid-connect'Sean McGivern2017-03-0736-131/+731
|\ \ \ \
| * | | | Add specs for Doorkeeper resource_owner_authenticatorMarkus Koller2017-03-072-6/+65
| * | | | Remove whitespace in GemfileMarkus Koller2017-03-071-51/+51
| * | | | Require explicit scopes on personal access tokensMarkus Koller2017-03-074-29/+26
| * | | | 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 remote-tracking branch 'origin/personal_access_token_api_and_impersonat...Douwe Maan2017-03-0730-145/+1053
|\ \ \ \
| * | | | apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_tokenTiago Botelho2017-03-0627-649/+313
| * | | | refactors finder and correlated codeTiago Botelho2017-03-0117-202/+378
| * | | | applies relevant changes to the code and code structureTiago Botelho2017-02-2824-279/+317
| * | | | refactors documentation and personal access tokens form to not allow admins t...Tiago Botelho2017-02-2814-127/+230
| * | | | add admin panel for personal access tokensSimon Vocella2017-02-287-0/+269
| * | | | add documentation and changelog entry for user personal access tokens apiSimon Vocella2017-02-284-0/+152
| * | | | Add text-warning class in profile settings if the personal_access_token expir...Simon Vocella2017-02-282-3/+4
| * | | | add impersonation tokenSimon Vocella2017-02-2810-35/+116
| * | | | manage personal_access_tokens through apiSimon Vocella2017-02-2812-3/+427
* | | | | Merge branch '28559-remove-active-underline' into 'master' Annabel Dunstone Gray2017-03-071-0/+4
|\ \ \ \ \
| * | | | | don't underline clicked links in Notes header28559-remove-active-underlineSimon Knox2017-03-071-0/+4
* | | | | | Merge branch '26790-label-color-todos' into 'master' Douwe Maan2017-03-073-1/+17
|\ \ \ \ \ \
| * | | | | | whitelist style attribute in event_notemhasbini2017-03-073-1/+17
* | | | | | | Merge branch '28835-jobs-head' into 'master' Annabel Dunstone Gray2017-03-072-1/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | fix Jobs header height - only set fixed size for rows28835-jobs-headSimon Knox2017-03-072-1/+5
| | |/ / / / | |/| | | |
* | | | | | 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
View Lorry Controller Status