Merge branch 'send_checkout_sha_to_services' into 'master'

Send checkout sha to services

In case of tags it may be useful to have sha of commit this tag points to.
So now web hooks and services get additional parameter `checkout_sha`

See merge request !1400

lib/gitlab/git.rb

 module Gitlab
   module Git
     BLANK_SHA = '0' * 40
+
+    def self.extract_ref_name(ref)
+      ref.gsub(/\Arefs\/(tags|heads)\//, '')
+    end
   end
 end

lib/gitlab/push_data_builder.rb

 module Gitlab
   class PushDataBuilder
+    class << self
       # Produce a hash of post-receive data
       #
       # data = {
@@ -19,7 +20,7 @@ module Gitlab
       #   total_commits_count: Fixnum
       # }
       #
-    def self.build(project, user, oldrev, newrev, ref, commits = [])
+      def build(project, user, oldrev, newrev, ref, commits = [])
         # Total commits count
         commits_count = commits.size
 
@@ -31,6 +32,7 @@ module Gitlab
           before: oldrev,
           after: newrev,
           ref: ref,
+          checkout_sha: checkout_sha(project.repository, newrev, ref),
           user_id: user.id,
           user_name: user.name,
           project_id: project.id,
@@ -55,9 +57,24 @@ module Gitlab
 
       # This method provide a sample data generated with
       # existing project and commits to test web hooks
-    def self.build_sample(project, user)
+      def build_sample(project, user)
         commits = project.repository.commits(project.default_branch, nil, 3)
         build(project, user, commits.last.id, commits.first.id, "refs/heads/#{project.default_branch}", commits)
       end
+
+      def checkout_sha(repository, newrev, ref)
+        if newrev != Gitlab::Git::BLANK_SHA && ref.start_with?('refs/tags/')
+          tag_name = Gitlab::Git.extract_ref_name(ref)
+          tag = repository.find_tag(tag_name)
+
+          if tag
+            commit = repository.commit(tag.target)
+            commit.try(:sha)
+          end
+        else
+          newrev
+        end
+      end
+    end
   end
 end

spec/lib/gitlab/push_data_builder_spec.rb

@@ -21,13 +21,14 @@ describe 'Gitlab::PushDataBuilder' do
       Gitlab::PushDataBuilder.build(project,
                                     user,
                                     Gitlab::Git::BLANK_SHA,
-                                    '5937ac0a7beb003549fc5fd26fc247adbce4a52e',
+                                    '8a2a6eb295bb170b34c24c76c49ed0e9b2eaf34b',
                                     'refs/tags/v1.1.0')
     end
 
     it { data.should be_a(Hash) }
     it { data[:before].should == Gitlab::Git::BLANK_SHA }
-    it { data[:after].should == '5937ac0a7beb003549fc5fd26fc247adbce4a52e' }
+    it { data[:checkout_sha].should == '5937ac0a7beb003549fc5fd26fc247adbce4a52e' }
+    it { data[:after].should == '8a2a6eb295bb170b34c24c76c49ed0e9b2eaf34b' }
     it { data[:ref].should == 'refs/tags/v1.1.0' }
     it { data[:commits].should be_empty }
     it { data[:total_commits_count].should be_zero }