From 9f10943c1a76576ac40d96189a28a4d6123a75d8 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 11 Aug 2015 10:28:42 +0200
Subject: Revert "Merge branch 'drop-satellites'"

This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing
changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 config/routes.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/routes.rb b/config/routes.rb
index d7307a61ede..1166a4b3eba 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -463,8 +463,8 @@ Gitlab::Application.routes.draw do
           member do
             get :diffs
             get :commits
-            post :merge
-            get :merge_check
+            post :automerge
+            get :automerge_check
             get :ci_status
             post :toggle_subscription
           end
-- 
cgit v1.2.3