diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2011-12-12 23:17:28 +0200 |
|---|---|---|
| committer | Jeremy Mack <jmacktdkc@gmail.com> | 2011-12-13 13:20:46 -0500 |
| commit | 3a14432879199f117af8a73098dce6261b0840cc (patch) | |
| tree | 49aa0ed7d291e08126cb142787c008067d07a57e | |
| parent | 4c3a61a760b22687fd670c8b02252b20532419be (diff) | |
| download | gitlab-ce-3a14432879199f117af8a73098dce6261b0840cc.tar.gz | |
fix default branch
| -rw-r--r-- | app/assets/stylesheets/projects.css.scss | 3 | ||||
| -rw-r--r-- | app/controllers/projects_controller.rb | 1 | ||||
| -rw-r--r-- | app/helpers/application_helper.rb | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index b26ffcf2d92..dd897ed39bb 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 8d9adedfbcf..1f1da559abf 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 2f982dac949..76323b271e1 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) |