Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
OHR Support
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
97
Issues
97
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
OHR Support
Commits
9851ca92
Commit
9851ca92
authored
Jul 29, 2011
by
Eric Davis
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release-v1.5.1' into stable-1.x
parents
c8a6f804
e9f76cec
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
9 deletions
+19
-9
application_controller.rb
app/controllers/application_controller.rb
+8
-3
application_helper.rb
app/helpers/application_helper.rb
+1
-1
show.rhtml
app/views/issues/show.rhtml
+4
-4
CHANGELOG.rdoc
doc/CHANGELOG.rdoc
+5
-0
version.rb
lib/redmine/version.rb
+1
-1
No files found.
app/controllers/application_controller.rb
View file @
9851ca92
...
...
@@ -26,7 +26,13 @@ class ApplicationController < ActionController::Base
layout
'base'
exempt_from_layout
'builder'
,
'rsb'
protect_from_forgery
def
handle_unverified_request
super
cookies
.
delete
(
:autologin
)
end
# Remove broken cookie after upgrade from 0.8.x (#4292)
# See https://rails.lighthouseapp.com/projects/8994/tickets/3360
# TODO: remove it when Rails is fixed
...
...
@@ -41,8 +47,7 @@ class ApplicationController < ActionController::Base
before_filter
:user_setup
,
:check_if_login_required
,
:set_localization
filter_parameter_logging
:password
protect_from_forgery
rescue_from
ActionController
::
InvalidAuthenticityToken
,
:with
=>
:invalid_authenticity_token
include
Redmine
::
Search
::
Controller
...
...
app/helpers/application_helper.rb
View file @
9851ca92
...
...
@@ -85,7 +85,7 @@ module ApplicationHelper
subject
=
truncate
(
subject
,
:length
=>
options
[
:truncate
])
end
end
s
=
link_to
"
#{
issue
.
tracker
}
#
#{
issue
.
id
}
"
,
{
:controller
=>
"issues"
,
:action
=>
"show"
,
:id
=>
issue
},
s
=
link_to
"
#{
h
(
issue
.
tracker
)
}
#
#{
issue
.
id
}
"
,
{
:controller
=>
"issues"
,
:action
=>
"show"
,
:id
=>
issue
},
:class
=>
issue
.
css_classes
,
:title
=>
title
s
<<
":
#{
h
subject
}
"
if
subject
...
...
app/views/issues/show.rhtml
View file @
9851ca92
<%=
render
:partial
=>
'action_menu'
%>
<h2>
<%=
@issue
.
tracker
.
name
%>
#
<%=
@issue
.
id
%><%=
call_hook
(
:view_issues_show_identifier
,
:issue
=>
@issue
)
%>
</h2>
<h2>
<%=
h
(
@issue
.
tracker
.
name
)
%>
#
<%=
h
(
@issue
.
id
)
%><%=
call_hook
(
:view_issues_show_identifier
,
:issue
=>
@issue
)
%>
</h2>
<div
class=
"
<%=
@issue
.
css_classes
%>
details"
>
<%=
avatar
(
@issue
.
author
,
:size
=>
"50"
)
%>
...
...
@@ -17,11 +17,11 @@
<table
class=
"attributes"
>
<tr>
<th
class=
"status"
>
<%=
l
(
:field_status
)
%>
:
</th><td
class=
"status"
>
<%=
@issue
.
status
.
name
%>
</td>
<th
class=
"status"
>
<%=
l
(
:field_status
)
%>
:
</th><td
class=
"status"
>
<%=
h
(
@issue
.
status
.
name
)
%>
</td>
<th
class=
"start-date"
>
<%=
l
(
:field_start_date
)
%>
:
</th><td
class=
"start-date"
>
<%=
format_date
(
@issue
.
start_date
)
%>
</td>
</tr>
<tr>
<th
class=
"priority"
>
<%=
l
(
:field_priority
)
%>
:
</th><td
class=
"priority"
>
<%=
@issue
.
priority
.
name
%>
</td>
<th
class=
"priority"
>
<%=
l
(
:field_priority
)
%>
:
</th><td
class=
"priority"
>
<%=
h
(
@issue
.
priority
.
name
)
%>
</td>
<th
class=
"due-date"
>
<%=
l
(
:field_due_date
)
%>
:
</th><td
class=
"due-date"
>
<%=
format_date
(
@issue
.
due_date
)
%>
</td>
</tr>
<tr>
...
...
@@ -29,7 +29,7 @@
<th
class=
"progress"
>
<%=
l
(
:field_done_ratio
)
%>
:
</th><td
class=
"progress"
>
<%=
progress_bar
@issue
.
done_ratio
,
:width
=>
'80px'
,
:legend
=>
"
#{
@issue
.
done_ratio
}
%"
%>
</td>
</tr>
<tr>
<th
class=
"category"
>
<%=
l
(
:field_category
)
%>
:
</th><td
class=
"category"
>
<%=
h
@issue
.
category
?
@issue
.
category
.
name
:
"-"
%>
</td>
<th
class=
"category"
>
<%=
l
(
:field_category
)
%>
:
</th><td
class=
"category"
>
<%=
h
(
@issue
.
category
?
@issue
.
category
.
name
:
"-"
)
%>
</td>
<%
if
User
.
current
.
allowed_to?
(
:view_time_entries
,
@project
)
%>
<th
class=
"spent-time"
>
<%=
l
(
:label_spent_time
)
%>
:
</th>
<td
class=
"spent-time"
>
<%=
@issue
.
spent_hours
>
0
?
(
link_to
l_hours
(
@issue
.
spent_hours
),
{:
controller
=>
'timelog'
,
:action
=>
'index'
,
:project_id
=>
@project
,
:issue_id
=>
@issue
})
:
"-"
%>
</td>
...
...
doc/CHANGELOG.rdoc
View file @
9851ca92
= ChiliProject changelog
== 2011-07-29 v1.5.1
* Bug #536: CSRF Protection
* Bug #544: XSS in app/views/issues/show.rhtml
== 2011-06-27 v1.5.0
* Bug #490: XSS in app/views/auth_sources/index.html.erb
...
...
lib/redmine/version.rb
View file @
9851ca92
...
...
@@ -4,7 +4,7 @@ module Redmine
module
VERSION
#:nodoc:
MAJOR
=
1
MINOR
=
5
PATCH
=
0
PATCH
=
1
TINY
=
PATCH
# Redmine compat
def
self
.
revision
...
...
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