Merge commit 'master' into discussions

Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb

1 files changed, 12 insertions, 0 deletions

diff --git a/app/models/group.rb b/app/models/group.rb
index b668f5560ab..8ba92980a9b 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -12,6 +12,14 @@
 #
 
 class Group < Namespace
+  def add_users_to_project_teams(user_ids, project_access)
+    UsersProject.add_users_into_projects(
+      projects.map(&:id),
+      user_ids,
+      project_access
+    )
+  end
+
   def users
     users = User.joins(:users_projects).where(users_projects: {project_id: project_ids})
     users = users << owner
@@ -21,4 +29,8 @@ class Group < Namespace
   def human_name
     name
   end
+
+  def truncate_teams
+    UsersProject.truncate_teams(project_ids)
+  end
 end