From 01ec6c793c533306365319e3bf01174a976352d0 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Tue, 25 Mar 2014 09:25:31 +0100 Subject: At mention participating users. --- app/controllers/projects_controller.rb | 3 ++- app/models/user.rb | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index e181a0ec7fa..aac9fcd555c 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -123,11 +123,12 @@ class ProjectsController < ApplicationController end def autocomplete_sources + participating_users = @project.team.members.sort_by(&:username).map { |user| { username: user.username, name: user.name } } + User.participating(@project.notes).select([:username, :name]).sort_by(&:username).map { |user| { username: user.username, name: user.name } } @suggestions = { emojis: Emoji.names.map { |e| { name: e, path: view_context.image_url("emoji/#{e}.png") } }, 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: participating_users.uniq } respond_to do |format| diff --git a/app/models/user.rb b/app/models/user.rb index d9f420759d2..99ebf1527bf 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -169,6 +169,7 @@ class User < ActiveRecord::Base scope :not_in_project, ->(project) { project.users.present? ? where("id not in (:ids)", ids: project.users.map(&:id) ) : all } scope :without_projects, -> { where('id NOT IN (SELECT DISTINCT(user_id) FROM users_projects)') } scope :ldap, -> { where(provider: 'ldap') } + scope :participating, ->(notes){ where(id: notes.inc_author.map(&:author_id))} scope :potential_team_members, ->(team) { team.members.any? ? active.not_in_team(team) : active } -- cgit v1.2.1 From 02850210b6694983bed0c3eb7ad8dedfc7d95c54 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Tue, 25 Mar 2014 09:52:27 +0100 Subject: Allow referencing an existing user. --- lib/gitlab/markdown.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index 80bb00821f7..1d3c6ac6eea 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -166,8 +166,8 @@ module Gitlab end def reference_user(identifier) - if member = @project.team_members.find { |user| user.username == identifier } - link_to("@#{identifier}", user_url(identifier), html_options.merge(class: "gfm gfm-team_member #{html_options[:class]}")) if member + if user = User.find_by_username(identifier) + link_to("@#{identifier}", user_url(identifier), html_options.merge(class: "gfm gfm-team_member #{html_options[:class]}")) if user end end -- cgit v1.2.1 From eda2c0c607e4f12803d9021f9f2eacf56a4d2fcd Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Tue, 25 Mar 2014 12:40:49 +0100 Subject: Include commits. --- app/controllers/projects_controller.rb | 25 +++++++++++++++++++++++-- app/views/layouts/_init_auto_complete.html.haml | 2 +- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index aac9fcd555c..353d4f0c4b6 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -123,12 +123,21 @@ class ProjectsController < ApplicationController end def autocomplete_sources - participating_users = @project.team.members.sort_by(&:username).map { |user| { username: user.username, name: user.name } } + User.participating(@project.notes).select([:username, :name]).sort_by(&:username).map { |user| { username: user.username, name: user.name } } + note_type = params['type'] + note_id = params['type_id'] + participating = if note_type && note_id + participants_in(note_type, note_id) + else + [] + end + team_members = @project.team.members.sort_by(&:username).map { |user| { username: user.username, name: user.name } } + participants = team_members + participating + #participating = @project.issues.map { |issue| issue.participants.sort_by(&:username).map { |user| { username: user.username, name: user.name } } }.flatten @suggestions = { emojis: Emoji.names.map { |e| { name: e, path: view_context.image_url("emoji/#{e}.png") } }, issues: @project.issues.select([:iid, :title, :description]), mergerequests: @project.merge_requests.select([:iid, :title, :description]), - members: participating_users.uniq + members: participants.uniq } respond_to do |format| @@ -163,4 +172,16 @@ class ProjectsController < ApplicationController def user_layout current_user ? "projects" : "public_projects" end + + def participants_in(type, id) + note = case type + when "Issue", "MergeRequest" + type.constantize.find_by_iid(id) + when "Commits" + type.constantize.find(id) + else + [] + end + note.participants.sort_by(&:username).map { |user| { username: user.username, name: user.name } } + end end diff --git a/app/views/layouts/_init_auto_complete.html.haml b/app/views/layouts/_init_auto_complete.html.haml index 9e728b462bb..353f7ce34f1 100644 --- a/app/views/layouts/_init_auto_complete.html.haml +++ b/app/views/layouts/_init_auto_complete.html.haml @@ -1,3 +1,3 @@ :javascript - GitLab.GfmAutoComplete.dataSource = "#{autocomplete_sources_project_path(@project)}" + GitLab.GfmAutoComplete.dataSource = "#{autocomplete_sources_project_path(@project, type: @noteable.class, type_id: params[:id])}" GitLab.GfmAutoComplete.setup(); -- cgit v1.2.1 From 0a4283b50adb10c13cf2f00c83e372549a004a05 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Tue, 25 Mar 2014 13:10:32 +0100 Subject: Extract sorting into a method. --- app/controllers/projects_controller.rb | 20 ++++++++++++-------- app/models/user.rb | 1 - 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 353d4f0c4b6..30196f9da3a 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -130,14 +130,13 @@ class ProjectsController < ApplicationController else [] end - team_members = @project.team.members.sort_by(&:username).map { |user| { username: user.username, name: user.name } } + team_members = sorted(@project.team.members) participants = team_members + participating - #participating = @project.issues.map { |issue| issue.participants.sort_by(&:username).map { |user| { username: user.username, name: user.name } } }.flatten @suggestions = { emojis: Emoji.names.map { |e| { name: e, path: view_context.image_url("emoji/#{e}.png") } }, issues: @project.issues.select([:iid, :title, :description]), mergerequests: @project.merge_requests.select([:iid, :title, :description]), - members: participants.uniq + members: participants } respond_to do |format| @@ -174,14 +173,19 @@ class ProjectsController < ApplicationController end def participants_in(type, id) - note = case type + users = case type when "Issue", "MergeRequest" - type.constantize.find_by_iid(id) - when "Commits" - type.constantize.find(id) + type.constantize.find_by_iid(id).participants + when "Commit" + author_ids = Note.for_commit_id(id).pluck(:author_id).uniq + User.where(id: author_ids) else [] end - note.participants.sort_by(&:username).map { |user| { username: user.username, name: user.name } } + sorted(users) + end + + def sorted(users) + users.uniq.sort_by(&:username).map { |user| { username: user.username, name: user.name } } end end diff --git a/app/models/user.rb b/app/models/user.rb index 99ebf1527bf..d9f420759d2 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -169,7 +169,6 @@ class User < ActiveRecord::Base scope :not_in_project, ->(project) { project.users.present? ? where("id not in (:ids)", ids: project.users.map(&:id) ) : all } scope :without_projects, -> { where('id NOT IN (SELECT DISTINCT(user_id) FROM users_projects)') } scope :ldap, -> { where(provider: 'ldap') } - scope :participating, ->(notes){ where(id: notes.inc_author.map(&:author_id))} scope :potential_team_members, ->(team) { team.members.any? ? active.not_in_team(team) : active } -- cgit v1.2.1 From 12c3962fc0741f4976688a9a15c5865b23414181 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Tue, 25 Mar 2014 14:00:43 +0100 Subject: Search within project. --- app/controllers/projects_controller.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 30196f9da3a..4afcedf3361 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -136,7 +136,7 @@ class ProjectsController < ApplicationController emojis: Emoji.names.map { |e| { name: e, path: view_context.image_url("emoji/#{e}.png") } }, issues: @project.issues.select([:iid, :title, :description]), mergerequests: @project.merge_requests.select([:iid, :title, :description]), - members: participants + members: participants.uniq } respond_to do |format| @@ -174,8 +174,10 @@ class ProjectsController < ApplicationController def participants_in(type, id) users = case type - when "Issue", "MergeRequest" - type.constantize.find_by_iid(id).participants + when "Issue" + @project.issues.find_by_iid(id).participants + when "MergeRequest" + @project.merge_requests.find_by_iid(id).participants when "Commit" author_ids = Note.for_commit_id(id).pluck(:author_id).uniq User.where(id: author_ids) -- cgit v1.2.1 From d26302215a81b3428ba121fe58be904ea1ac7b6e Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Tue, 25 Mar 2014 17:25:16 +0100 Subject: Correct identation, default value if note doesn't exist. --- app/controllers/projects_controller.rb | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 4afcedf3361..ebb8a90c630 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -126,10 +126,10 @@ class ProjectsController < ApplicationController note_type = params['type'] note_id = params['type_id'] participating = if note_type && note_id - participants_in(note_type, note_id) - else - [] - end + participants_in(note_type, note_id) + else + [] + end team_members = sorted(@project.team.members) participants = team_members + participating @suggestions = { @@ -174,16 +174,18 @@ class ProjectsController < ApplicationController def participants_in(type, id) users = case type - when "Issue" - @project.issues.find_by_iid(id).participants - when "MergeRequest" - @project.merge_requests.find_by_iid(id).participants - when "Commit" - author_ids = Note.for_commit_id(id).pluck(:author_id).uniq - User.where(id: author_ids) - else - [] - end + when "Issue" + issue = @project.issues.find_by_iid(id) + issue ? issue.participants : [] + when "MergeRequest" + merge_request = @project.merge_requests.find_by_iid(id) + merge_request ? merge_request.participants : [] + when "Commit" + author_ids = Note.for_commit_id(id).pluck(:author_id).uniq + User.where(id: author_ids) + else + [] + end sorted(users) end -- cgit v1.2.1 From 5245fac63b7ec7b4ad17c91e821350cff8e3bf04 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 21 Mar 2014 23:11:01 +0200 Subject: Version 6.7.2 Signed-off-by: Dmitriy Zaporozhets Conflicts: CHANGELOG VERSION --- CHANGELOG | 6 ++++++ VERSION | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 441f36a5bde..75d88e2ce3f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +v6.7.2 + - Fix upgrader script + +v6.7.1 + - Fix GitLab CI integration + v 6.7.0 - Increased the example Nginx client_max_body_size from 5MB to 20MB, consider updating it manually on existing installations - Add support for Gemnasium as a Project Service (Olivier Gonzalez) diff --git a/VERSION b/VERSION index f0e13c50902..2dd517aa61c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.7.0 +6.7.2 -- cgit v1.2.1 From 9dd58c320a38cbcaf8134157103b2b2a2fad76d2 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Tue, 25 Mar 2014 17:54:32 +0100 Subject: Add to changelog. --- CHANGELOG | 7 +++++-- lib/gitlab/markdown.rb | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 75d88e2ce3f..2a025d6481e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,10 @@ -v6.7.2 +v 6.8.0 + - Ability to at mention users that are participating in issue and merge req. discussion + +v 6.7.2 - Fix upgrader script -v6.7.1 +v 6.7.1 - Fix GitLab CI integration v 6.7.0 diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index 1d3c6ac6eea..de14a3eca27 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -167,7 +167,7 @@ module Gitlab def reference_user(identifier) if user = User.find_by_username(identifier) - link_to("@#{identifier}", user_url(identifier), html_options.merge(class: "gfm gfm-team_member #{html_options[:class]}")) if user + link_to("@#{identifier}", user_url(identifier), html_options.merge(class: "gfm gfm-team_member #{html_options[:class]}")) end end -- cgit v1.2.1