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
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 815
    • Issues 815
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 73
    • Merge Requests 73
  • 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
  • !336

Closed
Opened 3 weeks ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

WIP: (feat): Boost Campaigns module

Check out, review, and merge locally

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

git fetch https://gitlab.com/edgebal/front.git goal/campaigns-1
git checkout -b edgebal/front-goal/campaigns-1 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 edgebal/front-goal/campaigns-1

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 edgebal:goal/campaigns-1 into master
  • Email patches
  • Plain diff
Pipeline #68527621 failed for a2e51cc5 on edgebal:goal/campaigns-1
      Requires 2 more approvals from Devs.
      Brian Hatchet
      Brian Hatchet
      Marcelo Rivera
      Marcelo Rivera
      Ben Hayward
      Ben Hayward
      Mark Harding
      Mark Harding
      Martin Santangelo
      Martin Santangelo

      Closed by Emiliano Balbuena 1 hour ago

      The changes were not merged into master

      Allows commits from members who can merge to the target branch

      Deletes source branch

      • Discussion 1
      • Commits 31
      • Pipelines 23
      • Changes 34
      • Loading...
      • Emiliano Balbuena @edgebal added 1 commit 2 weeks ago

        added 1 commit

        • 663b29f1 - (wip): Campaign creator form

        Compare with previous version

      • Emiliano Balbuena @edgebal added 1 commit 2 weeks ago

        added 1 commit

        • 574b91cb - (chore): User menu

        Compare with previous version

      • Emiliano Balbuena @edgebal added 1 commit 2 weeks ago

        added 1 commit

        • 25553af7 - (feat): Content selector

        Compare with previous version

      • Emiliano Balbuena @edgebal added 2 commits 2 weeks ago

        added 2 commits

        • 82c533f0 - (chore): Specific service for campaign contents
        • daa192e9 - (proto): Improve type; get service; list and view proto

        Compare with previous version

      • Emiliano Balbuena @edgebal added 22 commits 2 weeks ago

        added 22 commits

        • daa192e9...3d0dcc67 - 21 commits from branch minds:master
        • 2003ea09 - Merge remote-tracking branch 'upstream/master' into goal/campaigns-1

        Compare with previous version

      • Emiliano Balbuena @edgebal added 4 commits 2 weeks ago

        added 4 commits

        • 54e5e006 - (feat): View screen prototype
        • e51881f4 - (chore): UI tweaks; move campaign info to service
        • 3778c47b - (chore): Missing provider
        • d7efde50 - (feat): Edit screen logic

        Compare with previous version

        Toggle commit list
      • Emiliano Balbuena @edgebal added 1 commit 2 weeks ago

        added 1 commit

        • 123c9327 - (chore): Entity changes

        Compare with previous version

      • Emiliano Balbuena @edgebal added 1 commit 2 weeks ago

        added 1 commit

        • f852f966 - (chore): Handle undefined end time; use listing endpoint to get

        Compare with previous version

      • Emiliano Balbuena @edgebal added 1 commit 1 week ago

        added 1 commit

        • 5359f735 - (proto): New/edit campaign

        Compare with previous version

      • Emiliano Balbuena @edgebal added 1 commit 1 week ago

        added 1 commit

        • f31e4f42 - (fix): Parse dates before sending to server

        Compare with previous version

      • Emiliano Balbuena @edgebal added 1 commit 1 week ago

        added 1 commit

        • 24f7399b - (fix): search()'s $event should be optional

        Compare with previous version

      • Emiliano Balbuena @edgebal added 1 commit 1 week ago

        added 1 commit

        • c648abb4 - (feat): Hashtags selector

        Compare with previous version

      • Emiliano Balbuena @edgebal added 1 commit 1 week ago

        added 1 commit

        • 530164dd - (feat): "Create Campaign" link on boost creator; allow create params

        Compare with previous version

      • Emiliano Balbuena @edgebal added 1 commit 1 week ago

        added 1 commit

        • c26e133d - (refactor): Use array for tags

        Compare with previous version

      • Emiliano Balbuena @edgebal added 1 commit 1 week ago

        added 1 commit

        • 29a45c0e - (fix): Redirection after create/edit

        Compare with previous version

      • Emiliano Balbuena @edgebal added 3 commits 1 week ago

        added 3 commits

        • e524adad - (chore): Add # character to hashtag list
        • 5aa67af9 - (chore): Remove unused status
        • 603149b0 - (chore): Remove bg to selected hashtags

        Compare with previous version

      • Emiliano Balbuena @edgebal added 1 commit 1 week ago

        added 1 commit

        • eb572783 - (feat): Allow cancel/revoke

        Compare with previous version

      • Emiliano Balbuena @edgebal added 1 commit 1 week ago

        added 1 commit

        • c1ecdaf6 - (refactor): raw entity read; sidebar preview; view label tooltips

        Compare with previous version

      • Emiliano Balbuena @edgebal added 2 commits 1 week ago

        added 2 commits

        • 7bc96f15 - (feat): Allow picking self
        • 53d4fa24 - (refactor): Boost campaigns and console under same outlet

        Compare with previous version

      • Emiliano Balbuena @edgebal added 2 commits 5 days ago

        added 2 commits

        • 3b18d439 - (chore): Ensure whole number of tokens as budget
        • e8749bb0 - (feat): Disallow editing campaigns on final states

        Compare with previous version

      • Emiliano Balbuena @edgebal added 41 commits 5 days ago

        added 41 commits

        • e8749bb0...4d5c1bd1 - 40 commits from branch minds:master
        • a37635f6 - Merge remote-tracking branch 'upstream/master' into goal/campaigns-1

        Compare with previous version

      • Emiliano Balbuena @edgebal added 5 commits 3 days ago

        added 5 commits

        • a37635f6...831c5249 - 4 commits from branch minds:master
        • a2e51cc5 - Merge remote-tracking branch 'upstream/master' into goal/campaigns-1

        Compare with previous version

      • Mark Harding @markeharding added MR::Awaiting Review label 5 hours ago

        added MR::Awaiting Review label

      • Emiliano Balbuena
        Emiliano Balbuena @edgebal · 1 hour ago
        Developer

        Superseded by !387

      • Emiliano Balbuena @edgebal closed 1 hour ago

        closed

      • 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
      Emiliano Balbuena's avatar Emiliano Balbuena @edgebal
      Assign to
      None
      Milestone
      None
      Assign milestone
      None
      Time tracking
      No estimate or time spent
      1
      Labels
      MR::Awaiting Review
      Assign labels
      • View project labels
      Lock merge request
      Unlocked
      6
      6 participants
      user avatar
      Brian Hatchet
      user avatar
      Marcelo Rivera
      user avatar
      Ben Hayward
      user avatar
      Mark Harding
      user avatar
      Martin Santangelo
      user avatar
      Emiliano Balbuena
      Reference: minds/front!336