Letting the user accept the EULA on signup by presenting him with the current version and a checkbox including the checksum for this version.

For now, if the user chooses not to accept he will still be created, but required to accept the EULA afterwards.

Also, added the passing of more parameters when handing off a merge request to an OAuth server.

1 files changed, 6 insertions, 1 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index e6a0ee5..93b057c 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -213,11 +213,16 @@ class MergeRequest < ActiveRecord::Base
   def terms_accepted
     validate_through_oauth do
       confirmed_by_user
-      callback_response = access_token.post('/merge_requests', {'commit_id' => ending_commit, 'user_name' => user.title, 'user_email' => user.email})
+      callback_response = access_token.post('/merge_requests', oauth_signoff_parameters)
       update_attributes(:contribution_agreement_version => callback_response.body)
     end
   end
   
+  # Returns the parameters that are passed on to the contribution agreement site
+  def oauth_signoff_parameters
+    {'commit_id' => ending_commit, 'user_name' => user.title, 'user_email' => user.email, 'commit_shas' => commits_to_be_merged.collect(&:id).join(","), 'proposal' => proposal, 'project_name' => source_repository.project.slug,'repository_name' => source_repository.name, 'merge_request_id' => id}
+  end
+  
   def validate_through_oauth
     yield if valid_oauth_credentials?
   end