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
  • !174

Closed
Opened Apr 30, 2018 by Stefan Busemann@stefan.busemannMaintainer
  • Report abuse
Report abuse

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 "209-event-list-view-superfluous-dot-when-enddate-is-missing"
git merge --no-ff "develop"

Step 4. Push the result of the merge to GitLab

git push origin "209-event-list-view-superfluous-dot-when-enddate-is-missing"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Release 2018-04-30

  • Overview 1
  • Commits 69
  • Pipelines 34
  • Changes 31
  • [FEATURE] Add new list layout without category selector
  • [FEATURE] Show category selector for events only if there is more then one category available
  • [FEATURE] Enable basis ddev support
  • [TAKS] Update TYPO3 CMS to 8.7.13
  • [TAKS] Update t3o_layout to 2.3.0
  • [TAKS] Update t3o_roadmap to 2.0.2
  • [TAKS] Update t3o_membership to 2.0.0
  • [BUGFIX] Remove bottom margin on latest events view and news on startpage
  • [BUGFIX] Use correct single PID for security advisories in solr results and list view
Assignee
Assign to
Sprint 2018-03 (Release)
Milestone
Sprint 2018-03 (Release) (Past due)
Assign milestone
Time tracking
Reference: services/typo3.org/typo3.org!174
Source branch: develop