diff options
author | Takuya Noguchi <takninnovationresearch@gmail.com> | 2018-11-19 23:08:23 +0900 |
---|---|---|
committer | Takuya Noguchi <takninnovationresearch@gmail.com> | 2018-11-22 01:01:23 +0900 |
commit | e902f462c213d1bb0cc56f298c7bef01befa0616 (patch) | |
tree | 1d9b1f7328e9a5f1e3fb2f047f764b97db772780 /app | |
parent | d093bbaec526637bf0ce550b50002c19c7a1c056 (diff) | |
download | gitlab-ce-e902f462c213d1bb0cc56f298c7bef01befa0616.tar.gz |
Eliminate duplicated words
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/blob/file_template_mediator.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/labels.js | 2 | ||||
-rw-r--r-- | app/models/concerns/blocks_json_serialization.rb | 2 | ||||
-rw-r--r-- | app/models/namespace.rb | 2 | ||||
-rw-r--r-- | app/services/commits/commit_patch_service.rb | 2 | ||||
-rw-r--r-- | app/services/notification_service.rb | 2 | ||||
-rw-r--r-- | app/views/profiles/personal_access_tokens/index.html.haml | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/blob/file_template_mediator.js b/app/assets/javascripts/blob/file_template_mediator.js index addacf29f1e..106fe2e0cef 100644 --- a/app/assets/javascripts/blob/file_template_mediator.js +++ b/app/assets/javascripts/blob/file_template_mediator.js @@ -124,7 +124,7 @@ export default class FileTemplateMediator { selectTemplateFile(selector, query, data) { selector.renderLoading(); - // in case undo menu is already already there + // in case undo menu is already there this.destroyUndoMenu(); this.fetchFileTemplate(selector.config.type, query, data) .then(file => { diff --git a/app/assets/javascripts/labels.js b/app/assets/javascripts/labels.js index 2bc09237495..cd8cf0d354c 100644 --- a/app/assets/javascripts/labels.js +++ b/app/assets/javascripts/labels.js @@ -22,7 +22,7 @@ export default class Labels { updateColorPreview() { const previewColor = $('input#label_color').val(); return $('div.label-color-preview').css('background-color', previewColor); - // Updates the the preview color with the hex-color input + // Updates the preview color with the hex-color input } // Updates the preview color with a click on a suggested color diff --git a/app/models/concerns/blocks_json_serialization.rb b/app/models/concerns/blocks_json_serialization.rb index d346da1ba4b..18c00532d78 100644 --- a/app/models/concerns/blocks_json_serialization.rb +++ b/app/models/concerns/blocks_json_serialization.rb @@ -3,7 +3,7 @@ # Overrides `as_json` and `to_json` to raise an exception when called in order # to prevent accidentally exposing attributes # -# Not that that would ever happen... but just in case. +# Not that would ever happen... but just in case. module BlocksJsonSerialization extend ActiveSupport::Concern diff --git a/app/models/namespace.rb b/app/models/namespace.rb index 4a6627d3ca1..11b03846f0b 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -190,7 +190,7 @@ class Namespace < ActiveRecord::Base .base_and_ancestors end - # returns all ancestors upto but excluding the the given namespace + # returns all ancestors upto but excluding the given namespace # when no namespace is given, all ancestors upto the top are returned def ancestors_upto(top = nil) Gitlab::GroupHierarchy.new(self.class.where(id: id)) diff --git a/app/services/commits/commit_patch_service.rb b/app/services/commits/commit_patch_service.rb index 9253cfaac20..49113c3c691 100644 --- a/app/services/commits/commit_patch_service.rb +++ b/app/services/commits/commit_patch_service.rb @@ -7,7 +7,7 @@ module Commits # - user: `User` that will be the committer # - params: # - branch_name: `String` the branch that will be committed into - # - start_branch: `String` the branch that will will started from + # - start_branch: `String` the branch that will be started from # - patches: `Gitlab::Git::Patches::Collection` that contains the patches def initialize(*args) super diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb index fb9c18ea75d..5904bfbf88d 100644 --- a/app/services/notification_service.rb +++ b/app/services/notification_service.rb @@ -50,7 +50,7 @@ class NotificationService # Always notify the user about gpg key added # - # This is a security email so it will be sent even if the user user disabled + # This is a security email so it will be sent even if the user disabled # notifications def new_gpg_key(gpg_key) if gpg_key.user&.can?(:receive_notifications) diff --git a/app/views/profiles/personal_access_tokens/index.html.haml b/app/views/profiles/personal_access_tokens/index.html.haml index c1e1eaff942..4c18398e3dc 100644 --- a/app/views/profiles/personal_access_tokens/index.html.haml +++ b/app/views/profiles/personal_access_tokens/index.html.haml @@ -26,7 +26,7 @@ %h4.prepend-top-0 Feed token %p - Your feed token is used to authenticate you when your RSS reader loads a personalized RSS feed or when when your calendar application loads a personalized calendar, and is included in those feed URLs. + Your feed token is used to authenticate you when your RSS reader loads a personalized RSS feed or when your calendar application loads a personalized calendar, and is included in those feed URLs. %p It cannot be used to access any other data. .col-lg-8.feed-token-reset |