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

CHANGELOG

@@ -8,6 +8,7 @@ v 6.7.0
   - Show contribution guide link for new issue form (Jeroen van Baarsen)
   - Fix CI status for merge requests from fork 
   - Added option to remove issue assignee on project issue page and issue edit page (Jason Blanchard)
+  - Converted all the help sections into markdown
 
 v 6.6.2
   - Fix 500 error on branch/tag create or remove via UI

app/assets/javascripts/gfm_auto_complete.js.coffee

@@ -13,6 +13,7 @@ GitLab.GfmAutoComplete =
   Members:
     template: '<li data-value="${username}">${username} <small>${name}</small></li>'
 
+  # Issues and MergeRequests
   Issues:
     template: '<li data-value="${id}"><small>${id}</small> ${title} </li>'
 
@@ -46,11 +47,22 @@ GitLab.GfmAutoComplete =
         before_save: (issues) ->
           $.map issues, (i) -> id: i.iid, title: sanitize(i.title), search: "#{i.iid} #{i.title}"
 
+    input.atwho
+      at: '!'
+      alias: 'mergerequests'
+      search_key: 'search'
+      tpl: @Issues.template
+      callbacks:
+        before_save: (merges) ->
+          $.map merges, (m) -> id: m.iid, title: sanitize(m.title), search: "#{m.iid} #{m.title}"
+
     input.one "focus", =>
       $.getJSON(@dataSource).done (data) ->
         # load members
         input.atwho 'load', "@", data.members
         # load issues
         input.atwho 'load', "issues", data.issues
+        # load merge requests
+        input.atwho 'load', "mergerequests", data.mergerequests
         # load emojis
         input.atwho 'load', ":", data.emojis

app/controllers/projects_controller.rb

@@ -108,6 +108,7 @@ class ProjectsController < ApplicationController
     @suggestions = {
       emojis: Emoji.names,
       issues: @project.issues.select([:iid, :title, :description]),
+      mergerequests: @project.merge_requests.select([:iid, :title, :description]),
       members: @project.team.members.sort_by(&:username).map { |user| { username: user.username, name: user.name } }
     }
 

app/views/projects/tree/_readme.html.haml

 .readme-holder#README
   %h4.readme-file-title
     %i.icon-file
-      = readme.name
+    = readme.name
   .wiki
     - if gitlab_markdown?(readme.name)
       = preserve do