Commit e09d4494 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'da-fix-typo' into 'master'

Fix typos

See merge request gitlab-org/gitlab-ee!13018
parents 66cc04c8 7e9a6a27
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
- user = local_assigns.fetch(:user, member.user) - user = local_assigns.fetch(:user, member.user)
- source = member.source - source = member.source
%li.member{ class: [dom_class(member), ("is-overriden" if member.override)], id: dom_id(member) } %li.member{ class: [dom_class(member), ("is-overridden" if member.override)], id: dom_id(member) }
%span.list-item-name %span.list-item-name
- if user - if user
= image_tag avatar_icon_for_user(user, 40), class: "avatar s40", alt: '' = image_tag avatar_icon_for_user(user, 40), class: "avatar s40", alt: ''
......
...@@ -93,7 +93,7 @@ export default class MembersEE extends Members { ...@@ -93,7 +93,7 @@ export default class MembersEE extends Members {
}, },
}) })
.then(() => { .then(() => {
$memberListitem.toggleClass('is-overriden', override); $memberListitem.toggleClass('is-overridden', override);
}); });
} }
} }
...@@ -21,7 +21,7 @@ describe API::Discussions do ...@@ -21,7 +21,7 @@ describe API::Discussions do
stub_licensed_features(epics: true) stub_licensed_features(epics: true)
end end
it_behaves_like 'discussions API', 'groups', 'epics', 'id', can_reply_to_invididual_notes: true do it_behaves_like 'discussions API', 'groups', 'epics', 'id', can_reply_to_individual_notes: true do
let(:parent) { group } let(:parent) { group }
let(:noteable) { epic } let(:noteable) { epic }
let(:note) { epic_note } let(:note) { epic_note }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment