Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce-upstream

CHANGELOG-EE

@@ -7,6 +7,9 @@ v 8.5.0 (unreleased)
 v 8.4.4
   - Re-introduce "Send email to users" link in Admin area
   - Fix category values for Jenkins and JenkinsDeprecated services
+  - Fix Elasticsearch indexing for newly added snippets
+  - Make Elasticsearch indexer more stable
+  - Update gitlab-elasticsearch-git to 0.0.10 which contain a few important fixes
 
 v 8.4.3
   - Elasticsearch: fix partial blob indexing on push

Gemfile

@@ -95,7 +95,7 @@ gem "seed-fu", '~> 2.3.5'
 # Search
 gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
-gem 'gitlab-elasticsearch-git', '~> 0.0.9', require: "elasticsearch/git"
+gem 'gitlab-elasticsearch-git', '~> 0.0.10', require: "elasticsearch/git"
 
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 1.11.0'

Gemfile.lock

@@ -359,7 +359,7 @@ GEM
       mime-types (>= 1.19)
       rugged (>= 0.23.0b)
     github-markup (1.3.3)
-    gitlab-elasticsearch-git (0.0.9)
+    gitlab-elasticsearch-git (0.0.10)
       activemodel (~> 4.2)
       activesupport (~> 4.2)
       charlock_holmes (~> 0.7)
@@ -956,7 +956,7 @@ DEPENDENCIES
   gemnasium-gitlab-service (~> 0.2)
   github-linguist (~> 4.7.0)
   github-markup (~> 1.3.1)
-  gitlab-elasticsearch-git (~> 0.0.9)
+  gitlab-elasticsearch-git (~> 0.0.10)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-license (~> 0.0.4)
   gitlab_emoji (~> 0.2.0)

app/models/personal_snippet.rb

@@ -16,4 +16,8 @@
 #
 
 class PersonalSnippet < Snippet
+  # Elastic search configuration (it does not support STI)
+  document_type 'snippet'
+  index_name [Rails.application.class.parent_name.downcase, 'snippet', Rails.env].join('-')
+  include Elastic::SnippetsSearch
 end

app/models/project_snippet.rb

@@ -16,6 +16,11 @@
 #
 
 class ProjectSnippet < Snippet
+  # Elastic search configuration (it does not support STI)
+  document_type 'snippet'
+  index_name [Rails.application.class.parent_name.downcase, 'snippet', Rails.env].join('-')
+  include Elastic::SnippetsSearch
+
   belongs_to :project
   belongs_to :author, class_name: "User"
 

doc/README.md

@@ -12,6 +12,7 @@
 - [Profile Settings](profile/README.md)
 - [Project Services](project_services/project_services.md) Integrate a project with external services, such as CI and chat.
 - [Public access](public_access/public_access.md) Learn how you can allow public and internal access to projects.
+- [Analytics](analytics/README.md)
 - [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects.
 - [Web hooks](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project.
 - [Workflow](workflow/README.md) Using GitLab functionality and importing projects from GitHub and SVN.

doc/analytics/README.md

+# Analytics
+
+- [Contribution Analytics](contribution_analytics.md)

doc/analytics/contribution_analytics.md

+# Contribution Analytics (EE only)
+
+_**Note:** This feature was introduced in GitLab EE 8.3._
+
+With contribution analytics you can have an overview for the activity of
+issues, merge requests and push events of your organization and its members.
+
+The analytics page is located at **Group > Contribution Analytics**
+under the URL `/groups/<groupname>/analytics`.
+
+The time period on which the analytics depend on, is spanned in three sections:
+last week, last month and last three months. You can choose which one to
+display by using the dropdown calendar menu in the upper right corner.
+
+![Contribution analytics choose period](img/group_stats_cal.png)
+
+---
+
+There are three main bar graphs that are deducted from the number of
+contributions per group member. These contributions include push events, merge
+requests and closed issues. Hovering on each bar you can see the number of
+events for a specific member.
+
+Below is an example of the push events of the
+[gitlab-org][https://gitlab.com/groups/gitlab-org] group.
+
+![Contribution analytics bar graphs](img/group_stats_graph.png)
+
+---
+
+Apart from the bar graphs you can also see the contributions per group member
+which are depicted in a table that can be sorted by:
+
+* Member name
+* Number of pushed events
+* Number of opened issues
+* Number of closed issues
+* Number of opened MRs
+* Number of accepted MRs
+* Number of total contributions
+
+![Contribution analytics contributions table](img/group_stats_table.png)

lib/tasks/gitlab/elastic.rake

@@ -11,14 +11,15 @@ namespace :gitlab do
           puts "Indexing #{project.name_with_namespace} (ID=#{project.id})..."
 
           index_status = IndexStatus.find_or_create_by(project: project)
-          head_sha = project.repository.commit.sha
-
-          if index_status.last_commit == head_sha
-            puts "Skipped".yellow
-            next
-          end
 
           begin
+            head_sha = project.repository.commit.sha
+
+            if index_status.last_commit == head_sha
+              puts "Skipped".yellow
+              next
+            end
+
             project.repository.index_commits(from_rev: project.index_status.last_commit)
             project.repository.index_blobs(from_rev: project.index_status.last_commit)