BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
fef5a4fd
Commit
fef5a4fd
authored
Jul 24, 2017
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
How to Merge to external File
parent
c2c8d7ff
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
11 deletions
+16
-11
how_to_merge.js
app/assets/javascripts/how_to_merge.js
+12
-0
_how_to_merge.html.haml
app/views/projects/merge_requests/_how_to_merge.html.haml
+3
-11
webpack.config.js
config/webpack.config.js
+1
-0
No files found.
app/assets/javascripts/how_to_merge.js
0 → 100644
View file @
fef5a4fd
document
.
addEventListener
(
'DOMContentLoaded'
,
()
=>
{
const
modal
=
$
(
'#modal_merge_info'
).
modal
({
modal
:
true
,
show
:
false
,
});
$
(
'.how_to_merge_link'
).
bind
(
'click'
,
()
=>
{
modal
.
show
();
});
$
(
'.modal-header .close'
).
bind
(
'click'
,
()
=>
{
modal
.
hide
();
});
});
app/views/projects/merge_requests/_how_to_merge.html.haml
View file @
fef5a4fd
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'how_to_merge'
)
#modal_merge_info
.modal
.modal-dialog
.modal-content
...
...
@@ -50,14 +53,3 @@
=
succeed
'.'
do
You can also checkout merge requests locally by
=
link_to
'following these guidelines'
,
help_page_path
(
'user/project/merge_requests/index.md'
,
anchor:
"checkout-merge-requests-locally"
),
target:
'_blank'
,
rel:
'noopener noreferrer'
:javascript
$
(
function
(){
var
modal
=
$
(
'#modal_merge_info'
).
modal
({
modal
:
true
,
show
:
false
});
$
(
'.how_to_merge_link'
).
bind
(
"click"
,
function
(){
modal
.
show
();
});
$
(
'.modal-header .close'
).
bind
(
"click"
,
function
(){
modal
.
hide
();
})
})
config/webpack.config.js
View file @
fef5a4fd
...
...
@@ -42,6 +42,7 @@ var config = {
group
:
'./group.js'
,
groups
:
'./groups/index.js'
,
groups_list
:
'./groups_list.js'
,
how_to_merge
:
'./how_to_merge.js'
,
issue_show
:
'./issue_show/index.js'
,
integrations
:
'./integrations'
,
job_details
:
'./jobs/job_details_bundle.js'
,
...
...
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