Merge 'master' branch

app/assets/javascripts/issues.js

@@ -5,7 +5,7 @@ function switchToNewIssue(form){
     $('select#issue_milestone_id').chosen();
     $("#new_issue_dialog").show("fade", { direction: "right" }, 150);
     $('.top-tabs .add_new').hide();
-    disableButtonIfEmtpyField("#issue_title", ".save-btn");
+    disableButtonIfEmptyField("#issue_title", ".save-btn");
   });
 }
 
@@ -16,7 +16,7 @@ function switchToEditIssue(form){
     $('select#issue_milestone_id').chosen();
     $("#edit_issue_dialog").show("fade", { direction: "right" }, 150);
     $('.add_new').hide();
-    disableButtonIfEmtpyField("#issue_title", ".save-btn");
+    disableButtonIfEmptyField("#issue_title", ".save-btn");
   });
 }
 
@@ -80,6 +80,10 @@ function issuesPage(){
     $(this).closest("form").submit();
   });
 
+  $("#new_issue_link").click(function(){
+    updateNewIssueURL();
+  });
+
   $('body').on('ajax:success', '.close_issue, .reopen_issue, #new_issue', function(){
     var t = $(this),
         totalIssues,
@@ -126,3 +130,20 @@ function issuesCheckChanged() {
     $('.issues_filters').show();
   }
 }
+
+function updateNewIssueURL(){
+  var new_issue_link = $("#new_issue_link");
+  var milestone_id = $("#milestone_id").val();
+  var assignee_id = $("#assignee_id").val();
+  var new_href = "";
+  if(milestone_id){
+    new_href = "issue[milestone_id]=" + milestone_id + "&";
+  }
+  if(assignee_id){
+    new_href = new_href + "issue[assignee_id]=" + assignee_id;
+  }
+  if(new_href.length){
+    new_href = new_issue_link.attr("href") + "?" + new_href;
+    new_issue_link.attr("href", new_href);
+  }
+};

app/assets/javascripts/main.js

@@ -1,130 +0,0 @@
-$(document).ready(function(){
-
-  $(".one_click_select").live("click", function(){
-    $(this).select();
-  });
-
-  $('body').on('ajax:complete, ajax:beforeSend, submit', 'form', function(e){
-    var buttons = $('[type="submit"]', this);
-    switch( e.type ){
-      case 'ajax:beforeSend':
-      case 'submit':
-        buttons.attr('disabled', 'disabled');
-      break;
-      case ' ajax:complete':
-      default:
-        buttons.removeAttr('disabled');
-      break;
-    }
-  })
-
-  $(".account-box").mouseenter(showMenu);
-  $(".account-box").mouseleave(resetMenu);
-
-  $("#projects-list .project").live('click', function(e){
-    if(e.target.nodeName != "A" && e.target.nodeName != "INPUT") {
-      location.href = $(this).attr("url");
-      e.stopPropagation();
-      return false;
-    }
-  });
-
-  /**
-   * Focus search field by pressing 's' key
-   */
-  $(document).keypress(function(e) {
-    if( $(e.target).is(":input") ) return;
-    switch(e.which)  {
-      case 115:  focusSearch();
-        e.preventDefault();
-    }
-  });
-
-  /**
-   * Commit show suppressed diff
-   *
-   */
-  $(".supp_diff_link").bind("click", function() {
-    showDiff(this);
-  });
-
-  /**
-   * Note markdown preview
-   *
-   */
-  $(document).on('click', '#preview-link', function(e) {
-    $('#preview-note').text('Loading...');
-
-    var previewLinkText = ($(this).text() == 'Preview' ? 'Edit' : 'Preview');
-    $(this).text(previewLinkText);
-
-    var note = $('#note_note').val();
-    if (note.trim().length === 0) { note = 'Nothing to preview'; }
-    $.post($(this).attr('href'), {note: note}, function(data) {
-      $('#preview-note').html(data);
-    });
-
-    $('#preview-note, #note_note').toggle();
-    e.preventDefault();
-  });
-});
-
-function focusSearch() {
-  $("#search").focus();
-}
-
-function updatePage(data){
-  $.ajax({type: "GET", url: location.href, data: data, dataType: "script"});
-}
-
-function showMenu() {
-  $(this).toggleClass('hover');
-}
-
-function resetMenu() {
-  $(this).removeClass("hover");
-}
-
-function slugify(text) {
-  return text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase();
-}
-
-function showDiff(link) {
-  $(link).next('table').show();
-  $(link).remove();
-}
-
-(function($){
-    var _chosen = $.fn.chosen;
-    $.fn.extend({
-        chosen: function(options) {
-            var default_options = {'search_contains' : 'true'};
-            $.extend(default_options, options);
-            return _chosen.apply(this, [default_options]);
-    }})
-})(jQuery);
-
-
-function ajaxGet(url) {
-  $.ajax({type: "GET", url: url, dataType: "script"});
-}
-
-/**
- * Disable button if text field is empty
- */
-function disableButtonIfEmtpyField(field_selector, button_selector) {
-  field = $(field_selector);
-  if(field.val() == "") {
-    field.closest("form").find(button_selector).attr("disabled", "disabled").addClass("disabled");
-  }
-
-  field.on('keyup', function(){
-    var field = $(this);
-    var closest_submit = field.closest("form").find(button_selector);
-    if(field.val() == "") {
-      closest_submit.attr("disabled", "disabled").addClass("disabled");
-    } else {
-      closest_submit.removeAttr("disabled").removeClass("disabled");
-    }
-  })
-}

app/assets/javascripts/main.js.coffee

@@ -0,0 +1,89 @@
+window.updatePage = (data) ->
+  $.ajax({type: "GET", url: location.href, data: data, dataType: "script"})
+
+window.slugify = (text) ->
+  text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase()
+
+window.ajaxGet = (url) ->
+  $.ajax({type: "GET", url: url, dataType: "script"})
+
+ # Disable button if text field is empty
+window.disableButtonIfEmptyField = (field_selector, button_selector) ->
+  field = $(field_selector)
+  closest_submit = field.closest("form").find(button_selector)
+
+  closest_submit.disable() if field.val() is ""
+
+  field.on "keyup", ->
+    if $(this).val() is ""
+      closest_submit.disable()
+    else
+      closest_submit.enable()
+
+$ ->
+  # Click a .one_click_select field, select the contents
+  $(".one_click_select").live 'click', -> $(this).select()
+
+  # Disable form buttons while a form is submitting
+  $('body').on 'ajax:complete, ajax:beforeSend, submit', 'form', (e) ->
+    buttons = $('[type="submit"]', this)
+
+    switch e.type
+      when 'ajax:beforeSend', 'submit'
+        buttons.disable()
+      else
+        buttons.enable()
+
+  # Show/Hide the profile menu when hovering the account box
+  $('.account-box').hover -> $(this).toggleClass('hover')
+
+  # Focus search field by pressing 's' key
+  $(document).keypress (e) ->
+    # Don't do anything if typing in an input
+    return if $(e.target).is(":input")
+
+    switch e.which
+      when 115
+        $("#search").focus()
+        e.preventDefault()
+
+  # Commit show suppressed diff
+  $(".supp_diff_link").bind "click", ->
+    $(this).next('table').show()
+    $(this).remove()
+
+  # Note markdown preview
+  $(document).on 'click', '#preview-link', (e) ->
+    $('#preview-note').text('Loading...')
+
+    previewLinkText = if $(this).text() == 'Preview' then 'Edit' else 'Preview'
+    $(this).text(previewLinkText)
+
+    note = $('#note_note').val()
+
+    if note.trim().length == 0
+      $('#preview-note').text("Nothing to preview.")
+    else
+      $.post $(this).attr('href'), {note: note}, (data) ->
+        $('#preview-note').html(data)
+
+    $('#preview-note, #note_note').toggle()
+    e.preventDefault()
+    false
+
+(($) ->
+  _chosen = $.fn.chosen
+  $.fn.extend chosen: (options) ->
+    default_options = search_contains: "true"
+    $.extend default_options, options
+    _chosen.apply this, [default_options]
+
+  # Disable an element and add the 'disabled' Bootstrap class
+  $.fn.extend disable: ->
+    $(this).attr('disabled', 'disabled').addClass('disabled')
+
+  # Enable an element and remove the 'disabled' Bootstrap class
+  $.fn.extend enable: ->
+    $(this).removeAttr('disabled').removeClass('disabled')
+
+)(jQuery)

app/assets/javascripts/note.js

@@ -25,14 +25,14 @@ var NoteList = {
         $(this).closest('li').fadeOut(); });
 
       $(".note-form-holder").live("ajax:before", function(){
-        $(".submit_note").attr("disabled", "disabled");
+        $(".submit_note").disable()
       })
 
       $(".note-form-holder").live("ajax:complete", function(){
-        $(".submit_note").removeAttr("disabled");
+        $(".submit_note").enable()
       })
 
-      disableButtonIfEmtpyField(".note-text", ".submit_note");
+      disableButtonIfEmptyField(".note-text", ".submit_note");
 
       $(".note-text").live("focus", function(){
         $(this).css("height", "80px");
@@ -177,6 +177,6 @@ var PerLineNotes = {
         form.show();
         return false;
       });
-      disableButtonIfEmtpyField(".line-note-text", ".submit_inline_note");
+      disableButtonIfEmptyField(".line-note-text", ".submit_inline_note");
     }
 }

app/assets/javascripts/projects.js.coffee

@@ -8,7 +8,7 @@ window.Projects = ->
     $('.save-project-loader').show()
 
   $('form #project_default_branch').chosen()
-  disableButtonIfEmtpyField '#project_name', '.project-submit'
+  disableButtonIfEmptyField '#project_name', '.project-submit'
 
 # Git clone panel switcher
 $ ->

app/assets/stylesheets/common.scss

@@ -179,6 +179,14 @@ span.update-author {
   &.merged {
     background-color: #2A2;
   }
+
+  &.joined {
+    background-color: #1cb9ff;
+  }
+
+  &.left {
+    background-color: #ff5057;
+  }
 }
 
 form {

app/controllers/application_controller.rb

@@ -11,15 +11,11 @@ class ApplicationController < ActionController::Base
   helper_method :abilities, :can?
 
   rescue_from Gitlab::Gitolite::AccessDenied do |exception|
-    render "errors/gitolite", layout: "error"
-  end
-
-  rescue_from Gitlab::Gitolite::InvalidKey do |exception|
-    render "errors/invalid_ssh_key", layout: "error"
+    render "errors/gitolite", layout: "error", status: 500
   end
 
   rescue_from Encoding::CompatibilityError do |exception|
-    render "errors/encoding", layout: "error", status: 404
+    render "errors/encoding", layout: "error", status: 500
   end
 
   rescue_from ActiveRecord::RecordNotFound do |exception|

app/controllers/issues_controller.rb

@@ -37,7 +37,7 @@ class IssuesController < ApplicationController
   end
 
   def new
-    @issue = @project.issues.new
+    @issue = @project.issues.new(params[:issue])
     respond_with(@issue)
   end
 

app/controllers/refs_controller.rb

@@ -1,3 +1,5 @@
+require 'github/markup'
+
 class RefsController < ApplicationController
   include Gitlab::Encode
   before_filter :project

app/controllers/team_members_controller.rb

@@ -17,13 +17,12 @@ class TeamMembersController < ApplicationController
   end
 
   def create
-    @team_member = UsersProject.new(params[:team_member])
-    @team_member.project = project
-    if @team_member.save
-      redirect_to team_project_path(@project)
-    else
-      render "new"
-    end
+    @project.add_users_ids_to_team(
+      params[:user_ids],
+      params[:project_access]
+    )
+
+    redirect_to team_project_path(@project)
   end
 
   def update

app/decorators/event_decorator.rb

@@ -8,7 +8,9 @@ class EventDecorator < ApplicationDecorator
       "#{self.author_name} #{self.action_name} MR ##{self.target_id}:" + self.merge_request_title
     elsif self.push?
       "#{self.author_name} #{self.push_action_name} #{self.ref_type} " + self.ref_name
-    else 
+    elsif self.membership_changed?
+      "#{self.author_name} #{self.action_name} #{self.project.name}"
+    else
       ""
     end
   end

app/helpers/gitlab_markdown_helper.rb

@@ -27,7 +27,7 @@ module GitlabMarkdownHelper
                           filter_html: true,
                           with_toc_data: true,
                           hard_wrap: true)
-      @markdown ||= Redcarpet::Markdown.new(gitlab_renderer,
+      @markdown = Redcarpet::Markdown.new(gitlab_renderer,
                       # see https://github.com/vmg/redcarpet#and-its-like-really-simple-to-use
                       no_intra_emphasis: true,
                       tables: true,

app/helpers/projects_helper.rb

@@ -0,0 +1,6 @@
+module ProjectsHelper
+  def grouper_project_members(project)
+    @project.users_projects.sort_by(&:project_access).reverse.group_by(&:project_access)
+  end
+end
+

app/helpers/tree_helper.rb

@@ -24,4 +24,14 @@ module TreeHelper
       content.name
     end
   end
+
+  # Public: Determines if a given filename is compatible with GitHub::Markup.
+  #
+  # filename - Filename string to check
+  #
+  # Returns boolean
+  def markup?(filename)
+    filename.end_with?(*%w(.mdown .md .markdown .textile .rdoc .org .creole
+                          .mediawiki .rst .asciidoc .pod))
+  end
 end

app/models/event.rb

@@ -10,6 +10,8 @@ class Event < ActiveRecord::Base
   Pushed    = 5
   Commented = 6
   Merged    = 7
+  Joined    = 8 # User joined project
+  Left      = 9 # User left project
 
   belongs_to :project
   belongs_to :target, polymorphic: true
@@ -37,7 +39,7 @@ class Event < ActiveRecord::Base
   #  - new issue
   #  - merge request
   def allowed?
-    push? || issue? || merge_request?
+    push? || issue? || merge_request? || membership_changed?
   end
 
   def push?
@@ -84,6 +86,18 @@ class Event < ActiveRecord::Base
       [Closed, Reopened].include?(action)
   end
 
+  def joined?
+    action == Joined
+  end
+
+  def left?
+    action == Left
+  end
+
+  def membership_changed?
+    joined? || left?
+  end
+
   def issue 
     target if target_type == "Issue"
   end
@@ -101,6 +115,10 @@ class Event < ActiveRecord::Base
       "closed"
     elsif merged?
       "merged"
+    elsif joined?
+      'joined'
+    elsif left?
+      'left'
     else 
       "opened"
     end

app/models/merge_request.rb

@@ -162,7 +162,7 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def automerge!(current_user)
-    if Gitlab::Merge.new(self, current_user).merge
+    if Gitlab::Merge.new(self, current_user).merge && self.unmerged_commits.empty?
       self.merge!(current_user.id)
       true
     end

app/models/users_project.rb

@@ -20,6 +20,23 @@ class UsersProject < ActiveRecord::Base
 
   delegate :name, :email, to: :user, prefix: true
 
+  def self.bulk_delete(project, user_ids)
+    UsersProject.transaction do
+      UsersProject.where(:user_id => user_ids, :project_id => project.id).each do |users_project|
+        users_project.destroy
+      end
+    end
+  end
+
+  def self.bulk_update(project, user_ids, project_access)
+    UsersProject.transaction do
+      UsersProject.where(:user_id => user_ids, :project_id => project.id).each do |users_project|
+        users_project.project_access = project_access
+        users_project.save
+      end
+    end
+  end
+
   def self.bulk_import(project, user_ids, project_access)
     UsersProject.transaction do
       user_ids.each do |user_id|

app/observers/users_project_observer.rb

@@ -3,4 +3,20 @@ class UsersProjectObserver < ActiveRecord::Observer
     return if users_project.destroyed?
     Notify.project_access_granted_email(users_project.id).deliver
   end
+
+  def after_create(users_project)
+    Event.create(
+      project_id: users_project.project.id,
+      action: Event::Joined,
+      author_id: users_project.user.id
+    )
+  end
+
+  def after_destroy(users_project)
+    Event.create(
+      project_id: users_project.project.id, 
+      action: Event::Left, 
+      author_id: users_project.user.id
+    )
+  end
 end

app/roles/push_event.rb

@@ -90,6 +90,8 @@ module PushEvent
 
   def push_with_commits? 
     md_ref? && commits.any? && parent_commit && last_commit
+  rescue Grit::NoSuchPathError
+    false
   end
 
   def last_push_to_non_root?

app/roles/team.rb

@@ -36,4 +36,17 @@ module Team
     UsersProject.bulk_import(self, users_ids, access_role)
     self.update_repository
   end
+
+  # Update multiple project users
+  # to same access role by user ids
+  def update_users_ids_to_role(users_ids, access_role)
+    UsersProject.bulk_update(self, users_ids, access_role)
+    self.update_repository
+  end
+
+  # Delete multiple users from project by user ids
+  def delete_users_ids_from_team(users_ids)
+    UsersProject.bulk_delete(self, users_ids)
+    self.update_repository
+  end
 end

app/views/errors/encoding.html.haml

@@ -1,5 +1,3 @@
-.alert-message.block-message.error
-  %h3 Encoding Error
-  %hr
-  %p
-    Page can't be loaded because of an encoding error.
+%h1 Encoding Error
+%hr
+%p Page can't be loaded because of an encoding error.

app/views/errors/invalid_ssh_key.html.haml

@@ -1,3 +0,0 @@
-%h1 Git Error
-%hr
-%p Seems like SSH Key you provided is not a valid SSH key.

app/views/events/_event.html.haml

@@ -11,3 +11,7 @@
     .event_feed
       = render "events/event_push", event: event
 
+  - elsif event.membership_changed?
+    .event_feed
+      = render "events/event_membership_changed", event: event
+

app/views/events/_event_membership_changed.html.haml

@@ -0,0 +1,9 @@
+= image_tag gravatar_icon(event.author_email), class: "avatar"
+%strong #{event.author_name}
+%span.event_label{class: event.action_name}= event.action_name
+project
+%strong= link_to event.project.name, event.project
+%span.cgray
+  = time_ago_in_words(event.created_at)
+  ago.
+

app/views/help/markdown.html.haml

@@ -20,6 +20,15 @@
       %li milestones
       %li wiki pages
 
+  .span4
+    .alert.alert-info
+      %p
+        If you're not already familiar with Markdown, you should spend 15 minutes and go over the excellent
+        %strong= link_to "Markdown Syntax Guide", "http://daringfireball.net/projects/markdown/syntax"
+        at Daring Fireball.
+
+.row
+  .span8
     %h3 Differences from traditional Markdown
 
     %h4 Newlines
@@ -62,6 +71,29 @@
     %p becomes
     = markdown %Q{```ruby\nrequire 'redcarpet'\nmarkdown = Redcarpet.new("Hello World!")\nputs markdown.to_html\n```}
 
+    %h4 Emoji
+
+.row
+  .span8
+    :ruby
+      puts markdown %Q{Sometimes you want to be :cool: and add some :sparkles: to your :speech_balloon:. Well we have a :gift: for you:
+
+        :exclamation: You can use emoji anywhere GFM is supported. :sunglasses:
+
+        You can use it to point out a :bug: or warn about :monkey:patches. And if someone improves your really :snail: code, send them a :bouquet: or some :candy:. People will :heart: you for that.
+
+        If you are :new: to this, don't be :fearful:. You can easily join the emoji :circus_tent:. All you need to do is to :book: up on the supported codes.
+        }
+
+  .span4
+    .alert.alert-info
+      %p
+        Consult the
+        %strong= link_to "Emoji Cheat Sheet", "http://www.emoji-cheat-sheet.com/"
+        for a list of all supported emoji codes.
+
+.row
+  .span8
     %h4 Special GitLab references
 
     %p
@@ -93,12 +125,5 @@
         %p For example in your #{link_to @project.name, project_path(@project)} project, writing:
         %pre= "This is related to ##{issue.id}. @#{current_user.name} is working on solving it."
         %p becomes:
-        %pre= gfm "This is related to ##{issue.id}. @#{current_user.name} is working on solving it."
+        = markdown "This is related to ##{issue.id}. @#{current_user.name} is working on solving it."
       - @project = nil # Prevent this from bubbling up to page title
-
-  .span4.right
-    .alert.alert-info
-      %p
-        If you're not already familiar with Markdown, you should spend 15 minutes and go over the excellent
-        %strong= link_to "Markdown Syntax Guide", "http://daringfireball.net/projects/markdown/syntax"
-        at Daring Fireball.

app/views/issues/index.html.haml

@@ -6,7 +6,7 @@
     .right
       .span5
         - if can? current_user, :write_issue, @project
-          = link_to new_project_issue_path(@project), class: "right btn", title: "New Issue", remote: true do
+          = link_to new_project_issue_path(@project), class: "right btn", title: "New Issue", remote: true, id: "new_issue_link" do
             %i.icon-plus
             New Issue
         = form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right  do

app/views/keys/index.html.haml

@@ -3,7 +3,7 @@
   = link_to "Add new", new_key_path, class: "btn right"
 
 %hr
-%p.slead 
+%p.slead
   SSH key allows you to establish a secure connection between your computer and GitLab
 
 
@@ -15,7 +15,7 @@
       %th
   - @keys.each do |key|
     = render(partial: 'show', locals: {key: key})
-  - if @keys.blank? 
+  - if @keys.blank?
     %tr
       %td{colspan: 3}
         %h3.nothing_here_message There are no SSH keys with access to your account.

app/views/layouts/_head_panel.html.haml

@@ -34,12 +34,4 @@
       source: #{raw search_autocomplete_source},
       select: function(event, ui) { location.href = ui.item.url }
     });
-
-    $(document).keypress(function(e) {
-      if($(e.target).is(":input")) return;
-        switch(e.which)  {
-        case 115:  focusSearch();
-        e.preventDefault();
-      }
-    });
   });

app/views/merge_requests/_form.html.haml

@@ -60,7 +60,7 @@
 
 :javascript
   $(function(){
-    disableButtonIfEmtpyField("#merge_request_title", ".save-btn");
+    disableButtonIfEmptyField("#merge_request_title", ".save-btn");
     $('select#merge_request_assignee_id').chosen();
     $('select#merge_request_source_branch').chosen();
     $('select#merge_request_target_branch').chosen();

app/views/milestones/_form.html.haml

@@ -41,7 +41,7 @@
 
 :javascript
   $(function() {
-    disableButtonIfEmtpyField("#milestone_title", ".save-btn");
+    disableButtonIfEmptyField("#milestone_title", ".save-btn");
     $( ".datepicker" ).datepicker({
       dateFormat: "yy-mm-dd",
       onSelect: function(dateText, inst) { $("#milestone_due_date").val(dateText) }

app/views/projects/_team.html.haml

@@ -1,11 +1,13 @@
-%table
-  %thead
-    %tr
-      %th User
-      %th Permissions
-  %tbody
-    - @project.users_projects.each do |up|
-      = render(partial: 'team_members/show', locals: {member: up})
+- grouper_project_members(@project).each do |access, members|
+  %table
+    %thead
+      %tr
+        %th.span7
+          = Project.access_options.key(access).pluralize
+        %th
+    %tbody
+      - members.each do |up|
+        = render(partial: 'team_members/show', locals: {member: up})
 
 
 :javascript

app/views/refs/_tree.html.haml

@@ -43,11 +43,7 @@
           %i.icon-file
           = content.name
         .file_content.wiki
-          - if content.name =~ /\.(md|markdown)$/i
-            = preserve do
-              = markdown(content.data)
-          - else
-            = simple_format(content.data)
+          = raw GitHub::Markup.render(content.name, content.data)
 
 :javascript
   $(function(){

app/views/refs/_tree_file.html.haml

@@ -9,10 +9,9 @@
       = link_to "history", project_commits_path(@project, path: params[:path], ref: @ref), class: "btn very_small"
       = link_to "blame", blame_file_project_ref_path(@project, @ref, path: params[:path]), class: "btn very_small"
   - if file.text?
-    - if name =~ /\.(md|markdown)$/i
+    - if markup?(name)
       .file_content.wiki
-        = preserve do
-          = markdown(file.data)
+        = raw GitHub::Markup.render(name, file.data)
     - else
       .file_content.code
         - unless file.empty?

app/views/team_members/_form.html.haml

@@ -1,4 +1,5 @@
-%h3= "New Team member"
+%h3.page_title
+  = "New Team member(s)"
 %hr
 = form_for @team_member, as: :team_member, url: project_team_members_path(@project, @team_member) do |f|
   -if @team_member.errors.any?
@@ -7,27 +8,23 @@
         - @team_member.errors.full_messages.each do |msg|
           %li= msg
 
+  %h6 1. Choose people you want in the team
   .clearfix
-    = f.label :user_id, "Name"
-    .input= f.select(:user_id, User.not_in_project(@project).all.collect {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, { style: "width:300px" })
+    = f.label :user_ids, "Peolpe"
+    .input= select_tag(:user_ids, options_from_collection_for_select(User.not_in_project(@project).all, :id, :name), { class: "xxlarge", multiple: true  })
 
 
+  %h6 2. Set access level for them
   .clearfix
     = f.label :project_access, "Project Access"
-    .input= f.select :project_access, options_for_select(Project.access_options, @team_member.project_access), {}, class: "project-access-select"
+    .input= select_tag :project_access, options_for_select(Project.access_options, @team_member.project_access), class: "project-access-select"
 
 
   .actions
-    = f.submit 'Save', class: "btn primary"
-    = link_to "Cancel", team_project_path(@project), class: "btn"
+    = f.submit 'Save', class: "btn save-btn"
+    = link_to "Cancel", team_project_path(@project), class: "btn cancel-btn"
 
-:css
-  form select {
-    width:300px;
-  }
 
 :javascript
-  $('select#team_member_user_id').chosen();
-  $('select#team_member_project_access').chosen();
-  //$('select#team_member_repo_access').chosen();
-  //$('select#team_member_project_access').chosen();
+  $('select#user_ids').chosen();
+  $('select#project_access').chosen();

app/views/team_members/_show.html.haml

@@ -2,12 +2,6 @@
 - allow_admin = can? current_user, :admin_project, @project
 %tr{id: dom_id(member), class: "team_member_row user_#{user.id}"}
   %td
-    .right
-      - if @project.owner == user
-        %span.label Project Owner
-      - if user.blocked
-        %span.label Blocked
-
     = 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
@@ -16,5 +10,11 @@
     %div.cgray= user.email
 
   %td
-    = 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", disabled: !allow_admin
+    .right
+      - if @project.owner == user
+        %span.btn.disabled.success Project Owner
+      - if user.blocked
+        %span.btn.disabled.blocked Blocked
+    - 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"