diff options
author | Rémy Coutable <remy@rymai.me> | 2018-11-21 17:40:34 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-11-21 17:40:34 +0000 |
commit | 62e0877d5a2290403975667eb679dc94a2340655 (patch) | |
tree | f166e1cd9d3e4e734f8d83f6bc2682632a430c7c /lib | |
parent | fd2c20bcad885645b79021cd4b7fccc244c2dcce (diff) | |
parent | e902f462c213d1bb0cc56f298c7bef01befa0616 (diff) | |
download | gitlab-ce-62e0877d5a2290403975667eb679dc94a2340655.tar.gz |
Merge branch '54230-eliminate-duplicated-words-in-apps' into 'master'
Eliminate duplicated words (in apps)
Closes #54230
See merge request gitlab-org/gitlab-ce!23184
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/gfm/uploads_rewriter.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/git/repository.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/i18n/po_linter.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/import/merge_request_creator.rb | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/lib/gitlab/gfm/uploads_rewriter.rb b/lib/gitlab/gfm/uploads_rewriter.rb index 3f06badf5d9..2d1c9ac40ae 100644 --- a/lib/gitlab/gfm/uploads_rewriter.rb +++ b/lib/gitlab/gfm/uploads_rewriter.rb @@ -8,7 +8,7 @@ module Gitlab # Class that rewrites markdown links for uploads # # Using a pattern defined in `FileUploader` it copies files to a new - # project and rewrites all links to uploads in in a given text. + # project and rewrites all links to uploads in a given text. # # class UploadsRewriter diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 993955d1a6b..e75f4ec1ec5 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -441,7 +441,7 @@ module Gitlab gitaly_ref_client.find_ref_name(sha, ref_path) end - # Get refs hash which key is is the commit id + # Get refs hash which key is the commit id # and value is a Gitlab::Git::Tag or Gitlab::Git::Branch # Note that both inherit from Gitlab::Git::Ref def refs_hash diff --git a/lib/gitlab/i18n/po_linter.rb b/lib/gitlab/i18n/po_linter.rb index 644ef8c8589..3e9a035010f 100644 --- a/lib/gitlab/i18n/po_linter.rb +++ b/lib/gitlab/i18n/po_linter.rb @@ -251,7 +251,7 @@ module Gitlab def validate_variable_usage(errors, translation, required_variables) # We don't need to validate when the message is empty. - # In this case we fall back to the default, which has all the the + # In this case we fall back to the default, which has all the # required variables. return if translation.empty? diff --git a/lib/gitlab/import/merge_request_creator.rb b/lib/gitlab/import/merge_request_creator.rb index a01951b0762..8291372bba9 100644 --- a/lib/gitlab/import/merge_request_creator.rb +++ b/lib/gitlab/import/merge_request_creator.rb @@ -6,10 +6,10 @@ # used for rendering Markdown) are completely unnecessary and may even lead to # transaction timeouts. # -# To ensure importing merge requests requests has a minimal impact and can -# complete in a reasonable time we bypass all the hooks by inserting the row -# and then retrieving it. We then only perform the additional work that is -# strictly necessary. +# To ensure importing merge requests has a minimal impact and can complete in +# a reasonable time we bypass all the hooks by inserting the row and then +# retrieving it. We then only perform the additional work that is strictly +# necessary. module Gitlab module Import class MergeRequestCreator |