36aae58f55
Add latest changes from gitlab-org/gitlab@master
2025-07-02 12:13:07 +00:00
ab5132651a
Add latest changes from gitlab-org/gitlab@master
2025-06-12 00:12:54 +00:00
c1c90c3a41
Add latest changes from gitlab-org/gitlab@master
2024-12-12 21:32:36 +00:00
885949181f
Add latest changes from gitlab-org/gitlab@master
2024-12-02 18:24:31 +00:00
959e358268
Add latest changes from gitlab-org/gitlab@master
2024-11-27 18:32:30 +00:00
de5a3e7e69
Add latest changes from gitlab-org/gitlab@master
2024-06-13 09:17:17 +00:00
4220cf46a3
Add latest changes from gitlab-org/gitlab@master
2022-03-22 12:07:28 +00:00
f5823d9c24
Add latest changes from gitlab-org/gitlab@master
2021-06-01 03:10:06 +00:00
be4b3134a2
Add latest changes from gitlab-org/gitlab@master
2021-05-04 15:10:36 +00:00
49a897eff9
Add latest changes from gitlab-org/gitlab@master
2020-09-08 09:08:31 +00:00
4e06ca9e7d
Add latest changes from gitlab-org/gitlab@master
2020-09-02 18:10:40 +00:00
5bdbc604c8
Add latest changes from gitlab-org/gitlab@master
2020-05-08 09:09:39 +00:00
3795b229ab
Add latest changes from gitlab-org/gitlab@master
2020-05-01 00:09:59 +00:00
0ab89d8e36
Add a rubocop for Rails.logger
...
Suggests to use a JSON structured log instead
Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/54102
2019-07-10 19:26:47 +00:00
61ea0e1a94
Remove Content-Type override for Mattermost OAuth login
2019-05-16 13:57:55 -04:00
c8755543f0
Enable even more frozen string in lib/**/*.rb
...
Enables frozen string for the following files:
* lib/generators/**/*.rb
* lib/gitaly/**/*.rb
* lib/google_api/**/*.rb
* lib/haml_lint/**/*.rb
* lib/json_web_token/**/*.rb
* lib/mattermost/**/*.rb
* lib/microsoft_teams/**/*.rb
* lib/object_storage/**/*.rb
* lib/omni_auth/**/*.rb
* lib/peek/**/*.rb
* lib/rouge/**/*.rb
* lib/rspec_flaky/**/*.rb
* lib/system_check/**/*.rb
Partially addresses #47424 .
2018-10-08 11:16:49 -07:00
f124b6fd11
Updated Mattermost integration to use Mattermost API v4
2018-05-28 09:18:43 -04:00
4d0ec5b128
Fixing request options to allow_local_requests with DELETE verb
2018-03-21 20:35:42 +01:00
7509589b99
Adapting mattermost to the new way of calling HTTP
2018-03-21 18:43:26 +01:00
95ced3bb5f
Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'
...
Server Side Request Forgery in Services and Web Hooks
See merge request gitlab/gitlabhq!2337
2018-03-21 14:39:21 +00:00
7fcf356053
Add missing delete method in mattermost session
2018-03-08 09:25:10 +00:00
26d15a89dd
Fix Mattermost integration
2017-08-04 12:22:10 +03:00
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
77d0de9102
Merge branch 'master' into 'zj-create-mattermost-team'
...
# Conflicts:
# db/schema.rb
2017-03-06 14:04:14 +00:00
2cc6485518
Improved team selection
...
Review changes
2017-03-05 21:05:48 +00:00
ddfd09c09c
Merge branch 'master' into zj-create-mattermost-team
2017-03-02 10:22:56 +01:00
52c4a7866e
Improve UX
2017-03-02 10:21:29 +01:00
811e598f60
Enable and autocorrect the CustomErrorClass cop
2017-03-01 15:28:10 +00:00
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
1a0e54b32d
Add tests for Mattermost team creation
2017-02-16 09:19:02 +01:00
297dc70158
Create MM team for GitLab group
2017-02-16 09:17:40 +01:00
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
55c61d2e41
Improve API specs
2016-12-21 11:53:44 +01:00
22a0567823
Fix a few error messages
2016-12-20 23:17:32 +01:00
70dcd45de2
Use separate file for error.rb
2016-12-20 23:08:55 +01:00
4a03fae930
Fix rspec tests due to different API
...
[ci skip]
2016-12-20 20:57:09 +01:00
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
2393d30da2
Fix rubocop errors [ci skip]
2016-12-20 20:11:02 +01:00
dec1e90e50
Add missing Mattermost::Error
2016-12-20 20:07:05 +01:00
2b7d759afd
Add with_lease to session [ci skip]
2016-12-20 20:01:48 +01:00
61d09a7b15
WIP
2016-12-20 19:11:53 +01:00
0cf23fde7c
Work on tests for mattermost
2016-12-20 12:02:37 +01:00
d305d15b6d
Fix Mattermost client
2016-12-20 11:32:42 +01:00
0d224376cf
Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config
2016-12-20 11:32:31 +01:00
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
841960f847
Fix flow
2016-12-20 00:22:10 +01:00
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
921f411a41
Last fixes
2016-12-19 23:50:42 +01:00
5d19723006
Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into zj-mattermost-slash-config
2016-12-19 22:07:19 +01:00
d21535602b
Minor adjustments API Mattermost
...
[ci skip]
2016-12-19 21:44:15 +01:00
GitLab Bot
Mayra Cabrera
Harrison Healey
gfyoung
Francisco Javier López
Douwe Maan
julien MILLAU
Valery Sizov
Z.J. van de Weg
Zeger-Jan van de Weg
Luke "Jared" Bennett
Sean McGivern
Kamil Trzcinski
Grzegorz Bizon