| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add a rubocop for Rails.logger | Mayra Cabrera | 2019-07-10 | 1 | -1/+1 |
| | | | | | | | Suggests to use a JSON structured log instead Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/54102 | ||||
| * | Remove Content-Type override for Mattermost OAuth login | Harrison Healey | 2019-05-16 | 1 | -1/+1 |
| | | |||||
| * | Enable even more frozen string in lib/**/*.rb | gfyoung | 2018-10-08 | 5 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | Updated Mattermost integration to use Mattermost API v4 | Harrison Healey | 2018-05-28 | 3 | -6/+6 |
| | | |||||
| * | Fixing request options to allow_local_requests with DELETE verblatest-security-to-master-21-03-18 | Francisco Javier López | 2018-03-21 | 1 | -1/+1 |
| | | |||||
| * | Adapting mattermost to the new way of calling HTTP | Francisco Javier López | 2018-03-21 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6' | Douwe Maan | 2018-03-21 | 1 | -8/+14 |
| | | | | | | Server Side Request Forgery in Services and Web Hooks See merge request gitlab/gitlabhq!2337 | ||||
| * | Add missing delete method in mattermost session | julien MILLAU | 2018-03-08 | 2 | -3/+8 |
| | | |||||
| * | Fix Mattermost integrationmattermost_fixes | Valery Sizov | 2017-08-04 | 1 | -6/+20 |
| | | |||||
| * | Remove Mattermost team with GitLab group | Z.J. van de Weg | 2017-07-28 | 2 | -0/+17 |
| | | | | | | | | 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. | ||||
| * | Merge branch 'master' into 'zj-create-mattermost-team' | Zeger-Jan van de Weg | 2017-03-06 | 1 | -1/+1 |
| |\ | | | | | | | # Conflicts: # db/schema.rb | ||||
| | * | Improved team selection | Luke "Jared" Bennett | 2017-03-05 | 1 | -1/+1 |
| | | | | | | | | | Review changes | ||||
| * | | Merge branch 'master' into zj-create-mattermost-team | Z.J. van de Weg | 2017-03-02 | 3 | -3/+3 |
| |\ \ | |/ | |||||
| | * | Enable and autocorrect the CustomErrorClass cop | Sean McGivern | 2017-03-01 | 3 | -3/+3 |
| | | | |||||
| * | | Improve UX | Z.J. van de Weg | 2017-03-02 | 1 | -14/+6 |
| | | | |||||
| * | | Transactional mattermost team creation | Z.J. van de Weg | 2017-02-20 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | 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. | ||||
| * | | Add tests for Mattermost team creation | Z.J. van de Weg | 2017-02-16 | 2 | -3/+17 |
| | | | |||||
| * | | Create MM team for GitLab group | Z.J. van de Weg | 2017-02-16 | 2 | -1/+6 |
| |/ | |||||
| * | Small update to the Mattermost APIzj-mattermost-api-update | Z.J. van de Weg | 2017-01-24 | 3 | -8/+18 |
| | | | | | | These changes make it possible to wrap multiple API requests in one session. | ||||
| * | Improve API specs | Kamil Trzcinski | 2016-12-21 | 1 | -14/+18 |
| | | |||||
| * | Fix a few error messages | Kamil Trzcinski | 2016-12-20 | 2 | -4/+4 |
| | | |||||
| * | Use separate file for error.rb | Kamil Trzcinski | 2016-12-20 | 1 | -2/+0 |
| | | |||||
| * | Fix rspec tests due to different API | Z.J. van de Weg | 2016-12-20 | 1 | -2/+2 |
| | | | | | [ci skip] | ||||
| * | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ↵ | Z.J. van de Weg | 2016-12-20 | 2 | -8/+35 |
| |\ | | | | | | | into zj-mattermost-slash-config | ||||
| | * | Add missing Mattermost::Error | Kamil Trzcinski | 2016-12-20 | 1 | -0/+3 |
| | | | |||||
| | * | Add with_lease to session [ci skip] | Kamil Trzcinski | 2016-12-20 | 1 | -8/+32 |
| | | | |||||
| * | | Fix rubocop errors [ci skip] | Z.J. van de Weg | 2016-12-20 | 1 | -1/+1 |
| |/ | |||||
| * | WIP | Kamil Trzcinski | 2016-12-20 | 2 | -14/+14 |
| | | |||||
| * | Work on tests for mattermost | Kamil Trzcinski | 2016-12-20 | 2 | -3/+17 |
| | | |||||
| * | Fix Mattermost client | Kamil Trzcinski | 2016-12-20 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 1 | -131/+0 |
| |\ | |||||
| | * | Merge branch 'zj-kamil-slack-slash-commands' into 'master' | Grzegorz Bizon | 2016-12-20 | 1 | -131/+0 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | Create Slack Slash command service | Z.J. van de Weg | 2016-12-16 | 1 | -131/+0 |
| | | | | |||||
| * | | | Fix flow | Kamil Trzcinski | 2016-12-20 | 3 | -21/+46 |
| | | | | |||||
| * | | | Improve sources | Kamil Trzcinski | 2016-12-19 | 3 | -7/+23 |
| | | | | | | | | | | | | | | | | | | | - Add proper error handling, - Use flash[:alert] and flash[:notice], - Use `resource` instead of `resources`, | ||||
| * | | | Last fixes | Z.J. van de Weg | 2016-12-19 | 1 | -4/+0 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into ↵ | Z.J. van de Weg | 2016-12-19 | 1 | -3/+1 |
| |\ \ \ | | | | | | | | | | | | | zj-mattermost-slash-config | ||||
| | * | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 3 | -20/+14 |
| | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 3 | -24/+17 |
| |/ / / | | | | | | | | | | [ci skip] | ||||
| * | | | Merge branch 'master' into 'zj-mattermost-slash-config' | Zeger-Jan van de Weg | 2016-12-18 | 1 | -36/+34 |
| |\ \ \ | |/ / | | | | | | | | | | | | | # Conflicts: # config/gitlab.yml.example # lib/mattermost/session.rb # spec/lib/mattermost/session_spec.rb | ||||
| | * | | Fix rubocop failureszj-mattermost-session | Kamil Trzcinski | 2016-12-17 | 1 | -15/+21 |
| | | | | |||||
| | * | | Store mattermost_url in settings | Kamil Trzcinski | 2016-12-17 | 1 | -8/+9 |
| | | | | |||||
| | * | | Improve Mattermost Session specs | Kamil Trzcinski | 2016-12-17 | 1 | -11/+12 |
| | | | | |||||
| | * | | Ensure the session is destroyed | Z.J. van de Weg | 2016-12-17 | 1 | -3/+5 |
| | | | | |||||
| | * | | Improve session tests | Z.J. van de Weg | 2016-12-17 | 1 | -3/+6 |
| | | | | |||||
| | * | | Setup mattermost session | Z.J. van de Weg | 2016-12-17 | 1 | -0/+102 |
| | |/ | |||||
| * | | Incorporate review | Z.J. van de Weg | 2016-12-16 | 1 | -12/+0 |
| | | | |||||
| * | | Add tests for auto configure slash commands | Z.J. van de Weg | 2016-12-16 | 2 | -7/+15 |
| | | | |||||
| * | | Merge branch 'zj-mattermost-session' into zj-mattermost-slash-config | Z.J. van de Weg | 2016-12-16 | 2 | -17/+15 |
| |\ \ | |||||
| | * | | Ensure the session is destroyed | Z.J. van de Weg | 2016-12-15 | 1 | -3/+5 |
| | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |