Skip to content
Snippets Groups Projects

Remove base64 encoding from files that contain plain text

Merged Jacques Erasmus requested to merge fix-base64-encoded-file-uploads into master
All threads resolved!

What does this MR do?

This merge request fixes the issue where files containing plain text were base64 encoded after being uploaded from the WebIDE.

Any file without the text/* mime type is base64 encoded and as a result, the contents of the file in the repo was base64 encoded even if it contains plain text.

This MR prevents this issue by removing the base64 encoding if the file contains plain text.

What are the relevant issue numbers?

Closes: #48746 (closed)

Does this MR meet the acceptance criteria?

screen_rec

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Simon Knox
  • Simon Knox
  • Simon Knox
  • @jerasmus missing Docker image just happens sometimes. I gave it a retry and was fine.

    I had a couple of questions/suggestions. Encoding is crazy

  • assigned to @jerasmus

  • added 1 commit

    • 5ed3f875 - Update unit test description

    Compare with previous version

  • 2 Warnings
    :warning: This merge request does not refer to an existing milestone.
    :warning: This merge request includes more than 10 commits. Please rebase these commits into a smaller number of commits.

    Generated by :no_entry_sign: Danger

    Edited by 🤖 GitLab Bot 🤖
  • added 1 commit

    • 153fe5df - Updated the `isText` method to test for file types

    Compare with previous version

  • added 1 commit

    • cae901a3 - Add null-safe check on encoded content

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • @psimyn I've addressed your comments, could you please have another look.

  • assigned to @psimyn

  • added 1 commit

    • a5c2e79e - Add file types to unit tests

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • Simon Knox resolved all discussions

    resolved all discussions

  • @jerasmus changes looks good :100:

    @iamphill can you please review this?

  • assigned to @iamphill

  • Phil Hughes approved this merge request

    approved this merge request

  • merged

  • Phil Hughes mentioned in commit 1438e322

    mentioned in commit 1438e322

  • Nice! Thanks @jerasmus :tada:

  • Thanks for the review! cc @psimyn @iamphill

  • Rémy Coutable changed milestone to %11.5

    changed milestone to %11.5

  • Please register or sign in to reply
    Loading