diff options
author | Fatih Acet <acetfatih@gmail.com> | 2019-04-12 22:23:49 +0200 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2019-04-15 09:02:50 +0200 |
commit | cf0265723479b2e511595312f8d053f737fa3d57 (patch) | |
tree | 4b3c68ed85ca35709da969a0463238601ac3d358 | |
parent | 25af3a15fc7819b6fe7620bdaa72a4281252079c (diff) | |
download | gitlab-ce-cf0265723479b2e511595312f8d053f737fa3d57.tar.gz |
Delete leftover code for referenced_merge_requests60476-actionview-missingtemplate-missing-template-projects-issues-_merge_requests-with-locale-en-formats-html-varian
We rewrote Related MRs widget using Vue.
The previous implementation was using Haml templates
and calling referenced_merge_requests endpoint which is
now deprecated. This MR deletes leftover stuff them.
-rw-r--r-- | app/controllers/projects/issues_controller.rb | 12 | ||||
-rw-r--r-- | app/views/projects/issues/_merge_requests_status.html.haml | 25 | ||||
-rw-r--r-- | config/routes/project.rb | 1 | ||||
-rw-r--r-- | spec/javascripts/issue_spec.js | 1 | ||||
-rw-r--r-- | spec/views/projects/issues/_merge_requests_status.html.haml_spec.rb | 28 |
5 files changed, 0 insertions, 67 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 3d16a368f23..87c224c3c62 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -132,18 +132,6 @@ class Projects::IssuesController < Projects::ApplicationController render_conflict_response end - def referenced_merge_requests - @merge_requests, @closed_by_merge_requests = ::Issues::ReferencedMergeRequestsService.new(project, current_user).execute(issue) - - respond_to do |format| - format.json do - render json: { - html: view_to_html_string('projects/issues/_merge_requests') - } - end - end - end - def related_branches @related_branches = Issues::RelatedBranchesService.new(project, current_user).execute(issue) diff --git a/app/views/projects/issues/_merge_requests_status.html.haml b/app/views/projects/issues/_merge_requests_status.html.haml deleted file mode 100644 index 90838a75214..00000000000 --- a/app/views/projects/issues/_merge_requests_status.html.haml +++ /dev/null @@ -1,25 +0,0 @@ -- time_format = '%b %e, %Y %l:%M%P %Z%z' - -- if merge_request.merged? - - mr_status_date = merge_request.merged_at - - mr_status_title = _('Merged') - - mr_status_icon = 'merge' - - mr_status_class = 'merged' -- elsif merge_request.closed? - - mr_status_date = merge_request.closed_event&.created_at - - mr_status_title = _('Closed') - - mr_status_icon = 'issue-close' - - mr_status_class = 'closed' -- else - - mr_status_date = merge_request.created_at - - mr_status_title = mr_status_date ? _('Opened') : _('Open') - - mr_status_icon = 'issue-open-m' - - mr_status_class = 'open' - -- if mr_status_date - - mr_status_tooltip = "<div><span class=\"bold\">#{mr_status_title}</span> #{time_ago_in_words(mr_status_date)} ago</div><span class=\"text-tertiary\">#{l(mr_status_date.to_time, format: time_format)}</span>" -- else - - mr_status_tooltip = "<div><span class=\"bold\">#{mr_status_title}</span></div>" - -%span.mr-status-wrapper.suggestion-help-hover{ class: css_class, data: { toggle: 'tooltip', placement: 'bottom', html: 'true', title: mr_status_tooltip } } - = sprite_icon(mr_status_icon, size: 16, css_class: "merge-request-status #{mr_status_class}") diff --git a/config/routes/project.rb b/config/routes/project.rb index 93d168fc595..e05c887aac0 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -360,7 +360,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do post :toggle_subscription post :mark_as_spam post :move - get :referenced_merge_requests get :related_branches get :can_create_branch get :realtime_changes diff --git a/spec/javascripts/issue_spec.js b/spec/javascripts/issue_spec.js index 11ab6c38a55..966aee72abb 100644 --- a/spec/javascripts/issue_spec.js +++ b/spec/javascripts/issue_spec.js @@ -113,7 +113,6 @@ describe('Issue', function() { mock = new MockAdapter(axios); mock.onGet(/(.*)\/related_branches$/).reply(200, {}); - mock.onGet(/(.*)\/referenced_merge_requests$/).reply(200, {}); findElements(isIssueInitiallyOpen); this.issue = new Issue(); diff --git a/spec/views/projects/issues/_merge_requests_status.html.haml_spec.rb b/spec/views/projects/issues/_merge_requests_status.html.haml_spec.rb deleted file mode 100644 index 9424795749d..00000000000 --- a/spec/views/projects/issues/_merge_requests_status.html.haml_spec.rb +++ /dev/null @@ -1,28 +0,0 @@ -# frozen_string_literal: true -require 'spec_helper' - -describe 'projects/issues/_merge_requests_status.html.haml' do - around do |ex| - Timecop.freeze(Date.new(2018, 7, 22)) do - ex.run - end - end - - it 'shows date of status change in tooltip' do - merge_request = create(:merge_request, created_at: 1.month.ago) - - render partial: 'projects/issues/merge_requests_status', - locals: { merge_request: merge_request, css_class: '' } - - expect(rendered).to match("Opened.*about 1 month ago") - end - - it 'shows only status in tooltip if date is not set' do - merge_request = create(:merge_request, state: :closed) - - render partial: 'projects/issues/merge_requests_status', - locals: { merge_request: merge_request, css_class: '' } - - expect(rendered).to match("Closed") - end -end |