From f039e8e03fb341e0cdca1c2597438549c84e15f1 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Mon, 23 Mar 2015 21:20:48 +0100
Subject: Don't use required keyword arguments to maintain support for Ruby
 2.0.

---
 app/mailers/emails/projects.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index 48458baa674..3cd812825e2 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -16,13 +16,17 @@ module Emails
            subject: subject("Project was moved"))
     end
 
-    def repository_push_email(project_id, recipient,  author_id:, 
-                                                      ref:, 
-                                                      action:, 
+    def repository_push_email(project_id, recipient,  author_id: nil, 
+                                                      ref: nil, 
+                                                      action: nil, 
                                                       compare: nil, 
                                                       reverse_compare: false, 
                                                       send_from_committer_email: false, 
                                                       disable_diffs: false)
+      unless author_id && ref && action
+        raise ArgumentError, "missing keywords: author_id, ref, action"
+      end
+
       @project = Project.find(project_id)
       @author  = User.find(author_id)
       @reverse_compare = reverse_compare
-- 
cgit v1.2.1


From 8a7b4eeb0e547251e97b7fd466de009dcbd7fe37 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Mon, 23 Mar 2015 21:21:23 +0100
Subject: Revert "Update gemnasium-gitlab-service gem"

This reverts commit af522ede14cad4605bc7f0137ddf6950974eccce.
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4f1cab43dd5..513e2c643e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -188,7 +188,7 @@ GEM
       dotenv (>= 0.7)
       thor (>= 0.13.6)
     formatador (0.2.4)
-    gemnasium-gitlab-service (0.2.5)
+    gemnasium-gitlab-service (0.2.4)
       rugged (~> 0.21)
     gemojione (2.0.0)
       json
-- 
cgit v1.2.1