Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2016-11-18 21:06:36 +0300
committerKamil Trzciński <ayufan@ayufan.eu>2016-11-18 21:06:36 +0300
commitffc5fc6a38f4859f491b0669f939876afa865533 (patch)
tree40590bab2397e5f48b4a2c211127b81f30a669be /spec/services
parent03933cd279f0870a16f126619380ec386d68345a (diff)
parent1db1896ed2375481d53f74f7900d259fe068ef64 (diff)
Merge branch 'zj-slash-commands-mattermost' into 'master'
Slash command for mattermost Closes #22540 ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) See merge request !7438
Diffstat (limited to 'spec/services')
-rw-r--r--spec/services/chat_names/find_user_service_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/chat_names/find_user_service_spec.rb b/spec/services/chat_names/find_user_service_spec.rb
index 5b885b2c657..51441e8f3be 100644
--- a/spec/services/chat_names/find_user_service_spec.rb
+++ b/spec/services/chat_names/find_user_service_spec.rb
@@ -13,7 +13,7 @@ describe ChatNames::FindUserService, services: true do
context 'when existing user is requested' do
let(:params) { { team_id: chat_name.team_id, user_id: chat_name.chat_id } }
- it 'returns existing user' do
+ it 'returns the existing user' do
is_expected.to eq(user)
end