Merge branch 'master' into mmonaco/gitlab-ce-api-user-noconfirm

Conflicts:
	lib/api/users.rb

1 files changed, 23 insertions, 0 deletions

diff --git a/app/models/project_contributions.rb b/app/models/project_contributions.rb
new file mode 100644
index 00000000000..8ab2d814a94
--- /dev/null
+++ b/app/models/project_contributions.rb
@@ -0,0 +1,23 @@
+class ProjectContributions
+  attr_reader :project, :user
+
+  def initialize(project, user)
+    @project, @user = project, user
+  end
+
+  def commits_log
+    repository = project.repository
+
+    if !repository.exists? || repository.empty?
+      return {}
+    end
+
+    Rails.cache.fetch(cache_key) do
+      repository.commits_per_day_for_user(user)
+    end
+  end
+
+  def cache_key
+    "#{Date.today.to_s}-commits-log-#{project.id}-#{user.email}"
+  end
+end