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

Merge pull request #923 from NARKOZ/refactoring-2

Browse source 
Minor cleanup
This commit is contained in:
Dmitriy Zaporozhets 2012-06-13 05:44:58 -07:00
commit d143680c64
3 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/controllers/projects_controller.rb
View file

@ -10,19 +10,6 @@ class ProjectsController < ApplicationController
before_filter :authorize_admin_project!, :only => [:edit, :update, :destroy]
before_filter :require_non_empty_project, :only => [:blob, :tree, :graph]
def index
@projects = current_user.projects.includes(:events).order("events.created_at DESC")
@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 }
end
end
def new
@project = Project.new
end

3
config/application.rb
View file

@ -44,8 +44,5 @@ module Gitlab
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
# Extend assets path
config.assets.paths << Rails.root.join('vendor', 'assets', 'images', 'jquery-ui')
end
end

2
spec/requests/last_push_widget_spec.rb
View file

@ -21,7 +21,7 @@ describe "Last Push widget" do
it { current_path.should == new_project_merge_request_path(@project) }
it { find("#merge_request_source_branch").value.should == "new_design" }
it { find("#merge_request_target_branch").value.should == "master" }
it { find("#merge_request_title").value.should == "\nNew Design" }
it { find("#merge_request_title").value.should == "New Design" }
end