Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'config/routes/admin.rb')
-rw-r--r--config/routes/admin.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index bbf00cd0b00..2f4e286f5eb 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -65,6 +65,7 @@ namespace :admin do
resource :avatar, controller: 'topics/avatars', only: [:destroy]
collection do
post :preview_markdown
+ post :merge
end
end