diff options
Diffstat (limited to 'app')
4 files changed, 11 insertions, 0 deletions
diff --git a/app/assets/javascripts/terminal/terminal_bundle.js.es6 b/app/assets/javascripts/terminal/terminal_bundle.js.es6 new file mode 100644 index 00000000000..df213d912f2 --- /dev/null +++ b/app/assets/javascripts/terminal/terminal_bundle.js.es6 @@ -0,0 +1 @@ +//= require term
\ No newline at end of file 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 diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index d03ff9ec7e8..f60b961340b 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -21,6 +21,7 @@ Run in IDE (Koding) = link_to "#modal_merge_info", class: "btn inline btn-grouped btn-sm", "data-toggle" => "modal" do Check out branch + = link_to "Terminal", terminal_namespace_project_merge_request_path, class: 'btn inline btn-sm' %span.dropdown.inline.prepend-left-5 %a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} } diff --git a/app/views/projects/merge_requests/terminal.html.haml b/app/views/projects/merge_requests/terminal.html.haml new file mode 100644 index 00000000000..6348ed5017b --- /dev/null +++ b/app/views/projects/merge_requests/terminal.html.haml @@ -0,0 +1,5 @@ + +- content_for :page_specific_javascripts do + = page_specific_javascript_tag('terminal/terminal_bundle.js') + +%script{:src => 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.8/angular.js'}
\ No newline at end of file |