Merge branch 'release/1.2.1' into develop

2020-03-08 22:15:58 +05:30
parent 60dc564f37 2a4fb7b056
commit 1db35caa56
27 changed files with 235 additions and 111 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -73,8 +73,8 @@ Rails.application.routes.draw do
      end

      resources :conversations, only: [:index, :show] do
-        scope module: :conversations do # for nested controller
-          resources :messages, only: [:create]
+        scope module: :conversations do
+          resources :messages, only: [:index, :create]
          resources :assignments, only: [:create]
          resources :labels, only: [:create, :index]
        end