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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
473efc82
Commit
473efc82
authored
Mar 10, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Group and team rss is valid now
parent
8812d9de
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
51 additions
and
29 deletions
+51
-29
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
+1
-1
app/views/commits/_head.html.haml
app/views/commits/_head.html.haml
+2
-3
app/views/dashboard/show.atom.builder
app/views/dashboard/show.atom.builder
+2
-2
app/views/groups/show.atom.builder
app/views/groups/show.atom.builder
+3
-3
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+5
-5
app/views/issues/_head.html.haml
app/views/issues/_head.html.haml
+2
-3
app/views/teams/show.atom.builder
app/views/teams/show.atom.builder
+29
-0
app/views/teams/show.html.haml
app/views/teams/show.html.haml
+5
-5
config/routes.rb
config/routes.rb
+2
-2
features/teams/team.feature
features/teams/team.feature
+0
-5
No files found.
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
View file @
473efc82
...
@@ -71,7 +71,7 @@
...
@@ -71,7 +71,7 @@
color
:
$style_color
;
color
:
$style_color
;
text-shadow
:
0
1px
1px
#FFF
;
text-shadow
:
0
1px
1px
#FFF
;
font-size
:
18px
;
font-size
:
18px
;
line-height
:
4
2
px
;
line-height
:
4
0
px
;
font-weight
:
normal
;
font-weight
:
normal
;
letter-spacing
:
-1px
;
letter-spacing
:
-1px
;
}
}
...
...
app/views/commits/_head.html.haml
View file @
473efc82
...
@@ -23,6 +23,5 @@
...
@@ -23,6 +23,5 @@
-
if
current_controller?
(
:commits
)
&&
current_user
.
private_token
-
if
current_controller?
(
:commits
)
&&
current_user
.
private_token
%li
.pull-right
%li
.pull-right
%span
.rss-icon
=
link_to
project_commits_path
(
@project
,
@ref
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
do
=
link_to
project_commits_path
(
@project
,
@ref
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
do
%i
.icon-rss
=
image_tag
"rss_ui.png"
,
title:
"feed"
app/views/dashboard/show.atom.builder
View file @
473efc82
xml.instruct!
xml.instruct!
xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
xml.title "Dashboard feed#{" - #{current_user.name}" if current_user.name.present?}"
xml.title "Dashboard feed#{" - #{current_user.name}" if current_user.name.present?}"
xml.link :href =>
projects
_url(:atom), :rel => "self", :type => "application/atom+xml"
xml.link :href =>
dashboard
_url(:atom), :rel => "self", :type => "application/atom+xml"
xml.link :href =>
projects
_url, :rel => "alternate", :type => "text/html"
xml.link :href =>
dashboard
_url, :rel => "alternate", :type => "text/html"
xml.id projects_url
xml.id projects_url
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?
...
...
app/views/groups/show.atom.builder
View file @
473efc82
xml.instruct!
xml.instruct!
xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
xml.title "
Dashboard feed#{" - #{current_user.name}" if current_user.name.present?
}"
xml.title "
Group feed - #{@group.name
}"
xml.link :href =>
projects_url(
:atom), :rel => "self", :type => "application/atom+xml"
xml.link :href =>
group_path(@group,
:atom), :rel => "self", :type => "application/atom+xml"
xml.link :href =>
projects_url
, :rel => "alternate", :type => "text/html"
xml.link :href =>
group_path(@group)
, :rel => "alternate", :type => "text/html"
xml.id projects_url
xml.id projects_url
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?
...
...
app/views/groups/show.html.haml
View file @
473efc82
...
@@ -16,11 +16,11 @@
...
@@ -16,11 +16,11 @@
.description.well.light
.description.well.light
=
@group
.
description
=
@group
.
description
=
render
"projects"
,
projects:
@projects
=
render
"projects"
,
projects:
@projects
%div
.prepend-top-20
%span
.rss-icon
=
link_to
group_path
(
@group
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
do
=
link_to
dashboard_path
(
:atom
,
{
private_token:
current_user
.
private_token
})
do
%strong
=
image_tag
"rss_ui.png"
,
title:
"feed"
%i
.icon-rss
%strong
News Feed
News Feed
%hr
%hr
.gitlab-promo
.gitlab-promo
...
...
app/views/issues/_head.html.haml
View file @
473efc82
...
@@ -6,6 +6,5 @@
...
@@ -6,6 +6,5 @@
=
nav_link
(
controller: :labels
)
do
=
nav_link
(
controller: :labels
)
do
=
link_to
'Labels'
,
project_labels_path
(
@project
),
class:
"tab"
=
link_to
'Labels'
,
project_labels_path
(
@project
),
class:
"tab"
%li
.pull-right
%li
.pull-right
%span
.rss-icon
=
link_to
project_issues_path
(
@project
,
:atom
,
{
private_token:
current_user
.
private_token
})
do
=
link_to
project_issues_path
(
@project
,
:atom
,
{
private_token:
current_user
.
private_token
})
do
%i
.icon-rss
=
image_tag
"rss_ui.png"
,
title:
"feed"
app/views/teams/show.atom.builder
0 → 100644
View file @
473efc82
xml.instruct!
xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
xml.title "Team feed - #{@team.name}"
xml.link :href => team_url(@team, :atom), :rel => "self", :type => "application/atom+xml"
xml.link :href => team_url(@team), :rel => "alternate", :type => "text/html"
xml.id projects_url
xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any?
@events.each do |event|
if event.proper?
event = EventDecorator.decorate(event)
xml.entry do
event_link = event.feed_url
event_title = event.feed_title
xml.id "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}"
xml.link :href => event_link
xml.title truncate(event_title, :length => 80)
xml.updated event.created_at.strftime("%Y-%m-%dT%H:%M:%SZ")
xml.media :thumbnail, :width => "40", :height => "40", :url => gravatar_icon(event.author_email)
xml.author do |author|
xml.name event.author_name
xml.email event.author_email
end
xml.summary event_title
end
end
end
end
app/views/teams/show.html.haml
View file @
473efc82
...
@@ -15,11 +15,11 @@
...
@@ -15,11 +15,11 @@
.description.well.light
.description.well.light
=
@team
.
description
=
@team
.
description
=
render
"projects"
,
projects:
@projects
=
render
"projects"
,
projects:
@projects
%div
.prepend-top-20
%span
.rss-icon
=
link_to
team_path
(
@team
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
do
=
link_to
dashboard_path
(
:atom
,
{
private_token:
current_user
.
private_token
})
do
%strong
=
image_tag
"rss_ui.png"
,
title:
"feed"
%i
.icon-rss
%strong
News Feed
News Feed
%hr
%hr
.gitlab-promo
.gitlab-promo
...
...
config/routes.rb
View file @
473efc82
...
@@ -135,7 +135,7 @@ Gitlab::Application.routes.draw do
...
@@ -135,7 +135,7 @@ Gitlab::Application.routes.draw do
#
#
# Groups Area
# Groups Area
#
#
resources
:groups
,
constraints:
{
id:
/[^\/]+/
}
do
resources
:groups
,
constraints:
{
id:
/(?:[^.]|\.(?!atom$))+/
,
format:
/atom/
}
do
member
do
member
do
get
:issues
get
:issues
get
:merge_requests
get
:merge_requests
...
@@ -148,7 +148,7 @@ Gitlab::Application.routes.draw do
...
@@ -148,7 +148,7 @@ Gitlab::Application.routes.draw do
#
#
# Teams Area
# Teams Area
#
#
resources
:teams
,
constraints:
{
id:
/[^\/]+/
}
do
resources
:teams
,
constraints:
{
id:
/(?:[^.]|\.(?!atom$))+/
,
format:
/atom/
}
do
member
do
member
do
get
:issues
get
:issues
get
:merge_requests
get
:merge_requests
...
...
features/teams/team.feature
View file @
473efc82
...
@@ -4,11 +4,6 @@ Feature: UserTeams
...
@@ -4,11 +4,6 @@ Feature: UserTeams
And
I own project
"Shop"
And
I own project
"Shop"
And
project
"Shop"
has push event
And
project
"Shop"
has push event
Scenario
:
No
teams, no dashboard info block
When
I do not have teams with me
And
I visit dashboard page
Then
I should see dashboard page without teams info block
Scenario
:
I
should see teams info block
Scenario
:
I
should see teams info block
When
I have teams with my membership
When
I have teams with my membership
And
I visit dashboard page
And
I visit dashboard page
...
...
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