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
8078f879
Commit
8078f879
authored
Sep 23, 2016
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-variable-and-comments' into 'master'
Remove unused attributes Closes #22282 See merge request !6465
parents
00a7ca74
588dc31a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
app/assets/javascripts/protected_branch_edit.js.es6
app/assets/javascripts/protected_branch_edit.js.es6
+0
-1
app/views/projects/protected_branches/_protected_branch.html.haml
...s/projects/protected_branches/_protected_branch.html.haml
+1
-1
No files found.
app/assets/javascripts/protected_branch_edit.js.es6
View file @
8078f879
...
@@ -40,7 +40,6 @@
...
@@ -40,7 +40,6 @@
dataType: 'json',
dataType: 'json',
data: {
data: {
_method: 'PATCH',
_method: 'PATCH',
id: this.$wrap.data('banchId'),
protected_branch: {
protected_branch: {
merge_access_levels_attributes: [{
merge_access_levels_attributes: [{
id: this.$allowedToMergeDropdown.data('access-level-id'),
id: this.$allowedToMergeDropdown.data('access-level-id'),
...
...
app/views/projects/protected_branches/_protected_branch.html.haml
View file @
8078f879
%tr
.js-protected-branch-edit-form
{
data:
{
url:
namespace_project_protected_branch_path
(
@project
.
namespace
,
@project
,
protected_branch
)
,
branch_id:
protected_branch
.
id
}
}
%tr
.js-protected-branch-edit-form
{
data:
{
url:
namespace_project_protected_branch_path
(
@project
.
namespace
,
@project
,
protected_branch
)
}
}
%td
%td
=
protected_branch
.
name
=
protected_branch
.
name
-
if
@project
.
root_ref?
(
protected_branch
.
name
)
-
if
@project
.
root_ref?
(
protected_branch
.
name
)
...
...
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