diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-24 14:06:55 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-24 14:06:55 -0500 |
| commit | a4e522a889b24d7d7768ac3b77d0b544a25c3782 (patch) | |
| tree | 5133df88a0bf7d5cdb8aeef7acd6232f9d6aadcb /spec/models/merge_request_spec.rb | |
| parent | 9f0a71f4fe0eade788c1c722c70873b319492dbe (diff) | |
| parent | 4a9affa7330f2099f6385d3d74150f93cfd008f1 (diff) | |
| download | gitlab-ce-a4e522a889b24d7d7768ac3b77d0b544a25c3782.tar.gz | |
Merge branch 'master' into minimize-on-diff
Diffstat (limited to 'spec/models/merge_request_spec.rb')
| -rw-r--r-- | spec/models/merge_request_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index f35b48601ad..c51f34034d7 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -24,6 +24,7 @@ # merge_params :text # merge_when_build_succeeds :boolean default(FALSE), not null # merge_user_id :integer +# merge_commit_sha :string # require 'spec_helper' |