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 392
    • Issues 392
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 54
    • Merge Requests 54
  • 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
  • !2053

Merged
Opened Dec 11, 2019 by Ivan Tashkinov@i1tDeveloper
  • 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/i1t/pleroma.git" "1427-oauth-admin-scopes"
git checkout -b "i1t/pleroma-1427-oauth-admin-scopes" 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 "i1t/pleroma-1427-oauth-admin-scopes"

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.

[HOTFIX] [#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests

  • Overview 0
  • Commits 1
  • Pipelines 1
  • Changes 3

Closes #1427 (closed)

Follow-up to !2025 (merged)

Edited Dec 11, 2019 by Ivan Tashkinov
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: pleroma/pleroma!2053
Source branch: 1427-oauth-admin-scopes

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.