summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
diff options
context:
space:
mode:
authorMark Lapierre <mlapierre@gitlab.com>2019-03-13 10:56:00 +0000
committerMark Lapierre <mlapierre@gitlab.com>2019-03-13 10:56:00 +0000
commitf06a649ced952bcc439a5b3d36d96df178aabd66 (patch)
tree9272eecab33e6d20aa67ec68d61ab109fe0bf676 /app/controllers/concerns
parent6a3b59f8f93438c81afe8826d136f03be4eb0aa6 (diff)
parentec42a6e6600602760e71aaae6060ea62b7e0b8d3 (diff)
downloadgitlab-ce-f06a649ced952bcc439a5b3d36d96df178aabd66.tar.gz
Merge branch 'qa-staging-45-fix-add-project-member-spec' into 'master'
Ignore user status emoji in assertion Closes gitlab-org/quality/staging#45 See merge request gitlab-org/gitlab-ce!26085
Diffstat (limited to 'app/controllers/concerns')
0 files changed, 0 insertions, 0 deletions