Merge branch 'master' into remove-satellites

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

12 files changed, 59 insertions, 40 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 7aef3bf40a8..a5a204fe4bb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,13 +5,12 @@ v 8.0.0 (unreleased)
   - Better performance for web editor (switched from satellites to rugged)
   - Faster merge
   - Ability to fetch merge requests from refs/merge-requests/:id
-  - Improve MR merge widget text and UI consistency.
-  - Improve text in MR "How To Merge" modal.
 
 v 7.14.0 (unreleased)
   - Disable turbolinks when linking to Bitbucket import status (Stan Hu)
   - Fix broken code import and display error messages if something went wrong with creating project (Stan Hu)
   - Fix corrupted binary files when using API files endpoint (Stan Hu)
+  - Bump Haml to 4.0.7 to speed up textarea rendering (Stan Hu)
   - Show incompatible projects in Bitbucket import status (Stan Hu)
   - Fix coloring of diffs on MR Discussion-tab (Gert Goet)
   - Fix "Network" and "Graphs" pages for branches with encoded slashes (Stan Hu)
@@ -54,6 +53,9 @@ v 7.14.0 (unreleased)
   - Add support for CI skipped status
   - Fetch code from forks to refs/merge-requests/:id/head when merge request created
   - Remove comments and email addresses when publicly exposing ssh keys (Zeger-Jan van de Weg)
+  - Add "Check out branch" button to the MR page.
+  - Improve MR merge widget text and UI consistency.
+  - Improve text in MR "How To Merge" modal.
   - Cache all events
   - Order commits by date when comparing branches
   - Fix bug causing error when the target branch of a symbolic ref was deleted
@@ -63,6 +65,8 @@ v 7.14.0 (unreleased)
 v 7.13.3
   - Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
   - Allow users to send abuse reports
+  - Remove satellites 
+  - Link username to profile on Group Members page (Tom Webster)
 
 v 7.13.2
   - Fix randomly failed spec
diff --git a/Gemfile b/Gemfile
index c2d618f41de..2483a7d24a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,7 +38,7 @@ gem "browser", '~> 0.8.0'
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", '~> 7.2.11'
+gem "gitlab_git", '~> 7.2.12'
 
 # Ruby/Rack Git Smart-HTTP Server Handler
 # GitLab fork with a lot of changes (improved thread-safety, better memory usage etc)
diff --git a/Gemfile.lock b/Gemfile.lock
index 5ba6948cbc1..335f6777c9f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -271,7 +271,7 @@ GEM
       mime-types (~> 1.19)
     gitlab_emoji (0.1.0)
       gemojione (~> 2.0)
-    gitlab_git (7.2.11)
+    gitlab_git (7.2.12)
       activesupport (~> 4.0)
       charlock_holmes (~> 0.6)
       gitlab-linguist (~> 3.0)
@@ -307,7 +307,7 @@ GEM
     grape-entity (0.4.2)
       activesupport
       multi_json (>= 1.3.2)
-    haml (4.0.5)
+    haml (4.0.7)
       tilt
     haml-rails (0.5.3)
       actionpack (>= 4.0.1)
@@ -783,7 +783,7 @@ DEPENDENCIES
   gitlab-grack (~> 2.0.2)
   gitlab-linguist (~> 3.0.1)
   gitlab_emoji (~> 0.1)
-  gitlab_git (~> 7.2.11)
+  gitlab_git (~> 7.2.12)
   gitlab_meta (= 7.0)
   gitlab_omniauth-ldap (= 1.2.1)
   gollum-lib (~> 4.0.2)
diff --git a/app/assets/stylesheets/generic/files.scss b/app/assets/stylesheets/generic/files.scss
index 8014dcb165b..f845342c67b 100644
--- a/app/assets/stylesheets/generic/files.scss
+++ b/app/assets/stylesheets/generic/files.scss
@@ -90,12 +90,7 @@
           border-right: none;
         }
         background: #fff;
-        padding: 5px;
-      }
-      .author,
-      .blame_commit {
-        background: $background-color;
-        vertical-align: top;
+        padding: 8px;
       }
       .lines {
         pre {
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 30bbec7b795..10fce5b3daa 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -186,3 +186,7 @@
 #modal_merge_info .modal-dialog {
   width: 600px;
 }
+
+.mr-source-target {
+  line-height: 31px;
+}
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 34ee4d7b31e..092918e4de1 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -89,6 +89,10 @@
     td.blame-commit {
       background: #f9f9f9;
       min-width: 350px;
+
+      .commit-author-link {
+        color: #888;
+      }
     }
     td.blame-numbers {
       pre {
diff --git a/app/controllers/projects/blame_controller.rb b/app/controllers/projects/blame_controller.rb
index 3362264dcce..45e157c90cb 100644
--- a/app/controllers/projects/blame_controller.rb
+++ b/app/controllers/projects/blame_controller.rb
@@ -7,7 +7,7 @@ class Projects::BlameController < Projects::ApplicationController
   before_action :authorize_download_code!
 
   def show
+    @blob = @repository.blob_at(@commit.id, @path)
     @blame = Gitlab::Git::Blame.new(@repository, @commit.id, @path)
-    @blob = @blame.blob
   end
 end
diff --git a/app/views/groups/group_members/_group_member.html.haml b/app/views/groups/group_members/_group_member.html.haml
index acc7f8b28c2..b5f359279d5 100644
--- a/app/views/groups/group_members/_group_member.html.haml
+++ b/app/views/groups/group_members/_group_member.html.haml
@@ -6,7 +6,8 @@
   %span{class: ("list-item-name" if show_controls)}
     - if member.user
       = image_tag avatar_icon(user.email, 16), class: "avatar s16", alt: ''
-      %strong= user.name
+      %strong
+        = link_to user.name, user_path(user)
       %span.cgray= user.username
       - if user == current_user
         %span.label.label-success It's you
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index 8019c7f4569..05d5db5d3fe 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -12,25 +12,31 @@
         = render "projects/blob/actions"
     .file-content.blame.highlight
       %table
-        - @blame.each do |commit, lines, since|
-          - commit = Commit.new(commit, @project)
+        - current_line = 1
+        - @blame.each do |raw_commit, line|
           %tr
             %td.blame-commit
-              %span.commit
-                = link_to commit.short_id, namespace_project_commit_path(@project.namespace, @project, commit), class: "commit_short_id"
-                &nbsp;
-                = commit_author_link(commit, avatar: true, size: 16)
-                &nbsp;
-                = link_to_gfm truncate(commit.title, length: 20), namespace_project_commit_path(@project.namespace, @project, commit.id), class: "row_title"
+              .commit
+                - unless @prev_commit && @prev_commit.sha == raw_commit.sha
+                  - commit = Commit.new(raw_commit, @project)
+                  .commit-row-title
+                    %strong
+                      = link_to_gfm truncate(commit.title, length: 35), namespace_project_commit_path(@project.namespace, @project, commit.id), class: "cdark"
+                    .pull-right
+                      = link_to commit.short_id, namespace_project_commit_path(@project.namespace, @project, commit), class: "monospace"
+                    &nbsp;
+                  .light
+                    = commit_author_link(commit, avatar: false)
+                    authored
+                    #{time_ago_with_tooltip(commit.committed_date)}
+                - @prev_commit = raw_commit
             %td.lines.blame-numbers
               %pre
-                - (since...(since + lines.count)).each do |i|
-                  = i
-                  \
+                = current_line
+                - current_line += 1
             %td.lines
               %pre{class: 'code highlight white'}
                 %code
                   :erb
-                    <% lines.each do |line| %>
-                      <%= highlight(@blob.name, line, nowrap: true, continue: true).html_safe %>
-                    <% end %>
+                    <%= highlight(@blob.name, line, nowrap: true, continue: true).html_safe %>
+
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 2662e3aff6b..cd53856c4a6 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -5,19 +5,25 @@
     %hr
     = render "projects/merge_requests/show/mr_box"
     %hr
-    .append-bottom-20
+    .append-bottom-20.mr-source-target
       - if @merge_request.open?
-        .btn-group.btn-group-sm.pull-right
-          %a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} }
-            = icon('download')
-            Download as
-            %span.caret
-          %ul.dropdown-menu
-            %li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
-            %li= link_to "Plain Diff",    merge_request_path(@merge_request, format: :diff)
+        .pull-right
+          - if @merge_request.source_branch_exists?
+            = link_to "#modal_merge_info", class: "btn btn-sm", "data-toggle" => "modal" do
+              = icon('cloud-download fw')
+              Check out branch
+
+          %span.dropdown
+            %a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} }
+              = icon('download')
+              Download as
+              %span.caret
+            %ul.dropdown-menu
+              %li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
+              %li= link_to "Plain Diff",    merge_request_path(@merge_request, format: :diff)
       .light
         %div
-          %span From
+          %span Request to merge
           %span.label-branch #{source_branch_with_namespace(@merge_request)}
           %span into
           %span.label-branch #{@merge_request.target_branch}
diff --git a/app/views/projects/tree/_tree_commit_column.html.haml b/app/views/projects/tree/_tree_commit_column.html.haml
index 50521264a61..a3a4bd4f752 100644
--- a/app/views/projects/tree/_tree_commit_column.html.haml
+++ b/app/views/projects/tree/_tree_commit_column.html.haml
@@ -1,3 +1,2 @@
 %span.str-truncated
-  %span.tree_author= commit_author_link(commit, avatar: true, size: 16)
   = link_to_gfm commit.title, namespace_project_commit_path(@project.namespace, @project, commit.id), class: "tree-commit-link"
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index f2198f58c13..778dce06359 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -321,7 +321,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I should see new target branch changes' do
-    expect(page).to have_content 'From fix into feature'
+    expect(page).to have_content 'Request to merge fix into feature'
     expect(page).to have_content 'Target branch changed from master to feature'
   end