Merge remote-tracking branch 'upstream/master'

vagrant
2 parents c00917e4 a01db3d6
Showing 11 changed files with 88 additions and 14 deletions Show diff stats
CONTRIBUTING.md
README.md
app/assets/javascripts/dispatcher.js.coffee
app/assets/stylesheets/sections/issues.scss
app/helpers/projects_helper.rb
app/models/concerns/issuable.rb
app/models/concerns/mentionable.rb
app/models/note.rb
app/services/notification_service.rb
app/views/issues/show.html.haml
spec/services/notification_service_spec.rb
@@ -36,7 +36,7 @@ We welcome pull requests with fixes and improvements to GitLab code, tests, and/
 ### Pull request guidelines
-If you can, please submit a pull request with the fix or improvements including tests. If you don't know how to fix the issue but can write a test that exposes the issue we will accept that as well. The workflow to make a pull request is as follows:
+If you can, please submit a pull request with the fix or improvements including tests. If you don't know how to fix the issue but can write a test that exposes the issue we will accept that as well. In general bug fixes that include a regression test are merged quickly while new features without proper tests are least likely to receive timely feedback. The workflow to make a pull request is as follows:
 1. Fork the project on GitHub
 1. Create a feature branch
@@ -51,10 +51,11 @@ We will accept pull requests if:
 * The code has proper tests and all tests pass (or it is a test exposing a failure in existing code)
 * It can be merged without problems (if not please use: `git rebase master`)
 * It doesn't break any existing functionality
-* It's quality code that conforms to the [Rails style guide](https://github.com/bbatsov/rails-style-guide) and best practices
+* It's quality code that conforms to the [Ruby](https://github.com/bbatsov/ruby-style-guide) and [Rails](https://github.com/bbatsov/rails-style-guide) style guides and best practices
 * The description includes a motive for your change and the method you used to achieve it
 * It keeps the GitLab code base clean and well structured
 * We think other users will benefit from the same functionality
 * If it makes changes to the UI the pull request should include screenshots
+* It is a single commit (please use git rebase -i to squash commits)
 For examples of feedback on pull requests please look at already [closed pull requests](https://github.com/gitlabhq/gitlabhq/pulls?direction=desc&page=1&sort=created&state=closed).
@@ -2,6 +2,8 @@
 ![logo](https://raw.github.com/gitlabhq/gitlabhq/master/public/gitlab_logo.png)
+![animated-screenshots](http://makeagif.com/media/6-23-2013/AN3Mo6.gif)
+
 ### GitLab allows you to
  * keep your code secure on your own server
  * manage repositories, users and access permissions
@@ -22,7 +24,7 @@
 * [![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.png)](https://codeclimate.com/github/gitlabhq/gitlabhq)
-* [![Dependency Status](https://gemnasium.com/gitlabhq/gitlabhq.png)](https://gemnasium.com/gitlabhq/gitlabhq) this button can be yellow (small updates are available) but must not be red (a security fix or an important update is available)
+* [![Dependency Status](https://gemnasium.com/gitlabhq/gitlabhq.png)](https://gemnasium.com/gitlabhq/gitlabhq) this button can be yellow (small updates are available) but must not be red (a security fix or an important update is available), gems are updated in major releases of GitLab.
 * [![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.png?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq)
 $ ->
   new Dispatcher()
-  
+
 class Dispatcher
   constructor: () ->
     @initSearch()
@@ -10,8 +10,6 @@ class Dispatcher
     page = $('body').attr('data-page')
     project_id = $('body').attr('data-project-id')
-    console.log(page)
- 
     unless page
       return false
@@ -106,3 +106,7 @@ input.check_all_issues {
 #update_status {
   width: 100px;
 }
+
+.participants {
+  margin-bottom: 10px;
+}
@@ -17,7 +17,7 @@ module ProjectsHelper
   end
   def link_to_member(project, author, opts = {})
-    default_opts = { avatar: true }
+    default_opts = { avatar: true, name: true, size: 16 }
     opts = default_opts.merge(opts)
     return "(deleted)" unless author
@@ -25,10 +25,10 @@ module ProjectsHelper
     author_html =  ""
     # Build avatar image tag
-    author_html << image_tag(gravatar_icon(author.try(:email)), width: 16, class: "avatar avatar-inline s16") if opts[:avatar]
+    author_html << image_tag(gravatar_icon(author.try(:email), opts[:size]), width: opts[:size], class: "avatar avatar-inline #{"s#{opts[:size]}" if opts[:size]}") if opts[:avatar]
     # Build name span tag
-    author_html << content_tag(:span, sanitize(author.name), class: 'author')
+    author_html << content_tag(:span, sanitize(author.name), class: 'author') if opts[:name]
     author_html = author_html.html_safe
@@ -6,6 +6,7 @@
 #
 module Issuable
   extend ActiveSupport::Concern
+  include Mentionable
   included do
     belongs_to :project
@@ -97,4 +98,18 @@ module Issuable
   def votes_count
     upvotes + downvotes
   end
+
+  # Return all users participating on the discussion
+  def participants
+    users = []
+    users << author
+    users << assignee if is_assigned?
+    mentions = []
+    mentions << self.mentioned_users
+    notes.each do |note|
+      users << note.author
+      mentions << note.mentioned_users
+    end
+    users.concat(mentions.reduce([], :|)).uniq
+  end
 end
@@ -0,0 +1,37 @@
+# == Mentionable concern
+#
+# Contains common functionality shared between Issues and Notes
+#
+# Used by Issue, Note
+#
+module Mentionable
+  extend ActiveSupport::Concern
+
+  def mentioned_users
+    users = []
+    return users if mentionable_text.blank?
+    has_project = self.respond_to? :project
+    matches = mentionable_text.scan(/@[a-zA-Z][a-zA-Z0-9_\-\.]*/)
+    matches.each do |match|
+      identifier = match.delete "@"
+      if has_project
+        id = project.users_projects.joins(:user).where(users: { username: identifier }).pluck(:user_id).first
+      else
+        id = User.where(username: identifier).pluck(:id).first
+      end
+      users << User.find(id) unless id.blank?
+    end
+    users.uniq
+  end
+
+  def mentionable_text
+    if self.class == Issue
+      description
+    elsif self.class == Note
+      note
+    else
+      nil
+    end
+  end
+
+end
@@ -19,6 +19,8 @@ require &#39;carrierwave/orm/activerecord&#39;
 require 'file_size_validator'
 class Note < ActiveRecord::Base
+  include Mentionable
+
   attr_accessible :note, :noteable, :noteable_id, :noteable_type, :project_id,
                   :attachment, :line_code, :commit_id
@@ -110,9 +110,11 @@ class NotificationService
     else
       opts.merge!(noteable_id: note.noteable_id)
       target = note.noteable
-      recipients = []
-      recipients << target.assignee if target.respond_to?(:assignee)
-      recipients << target.author if target.respond_to?(:author)
+      if target.respond_to?(:participants)
+        recipients = target.participants
+      else
+        recipients = []
+      end
     end
     # Get users who left comment in thread
@@ -181,7 +183,12 @@ class NotificationService
   end
   def new_resource_email(target, method)
-    recipients = reject_muted_users([target.assignee], target.project)
+    if target.respond_to?(:participants)
+      recipients = target.participants
+    else
+      recipients = []
+    end
+    recipients = reject_muted_users(recipients, target.project)
     recipients = recipients.concat(project_watchers(target.project)).uniq
     recipients.delete(target.author)
@@ -65,4 +65,9 @@
     - else
       = link_to 'Close Issue', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped close_issue", title: "Close Issue"
+.participants
+  %cite.cgray #{@issue.participants.count} participants
+  - @issue.participants.each do |participant|
+    = link_to_member(@project, participant, name: false, size: 24)
+
 .voting_notes#notes= render "notes/notes_with_form"
@@ -19,7 +19,7 @@ describe NotificationService do
   describe 'Notes' do
     context 'issue note' do
       let(:issue) { create(:issue, assignee: create(:user)) }
-      let(:note) { create(:note_on_issue, noteable: issue, project_id: issue.project_id) }
+      let(:note) { create(:note_on_issue, noteable: issue, project_id: issue.project_id, note: '@mention referenced') }
       before do
         build_team(note.project)
@@ -30,6 +30,7 @@ describe NotificationService do
           should_email(@u_watcher.id)
           should_email(note.noteable.author_id)
           should_email(note.noteable.assignee_id)
+          should_email(@u_mentioned.id)
           should_not_email(note.author_id)
           should_not_email(@u_participating.id)
           should_not_email(@u_disabled.id)
@@ -235,9 +236,11 @@ describe NotificationService do
     @u_watcher = create(:user, notification_level: Notification::N_WATCH)
     @u_participating = create(:user, notification_level: Notification::N_PARTICIPATING)
     @u_disabled = create(:user, notification_level: Notification::N_DISABLED)
+    @u_mentioned = create(:user, username: 'mention', notification_level: Notification::N_WATCH)
     project.team << [@u_watcher, :master]
     project.team << [@u_participating, :master]
     project.team << [@u_disabled, :master]
+    project.team << [@u_mentioned, :master]
   end
 end
	@@ -106,3 +106,7 @@ input.check_all_issues {		@@ -106,3 +106,7 @@ input.check_all_issues {
106	#update_status {	106	#update_status {
107	width: 100px;	107	width: 100px;
108	}	108	}
		109	+
		110	+.participants {
		111	+ margin-bottom: 10px;
		112	+}
	@@ -17,7 +17,7 @@ module ProjectsHelper		@@ -17,7 +17,7 @@ module ProjectsHelper
17	end	17	end
18		18
19	def link_to_member(project, author, opts = {})	19	def link_to_member(project, author, opts = {})
20	- default_opts = { avatar: true }	20	+ default_opts = { avatar: true, name: true, size: 16 }
21	opts = default_opts.merge(opts)	21	opts = default_opts.merge(opts)
22		22
23	return "(deleted)" unless author	23	return "(deleted)" unless author
	@@ -25,10 +25,10 @@ module ProjectsHelper		@@ -25,10 +25,10 @@ module ProjectsHelper
25	author_html = ""	25	author_html = ""
26		26
27	# Build avatar image tag	27	# Build avatar image tag
28	- author_html << image_tag(gravatar_icon(author.try(:email)), width: 16, class: "avatar avatar-inline s16") if opts[:avatar]	28	+ author_html << image_tag(gravatar_icon(author.try(:email), opts[:size]), width: opts[:size], class: "avatar avatar-inline #{"s#{opts[:size]}" if opts[:size]}") if opts[:avatar]
29		29
30	# Build name span tag	30	# Build name span tag
31	- author_html << content_tag(:span, sanitize(author.name), class: 'author')	31	+ author_html << content_tag(:span, sanitize(author.name), class: 'author') if opts[:name]
32		32
33	author_html = author_html.html_safe	33	author_html = author_html.html_safe
34		34
	@@ -6,6 +6,7 @@		@@ -6,6 +6,7 @@
6	#	6	#
7	module Issuable	7	module Issuable
8	extend ActiveSupport::Concern	8	extend ActiveSupport::Concern
		9	+ include Mentionable
9		10
10	included do	11	included do
11	belongs_to :project	12	belongs_to :project
	@@ -97,4 +98,18 @@ module Issuable		@@ -97,4 +98,18 @@ module Issuable
97	def votes_count	98	def votes_count
98	upvotes + downvotes	99	upvotes + downvotes
99	end	100	end
		101	+
		102	+ # Return all users participating on the discussion
		103	+ def participants
		104	+ users = []
		105	+ users << author
		106	+ users << assignee if is_assigned?
		107	+ mentions = []
		108	+ mentions << self.mentioned_users
		109	+ notes.each do \|note\|
		110	+ users << note.author
		111	+ mentions << note.mentioned_users
		112	+ end
		113	+ users.concat(mentions.reduce([], :\|)).uniq
		114	+ end
100	end	115	end
@@ -0,0 +1,37 @@		@@ -0,0 +1,37 @@
	1	+# == Mentionable concern
	2	+#
	3	+# Contains common functionality shared between Issues and Notes
	4	+#
	5	+# Used by Issue, Note
	6	+#
	7	+module Mentionable
	8	+ extend ActiveSupport::Concern
	9	+
	10	+ def mentioned_users
	11	+ users = []
	12	+ return users if mentionable_text.blank?
	13	+ has_project = self.respond_to? :project
	14	+ matches = mentionable_text.scan(/@[a-zA-Z][a-zA-Z0-9_\-\.]*/)
	15	+ matches.each do \|match\|
	16	+ identifier = match.delete "@"
	17	+ if has_project
	18	+ id = project.users_projects.joins(:user).where(users: { username: identifier }).pluck(:user_id).first
	19	+ else
	20	+ id = User.where(username: identifier).pluck(:id).first
	21	+ end
	22	+ users << User.find(id) unless id.blank?
	23	+ end
	24	+ users.uniq
	25	+ end
	26	+
	27	+ def mentionable_text
	28	+ if self.class == Issue
	29	+ description
	30	+ elsif self.class == Note
	31	+ note
	32	+ else
	33	+ nil
	34	+ end
	35	+ end
	36	+
	37	+end
	@@ -19,6 +19,8 @@ require 'carrierwave/orm/activerecord'		@@ -19,6 +19,8 @@ require 'carrierwave/orm/activerecord'
19	require 'file_size_validator'	19	require 'file_size_validator'
20		20
21	class Note < ActiveRecord::Base	21	class Note < ActiveRecord::Base
		22	+ include Mentionable
		23	+
22	attr_accessible :note, :noteable, :noteable_id, :noteable_type, :project_id,	24	attr_accessible :note, :noteable, :noteable_id, :noteable_type, :project_id,
23	:attachment, :line_code, :commit_id	25	:attachment, :line_code, :commit_id
24		26
	@@ -65,4 +65,9 @@		@@ -65,4 +65,9 @@
65	- else	65	- else
66	= link_to 'Close Issue', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped close_issue", title: "Close Issue"	66	= link_to 'Close Issue', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped close_issue", title: "Close Issue"
67		67
		68	+.participants
		69	+ %cite.cgray #{@issue.participants.count} participants
		70	+ - @issue.participants.each do \|participant\|
		71	+ = link_to_member(@project, participant, name: false, size: 24)
		72	+
68	.voting_notes#notes= render "notes/notes_with_form"	73	.voting_notes#notes= render "notes/notes_with_form"