diff --git a/app/assets/javascripts/merge_requests.js b/app/assets/javascripts/merge_requests.js index af59634f7baf5a721dffae9df2c26e9e53454080..7885048079201450f5310d238736fb4d096e68cf 100644 --- a/app/assets/javascripts/merge_requests.js +++ b/app/assets/javascripts/merge_requests.js @@ -10,40 +10,19 @@ var MergeRequest = { }); $(".tabs a.merge-notes-tab").live("click", function() { - $(".merge-request-commits, .merge-request-diffs").hide(); + $(".merge-request-diffs").hide(); $(".merge-request-notes").show(); }); - $(".tabs a.merge-commits-tab").live("click", function() { - if(!MergeRequest.commits_loaded) { - MergeRequest.loadCommits(); - } - $(".merge-request-notes, .merge-request-diffs").hide(); - $(".merge-request-commits").show(); - }); - $(".tabs a.merge-diffs-tab").live("click", function() { if(!MergeRequest.diffs_loaded) { MergeRequest.loadDiff(); } - $(".merge-request-notes, .merge-request-commits").hide(); + $(".merge-request-notes").hide(); $(".merge-request-diffs").show(); }); }, - loadCommits: - function() { - $(".dashboard-loader").show(); - $.ajax({ - type: "GET", - url: $(".merge-commits-tab").attr("data-url"), - complete: function(){ - MergeRequest.commits_loaded = true; - $(".merge-request-notes, .merge-request-diffs").hide(); - $(".dashboard-loader").hide()}, - dataType: "script"}); - }, - loadDiff: function() { $(".dashboard-loader").show(); @@ -52,7 +31,7 @@ var MergeRequest = { url: $(".merge-diffs-tab").attr("data-url"), complete: function(){ MergeRequest.diffs_loaded = true; - $(".merge-request-notes, .merge-request-commits").hide(); + $(".merge-request-notes").hide(); $(".dashboard-loader").hide()}, dataType: "script"}); } diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index d952033faa091cc68c39100a42b495ec36d437f6..2c0fcaf9cd3fba7555e0a8a348056f0cb91e1c0f 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -233,6 +233,10 @@ img.lil_av { @include round-borders-all(4px); border-color:#ddd; + ul { + margin:0; + } + h5 { padding: 0 10px; background:#f5f5f5; @@ -247,6 +251,11 @@ img.lil_av { @include round-borders-top(4px); border-top:none; } + + &:last-child { + @include round-borders-bottom(4px); + border:none; + } } } diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb index 8b3952126bd73991207c40cc1c01c42b1db040cc..7a456a0b037accd0907fa696ad7d5385464b0098 100644 --- a/app/controllers/merge_requests_controller.rb +++ b/app/controllers/merge_requests_controller.rb @@ -40,6 +40,12 @@ class MergeRequestsController < ApplicationController @notes = @merge_request.notes.inc_author.order("created_at DESC").limit(20) @note = @project.notes.new(:noteable => @merge_request) + @commits = @project.repo. + commits_between(@merge_request.target_branch, @merge_request.source_branch). + map {|c| Commit.new(c)}. + sort_by(&:created_at). + reverse + render_full_content respond_to do |format| @@ -48,14 +54,6 @@ class MergeRequestsController < ApplicationController end end - def commits - @commits = @project.repo. - commits_between(@merge_request.target_branch, @merge_request.source_branch). - map {|c| Commit.new(c)}. - sort_by(&:created_at). - reverse - end - def diffs @diffs = @merge_request.diffs @commit = @merge_request.last_commit diff --git a/app/views/merge_requests/_commits.html.haml b/app/views/merge_requests/_commits.html.haml index baeca7a3aa461e38aebce5c089fd2f91dae805bd..7606e71e7c06da382de9b9755a4c71fb1b005d89 100644 --- a/app/views/merge_requests/_commits.html.haml +++ b/app/views/merge_requests/_commits.html.haml @@ -1,6 +1,13 @@ -- if @commits.size > 0 - .merge-request-commits - %ul.unstyled= render @commits +- unless @commits.empty? + .ui-box + %h5 Commits + .merge-request-commits + %ul.unstyled= render @commits -- if @commits.empty? - %p.cgray Nothing to merge +- else + %h5 + Nothing to merge from + %span.label #{@merge_request.source_branch} + to + %span.label #{@merge_request.target_branch} + %br diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml index 9840ea4a3218620626744d82e94e7fe9e1acd559..132f2063ddcb4636cb9577694c44c78a9fa10665 100644 --- a/app/views/merge_requests/show.html.haml +++ b/app/views/merge_requests/show.html.haml @@ -41,19 +41,18 @@ %div= simple_format @merge_request.title += render "merge_requests/commits" -.tabs - %li.active - = link_to "#notes", :class => "merge-notes-tab tab" do - Notes - %li - = link_to "#commits", "data-url" => commits_project_merge_request_path(@project, @merge_request), :class => "merge-commits-tab tab" do - Commits - %li - = link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab tab" do - Diff +- unless @commits.empty? + .tabs + %li.active + = link_to "#notes", :class => "merge-notes-tab tab" do + Notes + %li + = link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab tab" do + Diff - %img{:src => "/assets/ajax-loader-facebook.gif", :class => "dashboard-loader"} + %img{:src => "/assets/ajax-loader-facebook.gif", :class => "dashboard-loader"} .merge-request-notes .merge_request_notes= render "notes/notes" @@ -61,7 +60,6 @@ %center= image_tag "ajax-loader.gif" .clear -.merge-request-commits .merge-request-diffs diff --git a/config/routes.rb b/config/routes.rb index 25c4240da311ad604dcb11f8394f83508ee9c2ce..81bf93c7f23454100ae9a265d6d2311b57875b81 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -90,7 +90,6 @@ Gitlab::Application.routes.draw do resources :merge_requests do member do get :diffs - get :commits end end