summaryrefslogtreecommitdiff
path: root/spec/features/merge_request/maintainer_edits_fork_spec.rb
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2018-03-06 23:30:47 +0100
committerBob Van Landuyt <bob@vanlanduyt.co>2018-03-07 16:59:17 +0100
commit9aabd8fd5ecb4090515db48692f3d064624aec0a (patch)
tree318418b94d97bc846e6e00ed782181cfd26e9487 /spec/features/merge_request/maintainer_edits_fork_spec.rb
parent9b27027619580bffeffa88965007c2c29ac9648c (diff)
downloadgitlab-ce-9aabd8fd5ecb4090515db48692f3d064624aec0a.tar.gz
Limit queries to a user-branch combination
The query becomes a lot simpler if we can check the branch name as well instead of having to load all branch names.
Diffstat (limited to 'spec/features/merge_request/maintainer_edits_fork_spec.rb')
-rw-r--r--spec/features/merge_request/maintainer_edits_fork_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_request/maintainer_edits_fork_spec.rb b/spec/features/merge_request/maintainer_edits_fork_spec.rb
index d11ccb46a26..c1f76202e60 100644
--- a/spec/features/merge_request/maintainer_edits_fork_spec.rb
+++ b/spec/features/merge_request/maintainer_edits_fork_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe 'a maintainer edits files on a source-branch of an MR from a fork', :js do
include ProjectForksHelper
- let(:user) { create(:user) }
+ let(:user) { create(:user, username: 'the-maintainer') }
let(:target_project) { create(:project, :public, :repository) }
let(:author) { create(:user, username: 'mr-authoring-machine') }
let(:source_project) { fork_project(target_project, author, repository: true) }