summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allow SlackService while migratingallow-slack-serviceSean McGivern2016-12-204-9/+26
* Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-2037-242/+483
|\
| * Fix specszj-kamil-slack-slash-commandsKamil Trzcinski2016-12-193-28/+20
| * Improve after feedbackKamil Trzcinski2016-12-199-51/+32
| * Fix previously reverted spec failuresKamil Trzcinski2016-12-197-47/+47
| * Improve code designKamil Trzcinski2016-12-192-6/+8
| * Fix failuresKamil Trzcinski2016-12-181-1/+1
| * Fix spec failuresKamil Trzcinski2016-12-184-4/+5
| * Remove not related spec changesKamil Trzcinski2016-12-186-43/+43
| * Fix RubocopKamil Trzcinski2016-12-181-2/+2
| * Added slack slash commands frontend help wellLuke "Jared" Bennett2016-12-183-0/+145
| * Use Slack::Notifier::LinkFormatter to convert markdown links to slack compatKamil Trzcinski2016-12-1612-58/+57
| * Fix SlackSlashCommands testsKamil Trzcinski2016-12-168-118/+127
| * Fix specsKamil Trzcinski2016-12-163-8/+12
| * Render format dependent linksKamil Trzcinski2016-12-166-99/+132
| * Use Slack compatible syntaxKamil Trzcinski2016-12-161-4/+4
| * Use single presenter for everythingKamil Trzcinski2016-12-163-14/+2
| * Rename Mattermost::Presenter to PresenterKamil Trzcinski2016-12-162-131/+133
| * Rename ChatService into ChatSlashCommandsServiceKamil Trzcinski2016-12-165-81/+60
| * Create Slack Slash command serviceZ.J. van de Weg2016-12-1617-51/+156
* | Merge branch '25810-misaligned-count' into 'master' Fatih Acet2016-12-202-3/+19
|\ \
| * | Align milestone column header with count number25810-misaligned-countSam Rose2016-12-192-3/+19
* | | Merge branch '25735-font-size' into 'master' Fatih Acet2016-12-201-1/+0
|\ \ \
| * | | Update font size of detail page header to 14px25735-font-sizeAnnabel Dunstone Gray2016-12-191-1/+0
* | | | Merge branch 'status-badge-height' into 'master' Fatih Acet2016-12-202-2/+0
|\ \ \ \
| * | | | Remove inline-block styling from statusstatus-badge-heightAnnabel Dunstone Gray2016-12-192-2/+0
* | | | | Merge branch 'fix-forbidden-for-build-api-for-deleted-project' into 'master' Grzegorz Bizon2016-12-203-17/+37
|\ \ \ \ \
| * | | | | Use a block to insert extra check for authenticate_build!fix-forbidden-for-build-api-for-deleted-projectLin Jen-Shin2016-12-201-3/+6
| * | | | | Spaces around literal hashLin Jen-Shin2016-12-191-2/+2
| * | | | | Just set the status rather than calling eventLin Jen-Shin2016-12-191-5/+2
| * | | | | Define actions in let so that it could be overriddenLin Jen-Shin2016-12-191-10/+13
| * | | | | Prefer unless over if notLin Jen-Shin2016-12-191-1/+1
| * | | | | Delete the project when building the buildLin Jen-Shin2016-12-191-10/+7
| * | | | | Use a separate method to skip validationLin Jen-Shin2016-12-192-3/+8
| * | | | | Merge remote-tracking branch 'upstream/master' into fix-forbidden-for-build-a...Lin Jen-Shin2016-12-19744-2807/+18085
| |\ \ \ \ \
| * | | | | | Give forbidden if project for the build was deletedLin Jen-Shin2016-12-153-15/+30
* | | | | | | Merge branch 'dz-fix-route-rename' into 'master' Douglas Barbosa Alexandre2016-12-193-4/+10
|\ \ \ \ \ \ \
| * | | | | | | Fix Route#rename_children behaviordz-fix-route-renameDmitriy Zaporozhets2016-12-193-4/+10
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '25740-fix-new-branch-button-padding' into 'master' Annabel Dunstone Gray2016-12-192-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Even out padding on plus button in breadcrumb menuRyan Harris2016-12-192-0/+5
* | | | | | | | Merge branch 'bb-wiki-import' into 'master' Douglas Barbosa Alexandre2016-12-199-6/+88
|\ \ \ \ \ \ \ \
| * | | | | | | | Add Wiki import to BB importerValery Sizov2016-12-199-6/+88
* | | | | | | | | Merge branch 'ldap_maint_task' into 'master' Nick Thomas2016-12-196-22/+181
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add LDAP task to rename a providerDrew Blessing2016-12-166-22/+181
* | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDouglas Barbosa Alexandre2016-12-190-0/+0
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDouglas Barbosa Alexandre2016-12-199-33/+22
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDouglas Barbosa Alexandre2016-12-199-33/+22
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Update CHANGELOG.md for 8.13.10Alejandro Rodríguez2016-12-141-0/+7
| | | * | | | | | | | | | Update CHANGELOG.md for 8.14.5Alejandro Rodríguez2016-12-149-33/+15
* | | | | | | | | | | | | Update CHANGELOG.md for 8.13.10Alejandro Rodríguez2016-12-191-0/+7