tidying up the changes
This commit is contained in:
parent
3d8fbd12b8
commit
716f9cbb41
|
|
@ -7,11 +7,8 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
|
|||
include IssuableCollections
|
||||
|
||||
skip_before_action :merge_request, only: [:index, :bulk_update]
|
||||
|
||||
before_action :authorize_update_issuable!, only: [:close, :edit, :update, :remove_wip, :sort]
|
||||
|
||||
before_action :set_issuables_index, only: [:index]
|
||||
|
||||
before_action :authenticate_user!, only: [:assign_related_issues]
|
||||
|
||||
def index
|
||||
|
|
|
|||
|
|
@ -1021,13 +1021,4 @@ class MergeRequest < ActiveRecord::Base
|
|||
|
||||
project.merge_requests.merged.where(author_id: author_id).empty?
|
||||
end
|
||||
|
||||
def banzai_render_context(field)
|
||||
# this will be used to reference these commit in the context of the MR
|
||||
# the URL are built differently
|
||||
{
|
||||
merge_request: self,
|
||||
mr_commit_shas: all_commit_shas
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,11 +1,18 @@
|
|||
- view_details = local_assigns.fetch(:view_details, false)
|
||||
- view_details = local_assigns.fetch(:view_details, false)
|
||||
- merge_request = local_assigns.fetch(:merge_request, nil)
|
||||
- project = local_assigns.fetch(:project) { merge_request&.project }
|
||||
- ref = local_assigns.fetch(:ref) { merge_request&.source_branch }
|
||||
- link = commit_path(project, commit, merge_request: merge_request)
|
||||
- project = local_assigns.fetch(:project) { merge_request&.project }
|
||||
- ref = local_assigns.fetch(:ref) { merge_request&.source_branch }
|
||||
|
||||
- cache_key = [project.full_path, commit.id, current_application_settings, @path.presence, current_controller?(:commits), merge_request&.iid, view_details, I18n.locale]
|
||||
- cache_key.push(commit.status(ref)) if commit.status(ref)
|
||||
- link = commit_path(project, commit, merge_request: merge_request)
|
||||
- cache_key = [project.full_path,
|
||||
commit.id,
|
||||
current_application_settings,
|
||||
@path.presence,
|
||||
current_controller?(:commits),
|
||||
merge_request&.iid,
|
||||
view_details,
|
||||
commit.status(ref),
|
||||
I18n.locale].compact
|
||||
|
||||
= cache(cache_key, expires_in: 1.day) do
|
||||
%li.commit.flex-row.js-toggle-container{ id: "commit-#{commit.short_id}" }
|
||||
|
|
|
|||
Loading…
Reference in New Issue