Merge branch 'pre_trustie_server' into trustie_server

config/routes.rb

@@ -467,7 +467,7 @@ Rails.application.routes.draw do
 
     namespace :traces do 
       resources :trace_users, only: [:create]
-      scope "/:owner/:repo" do 
+      scope "/:owner/:repo", constraints: { repo: /[^\/]+/ }  do 
         resource :projects, path: '/', only: [:index] do
           member do 
             post :tasks
@@ -480,7 +480,7 @@ Rails.application.routes.draw do
     end
 
     # Project Area START
-    scope "/:owner/:repo" do
+    scope "/:owner/:repo",constraints: { repo: /[^\/]+/ }  do
       scope do
         get(
           '/activity',
@@ -1080,7 +1080,7 @@ Rails.application.routes.draw do
   end
 
   resources :installations, only: []  do
-    get :repositories, on: :collection
+    get :repositories, on: :member
   end
 
   root 'main#index'

config/routes/api.rb

@@ -2,7 +2,7 @@ defaults format: :json do
   namespace :api do 
     namespace :v1 do 
       scope ':owner' do 
-        resource :users, path: '/', only: [:show, :update, :edit, :destroy] do 
+        resource :users, path: '/', only: [:update, :edit, :destroy] do 
           collection do
             get :send_email_vefify_code
             post :check_password 
@@ -18,9 +18,9 @@ defaults format: :json do
           resources :feedbacks, only: [:create]
         end
 
-        scope ':repo' do 
+        scope ':repo', constraints: { repo: /[^\/]+/ }  do 
           # projects
-          resource :projects, path: '/', only: [:show, :update, :edit, :destroy] do 
+          resource :projects, path: '/', only: [:show, :update, :edit] do 
             collection do 
               get :compare
               get :blame
@@ -97,6 +97,7 @@ defaults format: :json do
       end
 
       resources :projects, only: [:index]
+      resources :project_topics, only: [:index, :create, :destroy]
 
       
     end