summaryrefslogtreecommitdiff
path: root/spec/models/ci/trigger_spec.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-08-16 13:18:03 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-08-16 13:18:03 +0200
commit32d0983a4ea3ce61b78e4d11d61892989ac4cb35 (patch)
tree3fe78e7302579c38046a7fbfd79ee1d78d8aecd3 /spec/models/ci/trigger_spec.rb
parent13a15e7009e292919109ea911640a627dbd0e327 (diff)
parent04f7f394d3825e3290f523dce28d42b7c87fc9bb (diff)
downloadgitlab-ce-32d0983a4ea3ce61b78e4d11d61892989ac4cb35.tar.gz
Merge branch 'master' into backstage/gb/migrate-stages-statuses
* master: (1000 commits) Fix username autocomplete group name with no avatar alignment Fix 'Projected tags' typo in protected_tags_spec.rb Many Repo Fixes Repo Editor Fixes Docs: New index for permissions link article from CI index link tech articles from the landing page new articles come first fix relative link fix date format Fixed changed files dropdown not being shown Update publication date Remove deprecated field from workhorse API responses Fix API responses when dealing with txt files Make sure MySQL would not use CURRENT_TIMESTAMP Add two more project templates Allow usage of any_projects? with an Array Copyedit Artifactory and GitLab article Rename Artifactory and GitLab article file Display GPG status loading spinner only when Ajax request is made ...
Diffstat (limited to 'spec/models/ci/trigger_spec.rb')
-rw-r--r--spec/models/ci/trigger_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/ci/trigger_spec.rb b/spec/models/ci/trigger_spec.rb
index de51f4879fd..bd9c837402f 100644
--- a/spec/models/ci/trigger_spec.rb
+++ b/spec/models/ci/trigger_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe Ci::Trigger do
- let(:project) { create :empty_project }
+ let(:project) { create :project }
describe 'associations' do
it { is_expected.to belong_to(:project) }