Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Programming exercises: Fix code button showing password authentication initially #10446

Conversation

SimonEntholzer
Copy link
Contributor

@SimonEntholzer SimonEntholzer commented Mar 6, 2025

Checklist

General

Client

  • Important: I implemented the changes with a very good performance, prevented too many (unnecessary) REST calls and made sure the UI is responsive, even with large data (e.g. using paging).
  • I strictly followed the client coding and design guidelines.
  • Following the theming guidelines, I specified colors only in the theming variable files and checked that the changes look consistent in both the light and the dark theme.
  • I added a tests (Jest) related to the bugfix (with a high test coverage), while following the test guidelines.
  • I documented the TypeScript code using JSDoc style.
  • I added multiple screenshots/screencasts of my UI changes.

Changes affecting Programming Exercises

  • High priority: I tested all changes and their related features with all corresponding user types on a test server configured with the integrated lifecycle setup (LocalVC and LocalCI).

Motivation and Context

When the server is configured to only use SSH and tokens for authentication to LocalVC, e.g. see the application-local.yml:

artemis:
  version-control:
    repository-authentication-mechanisms: token,ssh

The code button still showed HTTPs initially, although it should not be an available option.

Description

Fixes this issue, by assuring that as the default value, only an enabled authentication mechanism is used.

Steps for Testing

  1. You need to test this locally:
  2. Configure the application-local.yml as shown above.
  3. In the exercise view (as student or instructor), click the code button, and verify that HTTPs does not show up.

Testserver States

You can manage test servers using Helios. Check environment statuses in the environment list. To deploy to a test server, go to the CI/CD page, find your PR or branch, and trigger the deployment.

Review Progress

Code Review

  • Code Review 1
  • Code Review 2

Manual Tests

  • Test 1
  • Test 2

Test Coverage

Client

Class/File Line Coverage Confirmation (assert/expect)
code-button.component.ts 91.48% ✅ ❌

Screenshots

Incorrect behavior: - HTTPs is shown as selected, although only Token and SSH are available
image
Fixed behavior: - Token (or an actually available) mechanism is shown:
image

Summary by CodeRabbit

  • Refactor

    • Improved the handling of available authentication methods, ensuring a consistent and reliable selection process for users.
  • New Features

    • Added new input fields for configuring CPU count, memory, and memory swap limits in the programming exercise management interface.
  • Bug Fixes

    • Updated error messages related to resource limits for memory and CPU configurations.
  • Tests

    • Introduced test coverage to verify that only valid authentication options are displayed and correctly managed during user interactions.
    • Added new test cases to validate Docker configuration settings, ensuring correct behavior under specified resource constraints.

@SimonEntholzer SimonEntholzer self-assigned this Mar 6, 2025
@SimonEntholzer SimonEntholzer requested a review from a team as a code owner March 6, 2025 10:31
@SimonEntholzer SimonEntholzer requested a review from dfuchss March 6, 2025 10:31
@github-actions github-actions bot added tests client Pull requests that update TypeScript code. (Added Automatically!) labels Mar 6, 2025
@SimonEntholzer SimonEntholzer added bugfix programming Pull requests that affect the corresponding module labels Mar 6, 2025
Copy link

coderabbitai bot commented Mar 6, 2025

Walkthrough

This pull request renames the variable from a singular authenticationMechanism to a plural authenticationMechanisms in both the HTML template and the TypeScript component. The component logic is updated in the ngOnInit and onClick methods to handle a collection of authentication methods, ensuring that selections are valid based on available options. Additionally, a new test case is introduced to verify that the component correctly initializes and selects the right authentication mechanism when multiple options are provided.

Changes

File(s) Change Summary
src/main/webapp/app/shared/components/code-button/code-button.component.html
src/main/webapp/app/shared/components/code-button/code-button.component.ts
Renamed variable from authenticationMechanism to authenticationMechanisms. Updated template iteration and component logic in ngOnInit (filtering mechanisms) and onClick (validating and selecting the mechanism) to work with a list of authentication methods.
src/test/javascript/spec/component/shared/code-button.component.spec.ts Added a new test case to verify that only available authentication mechanisms are displayed and the correct mechanism is selected upon a click event.
build.gradle Updated various plugin and dependency versions, including introducing JUnit 5 dependencies.
docs/requirements.txt Updated Jinja2 package version from 3.1.5 to 3.1.6.
docs/user/exercises/programming-exercise-features.inc Modified support details for JavaScript programming language in the context of programming exercises.
gradle.properties Updated various dependency versions to ensure compatibility.
gradle/wrapper/gradle-wrapper.properties Changed Gradle distribution URL from a release candidate to a stable version.
jest.config.js Adjusted coverage threshold values slightly.
package.json Updated versions of various Angular-related packages and other dependencies.
src/main/java/de/tum/cit/aet/artemis/atlas/repository/KnowledgeAreaRepository.java Removed method findWithChildrenAndCompetenciesByIdElseThrow.
src/main/java/de/tum/cit/aet/artemis/atlas/web/StandardizedCompetencyResource.java Removed method getKnowledgeArea.
src/main/java/de/tum/cit/aet/artemis/buildagent/dto/DockerFlagsDTO.java
src/main/java/de/tum/cit/aet/artemis/buildagent/dto/DockerRunConfig.java
Updated records to include new fields for CPU count, memory, and memory swap.
src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobContainerService.java Modified configureContainer method to include new parameters for resource limits.
src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java Updated method to pass new configuration parameters for Docker.
src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java Removed ConversationRepository dependency and adjusted logic for conversation retrieval.
src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java Added new constants for Docker resource limits.
src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamAttendanceCheckEvent.java
src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamWideAnnouncementEvent.java
src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ProblemStatementUpdateEvent.java
src/main/java/de/tum/cit/aet/artemis/exam/domain/event/WorkingTimeUpdateEvent.java
Modified asDTO() methods to remove createdBy parameter.
src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/ExamAttendanceCheckEventDTO.java
src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/ExamWideAnnouncementEventDTO.java
src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/ProblemStatementUpdateEventDTO.java
src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/WorkingTimeUpdateEventDTO.java
Updated records to remove createdBy field.
src/main/java/de/tum/cit/aet/artemis/exam/service/ExamLiveEventsService.java Removed @Async annotation from createAndSendProblemStatementUpdateEvent method.
src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java Removed retrieval of current user (instructor) in notifyAboutExerciseChanges.
src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java Modified SQL query in findIdsByFilterCriteria method.
src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseBuildConfigService.java Updated methods to include new parameters for Docker configuration.
src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java Added validation checks for Docker configuration parameters.
src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIInfoContributor.java Introduced new dependency on ProgrammingLanguageConfiguration.
src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIProgrammingLanguageFeatureService.java Modified configuration for JAVASCRIPT programming language feature.
src/main/resources/templates/aeolus/javascript/default_static.sh New Bash script for dependency installation and testing.
src/main/resources/templates/javascript/staticCodeAnalysis/test/eslint.config.mjs New ESLint configuration file for JavaScript.
src/main/resources/templates/javascript/staticCodeAnalysis/test/package.json New package.json for the project "artemis-test".
src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component.ts Removed AccountService injection and usage.
src/main/webapp/app/exam/manage/students/exam-students.component.html Updated event bindings for components.
src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-button.component.ts Renamed output event emitter from finish to uploadDone.
src/main/webapp/app/exam/participate/exam-participation-live-events.service.ts Removed createdBy property from ExamLiveEvent type definition.
src/main/webapp/app/exam/shared/events/exam-live-event.component.html Removed author display section from the template.
src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-build-configuration/programming-exercise-build-configuration.component.html Added new input fields for Docker flags configuration.
src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-build-configuration/programming-exercise-build-configuration.component.ts Introduced new properties and methods for Docker flags configuration.
src/main/webapp/app/exercises/programming/shared/service/aeolus.service.ts Updated resource URL for Aeolus service.
src/main/webapp/app/index.d.ts Removed TypeScript declaration for markdown-it-class.
src/main/webapp/app/shared/circular-progress-bar/circular-progress-bar.component.html Deleted circular progress bar component HTML.
src/main/webapp/app/shared/circular-progress-bar/circular-progress-bar.component.scss Deleted circular progress bar component styles.
src/main/webapp/app/shared/circular-progress-bar/circular-progress-bar.component.ts Deleted circular progress bar component TypeScript file.
src/main/webapp/app/shared/course-group/course-group.component.html Updated event binding for user import button.
src/main/webapp/app/shared/layouts/profiles/profile-info.model.ts Added new optional properties for Docker resource limits.
src/main/webapp/app/shared/layouts/profiles/profile.service.ts Added new properties to profileInfo object in getProfileInfo method.
src/test/java/de/tum/cit/aet/artemis/atlas/competency/StandardizedCompetencyIntegrationTest.java Removed nested test class and methods for knowledge area retrieval.
src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java Removed assertions checking createdBy field in test methods.
src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIInfoContributorTest.java Updated constructor for LocalCIInfoContributor in test class.
src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIIntegrationTest.java Added new test method for performance-related configuration of Docker flags.
src/test/java/de/tum/cit/aet/artemis/shared/base/AbstractSpringIntegrationLocalCILocalVCTest.java Changed access level of dockerClientMock variable.
src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts Removed references to createdBy property in test cases.
src/test/javascript/spec/component/programming-exercise/programming-exercise-build-configuration.component.spec.ts Updated test cases for ProgrammingExerciseBuildConfigurationComponent.
src/test/javascript/spec/component/shared/circular-progress-bar.component.spec.ts Deleted unit tests for CircularProgressBarComponent.
src/test/javascript/spec/component/standardized-competencies/standardized-competency.service.spec.ts Removed references to KnowledgeArea entity in test suite.
src/test/javascript/spec/service/exam-participation-live-events.service.spec.ts Removed createdBy property from mock event objects.
src/test/playwright/e2e/exam/ExamParticipation.spec.ts Removed checks for dialog author in test cases.
src/test/playwright/support/pageobjects/exam/ExamManagementPage.ts Removed check for announcement author's username in dialog.
src/test/playwright/support/pageobjects/exam/ExamParticipationActions.ts Removed check for author's username in time change dialog.
src/test/playwright/support/pageobjects/exam/ModalDialogBox.ts Removed checkDialogAuthor method.
supporting_scripts/course-scripts/quick-course-setup/add_users_to_course.py Updated URL construction for adding students to a course.
supporting_scripts/course-scripts/quick-course-setup/create_course.py Updated course creation configuration and URL.
supporting_scripts/course-scripts/quick-course-setup/create_users.py Updated user creation URL.
supporting_scripts/course-scripts/quick-course-setup/large_course_main.py Modified comments related to run_cleanup() function.
supporting_scripts/course-scripts/quick-course-setup/manage_programming_exercise.py Updated URLs for API requests related to programming exercises.
supporting_scripts/course-scripts/quick-course-setup/utils.py Updated URLs for user addition and authentication functions.

Sequence Diagram(s)

sequenceDiagram
    participant C as CodeButtonComponent
    participant P as ProfileInfo
    C->>P: Retrieve repositoryAuthenticationMechanisms
    P-->>C: Return list of mechanisms
    C->>C: Assign list to authenticationMechanisms
Loading
sequenceDiagram
    participant U as User
    participant C as CodeButtonComponent
    participant L as LocalStorage
    U->>C: Click button
    C->>L: Retrieve saved authentication mechanism
    L-->>C: Return saved mechanism (if exists)
    C->>C: Validate against authenticationMechanisms
    C->>C: Set selectedAuthenticationMechanism (default to first if invalid)
Loading

Possibly related PRs

  • Development: Add documentation for authentication mechanisms #10264: The changes in the main PR, which involve renaming and updating the handling of authentication mechanisms in the code, are related to the retrieved PR that documents the configuration and usage of these authentication mechanisms, as both address the same underlying functionality.
  • Programming exercises: Fix code button showing HTTPS link when it should be disabled #9696: The changes in the main PR, which involve renaming and updating the handling of the authenticationMechanism variable in the CodeButtonComponent, are related to the modifications in the retrieved PR that also focus on the CodeButtonComponent, specifically the refactoring of the ngOnInit method and handling of user identity. Both PRs involve updates to the same component and its initialization logic.

Suggested labels

ready to merge

Suggested reviewers

  • BBesrour
  • krusche
  • az108
  • coolchock
✨ Finishing Touches
  • 📝 Generate Docstrings

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai or @coderabbitai title anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@dfuchss dfuchss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested on our test system as instructor. Works as expected (tested with practice mode)

Copy link
Contributor

@jfr2102 jfr2102 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tested locally, works as expected now

Copy link
Contributor

@cremertim cremertim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code

Copy link
Member

@BBesrour BBesrour left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code

@github-actions github-actions bot removed the programming Pull requests that affect the corresponding module label Mar 11, 2025
Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Caution

Inline review comments failed to post. This is likely due to GitHub's limits when posting large numbers of comments. If you are seeing this consistently it is likely a permissions issue. Please check "Moderation" -> "Code review limits" under your organization settings.

Actionable comments posted: 2

🧹 Nitpick comments (4)
src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java (1)

47-51: Improved SQL query readability and safety

Reformatted the SQL condition for better readability and replaced the inline string concatenation with the database-agnostic CONCAT() function. The new format is clearer, more explicit, and follows SQL best practices.

For consistency, consider applying similar formatting to other complex conditions in the query, such as the duration checks on lines 53-54.

src/main/resources/templates/aeolus/javascript/default_static.sh (2)

11-11: Consider handling all non-zero exit codes consistently

The script uses || [ $? -eq 1 ] to allow the linting command to exit with code 1, but it doesn't handle other non-zero exit codes. This could lead to unpredictable behavior if the linting process fails with a different exit code.

- npm run lint:ci || [ $? -eq 1 ]
+ npm run lint:ci || true

Alternatively, if you only want to accept exit code 1 as valid but fail on others:

- npm run lint:ci || [ $? -eq 1 ]
+ npm run lint:ci || { [ $? -eq 1 ] || exit $?; }

1-7: Add descriptive comment explaining the script's purpose

While the script is well-structured, it lacks a header comment explaining its purpose and usage.

 #!/usr/bin/env bash
+# This script automates JavaScript project setup, static code analysis, and testing
+# for the Aeolus CI/CD pipeline. It ensures each step runs in a clean environment.
+#
+# Usage: ./default_static.sh
+
 set -e
 export AEOLUS_INITIAL_DIRECTORY=${PWD}
src/main/webapp/app/shared/util/markdown.conversion.util.ts (1)

139-149: Consider aligning plugin name with Angular conventions.
While MarkdownitTagClass works, renaming it in camelCase may better reflect standard Angular naming (e.g., markdownItTagClass). Otherwise, the plugin implementation is robust and well-integrated.

-export function MarkdownitTagClass(markdown: MarkdownIt, mapping: TagClassMapping = {}): void {
+export function markdownItTagClass(markdown: MarkdownIt, mapping: TagClassMapping = {}): void {
🛑 Comments failed to post (2)
src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java (1)

92-95: ⚠️ Potential issue

Potential performance issue with orElse usage

The current implementation uses orElse() which will always execute loadConversationWithParticipantsIfGroupChat() regardless of whether the first method returns a value. This can lead to unnecessary database operations.

Consider using orElseGet() instead to ensure the second method is only called when needed:

-var conversation = conversationService.isMemberOrCreateForCourseWideElseThrow(conversationId, author, Optional.empty())
-        .orElse(conversationService.loadConversationWithParticipantsIfGroupChat(conversationId));
+var conversation = conversationService.isMemberOrCreateForCourseWideElseThrow(conversationId, author, Optional.empty())
+        .orElseGet(() -> conversationService.loadConversationWithParticipantsIfGroupChat(conversationId));
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

        var conversationId = answerMessage.getPost().getConversation().getId();
        // For group chats we need the participants to generate the conversation title
        var conversation = conversationService.isMemberOrCreateForCourseWideElseThrow(conversationId, author, Optional.empty())
                .orElseGet(() -> conversationService.loadConversationWithParticipantsIfGroupChat(conversationId));
src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIInfoContributor.java (1)

60-73: ⚠️ Potential issue

Added helper method to parse memory strings into megabytes.

The new parseMemoryStringToMB method converts Docker memory specifications (with g, m, k suffixes) into consistent megabyte values. This is good practice as it standardizes how memory values are represented internally.

However, there's a potential issue with the string parsing. The method expects quotes in suffixes (e.g., "g\""), which might be inconsistent with how memory strings are actually formatted.

-    private static long parseMemoryStringToMB(String memoryString) {
-        if (memoryString.endsWith("g\"")) {
-            return Long.parseLong(memoryString.replaceAll("[^0-9]", "")) * 1024L;
-        }
-        else if (memoryString.endsWith("m\"")) {
-            return Long.parseLong(memoryString.replaceAll("[^0-9]", ""));
-        }
-        else if (memoryString.endsWith("k\"")) {
-            return Long.parseLong(memoryString.replaceAll("[^0-9]", "")) / 1024L;
-        }
-        else {
-            return Long.parseLong(memoryString);
-        }
-    }
+    private static long parseMemoryStringToMB(String memoryString) {
+        // Remove any quotation marks that might be present
+        String cleanedString = memoryString.replace("\"", "");
+        
+        if (cleanedString.endsWith("g")) {
+            return Long.parseLong(cleanedString.replaceAll("[^0-9]", "")) * 1024L;
+        }
+        else if (cleanedString.endsWith("m")) {
+            return Long.parseLong(cleanedString.replaceAll("[^0-9]", ""));
+        }
+        else if (cleanedString.endsWith("k")) {
+            return Long.parseLong(cleanedString.replaceAll("[^0-9]", "")) / 1024L;
+        }
+        else {
+            return Long.parseLong(cleanedString.replaceAll("[^0-9]", ""));
+        }
+    }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

    private static long parseMemoryStringToMB(String memoryString) {
        // Remove any quotation marks that might be present
        String cleanedString = memoryString.replace("\"", "");
        
        if (cleanedString.endsWith("g")) {
            return Long.parseLong(cleanedString.replaceAll("[^0-9]", "")) * 1024L;
        }
        else if (cleanedString.endsWith("m")) {
            return Long.parseLong(cleanedString.replaceAll("[^0-9]", ""));
        }
        else if (cleanedString.endsWith("k")) {
            return Long.parseLong(cleanedString.replaceAll("[^0-9]", "")) / 1024L;
        }
        else {
            return Long.parseLong(cleanedString.replaceAll("[^0-9]", ""));
        }
    }

@krusche krusche changed the title Programming exercises: Fix code button showing password authentication initially, although it is disabled Programming exercises: Fix code button showing password authentication initially Mar 11, 2025
@krusche krusche added this to the 7.10.6 milestone Mar 11, 2025
@krusche krusche merged commit 591a3f9 into develop Mar 11, 2025
35 of 41 checks passed
@krusche krusche deleted the bugfix/programming/code-button-showing-incorrect-default-mechanism branch March 11, 2025 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix client Pull requests that update TypeScript code. (Added Automatically!) ready to merge tests
Projects
Status: Merged
Development

Successfully merging this pull request may close these issues.

6 participants