diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-08-26 04:26:48 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-08-26 04:26:48 +0300 |
| commit | f2df4c689b56a878848a9c348d9ce5180e77e0d6 (patch) | |
| tree | 8c89beb49e5923186e6a7aaf6d75c09c08494b14 /app/services | |
| parent | 9704fa22c58b4485a4a5c20e6598a1a6556dd0ec (diff) | |
| parent | 77abf8cccfff01fa09a4014aea0f5afc309a7ca2 (diff) | |
Merge branch 'capitalize-mentioned-issue-notes' into 'master'
Capitalize mentioned issue timeline notes
## What does this MR do?
Renames `mentioned in` to `Mentioned in` for issue timeline notes
## Are there points in the code the reviewer needs to double check?
Shouldn't be any :smile:
## Why was this MR needed?
Resolves existing UI inconsistency as all the other issue timeline notes have their first letter capitalized.
## What are the relevant issue numbers?
Closes #21416
## Screenshots (if relevant)
Before:
After:
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !6028
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/system_note_service.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index 546a8f11330..0c8446e7c3d 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -269,11 +269,11 @@ module SystemNoteService # # Example Note text: # - # "mentioned in #1" + # "Mentioned in #1" # - # "mentioned in !2" + # "Mentioned in !2" # - # "mentioned in 54f7727c" + # "Mentioned in 54f7727c" # # See cross_reference_note_content. # @@ -308,7 +308,7 @@ module SystemNoteService # Check if a cross-reference is disallowed # - # This method prevents adding a "mentioned in !1" note on every single commit + # This method prevents adding a "Mentioned in !1" note on every single commit # in a merge request. Additionally, it prevents the creation of references to # external issues (which would fail). # @@ -417,7 +417,7 @@ module SystemNoteService end def cross_reference_note_prefix - 'mentioned in ' + 'Mentioned in ' end def cross_reference_note_content(gfm_reference) |