diff options
author | Yoginth <me@yoginth.com> | 2019-05-20 14:11:44 +0000 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-05-20 14:11:44 +0000 |
commit | 2f6a20ce665de6a23fe2c1cc28cc6398afcb1b71 (patch) | |
tree | 8d11b78ab29992a7af02aed9dca5289aeb3d21bb /app | |
parent | 9c1470c260032c8b3d9cd6cf759fd08a610e9a1b (diff) | |
download | gitlab-ce-2f6a20ce665de6a23fe2c1cc28cc6398afcb1b71.tar.gz |
Fix typos in the whole gitlab-ce project
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/behaviors/markdown/render_mermaid.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/lib/utils/highlight.js | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/members.scss | 2 | ||||
-rw-r--r-- | app/graphql/resolvers/issues_resolver.rb | 2 | ||||
-rw-r--r-- | app/models/clusters/applications/jupyter.rb | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/behaviors/markdown/render_mermaid.js b/app/assets/javascripts/behaviors/markdown/render_mermaid.js index 798114b4b0b..d0b7f3ff7a2 100644 --- a/app/assets/javascripts/behaviors/markdown/render_mermaid.js +++ b/app/assets/javascripts/behaviors/markdown/render_mermaid.js @@ -15,7 +15,7 @@ import { sprintf, __ } from '../../locale'; // </pre> // -// This is an arbitary number; Can be iterated upon when suitable. +// This is an arbitrary number; Can be iterated upon when suitable. const MAX_CHAR_LIMIT = 5000; export default function renderMermaid($els) { diff --git a/app/assets/javascripts/lib/utils/highlight.js b/app/assets/javascripts/lib/utils/highlight.js index 4f7eff2cca1..8f0afa3467d 100644 --- a/app/assets/javascripts/lib/utils/highlight.js +++ b/app/assets/javascripts/lib/utils/highlight.js @@ -27,14 +27,14 @@ export default function highlight(string, match = '', matchPrefix = '<b>', match const sanitizedValue = sanitize(string.toString(), { allowedTags: [] }); - // occurences is an array of character indices that should be + // occurrences is an array of character indices that should be // highlighted in the original string, i.e. [3, 4, 5, 7] - const occurences = fuzzaldrinPlus.match(sanitizedValue, match.toString()); + const occurrences = fuzzaldrinPlus.match(sanitizedValue, match.toString()); return sanitizedValue .split('') .map((character, i) => { - if (_.contains(occurences, i)) { + if (_.contains(occurrences, i)) { return `${matchPrefix}${character}${matchSuffix}`; } diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss index 47ffdbae4b6..f8e273a2735 100644 --- a/app/assets/stylesheets/pages/members.scss +++ b/app/assets/stylesheets/pages/members.scss @@ -14,7 +14,7 @@ } .member { - &.is-overriden { + &.is-overridden { .btn-ldap-override { display: none !important; } diff --git a/app/graphql/resolvers/issues_resolver.rb b/app/graphql/resolvers/issues_resolver.rb index 1c3c24ad6dc..f7e49166ca0 100644 --- a/app/graphql/resolvers/issues_resolver.rb +++ b/app/graphql/resolvers/issues_resolver.rb @@ -46,7 +46,7 @@ module Resolvers def resolve(**args) # The project could have been loaded in batch by `BatchLoader`. # At this point we need the `id` of the project to query for issues, so - # make sure it's loaded and not `nil` before continueing. + # make sure it's loaded and not `nil` before continuing. project.sync if project.respond_to?(:sync) return Issue.none if project.nil? diff --git a/app/models/clusters/applications/jupyter.rb b/app/models/clusters/applications/jupyter.rb index 987c057ad6d..36c51522089 100644 --- a/app/models/clusters/applications/jupyter.rb +++ b/app/models/clusters/applications/jupyter.rb @@ -39,7 +39,7 @@ module Clusters end # Will be addressed in future MRs - # We need to investigate and document what will be permenantly deleted. + # We need to investigate and document what will be permanently deleted. def allowed_to_uninstall? false end |