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
bb02065a
Commit
bb02065a
authored
Aug 05, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent setting HTML directly from the JS
parent
1983eb6c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
app/assets/javascripts/protected_branch_dropdown.js.es6
app/assets/javascripts/protected_branch_dropdown.js.es6
+2
-2
app/views/projects/protected_branches/_dropdown.html.haml
app/views/projects/protected_branches/_dropdown.html.haml
+2
-1
No files found.
app/assets/javascripts/protected_branch_dropdown.js.es6
View file @
bb02065a
...
@@ -66,8 +66,8 @@ class ProtectedBranchDropdown {
...
@@ -66,8 +66,8 @@ class ProtectedBranchDropdown {
if (branchName) {
if (branchName) {
this.$dropdownContainer
this.$dropdownContainer
.find('.create-new-protected-branch')
.find('.create-new-protected-branch
code
')
.
html(`Create wildcard <code>${branchName}</code>`
);
.
text(branchName
);
}
}
this.$dropdownFooter.toggleClass('hidden', !branchName);
this.$dropdownFooter.toggleClass('hidden', !branchName);
...
...
app/views/projects/protected_branches/_dropdown.html.haml
View file @
bb02065a
...
@@ -11,4 +11,5 @@
...
@@ -11,4 +11,5 @@
%ul
.dropdown-footer-list
%ul
.dropdown-footer-list
%li
%li
=
link_to
'#'
,
title:
"New Protected Branch"
,
class:
"create-new-protected-branch"
do
=
link_to
'#'
,
title:
"New Protected Branch"
,
class:
"create-new-protected-branch"
do
Create new
Create wildcard
%code
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