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
ff07a5ab
Commit
ff07a5ab
authored
Jan 24, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'improve/developer_permissions' into 'master'
Permissions: Developer can manage issue tracker now
parents
baccb9a4
237ddd60
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
16 additions
and
2 deletions
+16
-2
CHANGELOG
CHANGELOG
+3
-0
app/controllers/projects/blob_controller.rb
app/controllers/projects/blob_controller.rb
+1
-0
app/controllers/projects/edit_tree_controller.rb
app/controllers/projects/edit_tree_controller.rb
+1
-0
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+1
-1
app/controllers/projects/new_tree_controller.rb
app/controllers/projects/new_tree_controller.rb
+1
-0
app/models/ability.rb
app/models/ability.rb
+1
-0
app/views/help/permissions.html.haml
app/views/help/permissions.html.haml
+7
-0
app/views/projects/tree/_tree.html.haml
app/views/projects/tree/_tree.html.haml
+1
-1
No files found.
CHANGELOG
View file @
ff07a5ab
v 6.6.0
- Permissions: Developer now can manage issue tracker (modify any issue)
v 6.5.1
- Fix branch selectbox when create merge request from fork
...
...
app/controllers/projects/blob_controller.rb
View file @
ff07a5ab
...
...
@@ -6,6 +6,7 @@ class Projects::BlobController < Projects::ApplicationController
before_filter
:authorize_read_project!
before_filter
:authorize_code_access!
before_filter
:require_non_empty_project
before_filter
:authorize_push!
,
only:
[
:destroy
]
before_filter
:blob
...
...
app/controllers/projects/edit_tree_controller.rb
View file @
ff07a5ab
class
Projects::EditTreeController
<
Projects
::
BaseTreeController
before_filter
:require_branch_head
before_filter
:blob
before_filter
:authorize_push!
def
show
@last_commit
=
Gitlab
::
Git
::
Commit
.
last_for_path
(
@repository
,
@ref
,
@path
).
sha
...
...
app/controllers/projects/issues_controller.rb
View file @
ff07a5ab
...
...
@@ -9,7 +9,7 @@ class Projects::IssuesController < Projects::ApplicationController
before_filter
:authorize_write_issue!
,
only:
[
:new
,
:create
]
# Allow modify issue
before_filter
:authorize_modify_issue!
,
only:
[
:edit
,
:update
]
before_filter
:authorize_modify_issue!
,
only:
[
:edit
,
:update
,
:bulk_update
]
respond_to
:html
...
...
app/controllers/projects/new_tree_controller.rb
View file @
ff07a5ab
class
Projects::NewTreeController
<
Projects
::
BaseTreeController
before_filter
:require_branch_head
before_filter
:authorize_push!
def
show
end
...
...
app/models/ability.rb
View file @
ff07a5ab
...
...
@@ -125,6 +125,7 @@ class Ability
project_report_rules
+
[
:write_merge_request
,
:write_wiki
,
:modify_issue
,
:push_code
]
end
...
...
app/views/help/permissions.html.haml
View file @
ff07a5ab
...
...
@@ -100,6 +100,13 @@
%td
.permission-x
✓
%td
.permission-x
✓
%td
.permission-x
✓
%tr
%td
Manage issue tracker
%td
%td
%td
.permission-x
✓
%td
.permission-x
✓
%td
.permission-x
✓
%tr
%td
Add new team members
%td
...
...
app/views/projects/tree/_tree.html.haml
View file @
ff07a5ab
...
...
@@ -9,7 +9,7 @@
=
link_to
truncate
(
title
,
length:
40
),
project_tree_path
(
@project
,
path
)
-
else
=
link_to
title
,
'#'
-
if
@repository
.
branch_names
.
include?
(
@ref
)
-
if
current_user
&&
@repository
.
branch_names
.
include?
(
@ref
)
&&
current_user
.
can?
(
:push_code
,
@project
)
%li
=
link_to
project_new_tree_path
(
@project
,
@id
),
title:
'New file'
,
id:
'new-file-link'
do
%small
...
...
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