summaryrefslogtreecommitdiff
path: root/app/models/project_services
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_26701' into 'master'Sean McGivern2017-02-091-10/+0
|\
| * Remove JIRA closed status iconissue_26701Felipe Artur2017-02-081-10/+0
* | Added small improvments to the chat slash command servicesLuke "Jared" Bennett2017-02-073-5/+5
* | Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-061-1/+10
|/
* Merge branch 'zj-format-chat-messages' into 'master' Kamil Trzciński2017-02-011-9/+5
|\
| * Fix testsZ.J. van de Weg2017-01-301-6/+2
| * Chat Commands have presentersZ.J. van de Weg2017-01-301-10/+10
* | Merge branch 'correct-gitlab-host-references' into 'master' Achilleas Pipinellis2017-01-311-2/+2
|\ \
| * | Corrected docs href'scorrect-gitlab-host-referencesLuke "Jared" Bennett2017-01-301-2/+2
* | | Update #list_teams to propagate errorsZ.J. van de Weg2017-01-301-4/+4
* | | Fix inconsistent return typeZ.J. van de Weg2017-01-241-2/+2
| |/ |/|
* | Merge branch '22974-trigger-service-events-through-api' into 'master' Douwe Maan2017-01-2332-60/+52
|\ \
| * | adds test suite22974-trigger-service-events-through-apiTiago Botelho2017-01-2226-143/+0
| * | adds events to services api deserializationTiago Botelho2017-01-2232-51/+186
* | | Fix Slack/Mattermost notifaction serviceszj-mattermost-fixesZ.J. van de Weg2017-01-201-7/+7
* | | Remove prefilled prefixZ.J. van de Weg2017-01-201-1/+1
|/ /
* | Merge branch '24185-legacy-ci-status-reactive-cache' into 'security'Robert Speicher2017-01-125-138/+108
|/
* Fix rubucop offensesDouglas Barbosa Alexandre2016-12-231-2/+2
* Rename `opt` to `opts` on ChatNotificationService#executeissue_25887Douglas Barbosa Alexandre2016-12-231-4/+4
* Do not override incoming webhook channel for mattermost and slackFelipe Artur2016-12-223-6/+8
* Merge branch 'zj-slack-404-error' into 'master' Kamil Trzciński2016-12-221-1/+1
|\
| * Fix format of Slack when result is nilzj-slack-404-errorZ.J. van de Weg2016-12-221-1/+1
* | Fix Mattermost command creation by specifying usernameKamil Trzcinski2016-12-221-1/+1
|/
* Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-211-0/+30
|\
| * Improve API specsKamil Trzcinski2016-12-211-3/+3
| * Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...Kamil Trzcinski2016-12-201-3/+3
| |\
| | * Fix rubocop errors [ci skip]Z.J. van de Weg2016-12-201-3/+3
| * | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-202-11/+74
| |\ \ | | |/ | |/|
| * | WIPKamil Trzcinski2016-12-201-2/+6
| * | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-204-48/+85
| |\ \
| * | | Fix flowKamil Trzcinski2016-12-201-7/+4
| * | | Improve sourcesKamil Trzcinski2016-12-191-25/+10
| * | | Last fixesZ.J. van de Weg2016-12-191-1/+1
| * | | Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into zj-matt...Z.J. van de Weg2016-12-191-2/+2
| |\ \ \
| | * | | Minor adjustments API MattermostZ.J. van de Weg2016-12-191-2/+2
| * | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-191-4/+21
| |/ / /
| * | | Merge branch 'master' into 'zj-mattermost-slash-config'Zeger-Jan van de Weg2016-12-1815-62/+128
| |\ \ \
| * | | | Incorporate reviewZ.J. van de Weg2016-12-161-6/+20
| * | | | Merge branch 'zj-mattermost-session' into zj-mattermost-slash-configZ.J. van de Weg2016-12-161-7/+7
| |\ \ \ \
| * | | | | Add auto configure of commandsZ.J. van de Weg2016-12-161-4/+0
| * | | | | Base work for auto config MM slash commandsZ.J. van de Weg2016-12-161-0/+15
* | | | | | Rename MattermostNotificationService back to MattermostServicefix/25843Douglas Barbosa Alexandre2016-12-201-2/+2
* | | | | | Rename SlackNotificationService back to SlackServiceDouglas Barbosa Alexandre2016-12-201-2/+2
| |_|_|_|/ |/| | | |
* | | | | Merge branch '22864-kubernetes-deploy-with-terminal' into 'master' Kamil Trzciński2016-12-202-11/+74
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add terminals to the Kubernetes deployment serviceNick Thomas2016-12-192-11/+74
| | |_|/ | |/| |
* | | | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-204-50/+85
|\ \ \ \ | |/ / / |/| | |
| * | | Improve code designKamil Trzcinski2016-12-192-6/+8
| * | | Fix spec failuresKamil Trzcinski2016-12-181-1/+1
| * | | Use Slack::Notifier::LinkFormatter to convert markdown links to slack compatKamil Trzcinski2016-12-163-12/+11
| * | | Fix SlackSlashCommands testsKamil Trzcinski2016-12-162-2/+2