Merge branch 'remove-update-files' into 'master'
Removed JS update templates See merge request !3814
This commit is contained in:
commit
d35dde0129
5 changed files with 1 additions and 3 deletions
|
@ -101,7 +101,6 @@ class Projects::IssuesController < Projects::ApplicationController
|
|||
end
|
||||
|
||||
respond_to do |format|
|
||||
format.js
|
||||
format.html do
|
||||
if @issue.valid?
|
||||
redirect_to issue_path(@issue)
|
||||
|
|
|
@ -149,7 +149,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
|
|||
|
||||
if @merge_request.valid?
|
||||
respond_to do |format|
|
||||
format.js
|
||||
format.html do
|
||||
redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
|
||||
@merge_request.target_project, @merge_request])
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
%a.btn.btn-default.issuable-pager.disabled{href: '#'}
|
||||
Next
|
||||
|
||||
= form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, html: {class: 'issuable-context-form inline-update js-issuable-update'} do |f|
|
||||
= form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, format: :json, html: {class: 'issuable-context-form inline-update js-issuable-update'} do |f|
|
||||
.block.assignee
|
||||
.sidebar-collapsed-icon.sidebar-collapsed-user{data: {toggle: "tooltip", placement: "left", container: "body"}, title: (issuable.assignee.to_reference if issuable.assignee)}
|
||||
- if issuable.assignee
|
||||
|
|
Loading…
Reference in a new issue