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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
3c4dc433
Commit
3c4dc433
authored
Feb 14, 2017
by
Sam Rose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dispatch needed JS when creating a new MR in diff view
parent
f802ad37
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
1 deletion
+8
-1
app/assets/javascripts/dispatcher.js.es6
app/assets/javascripts/dispatcher.js.es6
+1
-0
app/controllers/projects/application_controller.rb
app/controllers/projects/application_controller.rb
+0
-1
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+3
-0
changelogs/unreleased/27920-both-wip-messages-showing.yml
changelogs/unreleased/27920-both-wip-messages-showing.yml
+4
-0
No files found.
app/assets/javascripts/dispatcher.js.es6
View file @
3c4dc433
...
@@ -118,6 +118,7 @@ const ShortcutsBlob = require('./shortcuts_blob');
...
@@ -118,6 +118,7 @@ const ShortcutsBlob = require('./shortcuts_blob');
new gl.IssuableTemplateSelectors();
new gl.IssuableTemplateSelectors();
break;
break;
case 'projects:merge_requests:new':
case 'projects:merge_requests:new':
case 'projects:merge_requests:new_diffs':
case 'projects:merge_requests:edit':
case 'projects:merge_requests:edit':
new gl.Diff();
new gl.Diff();
shortcut_handler = new ShortcutsNavigation();
shortcut_handler = new ShortcutsNavigation();
...
...
app/controllers/projects/application_controller.rb
View file @
3c4dc433
...
@@ -83,7 +83,6 @@ class Projects::ApplicationController < ApplicationController
...
@@ -83,7 +83,6 @@ class Projects::ApplicationController < ApplicationController
end
end
def
apply_diff_view_cookie!
def
apply_diff_view_cookie!
@show_changes_tab
=
params
[
:view
].
present?
cookies
.
permanent
[
:diff_view
]
=
params
.
delete
(
:view
)
if
params
[
:view
].
present?
cookies
.
permanent
[
:diff_view
]
=
params
.
delete
(
:view
)
if
params
[
:view
].
present?
end
end
...
...
app/controllers/projects/merge_requests_controller.rb
View file @
3c4dc433
...
@@ -245,6 +245,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -245,6 +245,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
do
format
.
html
do
define_new_vars
define_new_vars
@show_changes_tab
=
true
render
"new"
render
"new"
end
end
format
.
json
do
format
.
json
do
...
@@ -613,6 +614,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -613,6 +614,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@labels
=
LabelsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
@labels
=
LabelsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
@show_changes_tab
=
params
[
:show_changes
].
present?
define_pipelines_vars
define_pipelines_vars
end
end
...
...
changelogs/unreleased/27920-both-wip-messages-showing.yml
0 → 100644
View file @
3c4dc433
---
title
:
Dispatch needed JS when creating a new MR in diff view
merge_request
:
author
:
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