diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-11-22 18:46:35 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-11-22 18:46:35 +0800 |
| commit | 17388eb034de3808c5c7f80c19726575dd073ce1 (patch) | |
| tree | 2f39deac4753e2a796210a42ba477ed27c6bbe13 /app/models/concerns | |
| parent | c7c4850d0b9d6751a5f6fdaa1f9c34aee6728676 (diff) | |
| parent | acaa6d733b37b18eb44a5d6e3b79f69ee821f62a (diff) | |
| download | gitlab-ce-17388eb034de3808c5c7f80c19726575dd073ce1.tar.gz | |
Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelines
* upstream/master: (133 commits)
Restructure steps for MM slash commands service
Add Changelog entry for CI linter validation fix
Fix entry lookup in CI config inheritance rules
Extend specs for global ci configuration entry
Remove unnecessary require_relative calls from service classes
Use single quote for strings
Ue svg from SVGs object
Dont trigger CI builds [ci skip]
Revert "Test only migrations"
Add custom copy for each empty stage
Refactor Mattermost slash commands docs
Fetch only one revision
Highlight nav item on hover
Test only migrations
Fix migration paths tests
Scroll CA stage panel on mobile
Fix CSS declaration
administer to administrator
Move SVGs to JS objects for easy reuse
Improve deploy command message
...
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/mentionable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb index eb2ff0428f6..8ab0401d288 100644 --- a/app/models/concerns/mentionable.rb +++ b/app/models/concerns/mentionable.rb @@ -1,6 +1,6 @@ # == Mentionable concern # -# Contains functionality related to objects that can mention Users, Issues, MergeRequests, or Commits by +# Contains functionality related to objects that can mention Users, Issues, MergeRequests, Commits or Snippets by # GFM references. # # Used by Issue, Note, MergeRequest, and Commit. |