deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

default_branch for project & fixed project destroy

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2011-12-07 23:56:57 +02:00
parent 2552a877df
commit d68ec5e0fb
7 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/project.html.haml
View file

@ -49,7 +49,7 @@
%span{ :class => "number" }= @project.snippets.non_expired.count
- if can? current_user, :admin_project, @project
= link_to "Project", edit_project_path(@project), :class => (current_page?(edit_project_path(@project))) ? "current" : nil
= link_to "Admin", edit_project_path(@project), :class => (current_page?(edit_project_path(@project))) ? "current" : nil
.medium-tags{:style => 'padding: 10px 0 0 10px; width: 210px;'}= tag_list @project

6
app/views/projects/_form.html.haml
View file

@ -29,6 +29,11 @@
%cite.right= "http://#{GIT_HOST["host"]}/"
%td= f.text_field :code, :placeholder => "example"
- unless @project.heads.empty?
%tr
%td= f.label :default_branch, "Default Branch"
%td= f.select(:default_branch, @project.heads.map(&:name), {}, :style => "width:300px;")
%tr
%td= f.label :tag_list
%td= f.text_area :tag_list, :placeholder => "project tags", :style => "height:50px", :id => :tag_field
@ -57,4 +62,5 @@
:javascript
$(function(){
taggifyForm();
$('form #project_default_branch').chosen();
})