Updated from opf/openproject release/7.4

opf · Mar 20, 2018 · 92d1d6f · 92d1d6f
2 parents 0eb5bda + d23ab7f
commit 92d1d6f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -364,7 +364,7 @@ GEM
     concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.2)
+    crass (1.0.3)
     crowdin-api (0.5.0)
       rest-client (~> 2.0)
     cucumber (3.0.1)
@@ -519,7 +519,7 @@ GEM
       omniauth (~> 1.1)
       omniauth-openid-connect (>= 0.2)
       rails (>= 3.2.21)
-    loofah (2.1.1)
+    loofah (2.2.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.6)

diff --git a/app/models/work_package/parent.rb b/app/models/work_package/parent.rb
@@ -116,7 +116,7 @@ def update_parent_relation
 
   def parent_from_relation
     if parent_relation && ((@parent_id && parent_relation.from.id == @parent_id) || !@parent_id)
-      parent_relation.from
+      @parent_object = parent_relation.from
     end
   end