Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
d35dde01
Commit
d35dde01
authored
Apr 21, 2016
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'remove-update-files' into 'master'
Removed JS update templates See merge request !3814
parents
fc038916
136887da
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 addition
and
3 deletions
+1
-3
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+0
-1
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+0
-1
app/views/projects/issues/update.js.haml
app/views/projects/issues/update.js.haml
+0
-0
app/views/projects/merge_requests/update.js.haml
app/views/projects/merge_requests/update.js.haml
+0
-0
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+1
-1
No files found.
app/controllers/projects/issues_controller.rb
View file @
d35dde01
...
@@ -101,7 +101,6 @@ class Projects::IssuesController < Projects::ApplicationController
...
@@ -101,7 +101,6 @@ class Projects::IssuesController < Projects::ApplicationController
end
end
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
js
format
.
html
do
format
.
html
do
if
@issue
.
valid?
if
@issue
.
valid?
redirect_to
issue_path
(
@issue
)
redirect_to
issue_path
(
@issue
)
...
...
app/controllers/projects/merge_requests_controller.rb
View file @
d35dde01
...
@@ -149,7 +149,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -149,7 +149,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
if
@merge_request
.
valid?
if
@merge_request
.
valid?
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
js
format
.
html
do
format
.
html
do
redirect_to
([
@merge_request
.
target_project
.
namespace
.
becomes
(
Namespace
),
redirect_to
([
@merge_request
.
target_project
.
namespace
.
becomes
(
Namespace
),
@merge_request
.
target_project
,
@merge_request
])
@merge_request
.
target_project
,
@merge_request
])
...
...
app/views/projects/issues/update.js.haml
deleted
100644 → 0
View file @
fc038916
app/views/projects/merge_requests/update.js.haml
deleted
100644 → 0
View file @
fc038916
app/views/shared/issuable/_sidebar.html.haml
View file @
d35dde01
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
%a
.btn.btn-default.issuable-pager.disabled
{
href:
'#'
}
%a
.btn.btn-default.issuable-pager.disabled
{
href:
'#'
}
Next
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
.block.assignee
.sidebar-collapsed-icon.sidebar-collapsed-user
{
data:
{
toggle:
"tooltip"
,
placement:
"left"
,
container:
"body"
},
title:
(
issuable
.
assignee
.
to_reference
if
issuable
.
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
-
if
issuable
.
assignee
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment