Commit 8426846d6dd018b16c7193ef1bea4527ea08360b
1 parent
04a908f6
Exists in
master
and in
4 other branches
fix default branch
Showing
3 changed files
with
2 additions
and
4 deletions
Show diff stats
app/assets/stylesheets/projects.css.scss
| @@ -548,9 +548,8 @@ h4.dash-tabs { | @@ -548,9 +548,8 @@ h4.dash-tabs { | ||
| 548 | h4.middle-panel { | 548 | h4.middle-panel { |
| 549 | margin: 0; | 549 | margin: 0; |
| 550 | border-bottom: 1px solid #ccc; | 550 | border-bottom: 1px solid #ccc; |
| 551 | - padding: 10px 10px; | 551 | + padding: 10px 20px; |
| 552 | font-size: 11px; | 552 | font-size: 11px; |
| 553 | - padding-left:20px; | ||
| 554 | background: #F7F7F7; | 553 | background: #F7F7F7; |
| 555 | height:30px; | 554 | height:30px; |
| 556 | 555 |
app/controllers/projects_controller.rb
| @@ -9,7 +9,6 @@ class ProjectsController < ApplicationController | @@ -9,7 +9,6 @@ class ProjectsController < ApplicationController | ||
| 9 | before_filter :authorize_read_project!, :except => [:index, :new, :create] | 9 | before_filter :authorize_read_project!, :except => [:index, :new, :create] |
| 10 | before_filter :authorize_admin_project!, :only => [:edit, :update, :destroy] | 10 | before_filter :authorize_admin_project!, :only => [:edit, :update, :destroy] |
| 11 | before_filter :require_non_empty_project, :only => [:blob, :tree, :graph] | 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 | def index | 13 | def index |
| 15 | source = current_user.projects | 14 | source = current_user.projects |
app/helpers/application_helper.rb
| @@ -53,7 +53,7 @@ module ApplicationHelper | @@ -53,7 +53,7 @@ module ApplicationHelper | ||
| 53 | [ "Tag", @project.tags ] | 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 | end | 57 | end |
| 58 | 58 | ||
| 59 | def markdown(text) | 59 | def markdown(text) |