Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
pleroma
pleroma
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 373
    • Issues 373
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 56
    • Merge Requests 56
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Pleroma
  • pleromapleroma
  • Merge Requests
  • !228

Merged
Opened Jun 18, 2018 by kaniini@kaniiniContributor
  • Report abuse
Report abuse

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://git.pleroma.social/kaniini/pleroma.git" "feature/application-xml-mime"
git checkout -b "kaniini/pleroma-feature/application-xml-mime" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "develop"
git merge --no-ff "kaniini/pleroma-feature/application-xml-mime"

Step 4. Push the result of the merge to GitLab

git push origin "develop"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

config: add application/xml mimetype support.

  • Overview 2
  • Commits 1
  • Pipelines 1
  • Changes 1

application/xml is the older xml mimetype. some legacy scripts make use of it, as well as common use for debugging with curl and other tools. so it makes sense to have it alongside text/xml.

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: pleroma/pleroma!228
Source branch: feature/application-xml-mime

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.