Commit 14d0ef011e598aae94f0f4baf0ad2352862fdcbb

revert merge_requests requires repos#has_commit? for now

Commit diff

app/controllers/merge_requests_controller.rb

 
22 before_filter :login_required, :except => [:index, :show]
33 before_filter :find_project
44 before_filter :find_repository
5 before_filter :check_repository_for_commits
65 before_filter :find_merge_request, :except => [:index, :show, :new, :create]
76 before_filter :assert_merge_request_ownership, :except => [:index, :show, :new, :create, :resolve]
87 before_filter :assert_merge_request_resolvable, :only => [:resolve]
toggle raw diff

spec/controllers/repositories_controller_spec.rb

 
4242 repo = @project.repositories.first
4343 repo.stub!(:git).and_return(mock("git mock", :null_object => true))
4444 do_get repo
45 assigns[:merge_request_count].should == 1
4645 end
4746end
4847
toggle raw diff