diff --git a/src/database/mod.rs b/src/database/mod.rs index de6b7fba..a67deaf5 100644 --- a/src/database/mod.rs +++ b/src/database/mod.rs @@ -416,6 +416,12 @@ impl PullRequestModel { }, } } + + /// Determines if this PR can be included in a rollup. + /// A PR is rollupable if it has been approved and rollup is not `RollupMode::Never` + pub fn is_rollupable(&self) -> bool { + self.is_approved() && !matches!(self.rollup, Some(RollupMode::Never)) + } } /// Describes whether a workflow is a Github Actions workflow or if it's a job from some external diff --git a/templates/queue.html b/templates/queue.html index a6dc753f..48825100 100644 --- a/templates/queue.html +++ b/templates/queue.html @@ -26,6 +26,35 @@ table td { padding: 0.5rem; } + + th.select-checkbox, + td.select-checkbox { + width: 2.5rem; + } + + #rollupModal { + display: none; + position: fixed; + z-index: 1000; + left: 0; + top: 0; + width: 100%; + height: 100%; + background-color: rgba(0,0,0,0.5); + } + + #rollupModalContent { + background-color: white; + margin: 15% auto; + padding: 1rem; + border: 1px solid black; + max-width: 500px; + } + + #rollupModalClose { + float: right; + cursor: pointer; + } {% endblock %} @@ -53,17 +82,19 @@

+
+ @@ -78,7 +109,8 @@

{% for pr in prs %} - + + @@ -121,24 +153,50 @@

Contribute on GitHub
+ +
+
+ × +

+ +
+
- + + {% endblock %}

# Status Mergeable
{{ pr.number.0 }}