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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
1610713c
Commit
1610713c
authored
Jun 08, 2018
by
tauriedavis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix styling of revert MR modal
parent
214de734
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
app/views/projects/commit/_change.html.haml
app/views/projects/commit/_change.html.haml
+4
-3
app/views/shared/_new_merge_request_checkbox.html.haml
app/views/shared/_new_merge_request_checkbox.html.haml
+1
-1
No files found.
app/views/projects/commit/_change.html.haml
View file @
1610713c
...
@@ -20,11 +20,12 @@
...
@@ -20,11 +20,12 @@
%span
{
"aria-hidden"
:
true
}
×
%span
{
"aria-hidden"
:
true
}
×
.modal-body
.modal-body
-
if
description
-
if
description
%p
.append-bottom-20
=
description
%p
=
description
=
form_tag
[
type
.
underscore
,
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
commit
],
method: :post
,
remote:
false
,
class:
"js-
#{
type
}
-form js-requires-input"
do
=
form_tag
[
type
.
underscore
,
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
commit
],
method: :post
,
remote:
false
,
class:
"js-
#{
type
}
-form js-requires-input"
do
.form-group.row.branch
.form-group.row.branch
=
label_tag
'start_branch'
,
branch_label
,
class:
'col-form-label col-sm-2'
.col-sm-12
.col-sm-10
=
label_tag
'start_branch'
,
branch_label
,
class:
'label-light'
=
hidden_field_tag
:start_branch
,
@project
.
default_branch
,
id:
'start_branch'
=
hidden_field_tag
:start_branch
,
@project
.
default_branch
,
id:
'start_branch'
=
dropdown_tag
(
@project
.
default_branch
,
options:
{
title:
s_
(
"BranchSwitcherTitle|Switch branch"
),
filter:
true
,
placeholder:
s_
(
"BranchSwitcherPlaceholder|Search branches"
),
toggle_class:
'js-project-refs-dropdown dynamic'
,
dropdown_class:
'dropdown-menu-selectable'
,
data:
{
field_name:
"start_branch"
,
selected:
@project
.
default_branch
,
start_branch:
@project
.
default_branch
,
refs_url:
project_branches_path
(
@project
),
submit_form_on_click:
false
}
})
=
dropdown_tag
(
@project
.
default_branch
,
options:
{
title:
s_
(
"BranchSwitcherTitle|Switch branch"
),
filter:
true
,
placeholder:
s_
(
"BranchSwitcherPlaceholder|Search branches"
),
toggle_class:
'js-project-refs-dropdown dynamic'
,
dropdown_class:
'dropdown-menu-selectable'
,
data:
{
field_name:
"start_branch"
,
selected:
@project
.
default_branch
,
start_branch:
@project
.
default_branch
,
refs_url:
project_branches_path
(
@project
),
submit_form_on_click:
false
}
})
...
...
app/views/shared/_new_merge_request_checkbox.html.haml
View file @
1610713c
.form-check
.form-check
.prepend-top-8
-
nonce
=
SecureRandom
.
hex
-
nonce
=
SecureRandom
.
hex
=
check_box_tag
'create_merge_request'
,
1
,
true
,
class:
'js-create-merge-request form-check-input'
,
id:
"create_merge_request-
#{
nonce
}
"
=
check_box_tag
'create_merge_request'
,
1
,
true
,
class:
'js-create-merge-request form-check-input'
,
id:
"create_merge_request-
#{
nonce
}
"
=
label_tag
"create_merge_request-
#{
nonce
}
"
,
class:
'form-check-label'
do
=
label_tag
"create_merge_request-
#{
nonce
}
"
,
class:
'form-check-label'
do
...
...
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