summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-18111-290/+4007
|\
| * Merge branch '4273-slash-commands' into 'master'Robert Speicher2016-08-1856-136/+2613
| |\
| | * Fix behavior around commands with optional arguments4273-slash-commandsDouwe Maan2016-08-185-42/+63
| | * Fix behavior of label_ids and add/remove_label_idsDouwe Maan2016-08-181-7/+8
| | * Remove unneeded aliasesDouwe Maan2016-08-188-117/+109
| | * Address feedbackDouwe Maan2016-08-174-23/+19
| | * Fix specs and implement fixes based on failing specsDouwe Maan2016-08-1711-84/+75
| | * Merge branch 'master' into 4273-slash-commandsDouwe Maan2016-08-16238-892/+4066
| | |\
| | * | Fixed specs and fixes based on failing specsDouwe Maan2016-08-1613-428/+365
| | * | Prefer `/reopen` over `/open`, remove `/reassign`Douwe Maan2016-08-122-24/+24
| | * | Allow setting labels, milestones and assignee based on nameDouwe Maan2016-08-121-3/+9
| | * | Force notes poll after commands have been executedDouwe Maan2016-08-124-33/+35
| | * | Autocomplete based on names and aliasesDouwe Maan2016-08-121-0/+16
| | * | Link to slash commands documentation from form hintsDouwe Maan2016-08-123-4/+11
| | * | Disable slash commands on edit formsDouwe Maan2016-08-125-7/+13
| | * | Fix autocomplete on commit and issue/MR edit pagesDouwe Maan2016-08-123-7/+8
| | * | Refactor slash command definitionDouwe Maan2016-08-1211-164/+190
| | * | Only autocomplete commands at the beginning of a lineDouwe Maan2016-08-121-2/+11
| | * | Simplify the slash commands DSL to store action blocks instead of creating me...Rémy Coutable2016-08-1316-159/+296
| | * | New TodoService#todo_exists? methodRémy Coutable2016-08-134-3/+19
| | * | Accept blocks for `.desc` and `.condition` slash commands DSLRémy Coutable2016-08-133-154/+171
| | * | Make slash commands contextualRémy Coutable2016-08-1310-65/+394
| | * | Add support for no-op slash commands that appear in autocompleteRémy Coutable2016-08-135-14/+35
| | * | Don't extract slash commands inside blockcode, blockquote or HTML tagsRémy Coutable2016-08-136-16/+98
| | * | Add the /title slash commandRémy Coutable2016-08-136-12/+89
| | * | New Notes::SlashCommandsService serviceRémy Coutable2016-08-1310-251/+387
| | * | Enforce permissions in `{Issues,MergeRequests}::{Close,Reopen}Service`Rémy Coutable2016-08-139-21/+178
| | * | Support slash commands in noteable description and notesRémy Coutable2016-08-1331-58/+1552
| * | | Merge branch '3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a...Jacob Schatz2016-08-184-4/+5
| |\ \ \
| | * | | Fix Ace syntax highlighting with compiled assets3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a-file-in-the-webuiSean McGivern2016-08-174-4/+5
| * | | | Merge branch '13664-abuse-report-page-should-have-a-maximum-width' into 'mast...Jacob Schatz2016-08-188-24/+172
| |\ \ \ \
| | * | | | Moved truncation method chain to utility method13664-abuse-report-page-should-have-a-maximum-widthLuke Bennett2016-08-182-2/+5
| | * | | | Review changesLuke Bennett2016-08-142-5/+8
| | * | | | Some more styling tweaks and added jasmine testLuke Bennett2016-08-145-8/+74
| | * | | | Reverted collapsible design for HazelsLuke Bennett2016-08-146-227/+95
| | * | | | Added new but unaccepted design pattern, it is only pushed for future referen...Luke "Jared" Bennett2016-08-143-47/+25
| | * | | | Updated collapsibleLuke "Jared" Bennett2016-08-143-53/+37
| | * | | | Review changesLuke "Jared" Bennett2016-08-142-18/+25
| | * | | | Final table styling changesLuke "Jared" Bennett2016-08-141-4/+7
| | * | | | Started on abuse reports message truncationLuke "Jared" Bennett2016-08-144-1/+209
| | * | | | Altered abuse report UILuke "Jared" Bennett2016-08-142-41/+69
| * | | | | Merge branch '18334-truncate-award-emoji-users' into 'master' Jacob Schatz2016-08-186-28/+116
| |\ \ \ \ \
| | * | | | | Replace resetTooltip with bootstrap's fixTitleJack Davison2016-08-171-14/+6
| | * | | | | Fix duplicate "me" in award emoji tooltipJack Davison2016-08-172-1/+7
| | * | | | | Award tooltips refer to current user as "You"Jack Davison2016-08-175-25/+25
| | * | | | | Switch to using to_sentence to construct tooltipsJack Davison2016-08-174-14/+44
| | * | | | | Truncates 9-10 users with current user in frontJack Davison2016-08-172-5/+19
| | * | | | | Truncated user list in award emoji tooltipsJack Davison2016-08-175-3/+49
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'zj-api-endpoints-ci' into 'master' Robert Speicher2016-08-1810-0/+424
| |\ \ \ \ \
| | * | | | | Do not expose projects on deploymentsZ.J. van de Weg2016-08-182-170/+3
View Lorry Controller Status