diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-06 15:50:18 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-06 15:50:18 +0200 |
| commit | 694388dfbc75c6d6f2b51fc2acf0b15c7d8eda2a (patch) | |
| tree | 5fb498de9f17fe3a82f017edb4826df01d828bb7 | |
| parent | cf6a0ff7602718941edbc85fa26e975cba5038f0 (diff) | |
| parent | 75f595ac9280581834e542effd47f430f749ea13 (diff) | |
| download | gitlab-ce-694388dfbc75c6d6f2b51fc2acf0b15c7d8eda2a.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/gfm_auto_complete.js.coffee | 12 | ||||
| -rw-r--r-- | app/controllers/projects_controller.rb | 1 | ||||
| -rw-r--r-- | app/views/projects/tree/_readme.html.haml | 2 |
4 files changed, 15 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index ab420399263..913dbab57cc 100644 --- a/CHANGELOG +++ b/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 diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee index 77091da8f61..dd12000a1cf 100644 --- a/app/assets/javascripts/gfm_auto_complete.js.coffee +++ b/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 diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 6ec109b9145..f1c0336e6ea 100644 --- a/app/controllers/projects_controller.rb +++ b/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 } } } diff --git a/app/views/projects/tree/_readme.html.haml b/app/views/projects/tree/_readme.html.haml index 16a9602ac97..0c19109445a 100644 --- a/app/views/projects/tree/_readme.html.haml +++ b/app/views/projects/tree/_readme.html.haml @@ -1,7 +1,7 @@ .readme-holder#README %h4.readme-file-title %i.icon-file - = readme.name + = readme.name .wiki - if gitlab_markdown?(readme.name) = preserve do |