summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/emoji
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-08-29 08:28:44 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-08-29 08:28:44 +0000
commitf0d22bb6f3bc50c7615eaef0fd0a5469bd35e179 (patch)
treeade2c898864dbc4add3629a6756499ac67137356 /app/assets/javascripts/emoji
parentedd56aeaf48b119be2b29c5a03e03aa2a1152af9 (diff)
parent86f43912fcb8dbf8604b0054d020acd12071d5b2 (diff)
downloadgitlab-ce-f0d22bb6f3bc50c7615eaef0fd0a5469bd35e179.tar.gz
Merge branch '36114-stuck-mrs-job-follow-up' into 'master'
Present enqueued merge jobs as "Merging" as well (https://gitlab.com/gitlab-org/gitlab-ce/issues/31207 follow-up) Closes #36114 See merge request !13483
Diffstat (limited to 'app/assets/javascripts/emoji')
0 files changed, 0 insertions, 0 deletions