Mattermost notifications for merge request approvals use the wrong text

Summary

Mattermost notifications for merge request approvals use the wrong text

Steps to reproduce

  1. Integrate with matterermost notifications https://docs.gitlab.com/ee/user/project/integrations/mattermost.html
  2. Ensure merge request notifications are enabled
  3. Create an MR that requires approval
  4. Approve the MR

What is the current bug behavior?

The notification states that the approver opened the MR e.g.

Joe Bloggs (username) opened !1 Test MR in username/project

What is the expected correct behavior?

The notification states that the approver approved the MR e.g.

Joe Bloggs (username) approved !1 Test MR in username/project

Results of GitLab environment info

Expand for output related to GitLab environment info 
System information
System:
Proxy:          no
Current User:   git
Using RVM:      no
Ruby Version:   2.5.3p105
Gem Version:    2.7.9
Bundler Version:1.17.3
Rake Version:   12.3.2
Redis Version:  3.2.12
Git Version:    2.21.0
Sidekiq Version:5.2.7
Go Version:     unknown


GitLab information
Version:        11.11.0-ee
Revision:       deb6f84e91f
Directory:      /opt/gitlab/embedded/service/gitlab-rails
DB Adapter:     PostgreSQL
DB Version:     9.6.11
URL:            https://gitlab.qwertee.com
HTTP Clone URL: https://gitlab.qwertee.com/some-group/some-project.git
SSH Clone URL:  ssh://git@gitlab.qwertee.com:1022/some-group/some-project.git
Elasticsearch:  no
Geo:            no
Using LDAP:     no
Using Omniauth: yes
Omniauth Providers:


GitLab Shell
Version:        9.1.0
Repository storage paths:
  • default: /var/opt/gitlab/git-data/repositories GitLab Shell path: /opt/gitlab/embedded/service/gitlab-shell Git: /opt/gitlab/embedded/bin/git

Results of GitLab application Check

Expand for output related to the GitLab application check 
#Checking GitLab subtasks ...                                                                                                                                                                                     

Checking GitLab Shell ...


GitLab Shell: ... GitLab Shell version >= 9.1.0 ? ... OK (9.1.0)

Running /opt/gitlab/embedded/service/gitlab-shell/bin/check

Check GitLab API access: OK

Redis available via internal API: OK


Access to /var/opt/gitlab/.ssh/authorized_keys: OK

gitlab-shell self-check successful


Checking GitLab Shell ... Finished


Checking Gitaly ...


Gitaly: ... default ... OK


Checking Gitaly ... Finished


Checking Sidekiq ...


Sidekiq: ... Running? ... yes

Number of Sidekiq processes ... 1


Checking Sidekiq ... Finished


Checking Incoming Email ...


Incoming Email: ... Reply by email is disabled in config/gitlab.yml


Checking Incoming Email ... Finished


Checking LDAP ...


LDAP: ... LDAP is disabled in config/gitlab.yml


Checking LDAP ... Finished


Checking GitLab App ...


Git configured correctly? ... yes
Database config exists? ... yes
All migrations up? ... yes
Database contains orphaned GroupMembers? ... no
GitLab config exists? ... yes
GitLab config up to date? ... yes
Log directory writable? ... yes
Tmp directory writable? ... yes
Uploads directory exists? ... yes
Uploads directory has correct permissions? ... yes
Uploads directory tmp has correct permissions? ... yes
Init script exists? ... skipped (omnibus-gitlab has no init script)
Init script up-to-date? ... skipped (omnibus-gitlab has no init script)
Projects have namespace: ...
1/1 ... yes
1/2 ... yes
1/3 ... yes
1/4 ... yes
1/5 ... yes
1/6 ... yes
1/7 ... yes
1/9 ... yes
1/10 ... yes
1/11 ... yes
Redis version >= 2.8.0? ... yes
Ruby version >= 2.5.3 ? ... yes (2.5.3)
Git version >= 2.21.0 ? ... yes (2.21.0)
Git user has default SSH configuration? ... yes
Active users: ... 11
Elasticsearch version 5.6 - 6.x? ... skipped (elasticsearch is disabled)


Checking GitLab App ... Finished


Checking GitLab subtasks ... Finished

Possible fixes

https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/models/project_services/chat_message/merge_message.rb#L51

It would appear that the state_or_action_text variable is opened instead of approved so I assume that the notification is being sent the state of the MR not the action of it being approved.

Edited by 🤖 GitLab Bot 🤖