Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 803
    • Issues 803
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 46
    • Merge Requests 46
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Packages
    • Packages
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds FrontendMinds Frontend
  • Merge Requests
  • !319

Open
Opened 38 minutes ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/FunnyFrog] (fix): show error if translation object is empty

closes #1156

By the way, @markeharding I set up a test key with the translation service activated and those two activities linked in the issue translated just fine in my environment.

Check out, review, and merge locally

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

git fetch https://gitlab.com/eiennohi/front.git sprint/FunnyFrog.fix.show-error-if-translation-fails
git checkout -b eiennohi/front-sprint/FunnyFrog.fix.show-error-if-translation-fails 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 origin/master
git merge --no-ff eiennohi/front-sprint/FunnyFrog.fix.show-error-if-translation-fails

Step 4. Push the result of the merge to GitLab

git push origin master

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

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

Request to merge eiennohi:sprint/FunnyFrog.fix.show-error-if-translation-fails into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #63614615 passed for 81aa9ff7 on eiennohi:sprint/FunnyFrog.fix.show-error-if-translation-fails
    Requires 2 more approvals from Devs.
    Emiliano Balbuena
    Emiliano Balbuena
    Brian Hatchet
    Brian Hatchet
    Mark Harding
    Mark Harding
    Ben Hayward
    Ben Hayward
    Martin Santangelo
    Martin Santangelo
    Ready to be merged automatically. Ask someone with write access to this repository to merge this request
    Allows commits from members who can merge to the target branch

    Closes #1156

    Deletes source branch

    • Discussion 0
    • Commits 1
    • Pipelines 1
    • Changes 1
    • Loading...
    • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
    Please register or sign in to reply
    Assignee
    None
    Assign to
    None
    Milestone
    None
    Assign milestone
    None
    Time tracking
    No estimate or time spent
    0
    Labels
    None
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    6
    6 participants
    user avatar
    Emiliano Balbuena
    user avatar
    Brian Hatchet
    user avatar
    Mark Harding
    user avatar
    Ben Hayward
    user avatar
    Martin Santangelo
    user avatar
    Marcelo Rivera
    Reference: minds/front!319