summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge branch 'master' into 22604-manual-actionsGrzegorz Bizon2016-12-09119-443/+1534
| |\ \ \ \ \
| * | | | | | Renders new icons for the pipeline graphFilipa Lacerda2016-12-0812-46/+25
| * | | | | | Merge branch 'build-statuses' into 22604-manual-actionsKamil Trzcinski2016-12-080-0/+0
| |\ \ \ \ \ \
| | * | | | | | Revert some unneeded changesKamil Trzcinski2016-12-081-1/+1
| | * | | | | | Add action_class/action_titleKamil Trzcinski2016-12-085-3/+30
| | * | | | | | Rename icon_with_label to icon_with_descriptionKamil Trzcinski2016-12-088-8/+9
| | * | | | | | Fix auto loading of constants for Ci StatusesKamil Trzcinski2016-12-089-20/+21
| * | | | | | | Add icon_with_name_and_action and use it everywhereKamil Trzcinski2016-12-084-41/+19
| * | | | | | | Add action_class/action_titleKamil Trzcinski2016-12-085-3/+30
| * | | | | | | Rename icon_with_label to icon_with_descriptionKamil Trzcinski2016-12-089-9/+10
| * | | | | | | Fix auto loading of constants for Ci StatusesKamil Trzcinski2016-12-089-20/+21
| * | | | | | | Merge branch 'build-statuses' into 22604-manual-actionsKamil Trzcinski2016-12-0829-131/+176
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fix some detailed statuses specs related to abilitiesGrzegorz Bizon2016-12-0810-18/+49
| | * | | | | | Fix tests related to detailed statuses and permissionsGrzegorz Bizon2016-12-0814-41/+45
| | * | | | | | Incorporate permission checks into new CI statusesGrzegorz Bizon2016-12-0811-49/+60
| | * | | | | | Refactor ci status factories to DRY code a littleGrzegorz Bizon2016-12-085-29/+28
| * | | | | | | Merge branch 'build-statuses' into 22604-manual-actionsGrzegorz Bizon2016-12-0848-233/+724
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Remove ci_status_with_icon helper and replace it with partial [ci skip]Kamil Trzcinski2016-12-088-34/+17
| | * | | | | | Check permission of detailsKamil Trzcinski2016-12-084-7/+7
| | * | | | | | Introduce `cancelable` and `returnable` [ci skip]Kamil Trzcinski2016-12-085-35/+64
| | * | | | | | Improve actionsKamil Trzcinski2016-12-085-18/+110
| | * | | | | | Added Ci::Status::BuildKamil Trzcinski2016-12-085-3/+84
| * | | | | | | Adds changelog entryFilipa Lacerda2016-12-071-0/+4
| * | | | | | | Adds tests for the status and actions icons rendered in the pipeline graphFilipa Lacerda2016-12-072-4/+41
| * | | | | | | Adds new icons for pipeline graphFilipa Lacerda2016-12-0711-24/+56
| * | | | | | | Adds actions to the nodesFilipa Lacerda2016-12-074-24/+86
| * | | | | | | Fix tooltip to show the all nameFilipa Lacerda2016-12-073-275/+231
| * | | | | | | Adds new hover stateFilipa Lacerda2016-12-073-10/+33
* | | | | | | | Merge branch '25339-2-webhooks-fired-for-issue-closed-and-reopened' into 'mas...Rémy Coutable2016-12-165-1/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Ensure issuable state changes only fire webhooks onceMark Fletcher2016-12-165-1/+37
* | | | | | | | | Merge branch '20916-issues-mrs-linelength' into 'master' Annabel Dunstone Gray2016-12-166-6/+56
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Limit description container for mrs while viewing side by side diff20916-issues-mrs-linelengthtauriedavis2016-12-154-17/+44
| * | | | | | | | | Add content_class for limited widthAnnabel Dunstone Gray2016-12-095-12/+3
| * | | | | | | | | 20916 Shorten line length of issues and mrstauriedavis2016-12-095-0/+32
* | | | | | | | | | Merge branch 'add_info_to_qr' into 'master' Sean McGivern2016-12-163-3/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add GitLab host to 2FA QR and manual infoDrew Blessing2016-12-163-3/+11
* | | | | | | | | | | Merge branch 'katex-math-license' into 'master' Stan Hu2016-12-162-0/+82
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Clearer comment as to why the procedure is neededMunken2016-12-162-2/+2
| * | | | | | | | | | Added KaTeX license and procedure to build it for GitlabMunken2016-12-162-0/+82
* | | | | | | | | | | Merge branch 'issue_22269' into 'master' Kamil Trzciński2016-12-1639-133/+321
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix rubocopKamil Trzcinski2016-12-161-1/+0
| * | | | | | | | | | | Change SlackService to SlackNotificationsServiceissue_22269_fix_eeissue_22269Felipe Artur2016-12-1519-168/+223
| * | | | | | | | | | | Mattermost Notifications ServiceFelipe Artur2016-12-1533-524/+658
* | | | | | | | | | | | Merge branch 'fix/25635' into 'master' Rémy Coutable2016-12-164-23/+32
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Improve performance on RemoveDuplicatesFromRoutes migrationfix/25635Douglas Barbosa Alexandre2016-12-151-14/+10
| * | | | | | | | | | | | Fix the AddNameIndexToNamespace migration to be reversibleDouglas Barbosa Alexandre2016-12-151-1/+1
| * | | | | | | | | | | | Use optimized query to fill the routes table when running PostgreSQLDouglas Barbosa Alexandre2016-12-152-6/+19
| * | | | | | | | | | | | Don't use the Route model in migrationsDouglas Barbosa Alexandre2016-12-152-2/+2
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'gem-update-grape' into 'master' Rémy Coutable2016-12-163-7/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update grape to 0.18.0gem-update-grapeRobert Schilling2016-12-143-7/+14