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
5015ca48
Commit
5015ca48
authored
Jul 29, 2011
by
Felix Schäfer
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:chiliproject/chiliproject
parents
ff6d75ca
25b7b42c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
application_controller.rb
app/controllers/application_controller.rb
+6
-1
_dir_list_content.rhtml
app/views/repositories/_dir_list_content.rhtml
+1
-1
_revisions.rhtml
app/views/repositories/_revisions.rhtml
+1
-1
No files found.
app/controllers/application_controller.rb
View file @
5015ca48
...
@@ -24,6 +24,12 @@ class ApplicationController < ActionController::Base
...
@@ -24,6 +24,12 @@ class ApplicationController < ActionController::Base
layout
'base'
layout
'base'
exempt_from_layout
'builder'
,
'rsb'
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)
# Remove broken cookie after upgrade from 0.8.x (#4292)
# See https://rails.lighthouseapp.com/projects/8994/tickets/3360
# See https://rails.lighthouseapp.com/projects/8994/tickets/3360
# TODO: remove it when Rails is fixed
# TODO: remove it when Rails is fixed
...
@@ -38,7 +44,6 @@ class ApplicationController < ActionController::Base
...
@@ -38,7 +44,6 @@ class ApplicationController < ActionController::Base
before_filter
:user_setup
,
:check_if_login_required
,
:set_localization
before_filter
:user_setup
,
:check_if_login_required
,
:set_localization
filter_parameter_logging
:password
filter_parameter_logging
:password
protect_from_forgery
rescue_from
ActionController
::
InvalidAuthenticityToken
,
:with
=>
:invalid_authenticity_token
rescue_from
ActionController
::
InvalidAuthenticityToken
,
:with
=>
:invalid_authenticity_token
...
...
app/views/repositories/_dir_list_content.rhtml
View file @
5015ca48
...
@@ -22,6 +22,6 @@
...
@@ -22,6 +22,6 @@
<td
class=
"revision"
>
<%=
link_to_revision
(
changeset
,
@project
)
if
changeset
%>
</td>
<td
class=
"revision"
>
<%=
link_to_revision
(
changeset
,
@project
)
if
changeset
%>
</td>
<td
class=
"age"
>
<%=
distance_of_time_in_words
(
entry
.
lastrev
.
time
,
Time
.
now
)
if
entry
.
lastrev
&&
entry
.
lastrev
.
time
%>
</td>
<td
class=
"age"
>
<%=
distance_of_time_in_words
(
entry
.
lastrev
.
time
,
Time
.
now
)
if
entry
.
lastrev
&&
entry
.
lastrev
.
time
%>
</td>
<td
class=
"author"
>
<%=
changeset
.
nil?
?
h
(
replace_invalid_utf8
(
entry
.
lastrev
.
author
.
to_s
.
split
(
'<'
).
first
))
:
changeset
.
author
if
entry
.
lastrev
%>
</td>
<td
class=
"author"
>
<%=
changeset
.
nil?
?
h
(
replace_invalid_utf8
(
entry
.
lastrev
.
author
.
to_s
.
split
(
'<'
).
first
))
:
changeset
.
author
if
entry
.
lastrev
%>
</td>
<td
class=
"comments"
>
<%=
h
truncate
(
changeset
.
comments
,
:length
=>
50
)
unless
changeset
.
nil?
%>
</td>
<td
class=
"comments"
>
<%=
h
truncate
(
Changeset
.
to_utf8
(
changeset
.
comments
,
changeset
.
repository
.
repo_log_encoding
)
,
:length
=>
50
)
unless
changeset
.
nil?
%>
</td>
</tr>
</tr>
<%
end
%>
<%
end
%>
app/views/repositories/_revisions.rhtml
View file @
5015ca48
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
<td
class=
"checkbox"
>
<%=
radio_button_tag
(
'rev_to'
,
changeset
.
identifier
,
(
line_num
==
2
),
:id
=>
"cbto-
#{
line_num
}
"
,
:onclick
=>
"if ($('cb-
#{
line_num
}
').checked==true) {$('cb-
#{
line_num
-
1
}
').checked=true;}"
)
if
show_diff
&&
(
line_num
>
1
)
%>
</td>
<td
class=
"checkbox"
>
<%=
radio_button_tag
(
'rev_to'
,
changeset
.
identifier
,
(
line_num
==
2
),
:id
=>
"cbto-
#{
line_num
}
"
,
:onclick
=>
"if ($('cb-
#{
line_num
}
').checked==true) {$('cb-
#{
line_num
-
1
}
').checked=true;}"
)
if
show_diff
&&
(
line_num
>
1
)
%>
</td>
<td
class=
"committed_on"
>
<%=
format_time
(
changeset
.
committed_on
)
%>
</td>
<td
class=
"committed_on"
>
<%=
format_time
(
changeset
.
committed_on
)
%>
</td>
<td
class=
"author"
>
<%=
h
changeset
.
author
%>
</td>
<td
class=
"author"
>
<%=
h
changeset
.
author
%>
</td>
<td
class=
"comments"
>
<%=
textilizable
(
truncate_at_line_break
(
changeset
.
comments
))
%>
</td>
<td
class=
"comments"
>
<%=
textilizable
(
truncate_at_line_break
(
Changeset
.
to_utf8
(
changeset
.
comments
,
changeset
.
repository
.
repo_log_encoding
)
))
%>
</td>
</tr>
</tr>
<%
line_num
+=
1
%>
<%
line_num
+=
1
%>
<%
end
%>
<%
end
%>
...
...
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