Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
diaspora
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Milan
diaspora
Commits
d5a9939c
Commit
d5a9939c
authored
10 years ago
by
Jason Robinson
Browse files
Options
Downloads
Plain Diff
Merge branch 'hotfix/0.3.0.1'
parents
234ce10c
7bfa7292
No related branches found
Branches containing commit
Tags
v0.3.0.1
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Changelog.md
+5
-0
5 additions, 0 deletions
Changelog.md
app/models/message.rb
+3
-2
3 additions, 2 deletions
app/models/message.rb
config/defaults.yml
+1
-1
1 addition, 1 deletion
config/defaults.yml
with
9 additions
and
3 deletions
Changelog.md
+
5
−
0
View file @
d5a9939c
# 0.3.0.1
## Bug fixes
*
Fix regression caused by using after_commit with nested '#save' which lead to an infinite recursion
[
#4715
](
https://github.com/diaspora/diaspora/issues/4715
)
# 0.3.0.0
## Pod statistics
...
...
This diff is collapsed.
Click to expand it.
app/models/message.rb
+
3
−
2
View file @
d5a9939c
...
...
@@ -11,13 +11,14 @@ class Message < ActiveRecord::Base
belongs_to
:author
,
:class_name
=>
'Person'
belongs_to
:conversation
,
:touch
=>
true
delegate
:name
,
to: :author
,
prefix:
true
validates
:text
,
:presence
=>
true
validate
:participant_of_parent_conversation
after_commit
:on
=>
:create
do
after_create
do
# don't use 'after_commit' here since there is a call to 'save!'
# inside, which would cause an infinite recursion
#sign comment as commenter
self
.
author_signature
=
self
.
sign_with_key
(
self
.
author
.
owner
.
encryption_key
)
if
self
.
author
.
owner
...
...
This diff is collapsed.
Click to expand it.
config/defaults.yml
+
1
−
1
View file @
d5a9939c
...
...
@@ -4,7 +4,7 @@
defaults
:
version
:
number
:
"
0.3.0.
0
"
# Do not touch unless doing a release, do not backport the version number that's in master but keep develp to always say "head"
number
:
"
0.3.0.
1
"
# Do not touch unless doing a release, do not backport the version number that's in master but keep devel
o
p to always say "head"
heroku
:
false
environment
:
url
:
"
http://localhost:3000/"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment