From: Dmitriy Zaporozhets Date: Mon, 12 Dec 2011 21:17:28 +0000 (+0200) Subject: fix default branch X-Git-Tag: v2.0.0~15^2~3 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3a14432879199f117af8a73098dce6261b0840cc;p=wvm%2Fgitlab.git fix default branch --- diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index b26ffcf2d..dd897ed39 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -548,9 +548,8 @@ h4.dash-tabs { h4.middle-panel { margin: 0; border-bottom: 1px solid #ccc; - padding: 10px 10px; + padding: 10px 20px; font-size: 11px; - padding-left:20px; background: #F7F7F7; height:30px; diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 8d9adedfb..1f1da559a 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -9,7 +9,6 @@ class ProjectsController < ApplicationController before_filter :authorize_read_project!, :except => [:index, :new, :create] before_filter :authorize_admin_project!, :only => [:edit, :update, :destroy] before_filter :require_non_empty_project, :only => [:blob, :tree, :graph] - before_filter :load_refs, :only => :tree # load @branch, @tag & @ref def index source = current_user.projects diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2f982dac9..76323b271 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -53,7 +53,7 @@ module ApplicationHelper [ "Tag", @project.tags ] ] - grouped_options_for_select(options, @ref) + grouped_options_for_select(options, @ref || @project.default_branch) end def markdown(text)