diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-02-28 00:10:43 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-02-28 00:10:43 +0000 |
| commit | 059ab73b8eae3a546d0a19fe99ef0c52df5fac01 (patch) | |
| tree | b24d4162072c0099147fcdb4f19f95511689ff6e /config | |
| parent | 0be4a77d0012613f960c4177f53101c46de2899c (diff) | |
| download | gitlab-ce-059ab73b8eae3a546d0a19fe99ef0c52df5fac01.tar.gz | |
Render MR Notes with Vue with behind a cookie
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 1 | ||||
| -rw-r--r-- | config/webpack.config.js | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 8fe545b721e..dd1a9c3be3b 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -103,6 +103,7 @@ constraints(ProjectUrlConstrainer.new) do post :toggle_subscription post :remove_wip post :assign_related_issues + get :discussions, format: :json post :rebase scope constraints: { format: nil }, action: :show do diff --git a/config/webpack.config.js b/config/webpack.config.js index 613ed1cad03..f9c10ff5986 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -52,6 +52,7 @@ function generateEntries() { help: './help/help.js', merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', monitoring: './monitoring/monitoring_bundle.js', + mr_notes: './mr_notes/index.js', notebook_viewer: './blob/notebook_viewer.js', pdf_viewer: './blob/pdf_viewer.js', pipelines_details: './pipelines/pipeline_details_bundle.js', @@ -243,6 +244,7 @@ var config = { 'groups', 'merge_conflicts', 'monitoring', + 'mr_notes', 'notebook_viewer', 'pdf_viewer', 'pipelines', |