diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-30 13:35:33 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-30 13:35:33 +0300 |
| commit | 0d715bcd812ca6c99884e117f28a400669aa8e57 (patch) | |
| tree | 5690fa43c790af40c51441425b9d8be068d4139d /spec/models/commit_spec.rb | |
| parent | 4f07a6a99cab8f8ae3ad0a786a6cc9a837955c08 (diff) | |
| parent | 4d373005968b8269a8d2fe56b7776820396127a4 (diff) | |
| download | gitlab-ce-0d715bcd812ca6c99884e117f28a400669aa8e57.tar.gz | |
Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork
Conflicts:
app/views/projects/commit/show.html.haml
app/views/projects/compare/show.html.haml
app/views/projects/merge_requests/branch_from.js.haml
Diffstat (limited to 'spec/models/commit_spec.rb')
| -rw-r--r-- | spec/models/commit_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb index ad99d8a390b..b84f24bf3ad 100644 --- a/spec/models/commit_spec.rb +++ b/spec/models/commit_spec.rb @@ -3,7 +3,6 @@ require 'spec_helper' describe Commit do let(:commit) { create(:project_with_code).repository.commit } - describe '#title' do it "returns no_commit_message when safe_message is blank" do commit.stub(:safe_message).and_return('') |