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

Fixed event.allowed? with event.proper?

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-12-14 21:54:49 +02:00
parent f03dc8716d
commit 0ff468160e
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/dashboard/index.atom.builder
View file

@ -7,7 +7,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any? xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any?
@events.each do |event| @events.each do |event|
if event.allowed? if event.proper?
event = EventDecorator.decorate(event) event = EventDecorator.decorate(event)
xml.entry do xml.entry do
event_link = event.feed_url event_link = event.feed_url

2
app/views/groups/show.atom.builder
View file

@ -7,7 +7,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any? xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any?
@events.each do |event| @events.each do |event|
if event.allowed? if event.proper?
event = EventDecorator.decorate(event) event = EventDecorator.decorate(event)
xml.entry do xml.entry do
event_link = event.feed_url event_link = event.feed_url

2
spec/models/event_spec.rb
View file

@ -59,7 +59,7 @@ describe Event do
end end
it { @event.push?.should be_true } it { @event.push?.should be_true }
it { @event.allowed?.should be_true } it { @event.proper?.should be_true }
it { @event.new_branch?.should be_true } it { @event.new_branch?.should be_true }
it { @event.tag?.should be_false } it { @event.tag?.should be_false }
it { @event.branch_name.should == "master" } it { @event.branch_name.should == "master" }