Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
0ff46816
Commit
0ff46816
authored
Dec 14, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed event.allowed? with event.proper?
parent
f03dc871
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/views/dashboard/index.atom.builder
app/views/dashboard/index.atom.builder
+1
-1
app/views/groups/show.atom.builder
app/views/groups/show.atom.builder
+1
-1
spec/models/event_spec.rb
spec/models/event_spec.rb
+1
-1
No files found.
app/views/dashboard/index.atom.builder
View file @
0ff46816
...
@@ -7,7 +7,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
...
@@ -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
...
...
app/views/groups/show.atom.builder
View file @
0ff46816
...
@@ -7,7 +7,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
...
@@ -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
...
...
spec/models/event_spec.rb
View file @
0ff46816
...
@@ -59,7 +59,7 @@ describe Event do
...
@@ -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"
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment