diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-09-19 11:42:30 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-09-19 11:42:30 +0000 |
| commit | c6660e61b267dafe7e4f6ce2b4e38b644e7b2177 (patch) | |
| tree | 72a0176283b39969acd8ee19c31c8803f7c54a87 /app/helpers/broadcast_messages_helper.rb | |
| parent | 617a723bb934e38f1467a1184e722415ecd6aec4 (diff) | |
| parent | ea1f388289ded7b89518076c211f95a3bf1e1d8a (diff) | |
| download | gitlab-ce-c6660e61b267dafe7e4f6ce2b4e38b644e7b2177.tar.gz | |
Merge branch 'mr-conflict-specs-enable' into 'master'
Re-enables merge conflicts resolution spec
See merge request gitlab-org/gitlab-ce!21654
Diffstat (limited to 'app/helpers/broadcast_messages_helper.rb')
0 files changed, 0 insertions, 0 deletions