Merge remote-tracking branch 'ce/8-5-stable' into ce-8-5-stable-to-ee-8-5-stable-ee

app/models/merge_request.rb

@@ -24,6 +24,7 @@
 #  merge_params              :text
 #  merge_when_build_succeeds :boolean          default(FALSE), not null
 #  merge_user_id             :integer
+#  merge_commit_sha          :string
 #
 require Rails.root.join("app/models/commit")
@@ -608,4 +609,12 @@ def diff_refs
     [diff_base_commit, last_commit]
   end
+
+  def merge_commit
+    @merge_commit ||= project.commit(merge_commit_sha) if merge_commit_sha
+  end
+
+  def can_be_reverted?(current_user = nil)
+    merge_commit && !merge_commit.has_been_reverted?(current_user, self)
+  end
 end

app/models/milestone.rb

@@ -28,6 +28,7 @@ class Milestone < ActiveRecord::Base
   belongs_to :project
   has_many :issues
+  has_many :labels, through: :issues
   has_many :merge_requests
   has_many :participants, through: :issues, source: :assignee
@@ -110,6 +111,19 @@ def percent_complete
     0
   end
+  # Returns the elapsed time (in percent) since the Milestone creation date until today.
+  # If the Milestone doesn't have a due_date then returns 0 since we can't calculate the elapsed time.
+  # If the Milestone is overdue then it returns 100%.
+  def percent_time_used
+    return 0 unless due_date
+    return 100 if expired?
+
+    duration = ((created_at - due_date.to_datetime) / 1.day)
+    days_elapsed = ((created_at - Time.now) / 1.day)
+
+    ((days_elapsed.to_f / duration) * 100).floor
+  end
+
   def expires_at
     if due_date
       if due_date.past?

app/models/repository.rb

@@ -655,6 +655,34 @@ def merge(user, source_sha, target_branch, options = {})
     end
   end
+  def revert(user, commit, base_branch, target_branch = nil)
+    source_sha    = find_branch(base_branch).target
+    target_branch ||= base_branch
+    args          = [commit.id, source_sha]
+    args          << { mainline: 1 } if commit.merge_commit?
+
+    revert_index = rugged.revert_commit(*args)
+    return false if revert_index.conflicts?
+
+    tree_id = revert_index.write_tree(rugged)
+    return false unless diff_exists?(source_sha, tree_id)
+
+    commit_with_hooks(user, target_branch) do |ref|
+      committer = user_to_committer(user)
+      source_sha = Rugged::Commit.create(rugged,
+        message: commit.revert_message,
+        author: committer,
+        committer: committer,
+        tree: tree_id,
+        parents: [rugged.lookup(source_sha)],
+        update_ref: ref)
+    end
+  end
+
+  def diff_exists?(sha1, sha2)
+    rugged.diff(sha1, sha2).size > 0
+  end
+
   def merged_to_root_ref?(branch_name)
     branch_commit = commit(branch_name)
     root_ref_commit = commit(root_ref)
@@ -821,10 +849,11 @@ def commit_with_hooks(current_user, branch)
     oldrev = Gitlab::Git::BLANK_SHA
     ref = Gitlab::Git::BRANCH_REF_PREFIX + branch
+    target_branch = find_branch(branch)
     was_empty = empty?
-    unless was_empty
-      oldrev = find_branch(branch).target
+    if !was_empty && target_branch
+      oldrev = target_branch.target
     end
     with_tmp_ref(oldrev) do |tmp_ref|
@@ -836,7 +865,7 @@ def commit_with_hooks(current_user, branch)
       end
       GitHooksService.new.execute(current_user, path_to_repo, oldrev, newrev, ref) do
-        if was_empty
+        if was_empty || !target_branch
           # Create branch
           rugged.references.create(ref, newrev)
         else
@@ -851,6 +880,8 @@ def commit_with_hooks(current_user, branch)
           end
         end
       end
+
+      newrev
     end
   end

app/services/commits/revert_service.rb

+module Commits
+  class RevertService < ::BaseService
+    class ValidationError < StandardError; end
+    class ReversionError < StandardError; end
+
+    def execute
+      @source_project = params[:source_project] || @project
+      @target_branch = params[:target_branch]
+      @commit = params[:commit]
+      @create_merge_request = params[:create_merge_request].present?
+
+      validate and commit
+    rescue Repository::CommitError, Gitlab::Git::Repository::InvalidBlobName, GitHooksService::PreReceiveError,
+           ValidationError, ReversionError => ex
+      error(ex.message)
+    end
+
+    def commit
+      revert_into = @create_merge_request ? @commit.revert_branch_name : @target_branch
+
+      if @create_merge_request
+        # Temporary branch exists and contains the revert commit
+        return success if repository.find_branch(revert_into)
+
+        create_target_branch
+      end
+
+      unless repository.revert(current_user, @commit, revert_into)
+        error_msg = "Sorry, we cannot revert this #{params[:revert_type_title]} automatically.
+                     It may have already been reverted, or a more recent commit may have updated some of its content."
+        raise ReversionError, error_msg
+      end
+
+      success
+    end
+
+    private
+
+    def create_target_branch
+      result = CreateBranchService.new(@project, current_user)
+                                  .execute(@commit.revert_branch_name, @target_branch, source_project: @source_project)
+
+      if result[:status] == :error
+        raise ReversionError, "There was an error creating the source branch: #{result[:message]}"
+      end
+    end
+
+    def validate
+      allowed = ::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(@target_branch)
+
+      unless allowed
+        raise_error('You are not allowed to push into this branch')
+      end
+
+      true
+    end
+  end
+end

app/services/merge_requests/build_service.rb

@@ -56,7 +56,7 @@ def execute
       if commits && commits.count == 1
         commit = commits.first
         merge_request.title       = commit.title
-        merge_request.description = commit.description.try(:strip)
+        merge_request.description ||= commit.description.try(:strip)
       else
         merge_request.title = merge_request.source_branch.titleize.humanize
       end

app/services/merge_requests/merge_service.rb

@@ -39,7 +39,8 @@ def commit
         committer: committer
       }
-      repository.merge(current_user, merge_request.source_sha, merge_request.target_branch, options)
+      commit_id = repository.merge(current_user, merge_request.source_sha, merge_request.target_branch, options)
+      merge_request.update(merge_commit_sha: commit_id)
     rescue StandardError => e
       merge_request.update(merge_error: "Something went wrong during merge")
       Rails.logger.error(e.message)

app/views/projects/builds/show.html.haml

@@ -76,10 +76,16 @@
         = link_to '#down-build-trace', class: 'btn' do
           %i.fa.fa-angle-down
-      %pre.trace#build-trace
-        %code.bash
-          = preserve do
-            = raw @build.trace_html
+      - if @build.erased?
+        .erased.alert.alert-warning
+          - erased_by = "by #{link_to @build.erased_by.name, user_path(@build.erased_by)}" if @build.erased_by
+          Build has been erased #{erased_by.html_safe} #{time_ago_with_tooltip(@build.erased_at)}
+      - else
+        %pre.trace#build-trace
+          %code.bash
+            = preserve do
+              = raw @build.trace_html
+
       %div#down-build-trace
     .col-md-3
@@ -94,37 +100,55 @@
           %h4.title Build artifacts
           .center
             .btn-group{ role: :group }
-              = link_to "Download", @build.artifacts_download_url, class: 'btn btn-sm btn-primary'
+              = link_to @build.artifacts_download_url, class: 'btn btn-sm btn-primary' do
+                = icon('download')
+                Download
+
               - if @build.artifacts_metadata?
-                = link_to "Browse", @build.artifacts_browse_url, class: 'btn btn-sm btn-primary'
+                = link_to @build.artifacts_browse_url, class: 'btn btn-sm btn-primary' do
+                  = icon('folder-open')
+                  Browse
       .build-widget
         %h4.title
           Build ##{@build.id}
           - if can?(current_user, :update_build, @project)
-            .pull-right
-              - if @build.cancel_url
-                = link_to "Cancel", @build.cancel_url, class: 'btn btn-sm btn-danger', method: :post
-              - elsif @build.retry_url
-                = link_to "Retry", @build.retry_url, class: 'btn btn-sm btn-primary', method: :post
-
-        - if @build.duration
+            .center
+              .btn-group{ role: :group }
+                - if @build.cancel_url
+                  = link_to "Cancel", @build.cancel_url, class: 'btn btn-sm btn-danger', method: :post
+                - elsif @build.retry_url
+                  = link_to "Retry", @build.retry_url, class: 'btn btn-sm btn-primary', method: :post
+
+                - if @build.erasable?
+                  = link_to erase_namespace_project_build_path(@project.namespace, @project, @build),
+                            class: 'btn btn-sm btn-warning', method: :post,
+                            data: { confirm: 'Are you sure you want to erase this build?' } do
+                    = icon('eraser')
+                    Erase
+
+        .clearfix
+          - if @build.duration
+            %p
+              %span.attr-name Duration:
+              #{duration_in_words(@build.finished_at, @build.started_at)}
           %p
-            %span.attr-name Duration:
-            #{duration_in_words(@build.finished_at, @build.started_at)}
-        %p
-          %span.attr-name Created:
-          #{time_ago_with_tooltip(@build.created_at)}
-        - if @build.finished_at
+            %span.attr-name Created:
+            #{time_ago_with_tooltip(@build.created_at)}
+          - if @build.finished_at
+            %p
+              %span.attr-name Finished:
+              #{time_ago_with_tooltip(@build.finished_at)}
+          - if @build.erased_at
+            %p
+              %span.attr-name Erased:
+              #{time_ago_with_tooltip(@build.erased_at)}
           %p
-            %span.attr-name Finished:
-            #{time_ago_with_tooltip(@build.finished_at)}
-        %p
-          %span.attr-name Runner:
-          - if @build.runner && current_user && current_user.admin
-            = link_to "##{@build.runner.id}", admin_runner_path(@build.runner.id)
-          - elsif @build.runner
-            \##{@build.runner.id}
+            %span.attr-name Runner:
+            - if @build.runner && current_user && current_user.admin
+              = link_to "##{@build.runner.id}", admin_runner_path(@build.runner.id)
+            - elsif @build.runner
+              \##{@build.runner.id}
       - if @build.trigger_request
         .build-widget

app/views/projects/commit/_commit_box.html.haml

@@ -16,6 +16,8 @@
     = link_to namespace_project_tree_path(@project.namespace, @project, @commit), class: "btn btn-grouped" do
       = icon('files-o')
       Browse Files
+    - unless @commit.has_been_reverted?(current_user)
+      = revert_commit_link(@commit, namespace_project_commit_path(@project.namespace, @project, @commit.id))
   %div
 %p

app/views/projects/commit/_revert.html.haml

+#modal-revert-commit.modal
+  .modal-dialog
+    .modal-content
+      .modal-header
+        %a.close{href: "#", "data-dismiss" => "modal"} ×
+        %h3.page-title== Revert this #{revert_commit_type(commit)}
+      .modal-body
+        = form_tag revert_namespace_project_commit_path(@project.namespace, @project, commit.id), method: :post, remote: false, class: 'form-horizontal js-create-dir-form js-requires-input' do
+          .form-group.branch
+            = label_tag 'target_branch', 'Revert in branch', class: 'control-label'
+            .col-sm-10
+              = select_tag "target_branch", grouped_options_refs, class: "select2 select2-sm js-target-branch"
+              - if can?(current_user, :push_code, @project)
+                .js-create-merge-request-container
+                  .checkbox
+                    - nonce = SecureRandom.hex
+                    = label_tag "create_merge_request-#{nonce}" do
+                      = check_box_tag 'create_merge_request', 1, true, class: 'js-create-merge-request', id: "create_merge_request-#{nonce}"
+                      Start a <strong>new merge request</strong> with these changes
+              - else
+                = hidden_field_tag 'create_merge_request', 1
+          .form-actions
+            = submit_tag "Revert", class: 'btn btn-create'
+            = link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal"
+
+            - unless can?(current_user, :push_code, @project)
+              .inline.prepend-left-10
+                = commit_in_fork_help
+
+:javascript
+  new NewCommitForm($('.js-create-dir-form'))

app/views/projects/commit/show.html.haml

@@ -12,3 +12,5 @@
 = render "projects/diffs/diffs", diffs: @diffs, project: @project,
          diff_refs: @diff_refs
 = render "projects/notes/notes_with_form"
+- if can_collaborate_with_project?
+  = render "projects/commit/revert", commit: @commit, title: @commit.title

app/views/projects/merge_requests/_show.html.haml

@@ -85,6 +85,8 @@
         = spinner
 = render 'shared/issuable/sidebar', issuable: @merge_request
+- if @merge_request.can_be_reverted?
+  = render "projects/commit/revert", commit: @merge_request.merge_commit, title: @merge_request.title
 :javascript
   var merge_request;

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

@@ -5,7 +5,7 @@
     Merge Request ##{@merge_request.iid}
   %span.creator
     ·
-    opened by #{link_to_member(@project, @merge_request.author, size: 24)}
+    by #{link_to_member(@project, @merge_request.author, size: 24)}
     ·
     = time_ago_with_tooltip(@merge_request.created_at)

app/views/projects/merge_requests/widget/_merged.html.haml

@@ -8,20 +8,18 @@
         #{time_ago_with_tooltip(@merge_request.merge_event.created_at)}
     %div
       - if !@merge_request.source_branch_exists? || (params[:delete_source] == 'true')
-        The changes were merged into
-        #{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
-        The source branch has been removed.
-
+        %p
+          The changes were merged into
+          #{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
+          The source branch has been removed.
+        = render 'projects/merge_requests/widget/merged_buttons'
       - elsif @merge_request.can_remove_source_branch?(current_user)
         .remove_source_branch_widget
           %p
             The changes were merged into
             #{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
             You can remove the source branch now.
-          = link_to namespace_project_branch_path(@merge_request.source_project.namespace, @merge_request.source_project, @merge_request.source_branch), remote: true, method: :delete, class: "btn btn-primary btn-sm remove_source_branch" do
-            %i.fa.fa-times
-            Remove Source Branch
-
+          = render 'projects/merge_requests/widget/merged_buttons', source_branch_exists: true
         .remove_source_branch_widget.failed.hide
           %p
             Failed to remove source branch '#{@merge_request.source_branch}'.

app/views/projects/merge_requests/widget/_merged_buttons.haml

+- source_branch_exists = local_assigns.fetch(:source_branch_exists, false)
+- mr_can_be_reverted = @merge_request.can_be_reverted?
+
+- if source_branch_exists || mr_can_be_reverted
+  .btn-group
+    - if source_branch_exists
+      = link_to namespace_project_branch_path(@merge_request.source_project.namespace, @merge_request.source_project, @merge_request.source_branch), remote: true, method: :delete, class: "btn btn-default btn-grouped btn-sm remove_source_branch" do
+        = icon('trash-o')
+        Remove Source Branch
+    - if mr_can_be_reverted
+      = revert_commit_link(@merge_request.merge_commit, namespace_project_merge_request_path(@project.namespace, @project, @merge_request), btn_class: 'sm')

app/views/projects/milestones/_issue.html.haml

 %li{ id: dom_id(issue, 'sortable'), class: 'issue-row', 'data-iid' => issue.iid, 'data-url' => issue_path(issue) }
-  .pull-right.assignee-icon
-    - if issue.assignee
-      = image_tag avatar_icon(issue.assignee, 16), class: "avatar s16", alt: ''
   %span
-    = link_to [@project.namespace.becomes(Namespace), @project, issue] do
-      %span.cgray ##{issue.iid}
     = link_to_gfm issue.title, [@project.namespace.becomes(Namespace), @project, issue], title: issue.title
-
+  .issue-detail
+    = link_to [@project.namespace.becomes(Namespace), @project, issue] do
+      %span.issue-number ##{issue.iid}
+    - issue.labels.each do |label|
+      = render_colored_label(label)
+    - if issue.assignee
+      = image_tag avatar_icon(issue.assignee, 16), class: "avatar s24", alt: ''

app/views/projects/milestones/_issues.html.haml

 .panel.panel-default
-  .panel-heading= title
+  .panel-heading
+    = title
+    .pull-right= issues.size
   %ul{ class: "well-list issues-sortable-list", id: "issues-list-#{id}", "data-state" => id }
     - issues.sort_by(&:position).each do |issue|
       = render 'issue', issue: issue
-    %li.light.ui-sort-disabled Drag and drop available

app/views/projects/milestones/_merge_requests.html.haml

@@ -3,4 +3,3 @@
   %ul{ class: "well-list merge_requests-sortable-list", id: "merge_requests-list-#{id}", "data-state" => id }
     - merge_requests.sort_by(&:position).each do |merge_request|
       = render 'merge_request', merge_request: merge_request
-    %li.light.ui-sort-disabled Drag and drop available

app/views/projects/milestones/show.html.haml

@@ -24,7 +24,7 @@
       - else
         = link_to 'Reopen Milestone', namespace_project_milestone_path(@project.namespace, @project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn btn-reopen btn-nr btn-grouped"
-      = link_to namespace_project_milestone_path(@project.namespace, @project, @milestone), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-grouped btn-nr btn-remove" do
+      = link_to namespace_project_milestone_path(@project.namespace, @project, @milestone), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-grouped btn-nr" do
         = icon('trash-o')
         Delete
@@ -32,7 +32,7 @@
         = icon('pencil-square-o')
         Edit
-.detail-page-description.content-block
+.detail-page-description.milestone-detail.second-block
   %h2.title
     = markdown escape_once(@milestone.title), pipeline: :single_line
   %div
@@ -47,32 +47,56 @@
     %span All issues for this milestone are closed. You may close milestone now.
 .context.prepend-top-default
-  %p.lead
-    Progress:
-    #{@milestone.closed_items_count} closed
-    –
-    #{@milestone.open_items_count} open
-     
-    %span.light #{@milestone.percent_complete}% complete
-    %span.pull-right= @milestone.expires_at
+  .milestone-summary
+    %h4 Progress
+    %strong= @milestone.issues.count
+    issues:
+    %span.milestone-stat
+      %strong= @milestone.open_items_count
+      open and
+      %strong= @milestone.closed_items_count
+      closed
+    %span.milestone-stat
+      %strong== #{@milestone.percent_complete}%
+      complete
+    %span.milestone-stat
+      %span.time-elapsed
+        %strong== #{@milestone.percent_time_used}%
+        time elapsed
+    %span.pull-right.tab-issues-buttons
+      - if can?(current_user, :create_issue, @project)
+        = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { milestone_id: @milestone.id }), class: "btn  btn-grouped", title: "New Issue" do
+          %i.fa.fa-plus
+          New Issue
+      - if can?(current_user, :read_issue, @project)
+        = link_to 'Browse Issues', namespace_project_issues_path(@milestone.project.namespace, @milestone.project, milestone_title: @milestone.title), class: "btn btn-grouped"
+    %span.pull-right.tab-merge-requests-buttons.hidden
+      - if can?(current_user, :read_merge_request, @project)
+        = link_to 'Browse Merge Requests', namespace_project_merge_requests_path(@milestone.project.namespace, @milestone.project, milestone_title: @milestone.title), class: "btn btn-grouped"
+
   = milestone_progress_bar(@milestone)
 %ul.nav-links.no-top.no-bottom
   %li.active
-    = link_to '#tab-issues', 'data-toggle' => 'tab' do
+    = link_to '#tab-issues', 'data-toggle' => 'tab', 'data-show' => '.tab-issues-buttons' do
       Issues
       %span.badge= @issues.count
   %li
-    = link_to '#tab-merge-requests', 'data-toggle' => 'tab' do
+    = link_to '#tab-merge-requests', 'data-toggle' => 'tab', 'data-show' => '.tab-merge-requests-buttons' do
       Merge Requests
       %span.badge= @merge_requests.count
   %li
     = link_to '#tab-participants', 'data-toggle' => 'tab' do
       Participants
       %span.badge= @users.count
-.tab-content
+  %li
+    = link_to '#tab-labels', 'data-toggle' => 'tab', 'data-show' => '.tab-issues-buttons' do
+      Labels
+      %span.badge= @labels.count
+.tab-content.milestone-content
   .tab-pane.active#tab-issues
+<<<<<<< HEAD
     .content-block.oneline-block
       .controls
         - if can?(current_user, :create_issue, @project)
@@ -88,6 +112,8 @@
         - unless total_weight.zero?
           Total weight of issues #{total_weight}
+=======
+>>>>>>> ce/8-5-stable
     .row.prepend-top-default
       .col-md-4
         = render('issues', title: 'Unstarted Issues (open and unassigned)', issues: @issues.opened.unassigned, id: 'unassigned')
@@ -97,14 +123,6 @@
         = render('issues', title: 'Completed Issues (closed)', issues: @issues.closed, id: 'closed')
   .tab-pane#tab-merge-requests
-    .content-block.oneline-block
-      .controls
-        - if can?(current_user, :read_merge_request, @project)
-          = link_to 'Browse Merge Requests', namespace_project_merge_requests_path(@milestone.project.namespace, @milestone.project, milestone_title: @milestone.title), class: "btn btn-grouped"
-
-      .oneline
-        All merge requests in this milestone
-
     .row.prepend-top-default
       .col-md-3
         = render('merge_requests', title: 'Work in progress (open and unassigned)', merge_requests: @merge_requests.opened.unassigned, id: 'unassigned')
@@ -120,9 +138,6 @@
               = render 'merge_request', merge_request: merge_request
   .tab-pane#tab-participants
-    .content-block.oneline-block
-      All participants to this milestone
-
     %ul.bordered-list
       - @users.each do |user|
         %li
@@ -131,3 +146,18 @@
             %strong= truncate(user.name, lenght: 40)
             %br
             %small.cgray= user.username
+
+  .tab-pane#tab-labels
+    %ul.bordered-list.manage-labels-list
+      - @labels.each do |label|
+        %li
+          = render_colored_label(label)
+          - args = [@milestone.project.namespace, @milestone.project, milestone_title: @milestone.title, label_name: label.title]
+          - options = args.extract_options!
+
+          %span.issues-count
+            = link_to namespace_project_issues_path(*args, options.merge(state: 'opened')) do
+              = pluralize label.open_issues_count, 'open issue'
+          %span.issues-count
+            = link_to namespace_project_issues_path(*args, options.merge(state: 'closed')) do
+              = pluralize label.closed_issues_count, 'closed issue'

config/routes.rb

@@ -543,6 +543,7 @@
             get :builds
             post :cancel_builds
             post :retry_builds
+            post :revert
           end
         end
@@ -671,6 +672,7 @@
             get :status
             post :cancel
             post :retry
+            post :erase
           end
           resource :artifacts, only: [] do

db/migrate/20160129155512_add_merge_commit_sha_to_merge_requests.rb

+class AddMergeCommitShaToMergeRequests < ActiveRecord::Migration
+  def change
+    add_column :merge_requests, :merge_commit_sha, :string
+  end
+end