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

Tests are fixed now

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-01-05 12:12:02 +02:00
parent 0a94640e32
commit e3d7ce2cc4
6 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/sections/events.scss
View file

@ -47,6 +47,12 @@
.event-info { .event-info {
color: #666; color: #666;
} }
.event-note {
padding-top: 5px;
padding-left: 5px;
display: inline-block;
color: #777;
}
} }
.avatar { .avatar {
position: relative; position: relative;

2
app/controllers/projects_controller.rb
View file

@ -101,7 +101,7 @@ class ProjectsController < ProjectResourceController
return access_denied! unless can?(current_user, :remove_project, project) return access_denied! unless can?(current_user, :remove_project, project)
# Delete team first in order to prevent multiple gitolite calls # Delete team first in order to prevent multiple gitolite calls
project.truncate_team project.team.truncate
project.destroy project.destroy

18
app/views/admin/projects/_form.html.haml
View file

@ -11,18 +11,18 @@
.input .input
= f.text_field :name, placeholder: "Example Project", class: "xxlarge" = f.text_field :name, placeholder: "Example Project", class: "xxlarge"
%fieldset.adv_settings - if project.repo_exists?
%legend Advanced settings: %fieldset.adv_settings
.clearfix %legend Advanced settings:
= f.label :path do .clearfix
Path = f.label :path do
.input Path
= text_field_tag :ppath, @project.path_to_repo, class: "xlarge", disabled: true .input
= text_field_tag :ppath, @project.repository.path_to_repo, class: "xlarge", disabled: true
- if project.repo_exists?
.clearfix .clearfix
= f.label :default_branch, "Default Branch" = f.label :default_branch, "Default Branch"
.input= f.select(:default_branch, repository.heads.map(&:name), {}, style: "width:210px;") .input= f.select(:default_branch, @project.repository.heads.map(&:name), {}, style: "width:210px;")
%fieldset.adv_settings %fieldset.adv_settings
%legend Features: %legend Features:

5
app/views/events/event/_note.html.haml
View file

@ -19,7 +19,6 @@
= event.project_name = event.project_name
.event-body .event-body
%span.hint %span.event-note
&nbsp; %i.icon-comment-alt
%i.icon-comment
= truncate event.target.note, length: 70 = truncate event.target.note, length: 70

2
spec/models/merge_request_spec.rb
View file

@ -40,7 +40,7 @@ describe MergeRequest do
let!(:merge_request) { create(:merge_request) } let!(:merge_request) { create(:merge_request) }
before do before do
merge_request.stub(:commits) { [merge_request.project.commit] } merge_request.stub(:commits) { [merge_request.project.repository.commit] }
create(:note, commit_id: merge_request.commits.first.id, noteable_type: 'Commit') create(:note, commit_id: merge_request.commits.first.id, noteable_type: 'Commit')
create(:note, noteable: merge_request) create(:note, noteable: merge_request)
end end

9
spec/models/protected_branch_spec.rb
View file

@ -39,13 +39,4 @@ describe ProtectedBranch do
branch.destroy branch.destroy
end end
end end
describe '#commit' do
let(:branch) { create(:protected_branch) }
it 'commits itself to its project' do
branch.project.repository.should_receive(:commit).with(branch.name)
branch.commit
end
end
end end