Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • G gitlabhq1
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 21
    • Issues 21
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 12
    • Merge requests 12
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Infrastructure Registry
  • Analytics
    • Analytics
    • CI/CD
    • Repository
    • Value stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • gpt
  • large_projects
  • gitlabhq1
  • Merge requests
  • !2067

Merged
Created Nov 25, 2012 by Administrator@rootOwner

Diff and patch for commits and merge requests

  • Overview 2
  • Commits 9
  • Changes 14

Created by: riyad

  • Fixes commit patches getting escaped (see #2036 (closed))
  • Support diff and patch generation for commits and merge request
  • MergeReqest doesn't generate a temporary file for the patch any more
  • Update the UI to allow downloading both

Problems with this PR:

  • I had to add a constraint to the id in the merge request routes. Otherwise the id was parsed something like "1.patch"
  • the merge requests controller spec won't execute the respond_to block. Adding render_views to the spec produces 404 errors. (that's also why the tests fail)

Can anyone see why? What is different in the MergeRequestsController? If noone knows I'll remove the merge request controller spec before merge.

Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: github/fork/riyad/diff-and-patch-for-commits-and-merge-requests