root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
111,884 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

38 Commits

Author SHA1 Message Date
GitLab Bot 4220cf46a3 Add latest changes from gitlab-org/gitlab@master 2022-03-22 12:07:28 +00:00
GitLab Bot f5823d9c24 Add latest changes from gitlab-org/gitlab@master 2021-06-01 03:10:06 +00:00
GitLab Bot be4b3134a2 Add latest changes from gitlab-org/gitlab@master 2021-05-04 15:10:36 +00:00
GitLab Bot 49a897eff9 Add latest changes from gitlab-org/gitlab@master 2020-09-08 09:08:31 +00:00
GitLab Bot 4e06ca9e7d Add latest changes from gitlab-org/gitlab@master 2020-09-02 18:10:40 +00:00
Mayra Cabrera 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
Harrison Healey 61ea0e1a94 Remove Content-Type override for Mattermost OAuth login 2019-05-16 13:57:55 -04:00
gfyoung 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
Harrison Healey f124b6fd11 Updated Mattermost integration to use Mattermost API v4 2018-05-28 09:18:43 -04:00
Francisco Javier López 4d0ec5b128
Fixing request options to allow_local_requests with DELETE verb 2018-03-21 20:35:42 +01:00
Francisco Javier López 7509589b99
Adapting mattermost to the new way of calling HTTP 2018-03-21 18:43:26 +01:00
Douwe Maan 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
julien MILLAU 7fcf356053 Add missing delete method in mattermost session 2018-03-08 09:25:10 +00:00
Valery Sizov 26d15a89dd Fix Mattermost integration 2017-08-04 12:22:10 +03:00
Z.J. van de Weg ddfd09c09c Merge branch 'master' into zj-create-mattermost-team 2017-03-02 10:22:56 +01:00
Sean McGivern 811e598f60 Enable and autocorrect the CustomErrorClass cop 2017-03-01 15:28:10 +00:00
Z.J. van de Weg 297dc70158 Create MM team for GitLab group 2017-02-16 09:17:40 +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
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 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 d21535602b Minor adjustments API Mattermost 
[ci skip]
 2016-12-19 21:44:15 +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 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 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