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
221a2e73
Commit
221a2e73
authored
Jun 10, 2012
by
Holger Just
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release-v3.2.1' into stable
parents
e6e057d1
c9d14106
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
2 deletions
+19
-2
.travis.yml
.travis.yml
+2
-0
application_helper.rb
app/helpers/application_helper.rb
+4
-1
CHANGELOG.rdoc
doc/CHANGELOG.rdoc
+4
-0
version.rb
lib/chili_project/version.rb
+1
-1
application_helper_test.rb
test/unit/helpers/application_helper_test.rb
+8
-0
No files found.
.travis.yml
View file @
221a2e73
...
...
@@ -27,6 +27,8 @@ branches:
-
unstable
-
master
-
stable
-
/^stable-.*$/
-
/^release-.*$/
notifications
:
email
:
false
irc
:
"
irc.freenode.org#chiliproject"
app/helpers/application_helper.rb
View file @
221a2e73
...
...
@@ -959,7 +959,10 @@ module ApplicationHelper
def
gravatar
(
email
,
options
=
{})
gravatarify_options
=
{}
gravatarify_options
[
:secure
]
=
options
.
delete
:ssl
[
:default
,
:size
,
:rating
,
:filetype
].
each
{
|
key
|
gravatarify_options
[
:key
]
=
options
.
delete
:key
}
[
:default
,
:size
,
:rating
,
:filetype
].
each
{
|
key
|
gravatarify_options
[
key
]
=
options
.
delete
key
}
# Default size is 50x50 px
gravatarify_options
[
:size
]
||=
50
options
[
:class
]
||=
'gravatar'
gravatarify_options
[
:html
]
=
options
gravatar_tag
email
,
gravatarify_options
end
...
...
doc/CHANGELOG.rdoc
View file @
221a2e73
= ChiliProject Changelog
== 2012-06-10 v3.2.1
* Bug #1034: Gravatar
== 2012-06-09 v3.2.0
* Bug #844: Set autocomplete=off for some fields in Registration form
...
...
lib/chili_project/version.rb
View file @
221a2e73
...
...
@@ -19,7 +19,7 @@ module ChiliProject
MAJOR
=
3
MINOR
=
2
PATCH
=
0
PATCH
=
1
TINY
=
PATCH
# Redmine compat
# Used by semver to define the special version (if any).
...
...
test/unit/helpers/application_helper_test.rb
View file @
221a2e73
...
...
@@ -664,6 +664,14 @@ RAW
Setting
.
gravatar_enabled
=
'1'
assert
avatar
(
User
.
find_by_mail
(
'jsmith@somenet.foo'
)).
include?
(
Digest
::
MD5
.
hexdigest
(
'jsmith@somenet.foo'
))
assert
avatar
(
'jsmith <jsmith@somenet.foo>'
).
include?
(
Digest
::
MD5
.
hexdigest
(
'jsmith@somenet.foo'
))
# Default size is 50
assert
avatar
(
'jsmith <jsmith@somenet.foo>'
).
include?
(
's=50'
)
assert
avatar
(
'jsmith <jsmith@somenet.foo>'
,
:size
=>
24
).
include?
(
's=24'
)
# Non-avatar options should be considered html options
assert
avatar
(
'jsmith <jsmith@somenet.foo>'
,
:title
=>
'John Smith'
).
include?
(
'title="John Smith"'
)
# The default class of the img tag should be gravatar
assert
avatar
(
'jsmith <jsmith@somenet.foo>'
).
include?
(
'class="gravatar"'
)
assert
!
avatar
(
'jsmith <jsmith@somenet.foo>'
,
:class
=>
'picture'
).
include?
(
'class="gravatar"'
)
assert_nil
avatar
(
'jsmith'
)
assert_nil
avatar
(
nil
)
...
...
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