summaryrefslogtreecommitdiff
path: root/doc/gitlab-basics
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-07-11 08:36:16 +0000
committerRémy Coutable <remy@rymai.me>2017-07-11 08:36:16 +0000
commit3c2fd9d54db073e045eddfecd784bd1c82d5ddbc (patch)
tree46f0c1faef7d1bf2a15440a4886d18504842922f /doc/gitlab-basics
parentd7bbafd8970f89bbdd30fa219b3901c3eae4331c (diff)
parentcd7f03ef83ab5657a6fb31f5e54f0cf3c67b4f72 (diff)
downloadgitlab-ce-3c2fd9d54db073e045eddfecd784bd1c82d5ddbc.tar.gz
Merge branch 'sh-fix-award-emoji-spec' into 'master'
Fix spec/helpers/award_emoji_helper_spec.rb by using `iid` instead of `id` Closes gitlab-ee#2890 See merge request !12770
Diffstat (limited to 'doc/gitlab-basics')
0 files changed, 0 insertions, 0 deletions