summaryrefslogtreecommitdiff
path: root/app/controllers/explore
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-04 13:14:29 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-04 13:14:29 +0000
commit57074d606b20516921ff2297e2f94262b58e3d3e (patch)
tree4d06a22ddd8ea93a12471d622a78b9f691df5abc /app/controllers/explore
parentb9ec1aaec8c94795b92623ec85da4ba5be286c46 (diff)
parent4c5be69583a61b9cce40b43dc93f00e1ae909680 (diff)
downloadgitlab-ce-57074d606b20516921ff2297e2f94262b58e3d3e.tar.gz
Merge branch 'stabilize_emoji' into 'master'
Catch Emoji name lookup error This is a first part of the fix https://gitlab.com/gitlab-org/gitlab-ce/issues/5829 See merge request !2282
Diffstat (limited to 'app/controllers/explore')
0 files changed, 0 insertions, 0 deletions