Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 861
    • Issues 861
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 54
    • Merge Requests 54
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Packages
    • Packages
    • List
    • Container Registry
  • 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
  • !494

Open
Opened 1 week ago by Juan Manuel Solaro@juanmsolaro
  • Report abuse
Report abuse

WIP: epic/post-scheduler

Check out, review, and merge locally

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

git fetch origin
git checkout -b epic/post-scheduler origin/epic/post-scheduler

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 epic/post-scheduler

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 epic/post-scheduler into master
The source branch is 47 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #77849124 passed with warnings for 1a8b1ef8 on epic/post-scheduler
            Requires 2 more approvals from Devs and Deployers.
            Mark Harding
            Mark Harding
            Ben Hayward
            Ben Hayward
            Martin Santangelo
            Martin Santangelo
            Marcelo Rivera
            Marcelo Rivera
            Emiliano Balbuena
            Emiliano Balbuena
            There are merge conflicts. Resolve these conflicts or ask someone with write access to this repository to merge it locally
            You can merge this merge request manually using the
            • Discussion 22
            • Commits 12
            • Pipelines 12
            • Changes 21
            18/19 threads resolved
            • Loading...
            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

              added 1 commit

              • 3d3b9987 - (feat) add tooltip to show date

              Compare with previous version

            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

              added 1 commit

              • 79d4c893 - (feat) add custom time when posting, creating and editing blog and when editing activity

              Compare with previous version

            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

              added 1 commit

              • 032af961 - (fix) change property name and add mock component to spec tests

              Compare with previous version

            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

              added 1 commit

              • 01a4158c - (fix) change format of time created property

              Compare with previous version

            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 6 days ago
              Resolved by Juan Manuel Solaro 3 days ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 6 days ago
              Resolved by Juan Manuel Solaro 3 days ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 6 days ago
              Resolved by Juan Manuel Solaro 3 days ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 6 days ago
              Resolved by Juan Manuel Solaro 3 days ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 6 days ago
              Resolved by Juan Manuel Solaro 3 days ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 6 days ago
              Resolved by Juan Manuel Solaro 3 days ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 6 days ago
              Resolved by Juan Manuel Solaro 3 days ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 6 days ago
              Resolved by Juan Manuel Solaro 3 days ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 6 days ago
              Resolved by Juan Manuel Solaro 3 days ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 6 days ago
              Resolved by Juan Manuel Solaro 3 days ago
            • Juan Manuel Solaro @juanmsolaro added 1 commit 3 days ago

              added 1 commit

              • ff0c90e4 - (fix) adapt code to reviews

              Compare with previous version

            • Juan Manuel Solaro @juanmsolaro resolved all threads 3 days ago

              resolved all threads

            • Juan Manuel Solaro @juanmsolaro added 1 commit 2 days ago

              added 1 commit

              • 4c47ed6c - (feat) add view and styles for scheduled activities count

              Compare with previous version

            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 day ago

              added 1 commit

              • 8aa592f5 - (feat) filter activities by time_created to get scheduled

              Compare with previous version

            • Mark Harding
              Mark Harding @markeharding started a thread on an old version of the diff 1 day ago
              Resolved by Juan Manuel Solaro 1 hour ago
            • Mark Harding
              Mark Harding @markeharding started a thread on an old version of the diff 1 day ago
              Resolved by Juan Manuel Solaro 3 hours ago
            • Mark Harding
              Mark Harding @markeharding started a thread on the diff 1 day ago
              Last updated by Juan Manuel Solaro 2 hours ago
              src/app/modules/blogs/blog.scss
              301 301
              302 302 m-wire-threshold-input {
              303 303 position: relative;
              304 padding: 8px;
              • Mark Harding
                Mark Harding @markeharding · 1 day ago
                Owner

                this doesn't look related to post scheduler?

              • Juan Manuel Solaro
                Juan Manuel Solaro @juanmsolaro · 2 hours ago
                Developer

                I removed that padding because of spacing. We don't have enough when mark Mature Content flag. Screenshot_from_2019-08-22_12-42-50 Another option is to reduce padding from the 'E' icon to from 8px to 6px, like this: Screenshot_from_2019-08-22_12-46-51

              • Please register or sign in to reply
            • Mark Harding
              Mark Harding @markeharding started a thread on an old version of the diff 1 day ago
              Resolved by Juan Manuel Solaro 1 hour ago
            • Mark Harding
              Mark Harding @markeharding started a thread on an old version of the diff 1 day ago
              Resolved by Juan Manuel Solaro 1 hour ago
            • Mark Harding
              Mark Harding @markeharding started a thread on an old version of the diff 1 day ago
              Resolved by Juan Manuel Solaro 1 hour ago
            • Mark Harding
              Mark Harding @markeharding started a thread on an old version of the diff 1 day ago
              Resolved by Juan Manuel Solaro 1 hour ago
            • Mark Harding
              Mark Harding @markeharding started a thread on an old version of the diff 1 day ago
              Resolved by Juan Manuel Solaro 1 hour ago
            • Mark Harding
              Mark Harding @markeharding started a thread on an old version of the diff 1 day ago
              Resolved by Juan Manuel Solaro 1 hour ago
            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 day ago

              added 1 commit

              • 3fa631c7 - (fix) minor view fixes

              Compare with previous version

            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 day ago

              added 1 commit

              • 56dfa91a - (feat) ability to count scheduled activities

              Compare with previous version

            • Juan Manuel Solaro @juanmsolaro added 1 commit 3 hours ago

              added 1 commit

              • 8741ca7a - (test) add spec to poster date selector component

              Compare with previous version

            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 hour ago

              added 1 commit

              • 1a8b1ef8 - (fix) adapt and fix code to mark's review

              Compare with previous version

            • 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
            9
            9 participants
            user avatar
            Mark Harding
            user avatar
            Ben Hayward
            user avatar
            Martin Santangelo
            user avatar
            Marcelo Rivera
            user avatar
            Emiliano Balbuena
            user avatar
            Brian Hatchet
            user avatar
            Olivia Madrid
            Reference: minds/front!494