Commit 69c193e7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' into remove-satellites

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parents d25c56cf cb6ad67f
...@@ -5,13 +5,12 @@ v 8.0.0 (unreleased) ...@@ -5,13 +5,12 @@ v 8.0.0 (unreleased)
- Better performance for web editor (switched from satellites to rugged) - Better performance for web editor (switched from satellites to rugged)
- Faster merge - Faster merge
- Ability to fetch merge requests from refs/merge-requests/:id - 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) v 7.14.0 (unreleased)
- Disable turbolinks when linking to Bitbucket import status (Stan Hu) - 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 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) - 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) - Show incompatible projects in Bitbucket import status (Stan Hu)
- Fix coloring of diffs on MR Discussion-tab (Gert Goet) - Fix coloring of diffs on MR Discussion-tab (Gert Goet)
- Fix "Network" and "Graphs" pages for branches with encoded slashes (Stan Hu) - Fix "Network" and "Graphs" pages for branches with encoded slashes (Stan Hu)
...@@ -54,6 +53,9 @@ v 7.14.0 (unreleased) ...@@ -54,6 +53,9 @@ v 7.14.0 (unreleased)
- Add support for CI skipped status - Add support for CI skipped status
- Fetch code from forks to refs/merge-requests/:id/head when merge request created - 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) - 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 - Cache all events
- Order commits by date when comparing branches - Order commits by date when comparing branches
- Fix bug causing error when the target branch of a symbolic ref was deleted - Fix bug causing error when the target branch of a symbolic ref was deleted
...@@ -63,6 +65,8 @@ v 7.14.0 (unreleased) ...@@ -63,6 +65,8 @@ v 7.14.0 (unreleased)
v 7.13.3 v 7.13.3
- Fix bug causing Bitbucket importer to crash when OAuth application had been removed. - Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
- Allow users to send abuse reports - Allow users to send abuse reports
- Remove satellites
- Link username to profile on Group Members page (Tom Webster)
v 7.13.2 v 7.13.2
- Fix randomly failed spec - Fix randomly failed spec
......
...@@ -38,7 +38,7 @@ gem "browser", '~> 0.8.0' ...@@ -38,7 +38,7 @@ gem "browser", '~> 0.8.0'
# Extracting information from a git repository # Extracting information from a git repository
# Provide access to Gitlab::Git library # 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 # Ruby/Rack Git Smart-HTTP Server Handler
# GitLab fork with a lot of changes (improved thread-safety, better memory usage etc) # GitLab fork with a lot of changes (improved thread-safety, better memory usage etc)
......
...@@ -271,7 +271,7 @@ GEM ...@@ -271,7 +271,7 @@ GEM
mime-types (~> 1.19) mime-types (~> 1.19)
gitlab_emoji (0.1.0) gitlab_emoji (0.1.0)
gemojione (~> 2.0) gemojione (~> 2.0)
gitlab_git (7.2.11) gitlab_git (7.2.12)
activesupport (~> 4.0) activesupport (~> 4.0)
charlock_holmes (~> 0.6) charlock_holmes (~> 0.6)
gitlab-linguist (~> 3.0) gitlab-linguist (~> 3.0)
...@@ -307,7 +307,7 @@ GEM ...@@ -307,7 +307,7 @@ GEM
grape-entity (0.4.2) grape-entity (0.4.2)
activesupport activesupport
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
haml (4.0.5) haml (4.0.7)
tilt tilt
haml-rails (0.5.3) haml-rails (0.5.3)
actionpack (>= 4.0.1) actionpack (>= 4.0.1)
...@@ -783,7 +783,7 @@ DEPENDENCIES ...@@ -783,7 +783,7 @@ DEPENDENCIES
gitlab-grack (~> 2.0.2) gitlab-grack (~> 2.0.2)
gitlab-linguist (~> 3.0.1) gitlab-linguist (~> 3.0.1)
gitlab_emoji (~> 0.1) gitlab_emoji (~> 0.1)
gitlab_git (~> 7.2.11) gitlab_git (~> 7.2.12)
gitlab_meta (= 7.0) gitlab_meta (= 7.0)
gitlab_omniauth-ldap (= 1.2.1) gitlab_omniauth-ldap (= 1.2.1)
gollum-lib (~> 4.0.2) gollum-lib (~> 4.0.2)
......
...@@ -90,12 +90,7 @@ ...@@ -90,12 +90,7 @@
border-right: none; border-right: none;
} }
background: #fff; background: #fff;
padding: 5px; padding: 8px;
}
.author,
.blame_commit {
background: $background-color;
vertical-align: top;
} }
.lines { .lines {
pre { pre {
......
...@@ -186,3 +186,7 @@ ...@@ -186,3 +186,7 @@
#modal_merge_info .modal-dialog { #modal_merge_info .modal-dialog {
width: 600px; width: 600px;
} }
.mr-source-target {
line-height: 31px;
}
...@@ -89,6 +89,10 @@ ...@@ -89,6 +89,10 @@
td.blame-commit { td.blame-commit {
background: #f9f9f9; background: #f9f9f9;
min-width: 350px; min-width: 350px;
.commit-author-link {
color: #888;
}
} }
td.blame-numbers { td.blame-numbers {
pre { pre {
......
...@@ -7,7 +7,7 @@ class Projects::BlameController < Projects::ApplicationController ...@@ -7,7 +7,7 @@ class Projects::BlameController < Projects::ApplicationController
before_action :authorize_download_code! before_action :authorize_download_code!
def show def show
@blob = @repository.blob_at(@commit.id, @path)
@blame = Gitlab::Git::Blame.new(@repository, @commit.id, @path) @blame = Gitlab::Git::Blame.new(@repository, @commit.id, @path)
@blob = @blame.blob
end end
end end
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
%span{class: ("list-item-name" if show_controls)} %span{class: ("list-item-name" if show_controls)}
- if member.user - if member.user
= image_tag avatar_icon(user.email, 16), class: "avatar s16", alt: '' = 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 %span.cgray= user.username
- if user == current_user - if user == current_user
%span.label.label-success It's you %span.label.label-success It's you
......
...@@ -12,25 +12,31 @@ ...@@ -12,25 +12,31 @@
= render "projects/blob/actions" = render "projects/blob/actions"
.file-content.blame.highlight .file-content.blame.highlight
%table %table
- @blame.each do |commit, lines, since| - current_line = 1
- commit = Commit.new(commit, @project) - @blame.each do |raw_commit, line|
%tr %tr
%td.blame-commit %td.blame-commit
%span.commit .commit
= link_to commit.short_id, namespace_project_commit_path(@project.namespace, @project, commit), class: "commit_short_id" - unless @prev_commit && @prev_commit.sha == raw_commit.sha
&nbsp; - commit = Commit.new(raw_commit, @project)
= commit_author_link(commit, avatar: true, size: 16) .commit-row-title
&nbsp; %strong
= link_to_gfm truncate(commit.title, length: 20), namespace_project_commit_path(@project.namespace, @project, commit.id), class: "row_title" = 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 %td.lines.blame-numbers
%pre %pre
- (since...(since + lines.count)).each do |i| = current_line
= i - current_line += 1
\
%td.lines %td.lines
%pre{class: 'code highlight white'} %pre{class: 'code highlight white'}
%code %code
:erb :erb
<% lines.each do |line| %> <%= highlight(@blob.name, line, nowrap: true, continue: true).html_safe %>
<%= highlight(@blob.name, line, nowrap: true, continue: true).html_safe %>
<% end %>
...@@ -5,19 +5,25 @@ ...@@ -5,19 +5,25 @@
%hr %hr
= render "projects/merge_requests/show/mr_box" = render "projects/merge_requests/show/mr_box"
%hr %hr
.append-bottom-20 .append-bottom-20.mr-source-target
- if @merge_request.open? - if @merge_request.open?
.btn-group.btn-group-sm.pull-right .pull-right
%a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} } - if @merge_request.source_branch_exists?
= icon('download') = link_to "#modal_merge_info", class: "btn btn-sm", "data-toggle" => "modal" do
Download as = icon('cloud-download fw')
%span.caret Check out branch
%ul.dropdown-menu
%li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch) %span.dropdown
%li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff) %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 .light
%div %div
%span From %span Request to merge
%span.label-branch #{source_branch_with_namespace(@merge_request)} %span.label-branch #{source_branch_with_namespace(@merge_request)}
%span into %span into
%span.label-branch #{@merge_request.target_branch} %span.label-branch #{@merge_request.target_branch}
......
%span.str-truncated %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" = link_to_gfm commit.title, namespace_project_commit_path(@project.namespace, @project, commit.id), class: "tree-commit-link"
...@@ -321,7 +321,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps ...@@ -321,7 +321,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end end
step 'I should see new target branch changes' do 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' expect(page).to have_content 'Target branch changed from master to feature'
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment