Merge branch 'master' into fixes/api

Conflicts: spec/requests/api/projects_spec.rb
2013-02-20 12:43:32 +01:00 · 2013-02-20 12:43:32 +01:00 · eefb27f5ae
commit eefb27f5ae
parent 1b97a2eee8 b7ac654b88
134 changed files with 1116 additions and 859 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -46,6 +46,11 @@ Gitlab::Application.routes.draw do
    root to: "projects#index"
  end

+  #
+  # Attachments serving
+  #
+  get 'files/:type/:id/:filename' => 'files#download', constraints: { id: /\d+/, type: /[a-z]+/, filename: /[a-zA-Z.0-9_\-\+]+/ }
+
  #
  # Admin Area
  #