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 /app/services | |
| 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 'app/services')
| -rw-r--r-- | app/services/commits/commit_patch_service.rb | 2 | ||||
| -rw-r--r-- | app/services/notification_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
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) |