Commit Graph

62 Commits

Author SHA1 Message Date
Valery Sizov 26d15a89dd Fix Mattermost integration 2017-08-04 12:22:10 +03:00
Z.J. van de Weg d7062dd042
Remove Mattermost team with GitLab group
When destroying a group, now an API call is made to the Mattermost
server to request the deletion of the project. Actual team deletion on
the Mattermost side happens async, so the runtime shouldn't increase by
more than a second.
2017-07-28 09:09:55 +02:00
Zeger-Jan van de Weg 77d0de9102 Merge branch 'master' into 'zj-create-mattermost-team'
# Conflicts:
#   db/schema.rb
2017-03-06 14:04:14 +00:00
Luke "Jared" Bennett 2cc6485518
Improved team selection
Review changes
2017-03-05 21:05:48 +00:00
Z.J. van de Weg ddfd09c09c Merge branch 'master' into zj-create-mattermost-team 2017-03-02 10:22:56 +01:00
Z.J. van de Weg 52c4a7866e Improve UX 2017-03-02 10:21:29 +01:00
Sean McGivern 811e598f60 Enable and autocorrect the CustomErrorClass cop 2017-03-01 15:28:10 +00:00
Z.J. van de Weg 444d71e043 Transactional mattermost team creation
Before this commit, but still on this feature branch, the creation of
mattermost teams where a background job. However, it was decided it was
better that these happened as transaction so feedback could be displayed
to the user.
2017-02-20 13:41:50 +01:00
Z.J. van de Weg 1a0e54b32d Add tests for Mattermost team creation 2017-02-16 09:19:02 +01:00
Z.J. van de Weg 297dc70158 Create MM team for GitLab group 2017-02-16 09:17:40 +01:00
Z.J. van de Weg f187cc59d6 Small update to the Mattermost API
These changes make it possible to wrap multiple API requests in one
session.
2017-01-24 11:30:47 +01:00
Kamil Trzcinski 55c61d2e41
Improve API specs 2016-12-21 11:53:44 +01:00
Kamil Trzcinski 22a0567823
Fix a few error messages 2016-12-20 23:17:32 +01:00
Kamil Trzcinski 70dcd45de2
Use separate file for error.rb 2016-12-20 23:08:55 +01:00
Z.J. van de Weg 4a03fae930 Fix rspec tests due to different API
[ci skip]
2016-12-20 20:57:09 +01:00
Z.J. van de Weg 0bd8669f3a Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce into zj-mattermost-slash-config 2016-12-20 20:14:27 +01:00
Z.J. van de Weg 2393d30da2 Fix rubocop errors [ci skip] 2016-12-20 20:11:02 +01:00
Kamil Trzcinski dec1e90e50
Add missing Mattermost::Error 2016-12-20 20:07:05 +01:00
Kamil Trzcinski 2b7d759afd
Add with_lease to session [ci skip] 2016-12-20 20:01:48 +01:00
Kamil Trzcinski 61d09a7b15
WIP 2016-12-20 19:11:53 +01:00
Kamil Trzcinski 0cf23fde7c
Work on tests for mattermost 2016-12-20 12:02:37 +01:00
Kamil Trzcinski d305d15b6d
Fix Mattermost client 2016-12-20 11:32:42 +01:00
Kamil Trzcinski 0d224376cf
Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config 2016-12-20 11:32:31 +01:00
Grzegorz Bizon 52278412c7 Merge branch 'zj-kamil-slack-slash-commands' into 'master'
Slack slash commands

## What does this MR do?

Implement Slack Slash Commands by utilizing generalized Mattermost presenter to fulfill Slack requirements.

## Why was this MR needed?

We want to expose Slack Slash Commands as a first-class service.

## What are the relevant issue numbers?

Supersedes !8007  
Closes #22182

See merge request !8126
2016-12-20 09:41:37 +00:00
Kamil Trzcinski 841960f847
Fix flow 2016-12-20 00:22:10 +01:00
Kamil Trzcinski 34295036e2
Improve sources
- Add proper error handling,
- Use flash[:alert] and flash[:notice],
- Use `resource` instead of `resources`,
2016-12-19 23:56:21 +01:00
Z.J. van de Weg 921f411a41 Last fixes 2016-12-19 23:50:42 +01:00
Z.J. van de Weg 5d19723006 Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into zj-mattermost-slash-config 2016-12-19 22:07:19 +01:00
Z.J. van de Weg d21535602b Minor adjustments API Mattermost
[ci skip]
2016-12-19 21:44:15 +01:00
Z.J. van de Weg 6d14a6640f Minor adjustments API Mattermost
[ci skip]
2016-12-19 14:14:09 +01:00
Zeger-Jan van de Weg a9d9895dc7 Merge branch 'master' into 'zj-mattermost-slash-config'
# Conflicts:
#   config/gitlab.yml.example
#   lib/mattermost/session.rb
#   spec/lib/mattermost/session_spec.rb
2016-12-18 12:59:09 +00:00
Kamil Trzcinski c9610e0a05 Fix rubocop failures 2016-12-17 10:32:06 +01:00
Kamil Trzcinski e663725961 Store mattermost_url in settings 2016-12-17 10:31:14 +01:00
Kamil Trzcinski 48ebfaa491 Improve Mattermost Session specs 2016-12-17 10:31:14 +01:00
Z.J. van de Weg 9bcc4d4de5 Ensure the session is destroyed 2016-12-17 10:31:14 +01:00
Z.J. van de Weg a31cdb29e4 Improve session tests 2016-12-17 10:31:14 +01:00
Z.J. van de Weg f11caaf469 Setup mattermost session 2016-12-17 10:31:14 +01:00
Z.J. van de Weg f0889bdfa3 Incorporate review 2016-12-16 20:29:17 +01:00
Z.J. van de Weg 0d3e24358b
Create Slack Slash command service 2016-12-16 17:51:07 +01:00
Z.J. van de Weg 7363a7d3b5 Add tests for auto configure slash commands 2016-12-16 15:51:43 +01:00
Z.J. van de Weg 475a4dc34d Merge branch 'zj-mattermost-session' into zj-mattermost-slash-config 2016-12-16 14:16:10 +01:00
Z.J. van de Weg 0045996728 Add auto configure of commands 2016-12-16 12:31:51 +01:00
Z.J. van de Weg 87d160634d Base work for auto config MM slash commands 2016-12-16 12:21:09 +01:00
Z.J. van de Weg dd385c7c3d Improve session tests 2016-12-16 12:21:09 +01:00
Z.J. van de Weg 178638c4b2 Setup mattermost session 2016-12-16 12:21:09 +01:00
Z.J. van de Weg 166ae89dfa Ensure the session is destroyed 2016-12-15 21:06:17 +01:00
Z.J. van de Weg 4b23764da7 Improve session tests 2016-12-15 20:21:35 +01:00
Z.J. van de Weg 429c9220f0 Setup mattermost session 2016-12-12 11:48:41 +01:00
Kamil Trzcinski 41aa605d4e Improve deploy command message 2016-11-21 21:36:22 +01:00
Kamil Trzcinski d375e3f15b Fix specs and improve code readability 2016-11-21 18:22:03 +01:00