diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-08-16 10:14:59 +0300 |
|---|---|---|
| committer | Jose Vargas <jvargas@gitlab.com> | 2018-08-20 18:17:30 +0300 |
| commit | e13427d150d182814bb93d2e305aaf18f7d984ff (patch) | |
| tree | d531675f86f4be5cd2b0253c9c98c8afe3ba7f37 /spec/lib/gitlab/gitaly_client/conflicts_service_spec.rb | |
| parent | 12d5ebd7e6ef1b7d6709bce18be265dfa1cbf91b (diff) | |
Merge branch 'master' into 'master'
Added missing html_safe on text messages.
See merge request gitlab-org/gitlab-ce!21232
Diffstat (limited to 'spec/lib/gitlab/gitaly_client/conflicts_service_spec.rb')
0 files changed, 0 insertions, 0 deletions