summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/slash_commands/issue_search_spec.rb
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-01-04 22:39:01 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-01-04 22:39:01 +0000
commita29a91f02d5de7a42a423f1c9ea2a18e325ef9ee (patch)
tree63956a640c01370f929fa25dad43f83e4714dec5 /spec/lib/gitlab/slash_commands/issue_search_spec.rb
parent3b8cee95a7d62bce3b3890ff8618073958dc2fb0 (diff)
parent6f1b4dc76b4619f538b7216ad3a10ca9336d0c2b (diff)
downloadgitlab-ce-a29a91f02d5de7a42a423f1c9ea2a18e325ef9ee.tar.gz
Merge branch 'master' into 22643-manual-job-page
* master: (200 commits) Fix issue boards scroll config. Added multi editor setting on the profile preferences page fix missing import of timeWeek which would cause errors in prometheus graphs with deployments Remove downcase from special path helper Rename db:seed_fu-{pg,mysql} to gitlab:setup-{pg,mysql} Fix error when viewing diffs without blobs Moves prettier to dev dependency Eager load event target authors whenever possible Do not run ee_compat_check on security branches Include integration tests in CE/EE testing documentation 41054-Disallow creation of new Kubernetes integrations Resolve "Resizable file list and commit panel" Make tooltip placement bottom by default as per design guidelines Fix groups list icon, timestamp alignment and row height Avoid leaving a push event empty if payload cannot be created Move git operations for UpdateRemoteMirrorService into Gitlab::Git Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::Repository Move push_remote_branches from Gitlab::Shell to Gitlab::Git::Repository Update Kubernetes service documentation fix issue #37843 ...
Diffstat (limited to 'spec/lib/gitlab/slash_commands/issue_search_spec.rb')
-rw-r--r--spec/lib/gitlab/slash_commands/issue_search_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/slash_commands/issue_search_spec.rb b/spec/lib/gitlab/slash_commands/issue_search_spec.rb
index 51f59216413..e41e5254dde 100644
--- a/spec/lib/gitlab/slash_commands/issue_search_spec.rb
+++ b/spec/lib/gitlab/slash_commands/issue_search_spec.rb
@@ -21,7 +21,7 @@ describe Gitlab::SlashCommands::IssueSearch do
context 'the user has access' do
before do
- project.team << [user, :master]
+ project.add_master(user)
end
it 'returns all results' do