Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Mobile
Minds Mobile
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 149
    • Issues 149
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 8
    • Merge Requests 8
  • Security & Compliance
    • Security & Compliance
    • Dependency List
  • 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
  • !370

Our Privacy Policy has changed, please visit https://about.gitlab.com/privacy to review these changes.

Open
Opened 3 hours ago by Juan Manuel Solaro@juanmsolaro
  • Report abuse
Report abuse

[Sprint/OldfashionedOwl] (chore) add yellow flag to scheduled activities

closes #1347

Check out, review, and merge locally

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

git fetch origin
git checkout -b "chore/add-yellow-flag-to-scheduled-activities" "origin/chore/add-yellow-flag-to-scheduled-activities"

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "origin/release/3.11.0"
git merge --no-ff "chore/add-yellow-flag-to-scheduled-activities"

Step 4. Push the result of the merge to GitLab

git push origin "release/3.11.0"

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 chore/add-yellow-flag-to-scheduled-activities into release/3.11.0
Open in Web IDE
  • Email patches
  • Plain diff
Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.
Requires 2 more approvals.
Ready to be merged automatically. Ask someone with write access to this repository to merge this request
  • Discussion 1
  • Commits 1
  • Pipelines 1
  • Changes 3
0/1 thread resolved
  • Loading...
  • Martin Santangelo
    Martin Santangelo @msantang78 started a thread on the diff 2 hours ago
    src/newsfeed/activity/Activity.js
    110 110 </View>
    111 111 { this.showActions() }
    112 { this.isScheduled() &&
    113 <View style={[{backgroundColor: '#ffecb3'}, CommonStyle.padding]}>
    114 <Text style={[styles.scheduledText, CommonStyle.paddingLeft]}>
    115 {`${i18n.t('activity.scheduled')} ${formatDate(this.props.entity.time_created)}.`}
    116 </Text>
    117 </View> }
    112 118 { this.props.isLast ? <View style={styles.activitySpacer}></View> : null}
    113 { !this.props.hideTabs && <ActivityMetrics entity={this.props.entity}/> }
    119 { !this.props.hideTabs && !this.isScheduled() && <ActivityMetrics entity={this.props.entity}/> }
    114 120 </View>
    115 121 );
    116 122 }
    117 123
    124 isScheduled() {
    • Martin Santangelo
      Martin Santangelo @msantang78 · 2 hours ago
      Maintainer

      Maybe it will be useful to move this method to the activity model

    • Please register or sign in to reply
  • 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!370