Download as
Browse Code »

Commit 8426846d6dd018b16c7193ef1bea4527ea08360b

Authored by Dmitriy Zaporozhets
1 parent 04a908f6
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

fix default branch

Showing 3 changed files with 2 additions and 4 deletions   Show diff stats
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @8426846
... ... @@ -548,9 +548,8 @@ h4.dash-tabs {
548 548 h4.middle-panel {
549 549 margin: 0;
550 550 border-bottom: 1px solid #ccc;
551   - padding: 10px 10px;
  551 + padding: 10px 20px;
552 552 font-size: 11px;
553   - padding-left:20px;
554 553 background: #F7F7F7;
555 554 height:30px;
556 555  
... ...
app/controllers/projects_controller.rb
  Diff comments   View file @8426846
... ... @@ -9,7 +9,6 @@ class ProjectsController < ApplicationController
9 9 before_filter :authorize_read_project!, :except => [:index, :new, :create]
10 10 before_filter :authorize_admin_project!, :only => [:edit, :update, :destroy]
11 11 before_filter :require_non_empty_project, :only => [:blob, :tree, :graph]
12   - before_filter :load_refs, :only => :tree # load @branch, @tag & @ref
13 12  
14 13 def index
15 14 source = current_user.projects
... ...
app/helpers/application_helper.rb
  Diff comments   View file @8426846
... ... @@ -53,7 +53,7 @@ module ApplicationHelper
53 53 [ "Tag", @project.tags ]
54 54 ]
55 55  
56   - grouped_options_for_select(options, @ref)
  56 + grouped_options_for_select(options, @ref || @project.default_branch)
57 57 end
58 58  
59 59 def markdown(text)
... ...