Merge branch 'master' into api_errors_refactoring

4 files changed, 21 insertions, 10 deletions

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 012aad031b1..6f69ba5abdc 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -181,11 +181,12 @@ span.update-author {
   }
 
   &.joined {
-    background-color: #1cb9ff;
+    background-color: #1ca9dd;
   }
 
   &.left {
-    background-color: #ff5057;
+    background-color: #888;
+    float:none;
   }
 }
 
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 34dbb06cfb5..c7dc54ee93d 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -2,5 +2,9 @@ module ProjectsHelper
   def grouper_project_members(project)
     @project.users_projects.sort_by(&:project_access).reverse.group_by(&:project_access)
   end
+
+  def remove_from_team_message(project, member)
+    "You are going to remove #{member.user_name} from #{project.name}. Are you sure?"
+  end
 end
 
diff --git a/app/views/team_members/_show.html.haml b/app/views/team_members/_show.html.haml
index d9a724944b8..f68f8eb471f 100644
--- a/app/views/team_members/_show.html.haml
+++ b/app/views/team_members/_show.html.haml
@@ -1,20 +1,26 @@
 - user = member.user
 - allow_admin = can? current_user, :admin_project, @project
 %tr{id: dom_id(member), class: "team_member_row user_#{user.id}"}
-  %td
+  %td.span6
     = link_to project_team_member_path(@project, member), title: user.name, class: "dark" do
       = image_tag gravatar_icon(user.email, 40), class: "avatar s32"
     = link_to project_team_member_path(@project, member), title: user.name, class: "dark" do
       %strong= truncate(user.name, lenght: 40)
-    %br
-    %div.cgray= user.email
+      %br
+      %small.cgray= user.email
 
-  %td
+  %td.span5
     .right
+      - if current_user == user
+        %span.btn.disabled This is you!
       - if @project.owner == user
-        %span.btn.disabled.success Project Owner
-      - if user.blocked
+        %span.btn.disabled.success Owner
+      - elsif user.blocked
         %span.btn.disabled.blocked Blocked
+      - elsif allow_admin
+        = 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
+          %i.icon-minus.icon-white
+
     - if allow_admin
       = form_for(member, as: :team_member, url: project_team_member_path(@project, member)) do |f|
-        = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select"
+        = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2"
diff --git a/lib/gitlab/backend/gitolite_config.rb b/lib/gitlab/backend/gitolite_config.rb
index 60eef8e863b..0d636d2d789 100644
--- a/lib/gitlab/backend/gitolite_config.rb
+++ b/lib/gitlab/backend/gitolite_config.rb
@@ -148,7 +148,7 @@ module Gitlab
     # Enable access to all repos for gitolite admin.
     # We use it for accept merge request feature
     def admin_all_repo
-      owner_name = Gitlab.settings.gitolite_admin_key
+      owner_name = Gitlab.config.gitolite_admin_key
 
       # @ALL repos premission for gitolite owner
       repo_name = "@all"