Merge branch 'master' of github.com:gitlabhq/gitlabhq

17 files changed, 110 insertions, 32 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 16ed0470f8e..1b4f77ce849 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 7.14.0 (unreleased)
+  - Provide more feedback what went wrong if HipChat service failed test (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 corrupted binary files when using API files endpoint (Stan Hu)
@@ -29,12 +30,8 @@ v 7.14.0 (unreleased)
   - Return comments in created order in merge request API (Stan Hu)
   - Expire Rails cache entries after two weeks to prevent endless Redis growth
   - Add support for destroying project milestones (Stan Hu)
-  - Add fetch command to the MR page.
   - Allow custom backup archive permissions
-  - Add fetch command to the MR page
   - Add project star and fork count, group avatar URL and user/group web URL attributes to API
-  - Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
-  - Add fetch command to the MR page.
   - Show who last edited a comment if it wasn't the original author
   - Send notification to all participants when MR is merged.
   - Add ability to manage user email addresses via the API.
@@ -56,6 +53,13 @@ v 7.14.0 (unreleased)
   - Include branch/tag name in archive file and directory name
   - Add dropzone upload progress
   - Add a label for merged branches on branches page (Florent Baldino)
+  - Detect .mkd and .mkdn files as markdown (Ben Boeckel)
+
+v 7.13.5
+  - Satellites reverted
+
+v 7.13.4
+  - Allow users to send abuse reports
 
 v 7.13.3
   - Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
diff --git a/VERSION b/VERSION
index 5778e530e10..da8322eb293 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.13.0.pre
+7.14.0.pre
diff --git a/app/assets/javascripts/project.js.coffee b/app/assets/javascripts/project.js.coffee
index 87c1b67a772..39a433dfc91 100644
--- a/app/assets/javascripts/project.js.coffee
+++ b/app/assets/javascripts/project.js.coffee
@@ -24,8 +24,3 @@ class @Project
       $.cookie('hide_no_password_message', 'false', { path: path })
       $(@).parents('.no-password-message').remove()
       e.preventDefault()
-
-    $('.js-toggle-clone-holder').on 'click', (e) ->
-      cloneHolder.toggle()
-
-    cloneHolder.hide() unless $('.empty-project').length
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index 1e435be8275..01105532479 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -39,10 +39,13 @@ class Projects::ServicesController < Projects::ApplicationController
 
   def test
     data = Gitlab::PushDataBuilder.build_sample(project, current_user)
-    if @service.execute(data)
+    outcome = @service.test(data)
+    if outcome[:success]
       message = { notice: 'We sent a request to the provided URL' }
     else
-      message = { alert: 'We tried to send a request to the provided URL but an error occured' }
+      error_message = "We tried to send a request to the provided URL but an error occurred"
+      error_message << ": #{outcome[:result]}" if outcome[:result].present?
+      message = { alert: error_message }
     end
 
     redirect_to :back, message
diff --git a/app/models/note.rb b/app/models/note.rb
index a99d428b02d..913a8c00337 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -360,6 +360,10 @@ class Note < ActiveRecord::Base
     create_new_cross_references!(project, author)
   end
 
+  def system?
+    read_attribute(:system)
+  end
+
   def editable?
     !read_attribute(:system)
   end
diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb
index 6761f00183e..7a15a861abc 100644
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
@@ -60,6 +60,16 @@ class HipchatService < Service
     gate[room].send('GitLab', message, message_options)
   end
 
+  def test(data)
+    begin
+      result = execute(data)
+    rescue StandardError => error
+      return { success: false, result: error }
+    end
+
+    { success: true, result: result }
+  end
+
   private
 
   def gate
diff --git a/app/models/service.rb b/app/models/service.rb
index 818a6808db5..dcef2866c3b 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -87,10 +87,16 @@ class Service < ActiveRecord::Base
     %w(push tag_push issue merge_request)
   end
 
-  def execute
+  def execute(data)
     # implement inside child
   end
 
+  def test(data)
+    # default implementation
+    result = execute(data)
+    { success: result.present?, result: result }
+  end
+
   def can_test?
     !project.empty_repo?
   end
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index 71e92970305..bec40ec27a5 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -21,11 +21,6 @@
           = forked_from_project.namespace.try(:name)
 
       - if can? current_user, :download_code, @project
-        = link_to "#", class: 'btn js-toggle-clone-holder' do
-          = icon('cloud-download fw')
-          Clone
-
-      - if can? current_user, :download_code, @project
         = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: @ref, format: 'zip'), class: 'btn', rel: 'nofollow' do
           = icon('download fw')
           Download
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index cd53856c4a6..007f6c6a787 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -22,19 +22,19 @@
               %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 Request to merge
-          %span.label-branch #{source_branch_with_namespace(@merge_request)}
-          %span into
-          %span.label-branch #{@merge_request.target_branch}
-        - if @merge_request.open? && !@merge_request.branch_missing?
-          %div
-            If you want to try or merge this request manually, you can use the
-            = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
+        %span Request to merge
+        %span.label-branch #{source_branch_with_namespace(@merge_request)}
+        %span into
+        %span.label-branch #{@merge_request.target_branch}
 
     = render "projects/merge_requests/show/how_to_merge"
     = render "projects/merge_requests/widget/show.html.haml"
 
+    - if @merge_request.open? && @merge_request.can_be_merged?
+      .light
+        You can also accept this merge request manually using the
+        = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
+
   - if @commits.present?
     %ul.nav.nav-tabs.merge-request-tabs
       %li.notes-tab
diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml
index d8f6ce91c0c..df20205de1c 100644
--- a/app/views/projects/merge_requests/widget/open/_accept.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml
@@ -23,4 +23,3 @@
       btn = $('.accept_merge_request')
       btn.disable()
       btn.html("<i class='fa fa-spinner fa-spin'></i> Merge in progress")
-
diff --git a/doc/api/notes.md b/doc/api/notes.md
index ee2f9fa0eac..c683cb883d4 100644
--- a/doc/api/notes.md
+++ b/doc/api/notes.md
@@ -31,7 +31,10 @@ Parameters:
       "state": "active",
       "created_at": "2013-09-30T13:46:01Z"
     },
-    "created_at": "2013-10-02T09:22:45Z"
+    "created_at": "2013-10-02T09:22:45Z",
+    "system": true,
+    "upvote": false,
+    "downvote": false
   },
   {
     "id": 305,
@@ -45,7 +48,10 @@ Parameters:
       "state": "active",
       "created_at": "2013-09-30T13:46:01Z"
     },
-    "created_at": "2013-10-02T09:56:03Z"
+    "created_at": "2013-10-02T09:56:03Z",
+    "system": false,
+    "upvote": false,
+    "downvote": false
   }
 ]
 ```
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index b5556682449..09d231af41b 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -205,6 +205,9 @@ module API
       expose :attachment_identifier, as: :attachment
       expose :author, using: Entities::UserBasic
       expose :created_at
+      expose :system?, as: :system
+      expose :upvote?, as: :upvote
+      expose :downvote?, as: :downvote
     end
 
     class MRNote < Grape::Entity
diff --git a/lib/gitlab/markup_helper.rb b/lib/gitlab/markup_helper.rb
index b1991e2e285..a5f767b134d 100644
--- a/lib/gitlab/markup_helper.rb
+++ b/lib/gitlab/markup_helper.rb
@@ -21,7 +21,7 @@ module Gitlab
     #
     # Returns boolean
     def gitlab_markdown?(filename)
-      filename.downcase.end_with?(*%w(.mdown .md .markdown))
+      filename.downcase.end_with?(*%w(.mdown .mkd .mkdn .md .markdown))
     end
 
     # Public: Determines if the given filename has AsciiDoc extension.
diff --git a/spec/controllers/projects/services_controller_spec.rb b/spec/controllers/projects/services_controller_spec.rb
new file mode 100644
index 00000000000..d4ecd98e12d
--- /dev/null
+++ b/spec/controllers/projects/services_controller_spec.rb
@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Projects::ServicesController do
+  let(:project) { create(:project) }
+  let(:user)    { create(:user) }
+  let(:service) { create(:service, project: project) }
+
+  before do
+    sign_in(user)
+    project.team << [user, :master]
+    controller.instance_variable_set(:@project, project)
+    controller.instance_variable_set(:@service, service)
+    request.env["HTTP_REFERER"] = "/"
+  end
+
+  describe "#test" do
+    context 'success' do
+      it "should redirect and show success message" do
+        expect(service).to receive(:test).and_return({ success: true, result: 'done' })
+        get :test, namespace_id: project.namespace.id, project_id: project.id, id: service.id, format: :html
+        expect(response.status).to redirect_to('/')
+        expect(flash[:notice]).to eq('We sent a request to the provided URL')
+      end
+    end
+
+    context 'failure' do
+      it "should redirect and show failure message" do
+        expect(service).to receive(:test).and_return({ success: false, result: 'Bad test' })
+        get :test, namespace_id: project.namespace.id, project_id: project.id, id: service.id, format: :html
+        expect(response.status).to redirect_to('/')
+        expect(flash[:alert]).to eq('We tried to send a request to the provided URL but an error occurred: Bad test')
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markup_helper_spec.rb b/spec/lib/gitlab/markup_helper_spec.rb
index 7e716e866b1..e610fab05da 100644
--- a/spec/lib/gitlab/markup_helper_spec.rb
+++ b/spec/lib/gitlab/markup_helper_spec.rb
@@ -15,7 +15,7 @@ describe Gitlab::MarkupHelper do
   end
 
   describe '#gitlab_markdown?' do
-    %w(mdown md markdown).each do |type|
+    %w(mdown mkd mkdn md markdown).each do |type|
       it "returns true for #{type} files" do
         expect(Gitlab::MarkupHelper.gitlab_markdown?("README.#{type}")).to be_truthy
       end
diff --git a/spec/models/project_services/hipchat_service_spec.rb b/spec/models/project_services/hipchat_service_spec.rb
index 4707673269a..65d16beef91 100644
--- a/spec/models/project_services/hipchat_service_spec.rb
+++ b/spec/models/project_services/hipchat_service_spec.rb
@@ -47,6 +47,14 @@ describe HipchatService do
       WebMock.stub_request(:post, api_url)
     end
 
+    it 'should test and return errors' do
+      allow(hipchat).to receive(:execute).and_raise(StandardError, 'no such room')
+      result = hipchat.test(push_sample_data)
+
+      expect(result[:success]).to be_falsey
+      expect(result[:result].to_s).to eq('no such room')
+    end
+
     it 'should use v1 if version is provided' do
       allow(hipchat).to receive(:api_version).and_return('v1')
       expect(HipChat::Client).to receive(:new).
diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index ca11758ee06..a213ffe6c4b 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -46,6 +46,16 @@ describe Service do
       describe :can_test do
         it { expect(@testable).to eq(true) }
       end
+
+      describe :test do
+        let(:data) { 'test' }
+
+        it 'test runs execute' do
+          expect(@service).to receive(:execute).with(data)
+
+          @service.test(data)
+        end
+      end
     end
 
     describe "With commits" do