diff options
| -rw-r--r-- | app/models/ability.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 6 | ||||
| -rw-r--r-- | app/views/admin/team_members/edit.html.haml | 21 | ||||
| -rw-r--r-- | app/views/admin/users/show.html.haml | 6 | ||||
| -rw-r--r-- | app/views/help/permissions.html.haml | 1 | ||||
| -rw-r--r-- | app/views/merge_requests/index.html.haml | 4 |
6 files changed, 14 insertions, 26 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index c0da9396baa..9d33501fdbc 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -57,13 +57,13 @@ class Ability def project_report_rules project_guest_rules + [ :download_code, - :write_merge_request, :write_snippet ] end def project_dev_rules project_report_rules + [ + :write_merge_request, :write_wiki, :push_code ] diff --git a/app/models/user.rb b/app/models/user.rb index 7a75379e500..35a693fdb1c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -191,9 +191,9 @@ class User < ActiveRecord::Base namespaces: namespaces.map(&:id), user_id: self.id) end - # Team membership in personal projects - def tm_in_personal_projects - UsersProject.where(project_id: personal_projects.map(&:id), user_id: self.id) + # Team membership in authorized projects + def tm_in_authorized_projects + UsersProject.where(project_id: authorized_projects.map(&:id), user_id: self.id) end # Returns a string for use as a Gitolite user identifier diff --git a/app/views/admin/team_members/edit.html.haml b/app/views/admin/team_members/edit.html.haml index 431387be152..aea9bd70a79 100644 --- a/app/views/admin/team_members/edit.html.haml +++ b/app/views/admin/team_members/edit.html.haml @@ -1,19 +1,8 @@ -%h3 - Edit access - %small - = @admin_team_member.project.name - – - = @admin_team_member.user_name +%p.slead + Edit access for + = link_to @admin_team_member.user_name, admin_user_path(@admin_team_member) + in + = link_to @admin_team_member.project.name_with_namespace, admin_project_path(@admin_team_member) %hr -%table.zebra-striped - %tr - %td User: - %td= @admin_team_member.user_name - %tr - %td Project: - %td= @admin_team_member.project.name - %tr - %td Since: - %td= @admin_team_member.updated_at.stamp("Nov 11, 2010") = render 'form' diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index db132359c7f..a3be6614136 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -106,8 +106,8 @@ %td= link_to group.name, admin_group_path(group) -- if @admin_user.personal_projects.present? - %h5 Personal Projects: +- if @admin_user.authorized_projects.present? + %h5 Authorized Projects: %br %table.zebra-striped @@ -118,7 +118,7 @@ %th %th - - @admin_user.tm_in_personal_projects.each do |tm| + - @admin_user.tm_in_authorized_projects.each do |tm| - project = tm.project %tr %td= link_to project.name_with_namespace, admin_project_path(project) diff --git a/app/views/help/permissions.html.haml b/app/views/help/permissions.html.haml index c9ec701add7..b56251f35eb 100644 --- a/app/views/help/permissions.html.haml +++ b/app/views/help/permissions.html.haml @@ -19,7 +19,6 @@ %li Write on project wall %li Pull project code %li Download project - %li Create new merge request %li Create a code snippets diff --git a/app/views/merge_requests/index.html.haml b/app/views/merge_requests/index.html.haml index 43651a5ca15..61c32b533f6 100644 --- a/app/views/merge_requests/index.html.haml +++ b/app/views/merge_requests/index.html.haml @@ -1,4 +1,4 @@ -- if can? current_user, :write_issue, @project +- if can? current_user, :write_merge_request, @project = link_to new_project_merge_request_path(@project), class: "right btn primary", title: "New Merge Request" do %i.icon-plus New Merge Request @@ -10,7 +10,7 @@ .row .span3 - = render 'filter', entity: 'issue' + = render 'filter' .span9 .ui-box .title |