diff options
| author | Regis <boudinot.regis@yahoo.com> | 2016-12-23 16:34:56 -0700 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2016-12-23 16:34:56 -0700 |
| commit | 71d731a21b96cdd9d1881a8e03961f7008cb8d64 (patch) | |
| tree | f31b57dde85b65345733b4bcd3915bab37236e47 /spec/factories | |
| parent | 115536fbfa9904cef459bb735d29f20756887ebe (diff) | |
| parent | 21fb690c216f9e40be07229726e106d7016e13fc (diff) | |
| download | gitlab-ce-71d731a21b96cdd9d1881a8e03961f7008cb8d64.tar.gz | |
merge master and fix application.rb conflict
Diffstat (limited to 'spec/factories')
| -rw-r--r-- | spec/factories/todos.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/factories/todos.rb b/spec/factories/todos.rb index 866e663f026..082b02116c0 100644 --- a/spec/factories/todos.rb +++ b/spec/factories/todos.rb @@ -21,6 +21,7 @@ FactoryGirl.define do trait :build_failed do action { Todo::BUILD_FAILED } + target factory: :merge_request end trait :approval_required do |