Commit 8426846d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

fix default branch

parent 04a908f6
...@@ -548,9 +548,8 @@ h4.dash-tabs { ...@@ -548,9 +548,8 @@ h4.dash-tabs {
h4.middle-panel { h4.middle-panel {
margin: 0; margin: 0;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
padding: 10px 10px; padding: 10px 20px;
font-size: 11px; font-size: 11px;
padding-left:20px;
background: #F7F7F7; background: #F7F7F7;
height:30px; height:30px;
......
...@@ -9,7 +9,6 @@ class ProjectsController < ApplicationController ...@@ -9,7 +9,6 @@ class ProjectsController < ApplicationController
before_filter :authorize_read_project!, :except => [:index, :new, :create] before_filter :authorize_read_project!, :except => [:index, :new, :create]
before_filter :authorize_admin_project!, :only => [:edit, :update, :destroy] before_filter :authorize_admin_project!, :only => [:edit, :update, :destroy]
before_filter :require_non_empty_project, :only => [:blob, :tree, :graph] before_filter :require_non_empty_project, :only => [:blob, :tree, :graph]
before_filter :load_refs, :only => :tree # load @branch, @tag & @ref
def index def index
source = current_user.projects source = current_user.projects
......
...@@ -53,7 +53,7 @@ module ApplicationHelper ...@@ -53,7 +53,7 @@ module ApplicationHelper
[ "Tag", @project.tags ] [ "Tag", @project.tags ]
] ]
grouped_options_for_select(options, @ref) grouped_options_for_select(options, @ref || @project.default_branch)
end end
def markdown(text) def markdown(text)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment