Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Mobile
Minds Mobile
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 123
    • Issues 123
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 9
    • Merge Requests 9
  • Packages
    • Packages
    • List
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • Minds
  • Minds MobileMinds Mobile
  • Merge Requests
  • !248

Merged
Opened 3 days ago by Juan Manuel Solaro@juanmsolaro
  • Report abuse
Report abuse

(feat) add support to s3 direct upload

closes #1057 (closed)

Edited 20 hours ago by Juan Manuel Solaro

Check out, review, and merge locally

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

git fetch https://gitlab.com/juanmsolaro/mobile-native.git sprint/InterestingIguana.feat.s3.direct.upload
git checkout -b juanmsolaro/mobile-native-sprint/InterestingIguana.feat.s3.direct.upload 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 juanmsolaro/mobile-native-sprint/InterestingIguana.feat.s3.direct.upload

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 juanmsolaro:sprint/InterestingIguana.feat.s3.direct.upload into master
  • Email patches
  • Plain diff
Pipeline #71453271 passed for 4d3399ca on juanmsolaro:sprint/InterestingIguana.feat.s3.direct.upload
    No approval required

    Merged by Martin Santangelo 12 minutes ago

    The changes were merged into master with ca94a68d

    Closed #1057 (closed)

    Pipeline #71454230 running for ca94a68d on master
          • Discussion 2
          • Commits 2
          • Pipelines 2
          • Changes 3
          0/1 thread resolved
          • Loading...
            • Juan Manuel Solaro
              Juan Manuel Solaro @juanmsolaro · 3 days ago
              Developer

              need testing in iOS

            • Collapse replies
            • Juan Manuel Solaro
              Juan Manuel Solaro @juanmsolaro · 20 hours ago
              Developer

              done

            • Please register or sign in to reply
          • Juan Manuel Solaro @juanmsolaro unmarked as a Work In Progress 20 hours ago

            unmarked as a Work In Progress

          • Juan Manuel Solaro @juanmsolaro added 1 commit 17 minutes ago

            added 1 commit

            • 4d3399ca - Update AttachmentStore.js

            Compare with previous version

          • Martin Santangelo @msantang78 mentioned in commit ca94a68d 12 minutes ago

            mentioned in commit ca94a68d

          • Martin Santangelo @msantang78 merged 12 minutes ago

            merged

          • 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
          0 Assignees
          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
          2
          2 participants
          user avatar
          Martin Santangelo
          user avatar
          Juan Manuel Solaro
          Reference: minds/mobile-native!248

          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.