Merge branch 'ux-fixes' into 'master'

app/assets/stylesheets/sections/merge_requests.scss

@@ -122,6 +122,7 @@
   background: $box_bg;
   margin-bottom: 20px;
   color: #666;
+  border: 1px solid #EEE;
   @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.09));
 
   .ci_widget {

app/views/groups/_new_group_member.html.haml

@@ -5,7 +5,11 @@
 
   .form-group
     = f.label :access_level, "Group Access", class: 'control-label'
-    .col-sm-10= select_tag :access_level, options_for_select(GroupMember.access_level_roles, @users_group.access_level), class: "project-access-select select2"
+    .col-sm-10
+      = select_tag :access_level, options_for_select(GroupMember.access_level_roles, @users_group.access_level), class: "project-access-select select2"
+      .help-block
+        Read more about role permissions
+        %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
 
   .form-actions
     = f.submit 'Add users into group', class: "btn btn-create"

app/views/projects/forks/new.html.haml

 %h3.page-title Fork project
-%p.lead Select namespace where to fork this project
+%p.lead
+  Click to fork the project to a user or group
 %hr
 
 .fork-namespaces

app/views/projects/merge_requests/show/_mr_accept.html.haml

@@ -45,10 +45,17 @@
   .automerge_widget.cannot_be_merged.hide
     %h4
       This request can't be merged with GitLab.
-    %p
       You should do it manually with
       %strong
-        = link_to "command line", "#modal_merge_info", class: "how_to_merge_link", title: "How To Merge", "data-toggle" => "modal"
+        = link_to "#modal_merge_info", class: "underlined-link how_to_merge_link", title: "How To Merge", "data-toggle" => "modal" do
+          command line
+
+    %p
+      %button.btn.disabled
+        %i.fa.fa-warning
+        Accept Merge Request
+       
+      This usually happens when git can not resolve conflicts between branches automatically.
 
   .automerge_widget.unchecked
     %p

app/views/projects/team_members/_form.html.haml

@@ -17,7 +17,12 @@
   %p 2. Set access level for them
   .form-group
     = f.label :access_level, "Project Access", class: 'control-label'
-    .col-sm-10= select_tag :access_level, options_for_select(Gitlab::Access.options, @user_project_relation.access_level), class: "project-access-select select2"
+    .col-sm-10
+      = select_tag :access_level, options_for_select(Gitlab::Access.options, @user_project_relation.access_level), class: "project-access-select select2"
+      .help-block
+        Read more about role permissions
+        %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
+
 
   .form-actions
     = f.submit 'Add users', class: "btn btn-create"

features/steps/project/merge_requests.rb

@@ -173,7 +173,9 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
       merge!: true,
     )
 
-    click_button "Accept Merge Request"
+    within '.can_be_merged' do
+      click_button "Accept Merge Request"
+    end
   end
 
   step 'I should see merged request' do