Merge branch '7-12-stable' of dev.gitlab.org:gitlab/gitlabhq into 7-12-stable

.gitlab-ci.yml

+# This file is generated by GitLab CI
 before_script:
   - export PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin
   - ruby -v
@@ -7,33 +8,44 @@ before_script:
   - echo $PATH
   - cp config/database.yml.mysql config/database.yml
   - cp config/gitlab.yml.example config/gitlab.yml
-  - ! 'sed "s/username\:.*$/username\: runner/" -i config/database.yml'
-  - ! 'sed "s/password\:.*$/password\: ''password''/" -i config/database.yml'
+  - 'sed "s/username\:.*$/username\: runner/" -i config/database.yml'
+  - 'sed "s/password\:.*$/password\: ''password''/" -i config/database.yml'
   - sed "s/gitlabhq_test/gitlabhq_test_$((RANDOM/5000))/" -i config/database.yml
   - touch log/application.log
   - touch log/test.log
   - bundle install --without postgres production --jobs $(nproc)
   - bundle exec rake db:create RAILS_ENV=test
-jobs:
-- script:
+Rspec:
+  script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec
-  name: Rspec
-  runner: ruby,mysql
-- script:
+  tags:
+    - ruby
+    - mysql
+
+Spinach:
+  script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach
-  name: Spinach
-  runner: ruby,mysql
-- script:
+  tags:
+    - ruby
+    - mysql
+
+Jasmine:
+  script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake jasmine:ci
-  name: Jasmine
-  runner: ruby,mysql
-- script:
+  tags:
+    - ruby
+    - mysql
+
+Rubocop:
+  script:
     - bundle exec rubocop
-  name: Rubocop
-  runner: ruby,mysql
-- script:
+  tags:
+    - ruby
+    - mysql
+
+Brakeman:
+  script:
     - bundle exec rake brakeman
-  name: Brakeman
-  runner: ruby,mysql
-deploy_jobs: []
-skip_refs: ''
+  tags:
+    - ruby
+    - mysql

app/models/project_services/gitlab_ci_service.rb

@@ -40,10 +40,14 @@ class GitlabCiService < CiService
   def execute(data)
     return unless supported_events.include?(data[:object_kind])
 
-    ci_yaml_file = ci_yaml_file(data)
+    sha = data[:checkout_sha]
 
-    if ci_yaml_file
-      data.merge!(ci_yaml_file: ci_yaml_file)
+    if sha.present?
+      file = ci_yaml_file(sha)
+
+      if file && file.data
+        data.merge!(ci_yaml_file: file.data)
+      end
     end
 
     service_hook.execute(data)
@@ -129,15 +133,15 @@ class GitlabCiService < CiService
 
   private
 
-  def ci_yaml_file(data)
-    ref = data[:checkout_sha]
-    repo = project.repository
-    commit = repo.commit(ref)
-    blob = Gitlab::Git::Blob.find(repo, commit.id, ".gitlab-ci.yml")
-    blob && blob.data
+  def ci_yaml_file(sha)
+    repository.blob_at(sha, '.gitlab-ci.yml')
   end
 
   def fork_registration_path
     project_url.sub(/projects\/\d*/, "#{API_PREFIX}/forks")
   end
+
+  def repository
+    project.repository
+  end
 end

app/views/profiles/accounts/show.html.haml

@@ -113,4 +113,4 @@
               Your account is currently an owner in these groups:
               %strong #{@user.solo_owned_groups.map(&:name).join(', ')}
             %p
-              You must transfer ownership or delete these groups before you can delete yur account.
+              You must transfer ownership or delete these groups before you can delete your account.

spec/models/project_services/gitlab_ci_service_spec.rb

@@ -58,7 +58,7 @@ describe GitlabCiService do
         service_hook = double
         service_hook.should_receive(:execute)
         @service.should_receive(:service_hook).and_return(service_hook)
-        @service.should_receive(:ci_yaml_file).with(push_sample_data)
+        @service.should_receive(:ci_yaml_file).with(push_sample_data[:checkout_sha])
 
         @service.execute(push_sample_data)
       end