summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add downtime constantsdm-add-concurrent-index-copDouwe Maan2017-03-073-0/+6
|
* Add cop to ensure reversibility of add_concurrent_indexDouwe Maan2017-03-0722-22/+186
|
* Merge remote-tracking branch ↵Douwe Maan2017-03-0730-145/+1053
|\ | | | | | | 'origin/personal_access_token_api_and_impersonation_token'
| * 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 ↵Tiago Botelho2017-02-2814-127/+230
| | | | | | | | to generate non impersionation tokens
| * 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 ↵Simon Vocella2017-02-282-3/+4
| | | | | | | | expires soon
| * 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 header Closes #28559 See merge request !9753
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | #26790 whitelist style attribute in event_note Closes #26790 See merge request !9155
| * | | 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 rows Closes #28835 See merge request !9752
| * | | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature/runner jobs v4 api Closes #28513 See merge request !9273
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API routes referencing a specific issue should use the issue `iid` Closes #28251 See merge request !9530
| * | | | | Implement review comments from @dbalexandre28251-mr-and-issue-iids-for-api-v4Timothy Andrew2017-03-074-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Typo in docs - Newline between test/expectation in `api/issues_spec` - Use `find_by` instead of `reference_by` in the structure defining awardables
| * | | | | Add documentation for !9530.Timothy Andrew2017-03-074-226/+227
| | | | | |
| * | | | | Fix time tracking endpoints for API v4Timothy Andrew2017-03-075-5/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use issue/merge_request IID instead of ID - Duplicate the original `TimeTrackingEndpoints` concern (+ specs) for V3, since this is a breaking change.
| * | | | | Migrate the Todos API to use `issuable_iid`Timothy Andrew2017-03-072-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | - Instead of `issuable_id`
| * | | | | Migrate the AwardEmoji API to use `merge_request_iid` and `issue_iid`Timothy Andrew2017-03-074-37/+337
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Instead of `merge_request_id` and `issue_id` - The API also deals with `snippet_id`, which remains unchanged (since snippets don't have `iid`s - Duplicate the original `AwardEmoji` API (and spec) for use with the V3 API, since this is a breaking change.
| * | | | | Migrate the MergeRequestDiffs API to use `merge_request_iid`Timothy Andrew2017-03-073-19/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Instead of `merge_request_id` - Duplicate the original `MergeRequestDiffs` API (and spec) for use with the V3 API, since this is a breaking change.
| * | | | | API routes referencing a specific merge request should use the MR `iid`Timothy Andrew2017-03-074-80/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - As opposed to the `id` that was previously being used. - This brings the API routes closer to the web interface's routes. - This is specific to API v4.
| * | | | | API routes referencing a specific issue should use the issue `iid`Timothy Andrew2017-03-076-83/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - As opposed to the issue `id` that was previously being used. - This brings the API routes closer to the web interface's routes. - This is specific to API v4.
* | | | | | Merge branch 'sort-builds-in-stage' into 'master' Sean McGivern2017-03-074-4/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort builds in stage dropdown Closes #28354 See merge request !9760
| * | | | | | Sort builds in stage dropdownKamil Trzcinski2017-03-074-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Order: failed pending running manual canceled success skipped created
* | | | | | | Merge branch 'feature/gb/add-blocked-pipeline-mr-widget-state' into 'master' Kamil Trzciński2017-03-075-2/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new merge request widget state for blocked pipeline See merge request !9762
| * | | | | | | 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
| |/ / / / / /
View Lorry Controller Status