Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'zj-kamil-slack-slash-commands' into 'master' | Grzegorz Bizon | 2016-12-20 | 37 | -242/+483 |
|\ | |||||
| * | Fix specszj-kamil-slack-slash-commands | Kamil Trzcinski | 2016-12-19 | 3 | -28/+20 |
| * | Improve after feedback | Kamil Trzcinski | 2016-12-19 | 9 | -51/+32 |
| * | Fix previously reverted spec failures | Kamil Trzcinski | 2016-12-19 | 7 | -47/+47 |
| * | Improve code design | Kamil Trzcinski | 2016-12-19 | 2 | -6/+8 |
| * | Fix failures | Kamil Trzcinski | 2016-12-18 | 1 | -1/+1 |
| * | Fix spec failures | Kamil Trzcinski | 2016-12-18 | 4 | -4/+5 |
| * | Remove not related spec changes | Kamil Trzcinski | 2016-12-18 | 6 | -43/+43 |
| * | Fix Rubocop | Kamil Trzcinski | 2016-12-18 | 1 | -2/+2 |
| * | Added slack slash commands frontend help well | Luke "Jared" Bennett | 2016-12-18 | 3 | -0/+145 |
| * | Use Slack::Notifier::LinkFormatter to convert markdown links to slack compat | Kamil Trzcinski | 2016-12-16 | 12 | -58/+57 |
| * | Fix SlackSlashCommands tests | Kamil Trzcinski | 2016-12-16 | 8 | -118/+127 |
| * | Fix specs | Kamil Trzcinski | 2016-12-16 | 3 | -8/+12 |
| * | Render format dependent links | Kamil Trzcinski | 2016-12-16 | 6 | -99/+132 |
| * | Use Slack compatible syntax | Kamil Trzcinski | 2016-12-16 | 1 | -4/+4 |
| * | Use single presenter for everything | Kamil Trzcinski | 2016-12-16 | 3 | -14/+2 |
| * | Rename Mattermost::Presenter to Presenter | Kamil Trzcinski | 2016-12-16 | 2 | -131/+133 |
| * | Rename ChatService into ChatSlashCommandsService | Kamil Trzcinski | 2016-12-16 | 5 | -81/+60 |
| * | Create Slack Slash command service | Z.J. van de Weg | 2016-12-16 | 17 | -51/+156 |
* | | Merge branch '25810-misaligned-count' into 'master' | Fatih Acet | 2016-12-20 | 2 | -3/+19 |
|\ \ | |||||
| * | | Align milestone column header with count number25810-misaligned-count | Sam Rose | 2016-12-19 | 2 | -3/+19 |
* | | | Merge branch '25735-font-size' into 'master' | Fatih Acet | 2016-12-20 | 1 | -1/+0 |
|\ \ \ | |||||
| * | | | Update font size of detail page header to 14px25735-font-size | Annabel Dunstone Gray | 2016-12-19 | 1 | -1/+0 |
* | | | | Merge branch 'status-badge-height' into 'master' | Fatih Acet | 2016-12-20 | 2 | -2/+0 |
|\ \ \ \ | |||||
| * | | | | Remove inline-block styling from statusstatus-badge-height | Annabel Dunstone Gray | 2016-12-19 | 2 | -2/+0 |
* | | | | | Merge branch 'fix-forbidden-for-build-api-for-deleted-project' into 'master' | Grzegorz Bizon | 2016-12-20 | 3 | -17/+37 |
|\ \ \ \ \ | |||||
| * | | | | | Use a block to insert extra check for authenticate_build!fix-forbidden-for-build-api-for-deleted-project | Lin Jen-Shin | 2016-12-20 | 1 | -3/+6 |
| * | | | | | Spaces around literal hash | Lin Jen-Shin | 2016-12-19 | 1 | -2/+2 |
| * | | | | | Just set the status rather than calling event | Lin Jen-Shin | 2016-12-19 | 1 | -5/+2 |
| * | | | | | Define actions in let so that it could be overridden | Lin Jen-Shin | 2016-12-19 | 1 | -10/+13 |
| * | | | | | Prefer unless over if not | Lin Jen-Shin | 2016-12-19 | 1 | -1/+1 |
| * | | | | | Delete the project when building the build | Lin Jen-Shin | 2016-12-19 | 1 | -10/+7 |
| * | | | | | Use a separate method to skip validation | Lin Jen-Shin | 2016-12-19 | 2 | -3/+8 |
| * | | | | | Merge remote-tracking branch 'upstream/master' into fix-forbidden-for-build-a... | Lin Jen-Shin | 2016-12-19 | 744 | -2807/+18085 |
| |\ \ \ \ \ | |||||
| * | | | | | | Give forbidden if project for the build was deleted | Lin Jen-Shin | 2016-12-15 | 3 | -15/+30 |
* | | | | | | | Merge branch 'dz-fix-route-rename' into 'master' | Douglas Barbosa Alexandre | 2016-12-19 | 3 | -4/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix Route#rename_children behaviordz-fix-route-rename | Dmitriy Zaporozhets | 2016-12-19 | 3 | -4/+10 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch '25740-fix-new-branch-button-padding' into 'master' | Annabel Dunstone Gray | 2016-12-19 | 2 | -0/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Even out padding on plus button in breadcrumb menu | Ryan Harris | 2016-12-19 | 2 | -0/+5 |
* | | | | | | | | Merge branch 'bb-wiki-import' into 'master' | Douglas Barbosa Alexandre | 2016-12-19 | 9 | -6/+88 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add Wiki import to BB importer | Valery Sizov | 2016-12-19 | 9 | -6/+88 |
* | | | | | | | | | Merge branch 'ldap_maint_task' into 'master' | Nick Thomas | 2016-12-19 | 6 | -22/+181 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add LDAP task to rename a provider | Drew Blessing | 2016-12-16 | 6 | -22/+181 |
* | | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Douglas Barbosa Alexandre | 2016-12-19 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Douglas Barbosa Alexandre | 2016-12-19 | 9 | -33/+22 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Douglas Barbosa Alexandre | 2016-12-19 | 9 | -33/+22 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Update CHANGELOG.md for 8.13.10 | Alejandro Rodríguez | 2016-12-14 | 1 | -0/+7 |
| | | * | | | | | | | | | | Update CHANGELOG.md for 8.14.5 | Alejandro Rodríguez | 2016-12-14 | 9 | -33/+15 |
* | | | | | | | | | | | | | Update CHANGELOG.md for 8.13.10 | Alejandro Rodríguez | 2016-12-19 | 1 | -0/+7 |
* | | | | | | | | | | | | | Update CHANGELOG.md for 8.14.5 | Alejandro Rodríguez | 2016-12-19 | 9 | -33/+15 |
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |