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
efbce44c
Commit
efbce44c
authored
Jan 05, 2018
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused push_code_to_protected_branches
parent
7794c857
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
4 deletions
+0
-4
app/assets/javascripts/users_select.js
app/assets/javascripts/users_select.js
+0
-2
app/helpers/selects_helper.rb
app/helpers/selects_helper.rb
+0
-1
app/policies/project_policy.rb
app/policies/project_policy.rb
+0
-1
No files found.
app/assets/javascripts/users_select.js
View file @
efbce44c
...
@@ -541,7 +541,6 @@ function UsersSelect(currentUser, els, options = {}) {
...
@@ -541,7 +541,6 @@ function UsersSelect(currentUser, els, options = {}) {
options
.
projectId
=
$
(
select
).
data
(
'
project-id
'
);
options
.
projectId
=
$
(
select
).
data
(
'
project-id
'
);
options
.
groupId
=
$
(
select
).
data
(
'
group-id
'
);
options
.
groupId
=
$
(
select
).
data
(
'
group-id
'
);
options
.
showCurrentUser
=
$
(
select
).
data
(
'
current-user
'
);
options
.
showCurrentUser
=
$
(
select
).
data
(
'
current-user
'
);
options
.
pushCodeToProtectedBranches
=
$
(
select
).
data
(
'
push-code-to-protected-branches
'
);
options
.
authorId
=
$
(
select
).
data
(
'
author-id
'
);
options
.
authorId
=
$
(
select
).
data
(
'
author-id
'
);
options
.
skipUsers
=
$
(
select
).
data
(
'
skip-users
'
);
options
.
skipUsers
=
$
(
select
).
data
(
'
skip-users
'
);
showNullUser
=
$
(
select
).
data
(
'
null-user
'
);
showNullUser
=
$
(
select
).
data
(
'
null-user
'
);
...
@@ -688,7 +687,6 @@ UsersSelect.prototype.users = function(query, options, callback) {
...
@@ -688,7 +687,6 @@ UsersSelect.prototype.users = function(query, options, callback) {
todo_filter
:
options
.
todoFilter
||
null
,
todo_filter
:
options
.
todoFilter
||
null
,
todo_state_filter
:
options
.
todoStateFilter
||
null
,
todo_state_filter
:
options
.
todoStateFilter
||
null
,
current_user
:
options
.
showCurrentUser
||
null
,
current_user
:
options
.
showCurrentUser
||
null
,
push_code_to_protected_branches
:
options
.
pushCodeToProtectedBranches
||
null
,
author_id
:
options
.
authorId
||
null
,
author_id
:
options
.
authorId
||
null
,
skip_users
:
options
.
skipUsers
||
null
skip_users
:
options
.
skipUsers
||
null
},
},
...
...
app/helpers/selects_helper.rb
View file @
efbce44c
...
@@ -90,7 +90,6 @@ module SelectsHelper
...
@@ -90,7 +90,6 @@ module SelectsHelper
email_user:
opts
[
:email_user
]
||
false
,
email_user:
opts
[
:email_user
]
||
false
,
first_user:
opts
[
:first_user
]
&&
current_user
?
current_user
.
username
:
false
,
first_user:
opts
[
:first_user
]
&&
current_user
?
current_user
.
username
:
false
,
current_user:
opts
[
:current_user
]
||
false
,
current_user:
opts
[
:current_user
]
||
false
,
"push-code-to-protected-branches"
=>
opts
[
:push_code_to_protected_branches
],
author_id:
opts
[
:author_id
]
||
''
,
author_id:
opts
[
:author_id
]
||
''
,
skip_users:
opts
[
:skip_users
]
?
opts
[
:skip_users
].
map
(
&
:id
)
:
nil
skip_users:
opts
[
:skip_users
]
?
opts
[
:skip_users
].
map
(
&
:id
)
:
nil
}
}
...
...
app/policies/project_policy.rb
View file @
efbce44c
...
@@ -244,7 +244,6 @@ class ProjectPolicy < BasePolicy
...
@@ -244,7 +244,6 @@ class ProjectPolicy < BasePolicy
rule
{
repository_disabled
}.
policy
do
rule
{
repository_disabled
}.
policy
do
prevent
:push_code
prevent
:push_code
prevent
:push_code_to_protected_branches
prevent
:download_code
prevent
:download_code
prevent
:fork_project
prevent
:fork_project
prevent
:read_commit_status
prevent
:read_commit_status
...
...
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