Merge pull request #2067 from riyad/diff-and-patch-for-commits-and-merge-requests

Diff and patch for commits and merge requests
2012-11-26 04:40:49 -08:00 · 2012-11-26 04:40:49 -08:00 · e750efd9fc
commit e750efd9fc
parent 2d5a6fc850 79a4ed15ce
14 changed files with 238 additions and 37 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -159,12 +159,11 @@ Gitlab::Application.routes.draw do
      end
    end

-    resources :merge_requests do
+    resources :merge_requests, constraints: {id: /\d+/} do
      member do
        get :diffs
        get :automerge
        get :automerge_check
-        get :raw
      end

      collection do