summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
* | | | Merge branch 'use-publish-to-post-notifications' into 'master' Rémy Coutable2017-03-071-0/+13
|\ \ \ \
| * | | | Update notification codeKamil Trzcinski2017-03-061-3/+2
| * | | | Add specs for notificationsKamil Trzcinski2017-03-031-1/+1
| * | | | Add support for Workhorse notificationsKamil Trzcinski2017-03-031-0/+14
* | | | | Merge branch 'zj-create-mattermost-team' into 'master' Kamil Trzciński2017-03-063-2/+13
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'zj-create-mattermost-team'Zeger-Jan van de Weg2017-03-068-24/+252
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-03-0623-72/+748
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'master' into 'zj-create-mattermost-team'Luke "Jared" Bennett2017-03-026-7/+19
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-03-0289-475/+1580
| |\ \ \ \ \ \ \
| * | | | | | | | Improve UXZ.J. van de Weg2017-03-021-14/+6
| * | | | | | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-02-24140-588/+1348
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-02-2051-211/+507
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Transactional mattermost team creationZ.J. van de Weg2017-02-201-4/+4
| * | | | | | | | | | Add tests for Mattermost team creationZ.J. van de Weg2017-02-162-3/+17
| * | | | | | | | | | Create MM team for GitLab groupZ.J. van de Weg2017-02-162-1/+6
* | | | | | | | | | | Merge branch '21605-allow-html5-details' into 'master' Douwe Maan2017-03-061-0/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | SanitizationFilter allows html5 details and summary (Issue #21605)James2017-03-061-0/+4
* | | | | | | | | | | | Merge branch 'pipeline-blocking-actions' into 'master' Kamil Trzciński2017-03-066-27/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into pipeline-blocking-actionspipeline-blocking-actionsGrzegorz Bizon2017-03-068-24/+252
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| * | | | | | | | | | | Improve specs for detailed statuses with manual actionsGrzegorz Bizon2017-03-062-24/+0
| * | | | | | | | | | | Ignore job by default if it is a manual actionGrzegorz Bizon2017-03-062-2/+11
| * | | | | | | | | | | Reinstitute a core `manual` status for manual actionsGrzegorz Bizon2017-03-062-4/+4
| * | | | | | | | | | | Introduce core status for blocked manual actionsGrzegorz Bizon2017-03-061-3/+3
| * | | | | | | | | | | Refactor code related to pipeline blocking actionsGrzegorz Bizon2017-03-061-4/+0
| * | | | | | | | | | | Make manual actions blockingKamil Trzcinski2017-03-062-0/+23
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rs-fix-deployments-v3-namespace' into 'master' Robert Speicher2017-03-062-29/+31
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move `api/v3/deployments` to the correct namespaceRobert Speicher2017-03-062-29/+31
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'backup_storage_class' into 'master' Rémy Coutable2017-03-061-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add storage class configuration option for Amazon S3 remote backupsJon Keys2017-02-281-1/+2
* | | | | | | | | | | Merge branch 'zj-builds-to-jobs-api' into 'master' Kamil Trzciński2017-03-0610-92/+649
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Incorporate review, drop old endpointZ.J. van de Weg2017-03-062-25/+4
| * | | | | | | | | | | Rename build to job in the docsZ.J. van de Weg2017-03-061-5/+5
| * | | | | | | | | | | Add changelog entryZ.J. van de Weg2017-03-061-1/+1
| * | | | | | | | | | | Fix all testsToon Claes2017-03-065-256/+179
| * | | | | | | | | | | Pick API files from 8.16.6Z.J. van de Weg2017-03-064-2/+237
View Lorry Controller Status