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 829
    • Issues 829
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 50
    • Merge Requests 50
  • 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
  • !305

Open
Opened 4 days ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/ElevatedEagle](bug): Fixed colour theme issue on bulb button #1300

Closing #1300

image

Check out, review, and merge locally

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

git fetch https://gitlab.com/benhayward.ben/front.git fix-blacked-out-bulb-button-video-1300
git checkout -b benhayward.ben/front-fix-blacked-out-bulb-button-video-1300 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 benhayward.ben/front-fix-blacked-out-bulb-button-video-1300

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 benhayward.ben:fix-blacked-out-bulb-button-video-1300 into master
The source branch is 9 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #62441251 running for 91963638 on benhayward.ben:fix-blacked-out-bulb-button-video-1300
    No approval required
    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 #1300

    Deletes source branch

    • Discussion 9
    • Commits 3
    • Pipelines 3
    • Changes 2
    3/3 discussions resolved
    • Loading...
    • Mark Harding
      Mark Harding @markeharding · 3 hours ago
      Owner

      Please confirm no regression made on light mode.

    • Ben Hayward
      Ben Hayward @benhayward.ben · 1 hour ago
      Developer

      @markeharding image

    • Mark Harding
      Mark Harding @markeharding · 1 hour ago
      Owner

      Screen_Shot_2019-05-21_at_4.34.13_PM @benhayward.ben

    • Ben Hayward @benhayward.ben added 1 commit 37 minutes ago

      added 1 commit

      • 2b69e0a2 - Added theme to button

      Compare with previous version

    • Ben Hayward
      Ben Hayward @benhayward.ben · 37 minutes ago
      Developer

      image

    • Ben Hayward
      Ben Hayward @benhayward.ben · 37 minutes ago
      Developer

      New commit just pushed

    • Mark Harding
      Mark Harding @markeharding started a discussion on an old version of the diff 35 minutes ago
      Resolved by Ben Hayward 1 minute ago
    • Mark Harding
      Mark Harding @markeharding started a discussion on an old version of the diff 35 minutes ago
      Resolved by Ben Hayward 1 minute ago
    • Mark Harding
      Mark Harding @markeharding started a discussion on an old version of the diff 34 minutes ago
      Resolved by Ben Hayward 1 minute ago
    • Ben Hayward @benhayward.ben added 1 commit 1 minute ago

      added 1 commit

      • 91963638 - fixed up spacing and removed undeeded line

      Compare with previous version

    • Ben Hayward @benhayward.ben resolved all discussions 1 minute ago

      resolved all discussions

    • Ben Hayward
      Ben Hayward @benhayward.ben · 1 minute ago
      Developer

      Amended that, sorry for spacing issues, copy pasted trying to rush that in before our meeting; was a mistake.

    • 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
    2
    2 participants
    user avatar
    Ben Hayward
    user avatar
    Mark Harding
    Reference: minds/front!305