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
ce5fca48
Commit
ce5fca48
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix MR modal
parent
08bcf639
No related merge requests found
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
11 deletions
+11
-11
app/assets/javascripts/merge_requests.js.coffee
app/assets/javascripts/merge_requests.js.coffee
+1
-6
app/assets/stylesheets/sections/commits.scss
app/assets/stylesheets/sections/commits.scss
+4
-0
app/views/projects/commits/show.html.haml
app/views/projects/commits/show.html.haml
+1
-1
app/views/projects/merge_requests/edit.html.haml
app/views/projects/merge_requests/edit.html.haml
+1
-1
app/views/projects/merge_requests/show/_how_to_merge.html.haml
...iews/projects/merge_requests/show/_how_to_merge.html.haml
+1
-1
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+3
-2
No files found.
app/assets/javascripts/merge_requests.js.coffee
View file @
ce5fca48
...
...
@@ -22,12 +22,7 @@ class MergeRequest
this
.
$
(
'.show-all-commits'
).
on
'click'
,
=>
this
.
showAllCommits
()
modal
=
$
(
'#modal_merge_info'
).
modal
modal
:
true
,
show
:
false
$
(
'.how_to_merge_link'
).
bind
"click"
,
->
modal
.
show
()
$
(
'.modal-header .close'
).
bind
"click"
,
->
modal
.
hide
()
modal
=
$
(
'#modal_merge_info'
).
modal
(
show
:
false
)
# Local jQuery finder
$
:
(
selector
)
->
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/sections/commits.scss
View file @
ce5fca48
...
...
@@ -471,3 +471,7 @@ li.commit {
}
}
}
.commit-breadcrumb
{
padding
:
0
;
}
This diff is collapsed.
Click to expand it.
app/views/projects/commits/show.html.haml
View file @
ce5fca48
=
render
"head"
-
if
@path
.
present?
%ul
.breadcrumb
%ul
.breadcrumb
.commit-breadcrumb
%li
.light
History for
=
commits_breadcrumbs
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/edit.html.haml
View file @
ce5fca48
%h3
.page-title
=
"Edit merge request
#{
@merge_request
.
id
}
"
=
"Edit merge request #
#
{
@merge_request
.
id
}
"
%hr
=
render
'form'
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/show/_how_to_merge.html.haml
View file @
ce5fca48
%div
#modal_merge_info
.modal.hide
.modal-header
%a
.close
{
href:
"#"
}
×
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
How To Merge
.modal-body
%p
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
ce5fca48
...
...
@@ -11,7 +11,8 @@
%p
You can accept this request automatically.
If you still want to do it manually -
%strong
=
link_to
"click here"
,
"#"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
%strong
=
link_to
"click here"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
for instructions
.accept_group
=
f
.
submit
"Accept Merge Request"
,
class:
"btn btn-create accept_merge_request"
...
...
@@ -31,7 +32,7 @@
.automerge_widget.cannot_be_merged
{
style:
"display:none"
}
.alert.alert-disabled
%span
=
link_to
"Show how to merge"
,
"#
"
,
class:
"how_to_merge_link btn btn-small padded"
,
title:
"How To Merge
"
=
link_to
"Show how to merge"
,
"#
modal_merge_info"
,
class:
"how_to_merge_link btn btn-small padded"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal
"
%strong
This request can't be merged with GitLab. You should do it manually
...
...
This diff is collapsed.
Click to expand it.
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