Commit e68d0841be6e252baf98a045fc5b4bed431f31b2
Exists in
master
and in
4 other branches
Merge branch 'master' into api_errors_refactoring
Showing
4 changed files
with
21 additions
and
10 deletions
Show diff stats
app/assets/stylesheets/common.scss
| @@ -181,11 +181,12 @@ span.update-author { | @@ -181,11 +181,12 @@ span.update-author { | ||
| 181 | } | 181 | } |
| 182 | 182 | ||
| 183 | &.joined { | 183 | &.joined { |
| 184 | - background-color: #1cb9ff; | 184 | + background-color: #1ca9dd; |
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | &.left { | 187 | &.left { |
| 188 | - background-color: #ff5057; | 188 | + background-color: #888; |
| 189 | + float:none; | ||
| 189 | } | 190 | } |
| 190 | } | 191 | } |
| 191 | 192 |
app/helpers/projects_helper.rb
| @@ -2,5 +2,9 @@ module ProjectsHelper | @@ -2,5 +2,9 @@ module ProjectsHelper | ||
| 2 | def grouper_project_members(project) | 2 | def grouper_project_members(project) |
| 3 | @project.users_projects.sort_by(&:project_access).reverse.group_by(&:project_access) | 3 | @project.users_projects.sort_by(&:project_access).reverse.group_by(&:project_access) |
| 4 | end | 4 | end |
| 5 | + | ||
| 6 | + def remove_from_team_message(project, member) | ||
| 7 | + "You are going to remove #{member.user_name} from #{project.name}. Are you sure?" | ||
| 8 | + end | ||
| 5 | end | 9 | end |
| 6 | 10 |
app/views/team_members/_show.html.haml
| 1 | - user = member.user | 1 | - user = member.user |
| 2 | - allow_admin = can? current_user, :admin_project, @project | 2 | - allow_admin = can? current_user, :admin_project, @project |
| 3 | %tr{id: dom_id(member), class: "team_member_row user_#{user.id}"} | 3 | %tr{id: dom_id(member), class: "team_member_row user_#{user.id}"} |
| 4 | - %td | 4 | + %td.span6 |
| 5 | = link_to project_team_member_path(@project, member), title: user.name, class: "dark" do | 5 | = link_to project_team_member_path(@project, member), title: user.name, class: "dark" do |
| 6 | = image_tag gravatar_icon(user.email, 40), class: "avatar s32" | 6 | = image_tag gravatar_icon(user.email, 40), class: "avatar s32" |
| 7 | = link_to project_team_member_path(@project, member), title: user.name, class: "dark" do | 7 | = link_to project_team_member_path(@project, member), title: user.name, class: "dark" do |
| 8 | %strong= truncate(user.name, lenght: 40) | 8 | %strong= truncate(user.name, lenght: 40) |
| 9 | - %br | ||
| 10 | - %div.cgray= user.email | 9 | + %br |
| 10 | + %small.cgray= user.email | ||
| 11 | 11 | ||
| 12 | - %td | 12 | + %td.span5 |
| 13 | .right | 13 | .right |
| 14 | + - if current_user == user | ||
| 15 | + %span.btn.disabled This is you! | ||
| 14 | - if @project.owner == user | 16 | - if @project.owner == user |
| 15 | - %span.btn.disabled.success Project Owner | ||
| 16 | - - if user.blocked | 17 | + %span.btn.disabled.success Owner |
| 18 | + - elsif user.blocked | ||
| 17 | %span.btn.disabled.blocked Blocked | 19 | %span.btn.disabled.blocked Blocked |
| 20 | + - elsif allow_admin | ||
| 21 | + = link_to project_team_member_path(project_id: @project, id: member.id), confirm: remove_from_team_message(@project, member), method: :delete, class: "very_small btn danger" do | ||
| 22 | + %i.icon-minus.icon-white | ||
| 23 | + | ||
| 18 | - if allow_admin | 24 | - if allow_admin |
| 19 | = form_for(member, as: :team_member, url: project_team_member_path(@project, member)) do |f| | 25 | = form_for(member, as: :team_member, url: project_team_member_path(@project, member)) do |f| |
| 20 | - = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select" | 26 | + = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2" |
lib/gitlab/backend/gitolite_config.rb
| @@ -148,7 +148,7 @@ module Gitlab | @@ -148,7 +148,7 @@ module Gitlab | ||
| 148 | # Enable access to all repos for gitolite admin. | 148 | # Enable access to all repos for gitolite admin. |
| 149 | # We use it for accept merge request feature | 149 | # We use it for accept merge request feature |
| 150 | def admin_all_repo | 150 | def admin_all_repo |
| 151 | - owner_name = Gitlab.settings.gitolite_admin_key | 151 | + owner_name = Gitlab.config.gitolite_admin_key |
| 152 | 152 | ||
| 153 | # @ALL repos premission for gitolite owner | 153 | # @ALL repos premission for gitolite owner |
| 154 | repo_name = "@all" | 154 | repo_name = "@all" |