deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Recent push event

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-06-12 17:43:16 +03:00
parent 40af6e1ad2
commit e0d1fba15e
11 changed files with 70 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/merge_requests_controller.rb
View file

@ -63,7 +63,7 @@ class MergeRequestsController < ApplicationController
end
def new
@merge_request = @project.merge_requests.new
@merge_request = @project.merge_requests.new(params[:merge_request])
end
def edit

3
app/controllers/projects_controller.rb
View file

@ -15,6 +15,8 @@ class ProjectsController < ApplicationController
@projects = @projects.page(params[:page]).per(40)
@events = Event.where(:project_id => current_user.projects.map(&:id)).recent.limit(20)
@last_push = current_user.recent_push
respond_to do |format|
format.html
format.atom { render :layout => false }
@ -69,6 +71,7 @@ class ProjectsController < ApplicationController
respond_to do |format|
format.html do
if @project.repo_exists? && @project.has_commits?
@last_push = current_user.recent_push(@project.id)
render :show
else
render "projects/empty"