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
Kazuhiko Shiozaki
gitlab-ce
Commits
7af59c54
Commit
7af59c54
authored
May 06, 2015
by
Robert Schilling
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9248 from rumpelsepp/fix-modal
Fix a trailing new line
parents
2856d5f9
dc68179b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
1 deletion
+0
-1
app/views/projects/merge_requests/show/_how_to_merge.html.haml
...iews/projects/merge_requests/show/_how_to_merge.html.haml
+0
-1
No files found.
app/views/projects/merge_requests/show/_how_to_merge.html.haml
View file @
7af59c54
...
@@ -40,7 +40,6 @@
...
@@ -40,7 +40,6 @@
git merge --no-ff
#{
@merge_request
.
source_branch
}
git merge --no-ff
#{
@merge_request
.
source_branch
}
git push origin
#{
@merge_request
.
target_branch
}
git push origin
#{
@merge_request
.
target_branch
}
:javascript
:javascript
$
(
function
(){
$
(
function
(){
var
modal
=
$
(
'
#modal_merge_info
'
).
modal
({
modal
:
true
,
show
:
false
});
var
modal
=
$
(
'
#modal_merge_info
'
).
modal
({
modal
:
true
,
show
:
false
});
...
...
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