Merge "Allow loading Project Access when there is no refs/meta/config" into stable
diff --git a/Documentation/access-control.txt b/Documentation/access-control.txt
index 5f54b84..91f667b 100644
--- a/Documentation/access-control.txt
+++ b/Documentation/access-control.txt
@@ -716,7 +716,7 @@
VALUES
('Copyright Check'
,3
- 'MaxWithBlock'
+ ,'MaxWithBlock'
,'copy');
INSERT INTO approval_category_values
diff --git a/gerrit-server/src/main/prolog/gerrit_common.pl b/gerrit-server/src/main/prolog/gerrit_common.pl
index 5342b84..42ad519 100644
--- a/gerrit-server/src/main/prolog/gerrit_common.pl
+++ b/gerrit-server/src/main/prolog/gerrit_common.pl
@@ -198,8 +198,8 @@
%%
legacy_submit_rule('MaxWithBlock', Label, Id, Min, Max, T) :- !, max_with_block(Label, Min, Max, T).
legacy_submit_rule('MaxNoBlock', Label, Id, Min, Max, T) :- !, max_no_block(Label, Max, T).
-legacy_submit_rule('NoBlock', Label, Id, Min, Max, T) :- true.
-legacy_submit_rule('NoOp', Label, Id, Min, Max, T) :- true.
+legacy_submit_rule('NoBlock', Label, Id, Min, Max, T) :- T = ok(_), true.
+legacy_submit_rule('NoOp', Label, Id, Min, Max, T) :- T = ok(_), true.
legacy_submit_rule(Fun, Label, Id, Min, Max, T) :- T = impossible(unsupported(Fun)).
