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/controllers/commit_controller_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/controllers/commit_controller_spec.rb')
| -rw-r--r-- | spec/controllers/commit_controller_spec.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/controllers/commit_controller_spec.rb b/spec/controllers/commit_controller_spec.rb index 87c54143a05..8e98b0a3ce3 100644 --- a/spec/controllers/commit_controller_spec.rb +++ b/spec/controllers/commit_controller_spec.rb @@ -2,12 +2,11 @@ require 'spec_helper' describe Projects::CommitController do let(:project) { create(:project_with_code) } - let(:user) { create(:user) } - let(:commit) { project.repository.last_commit_for("master") } + let(:user) { create(:user) } + let(:commit) { project.repository.last_commit_for("master") } before do sign_in(user) - project.team << [user, :master] end |