Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
T
typo3.org
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 90
    • Issues 90
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
    • Iterations
  • Merge Requests 9
    • Merge Requests 9
  • Requirements
    • Requirements
    • List
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Security & Compliance
    • Security & Compliance
    • Dependency List
    • License Compliance
  • Operations
    • Operations
    • Incidents
    • Environments
  • Analytics
    • Analytics
    • CI / CD
    • Code Review
    • Insights
    • Issue
    • Repository
    • Value Stream
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • services
  • typo3.org
  • typo3.org
  • Merge Requests
  • !246

Merged
Opened Nov 06, 2018 by Thomas Löffler@tomalo.stuttgartOwner

Check out, review, and merge locally

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

git fetch origin
git checkout -b "develop" "origin/develop"

Step 2. Review the changes locally

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

git fetch origin
git checkout "master"
git merge --no-ff "develop"

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.

Salsa Release 06-11-18

  • Overview 0
  • Commits 1
  • Pipelines 1
  • Changes 1
  • [FEATURE] Add discourse integration on pages
  • [TASK] Remove Google+ from footer (now really)
  • [TASK] Increase default font weight
  • [FEATURE] Add template for selected news item list
  • [BUGFIX] Change line break in cookie banner text
  • [TASK] Reduce font size on mobile
  • [BUGFIX] Fix regression in login JS
Edited Nov 06, 2018 by Thomas Löffler
Assignee
Assign to
Sprint 6 (2018)
Milestone
Sprint 6 (2018) (Past due)
Assign milestone
Time tracking
Reference: services/typo3.org/typo3.org!246
Source branch: develop

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.