diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-03-13 13:09:37 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-03-13 13:09:37 -0500 |
| commit | 736b4ecf8efa034d95923e8741fb0e31b0d15bfe (patch) | |
| tree | 96ed63e408c2ac24cc704a6b5a48b3497ed01f16 /config/routes | |
| parent | 2e5de941392c8463a5e15e9f8cb3a3ab147b656d (diff) | |
| parent | 8f73ddd896dad7bd66d9c96dafcc4311ce272447 (diff) | |
| download | gitlab-ce-736b4ecf8efa034d95923e8741fb0e31b0d15bfe.tar.gz | |
Merge branch 'master' into add-csslabadd-csslab
Diffstat (limited to 'config/routes')
| -rw-r--r-- | config/routes/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index b82ed27664c..c803737d40b 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -130,7 +130,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do post :bulk_update end - resources :discussions, only: [], constraints: { id: /\h{40}/ } do + resources :discussions, only: [:show], constraints: { id: /\h{40}/ } do member do post :resolve delete :resolve, action: :unresolve |