Commit 694388df authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parents cf6a0ff7 75f595ac
...@@ -8,6 +8,7 @@ v 6.7.0 ...@@ -8,6 +8,7 @@ v 6.7.0
- Show contribution guide link for new issue form (Jeroen van Baarsen) - Show contribution guide link for new issue form (Jeroen van Baarsen)
- Fix CI status for merge requests from fork - Fix CI status for merge requests from fork
- Added option to remove issue assignee on project issue page and issue edit page (Jason Blanchard) - 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 v 6.6.2
- Fix 500 error on branch/tag create or remove via UI - Fix 500 error on branch/tag create or remove via UI
......
...@@ -13,6 +13,7 @@ GitLab.GfmAutoComplete = ...@@ -13,6 +13,7 @@ GitLab.GfmAutoComplete =
Members: Members:
template: '<li data-value="${username}">${username} <small>${name}</small></li>' template: '<li data-value="${username}">${username} <small>${name}</small></li>'
# Issues and MergeRequests
Issues: Issues:
template: '<li data-value="${id}"><small>${id}</small> ${title} </li>' template: '<li data-value="${id}"><small>${id}</small> ${title} </li>'
...@@ -46,11 +47,22 @@ GitLab.GfmAutoComplete = ...@@ -46,11 +47,22 @@ GitLab.GfmAutoComplete =
before_save: (issues) -> before_save: (issues) ->
$.map issues, (i) -> id: i.iid, title: sanitize(i.title), search: "#{i.iid} #{i.title}" $.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", => input.one "focus", =>
$.getJSON(@dataSource).done (data) -> $.getJSON(@dataSource).done (data) ->
# load members # load members
input.atwho 'load', "@", data.members input.atwho 'load', "@", data.members
# load issues # load issues
input.atwho 'load', "issues", data.issues input.atwho 'load', "issues", data.issues
# load merge requests
input.atwho 'load', "mergerequests", data.mergerequests
# load emojis # load emojis
input.atwho 'load', ":", data.emojis input.atwho 'load', ":", data.emojis
...@@ -108,6 +108,7 @@ class ProjectsController < ApplicationController ...@@ -108,6 +108,7 @@ class ProjectsController < ApplicationController
@suggestions = { @suggestions = {
emojis: Emoji.names, emojis: Emoji.names,
issues: @project.issues.select([:iid, :title, :description]), 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 } } members: @project.team.members.sort_by(&:username).map { |user| { username: user.username, name: user.name } }
} }
......
.readme-holder#README .readme-holder#README
%h4.readme-file-title %h4.readme-file-title
%i.icon-file %i.icon-file
= readme.name = readme.name
.wiki .wiki
- if gitlab_markdown?(readme.name) - if gitlab_markdown?(readme.name)
= preserve do = preserve do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment