Merge branch 'master' into discussions

Conflicts:
	app/assets/stylesheets/main.scss
	app/models/project.rb
	app/views/notes/_common_form.html.haml
	app/views/notes/_per_line_form.html.haml
	lib/gitlab/markdown.rb
	spec/models/note_spec.rb

app/views/merge_requests/_form.html.haml

@@ -32,7 +32,7 @@
       .top_box_content
         = f.label :title do
           %strong= "Title *"
-        .input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5
+        .input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true
       .merge_requests_middle_box
         .merge_requests_assignee
           = f.label :assignee_id do

app/views/merge_requests/_merge_request.html.haml

@@ -1,4 +1,4 @@
-%li.wll{ class: mr_css_classes(merge_request) }
+%li{ class: mr_css_classes(merge_request) }
   .right
     .left
       - if merge_request.merged?

app/views/merge_requests/_show.html.haml

@@ -2,6 +2,8 @@
 = render "merge_requests/show/how_to_merge"
 = render "merge_requests/show/mr_box"
 = render "merge_requests/show/mr_accept"
+- if @project.gitlab_ci?
+  = render "merge_requests/show/mr_ci"
 = render "merge_requests/show/commits"
 
 - if @commits.present?
@@ -26,6 +28,8 @@
     MergeRequest.init({
       url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
       check_enable: #{@merge_request.state == MergeRequest::UNCHECKED ? "true" : "false"},
+      url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}",
+      ci_enable: #{@project.gitlab_ci? ? "true" : "false"},
       current_state: "#{@merge_request.human_state}",
       action: "#{controller.action_name}"
     });

app/views/merge_requests/index.html.haml

@@ -30,7 +30,7 @@
         = hidden_field_tag :f, params[:f]
     .clearfix
 
-  %ul.unstyled
+  %ul.well-list
     = render @merge_requests
     - if @merge_requests.blank?
       %li

app/views/merge_requests/show/_commits.html.haml

@@ -5,19 +5,19 @@
       Commits (#{@commits.count})
     .merge-request-commits
       - if @commits.count > 8
-        %ul.first_mr_commits.unstyled
+        %ul.first_mr_commits.well-list
           - @commits.first(8).each do |commit|
             = render "commits/commit", commit: commit
           %li.bottom
             8 of #{@commits.count} commits displayed.
             %strong
               %a.mr_show_all_commits Click here to show all
-        %ul.all_mr_commits.hide.unstyled
+        %ul.all_mr_commits.hide.well-list
           - @commits.each do |commit|
             = render "commits/commit", commit: commit
 
       - else
-        %ul.unstyled
+        %ul.well-list
           - @commits.each do |commit|
             = render "commits/commit", commit: commit
 

app/views/merge_requests/show/_mr_box.html.haml

@@ -1,25 +1,20 @@
 .main_box
   .top_box_content
-    %h4
-      - if @merge_request.closed
-        .alert-message.error.status_info Closed
-      - else
-        .alert-message.success.status_info Open
+    %h4.box-title
+      - if @merge_request.merged
+        .error.status_info
+          %i.icon-ok
+          Merged
+      - elsif @merge_request.closed
+        .error.status_info Closed
       = gfm escape_once(@merge_request.title)
-      - if @project.gitlab_ci?
-        .right
-          = image_tag ci_status_path, class: 'status-badge'
 
   .middle_box_content
     %div
-      %cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by
-      = image_tag gravatar_icon(@merge_request.author_email), width: 16, class: "lil_av"
-      %strong.author= link_to_merge_request_author(@merge_request)
-
-      - if @merge_request.assignee
-        %cite.cgray , currently assigned to
-        = image_tag gravatar_icon(@merge_request.assignee_email), width: 16, class: "lil_av"
-        %strong.author= link_to_merge_request_assignee(@merge_request)
+      %cite.cgray
+        Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}
+        - if @merge_request.assignee
+          \, currently assigned to #{link_to_member(@project, @merge_request.assignee)}
       - if @merge_request.milestone
         - milestone = @merge_request.milestone
         %cite.cgray and attached to milestone
@@ -30,10 +25,10 @@
     .bottom_box_content
       - if @merge_request.merged?
         %span
-          Merged by #{@merge_request.merge_event.author_name}
+          Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
           %small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
       - elsif @merge_request.closed_event
         %span
-          Closed by #{@merge_request.closed_event.author_name}
+          Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
           %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
 

app/views/merge_requests/show/_mr_ci.html.haml

@@ -0,0 +1,35 @@
+- if @merge_request.open? && @commits.any?
+  .ci_widget.ci-success{style: "display:none"}
+    .alert.alert-success
+      %i.icon-ok
+      %strong CI build passed
+      for #{@merge_request.last_commit_short_sha}.
+      = link_to "Build page", ci_build_details_path(@merge_request)
+
+
+  .ci_widget.ci-failed{style: "display:none"}
+    .alert.alert-error
+      %i.icon-remove
+      %strong CI build failed
+      for #{@merge_request.last_commit_short_sha}.
+      = link_to "Build page", ci_build_details_path(@merge_request)
+
+  - [:running, :pending].each do |status|
+    .ci_widget{class: "ci-#{status}", style: "display:none"}
+      .alert
+        %i.icon-time
+        %strong CI build #{status}
+        for #{@merge_request.last_commit_short_sha}.
+        = link_to "Build page", ci_build_details_path(@merge_request)
+
+  .ci_widget
+    .alert-message
+      %strong
+        %i.icon-refresh
+        Checking for CI status for #{@merge_request.last_commit_short_sha}
+
+  .ci_widget.ci-error{style: "display:none"}
+    .alert.alert-error
+      %i.icon-remove
+      %strong Cannot connect to CI server. Please check your setting
+

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

@@ -6,11 +6,6 @@
   %span.label_branch= @merge_request.target_branch
 
   %span.right
-    - if @merge_request.merged?
-      %span.btn.small.disabled.grouped
-        %strong
-          %i.icon-ok
-          = "MERGED"
     - if can?(current_user, :modify_merge_request, @merge_request)
       - if @merge_request.open?
         .left.btn-group