From c426d83a0a6dd1cfb8d19299a449a112f1414d5b Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 11 Nov 2014 22:11:48 +0000 Subject: [PATCH] Updated solution to the check_permissions decorator, from Ryan - Legacy-Id: 8643 --- hold-for-merge | 1 + ready-for-merge | 1 + 2 files changed, 2 insertions(+) diff --git a/hold-for-merge b/hold-for-merge index 0c3031ec0..233bdac0b 100644 --- a/hold-for-merge +++ b/hold-for-merge @@ -1,5 +1,6 @@ # -*- conf-mode -*- +personal/rcross/v5.7.3-dev0@8640 # Rework: make the check_permissions() decorator handle the case where the user isn't logged in personal/rcross/v5.6.3-dev0@8237 # Includes other merges; merge personal/rcross/v5.6.2-dev0@8216 instead personal/liudapeng/v5.5.1-dev0@7925 # alternative resolution desired personal/rjs/v5.2.0@7544 diff --git a/ready-for-merge b/ready-for-merge index 7dc645cc0..bb5155516 100644 --- a/ready-for-merge +++ b/ready-for-merge @@ -7,6 +7,7 @@ # --- Add entries at the top --- +personal/rcross/v5.7.3-dev0@8641 personal/suresh/v5.7.3-dev0@8602 personal/rjs/v5.6.3-dev0-session@8305 personal/rcross/v5.6.2-dev0@8216