From d1953a26401c0550670fc780a4516b0799238454 Mon Sep 17 00:00:00 2001 From: Nihad Abbasov Date: Wed, 13 Jun 2012 05:19:02 -0700 Subject: [PATCH 1/3] no need to extend assets path anymore see 865cf830c482b120aad70d40ebee595901899b1c --- config/application.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/application.rb b/config/application.rb index 9b3dd636..7bd5703b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -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 From e735763f276b1950e89383b0ef40afc6dffeca32 Mon Sep 17 00:00:00 2001 From: Nihad Abbasov Date: Wed, 13 Jun 2012 05:22:40 -0700 Subject: [PATCH 2/3] remove useless index method from projects controller see edd81a79c5c2a61e565664cfa787185c4e19729b --- app/controllers/projects_controller.rb | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d049ce56..609445e6 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -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 From 51c30d90d407ce779c1b65caa93703eff8c2e95f Mon Sep 17 00:00:00 2001 From: Nihad Abbasov Date: Wed, 13 Jun 2012 05:36:51 -0700 Subject: [PATCH 3/3] fix broken spec --- spec/requests/last_push_widget_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/requests/last_push_widget_spec.rb b/spec/requests/last_push_widget_spec.rb index 831359a7..55ef3f0a 100644 --- a/spec/requests/last_push_widget_spec.rb +++ b/spec/requests/last_push_widget_spec.rb @@ -10,23 +10,23 @@ describe "Last Push widget" do visit dashboard_path end - it "should display last push widget with link to merge request page" do + it "should display last push widget with link to merge request page" do page.should have_content "Your last push was to branch new_design" page.should have_link "Create Merge Request" end - describe "click create MR" do + describe "click create MR" do before { click_link "Create Merge Request" } 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 def create_push_event - data = { + data = { :before => "0000000000000000000000000000000000000000", :after => "0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e", :ref => "refs/heads/new_design",