summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests_controller.rb
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-10-03 15:54:08 -0400
committerJacob Schatz <jschatz1@gmail.com>2016-10-03 15:54:08 -0400
commit10a2fb7ba9c2be14ecb5844701c109359ed60cb9 (patch)
treef5e8ae9fd0fb837e99cf2b2452cc0c329e524172 /app/controllers/projects/merge_requests_controller.rb
parent1fed97530af84b7660e45a9a8d4e3dafbed026f7 (diff)
downloadgitlab-ce-terminal.tar.gz
Initial terminalterminal
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
-rw-r--r--app/controllers/projects/merge_requests_controller.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 68bb4232f5b..5b9b14d7cbd 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -185,6 +185,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
end
+ def terminal
+ return 'TERMINAL'
+ end
+
def builds
respond_to do |format|
format.html do