Merge branch 'master' into fix/visibility-level-setting-in-forked-projects

* master: (723 commits)
  Bump Rack Attack to v4.3.1 for security fix
  Remove duplicate entry in the changelog
  Remove extra spaces after branchname
  Fix merge-request-reopen button title
  Add branch and tag operation to tree dropdown
  Use gitlab-shell 2.6.9
  Clarify Windows shell executor artifact upload support
  Fix feature specs: we always show the build status if ci_commit is present
  Do not display project group/name when issue and MR are in same project
  Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled
  Use gitlab-workhorse 0.5.1
  Fix ci_projects migration by using the value only from latest row [ci skip]
  Revert sidebar position for issue and merge request
  Add info on using private Docker registries in CI [ci skip]
  Upgrade Poltergeist to 1.8.1. #4131
  Fix ux issue with "This issue will be closed automatically" message
  Move MR Builds tab next to Commits
  Api support for requesting starred projects for user
  Fix Rubocop complain.
  Fix merge widget JS for buttons
  ...

Conflicts:
	app/models/project.rb

43 files changed, 760 insertions, 528 deletions

diff --git a/spec/services/archive_repository_service_spec.rb b/spec/services/archive_repository_service_spec.rb
index f7a36cd9670..bd871605c66 100644
--- a/spec/services/archive_repository_service_spec.rb
+++ b/spec/services/archive_repository_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ArchiveRepositoryService do
+describe ArchiveRepositoryService, services: true do
   let(:project) { create(:project) }
   subject { ArchiveRepositoryService.new(project, "master", "zip") }
 
diff --git a/spec/services/ci/create_commit_service_spec.rb b/spec/services/ci/create_commit_service_spec.rb
deleted file mode 100644
index e0ede1d58b7..00000000000
--- a/spec/services/ci/create_commit_service_spec.rb
+++ /dev/null
@@ -1,172 +0,0 @@
-require 'spec_helper'
-
-module Ci
-  describe CreateCommitService do
-    let(:service) { CreateCommitService.new }
-    let(:project) { FactoryGirl.create(:ci_project) }
-    let(:user) { nil }
-
-    before do
-      stub_ci_commit_to_return_yaml_file
-    end
-
-    describe :execute do
-      context 'valid params' do
-        let(:commit) do
-          service.execute(project, user,
-            ref: 'refs/heads/master',
-            before: '00000000',
-            after: '31das312',
-            commits: [ { message: "Message" } ]
-          )
-        end
-
-        it { expect(commit).to be_kind_of(Commit) }
-        it { expect(commit).to be_valid }
-        it { expect(commit).to be_persisted }
-        it { expect(commit).to eq(project.commits.last) }
-        it { expect(commit.builds.first).to be_kind_of(Build) }
-      end
-
-      context "skip tag if there is no build for it" do
-        it "creates commit if there is appropriate job" do
-          result = service.execute(project, user,
-            ref: 'refs/tags/0_1',
-            before: '00000000',
-            after: '31das312',
-            commits: [ { message: "Message" } ]
-          )
-          expect(result).to be_persisted
-        end
-
-        it "creates commit if there is no appropriate job but deploy job has right ref setting" do
-          config = YAML.dump({ deploy: { deploy: "ls", only: ["0_1"] } })
-          stub_ci_commit_yaml_file(config)
-
-          result = service.execute(project, user,
-            ref: 'refs/heads/0_1',
-            before: '00000000',
-            after: '31das312',
-            commits: [ { message: "Message" } ]
-          )
-          expect(result).to be_persisted
-        end
-      end
-
-      it 'skips commits without .gitlab-ci.yml' do
-        stub_ci_commit_yaml_file(nil)
-        result = service.execute(project, user,
-                                 ref: 'refs/heads/0_1',
-                                 before: '00000000',
-                                 after: '31das312',
-                                 commits: [ { message: 'Message' } ]
-        )
-        expect(result).to be_persisted
-        expect(result.builds.any?).to be_falsey
-        expect(result.status).to eq('skipped')
-        expect(result.yaml_errors).to be_nil
-      end
-
-      it 'skips commits if yaml is invalid' do
-        message = 'message'
-        allow_any_instance_of(Ci::Commit).to receive(:git_commit_message) { message }
-        stub_ci_commit_yaml_file('invalid: file: file')
-        commits = [{ message: message }]
-        commit = service.execute(project, user,
-                                 ref: 'refs/tags/0_1',
-                                 before: '00000000',
-                                 after: '31das312',
-                                 commits: commits
-        )
-        expect(commit.builds.any?).to be false
-        expect(commit.status).to eq('failed')
-        expect(commit.yaml_errors).to_not be_nil
-      end
-
-      describe :ci_skip? do
-        let(:message) { "some message[ci skip]" }
-
-        before do
-          allow_any_instance_of(Ci::Commit).to receive(:git_commit_message) { message }
-        end
-
-        it "skips builds creation if there is [ci skip] tag in commit message" do
-          commits = [{ message: message }]
-          commit = service.execute(project, user,
-            ref: 'refs/tags/0_1',
-            before: '00000000',
-            after: '31das312',
-            commits: commits
-          )
-          expect(commit.builds.any?).to be false
-          expect(commit.status).to eq("skipped")
-        end
-
-        it "does not skips builds creation if there is no [ci skip] tag in commit message" do
-          allow_any_instance_of(Ci::Commit).to receive(:git_commit_message) { "some message" }
-
-          commits = [{ message: "some message" }]
-          commit = service.execute(project, user,
-            ref: 'refs/tags/0_1',
-            before: '00000000',
-            after: '31das312',
-            commits: commits
-          )
-
-          expect(commit.builds.first.name).to eq("staging")
-        end
-
-        it "skips builds creation if there is [ci skip] tag in commit message and yaml is invalid" do
-          stub_ci_commit_yaml_file('invalid: file: fiile')
-          commits = [{ message: message }]
-          commit = service.execute(project, user,
-                                   ref: 'refs/tags/0_1',
-                                   before: '00000000',
-                                   after: '31das312',
-                                   commits: commits
-          )
-          expect(commit.builds.any?).to be false
-          expect(commit.status).to eq("skipped")
-          expect(commit.yaml_errors).to be_nil
-        end
-      end
-
-      it "skips build creation if there are already builds" do
-        allow_any_instance_of(Ci::Commit).to receive(:ci_yaml_file) { gitlab_ci_yaml }
-
-        commits = [{ message: "message" }]
-        commit = service.execute(project, user,
-          ref: 'refs/heads/master',
-          before: '00000000',
-          after: '31das312',
-          commits: commits
-        )
-        expect(commit.builds.count(:all)).to  eq(2)
-
-        commit = service.execute(project, user,
-          ref: 'refs/heads/master',
-          before: '00000000',
-          after: '31das312',
-          commits: commits
-        )
-        expect(commit.builds.count(:all)).to eq(2)
-      end
-
-      it "creates commit with failed status if yaml is invalid" do
-        stub_ci_commit_yaml_file('invalid: file')
-
-        commits = [{ message: "some message" }]
-
-        commit = service.execute(project, user,
-                                 ref: 'refs/tags/0_1',
-                                 before: '00000000',
-                                 after: '31das312',
-                                 commits: commits
-        )
-
-        expect(commit.status).to eq("failed")
-        expect(commit.builds.any?).to be false
-      end
-    end
-  end
-end
diff --git a/spec/services/ci/create_trigger_request_service_spec.rb b/spec/services/ci/create_trigger_request_service_spec.rb
index 2ef4bb50a57..dbdc5370bd8 100644
--- a/spec/services/ci/create_trigger_request_service_spec.rb
+++ b/spec/services/ci/create_trigger_request_service_spec.rb
@@ -1,9 +1,8 @@
 require 'spec_helper'
 
-describe Ci::CreateTriggerRequestService do
+describe Ci::CreateTriggerRequestService, services: true do
   let(:service) { Ci::CreateTriggerRequestService.new }
-  let(:gl_project) { create(:project) }
-  let(:project) { gl_project.ensure_gitlab_ci_project }
+  let(:project) { create(:project) }
   let(:trigger) { create(:ci_trigger, project: project) }
 
   before do
@@ -29,7 +28,7 @@ describe Ci::CreateTriggerRequestService do
 
       before do
         stub_ci_commit_yaml_file('{}')
-        FactoryGirl.create :ci_commit, gl_project: gl_project
+        FactoryGirl.create :ci_commit, project: project
       end
 
       it { expect(subject).to be_nil }
diff --git a/spec/services/ci/event_service_spec.rb b/spec/services/ci/event_service_spec.rb
deleted file mode 100644
index 1264e17ff5e..00000000000
--- a/spec/services/ci/event_service_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'spec_helper'
-
-describe Ci::EventService do
-  let(:project) { FactoryGirl.create :ci_project }
-  let(:user)   { double(username: "root", id: 1) }
-
-  before do
-    Event.destroy_all
-  end
-
-  describe :remove_project do
-    it "creates event" do
-      Ci::EventService.new.remove_project(user, project)
-
-      expect(Ci::Event.admin.last.description).to eq("Project \"#{project.name_with_namespace}\" has been removed by root")
-    end
-  end
-
-  describe :create_project do
-    it "creates event" do
-      Ci::EventService.new.create_project(user, project)
-
-      expect(Ci::Event.admin.last.description).to eq("Project \"#{project.name_with_namespace}\" has been created by root")
-    end
-  end
-
-  describe :change_project_settings do
-    it "creates event" do
-      Ci::EventService.new.change_project_settings(user, project)
-
-      expect(Ci::Event.last.description).to eq("User \"root\" updated projects settings")
-    end
-  end
-end
diff --git a/spec/services/ci/image_for_build_service_spec.rb b/spec/services/ci/image_for_build_service_spec.rb
index cda7d0c4a51..870861ad20a 100644
--- a/spec/services/ci/image_for_build_service_spec.rb
+++ b/spec/services/ci/image_for_build_service_spec.rb
@@ -1,18 +1,18 @@
 require 'spec_helper'
 
 module Ci
-  describe ImageForBuildService do
+  describe ImageForBuildService, services: true do
     let(:service) { ImageForBuildService.new }
-    let(:project) { FactoryGirl.create(:ci_project) }
-    let(:gl_project) { FactoryGirl.create(:project, gitlab_ci_project: project) }
-    let(:commit_sha) { gl_project.commit('master').sha }
-    let(:commit) { gl_project.ensure_ci_commit(commit_sha) }
+    let(:project) { FactoryGirl.create(:empty_project) }
+    let(:commit_sha) { '01234567890123456789' }
+    let(:commit) { project.ensure_ci_commit(commit_sha) }
     let(:build) { FactoryGirl.create(:ci_build, commit: commit) }
 
     describe :execute do
       before { build }
 
       context 'branch name' do
+        before { allow(project).to receive(:commit).and_return(OpenStruct.new(sha: commit_sha)) }
         before { build.run! }
         let(:image) { service.execute(project, ref: 'master') }
 
diff --git a/spec/services/ci/register_build_service_spec.rb b/spec/services/ci/register_build_service_spec.rb
index b370dfbe113..e81f9e757ac 100644
--- a/spec/services/ci/register_build_service_spec.rb
+++ b/spec/services/ci/register_build_service_spec.rb
@@ -1,16 +1,16 @@
 require 'spec_helper'
 
 module Ci
-  describe RegisterBuildService do
+  describe RegisterBuildService, services: true do
     let!(:service) { RegisterBuildService.new }
-    let!(:gl_project) { FactoryGirl.create :empty_project }
-    let!(:commit) { FactoryGirl.create :ci_commit, gl_project: gl_project }
+    let!(:project) { FactoryGirl.create :empty_project, shared_runners_enabled: false }
+    let!(:commit) { FactoryGirl.create :ci_commit, project: project }
     let!(:pending_build) { FactoryGirl.create :ci_build, commit: commit }
     let!(:shared_runner) { FactoryGirl.create(:ci_runner, is_shared: true) }
     let!(:specific_runner) { FactoryGirl.create(:ci_runner, is_shared: false) }
 
     before do
-      specific_runner.assign_to(gl_project.ensure_gitlab_ci_project)
+      specific_runner.assign_to(project)
     end
 
     describe :execute do
@@ -47,7 +47,7 @@ module Ci
 
       context 'allow shared runners' do
         before do
-          gl_project.gitlab_ci_project.update(shared_runners_enabled: true)
+          project.update(shared_runners_enabled: true)
         end
 
         context 'shared runner' do
@@ -71,7 +71,7 @@ module Ci
 
       context 'disallow shared runners' do
         before do
-          gl_project.gitlab_ci_project.update(shared_runners_enabled: false)
+          project.update(shared_runners_enabled: false)
         end
 
         context 'shared runner' do
diff --git a/spec/services/ci/web_hook_service_spec.rb b/spec/services/ci/web_hook_service_spec.rb
deleted file mode 100644
index aa48fcbcbfd..00000000000
--- a/spec/services/ci/web_hook_service_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe Ci::WebHookService do
-  let(:project) { FactoryGirl.create :ci_project }
-  let(:gl_project) { FactoryGirl.create :empty_project, gitlab_ci_project: project }
-  let(:commit)  { FactoryGirl.create :ci_commit, gl_project: gl_project }
-  let(:build)   { FactoryGirl.create :ci_build, commit: commit }
-  let(:hook)    { FactoryGirl.create :ci_web_hook, project: project }
-
-  describe :execute do
-    it "should execute successfully" do
-      stub_request(:post, hook.url).to_return(status: 200)
-      expect(Ci::WebHookService.new.build_end(build)).to be_truthy
-    end
-  end
-
-  context 'build_data' do
-    it "contains all needed fields" do
-      expect(build_data(build)).to include(
-        :build_id,
-        :project_id,
-        :ref,
-        :build_status,
-        :build_started_at,
-        :build_finished_at,
-        :before_sha,
-        :project_name,
-        :gitlab_url,
-        :build_name
-      )
-    end
-  end
-
-  def build_data(build)
-    Ci::WebHookService.new.send :build_data, build
-  end
-end
diff --git a/spec/services/create_commit_builds_service_spec.rb b/spec/services/create_commit_builds_service_spec.rb
new file mode 100644
index 00000000000..ea5dcfa068a
--- /dev/null
+++ b/spec/services/create_commit_builds_service_spec.rb
@@ -0,0 +1,175 @@
+require 'spec_helper'
+
+describe CreateCommitBuildsService, services: true do
+  let(:service) { CreateCommitBuildsService.new }
+  let(:project) { FactoryGirl.create(:empty_project) }
+  let(:user) { nil }
+
+  before do
+    stub_ci_commit_to_return_yaml_file
+  end
+
+  describe :execute do
+    context 'valid params' do
+      let(:commit) do
+        service.execute(project, user,
+                        ref: 'refs/heads/master',
+                        before: '00000000',
+                        after: '31das312',
+                        commits: [{ message: "Message" }]
+                       )
+      end
+
+      it { expect(commit).to be_kind_of(Ci::Commit) }
+      it { expect(commit).to be_valid }
+      it { expect(commit).to be_persisted }
+      it { expect(commit).to eq(project.ci_commits.last) }
+      it { expect(commit.builds.first).to be_kind_of(Ci::Build) }
+    end
+
+    context "skip tag if there is no build for it" do
+      it "creates commit if there is appropriate job" do
+        result = service.execute(project, user,
+                                 ref: 'refs/tags/0_1',
+                                 before: '00000000',
+                                 after: '31das312',
+                                 commits: [{ message: "Message" }]
+                                )
+        expect(result).to be_persisted
+      end
+
+      it "creates commit if there is no appropriate job but deploy job has right ref setting" do
+        config = YAML.dump({ deploy: { deploy: "ls", only: ["0_1"] } })
+        stub_ci_commit_yaml_file(config)
+
+        result = service.execute(project, user,
+                                 ref: 'refs/heads/0_1',
+                                 before: '00000000',
+                                 after: '31das312',
+                                 commits: [{ message: "Message" }]
+                                )
+        expect(result).to be_persisted
+      end
+    end
+
+    it 'skips creating ci_commit for refs without .gitlab-ci.yml' do
+      stub_ci_commit_yaml_file(nil)
+      result = service.execute(project, user,
+                               ref: 'refs/heads/0_1',
+                               before: '00000000',
+                               after: '31das312',
+                               commits: [{ message: 'Message' }]
+                              )
+      expect(result).to be_falsey
+      expect(Ci::Commit.count).to eq(0)
+    end
+
+    it 'fails commits if yaml is invalid' do
+      message = 'message'
+      allow_any_instance_of(Ci::Commit).to receive(:git_commit_message) { message }
+      stub_ci_commit_yaml_file('invalid: file: file')
+      commits = [{ message: message }]
+      commit = service.execute(project, user,
+                               ref: 'refs/tags/0_1',
+                               before: '00000000',
+                               after: '31das312',
+                               commits: commits
+                              )
+      expect(commit).to be_persisted
+      expect(commit.builds.any?).to be false
+      expect(commit.status).to eq('failed')
+      expect(commit.yaml_errors).to_not be_nil
+    end
+
+    describe :ci_skip? do
+      let(:message) { "some message[ci skip]" }
+
+      before do
+        allow_any_instance_of(Ci::Commit).to receive(:git_commit_message) { message }
+      end
+
+      it "skips builds creation if there is [ci skip] tag in commit message" do
+        commits = [{ message: message }]
+        commit = service.execute(project, user,
+                                 ref: 'refs/tags/0_1',
+                                 before: '00000000',
+                                 after: '31das312',
+                                 commits: commits
+                                )
+        expect(commit).to be_persisted
+        expect(commit.builds.any?).to be false
+        expect(commit.status).to eq("skipped")
+      end
+
+      it "does not skips builds creation if there is no [ci skip] tag in commit message" do
+        allow_any_instance_of(Ci::Commit).to receive(:git_commit_message) { "some message" }
+
+        commits = [{ message: "some message" }]
+        commit = service.execute(project, user,
+                                 ref: 'refs/tags/0_1',
+                                 before: '00000000',
+                                 after: '31das312',
+                                 commits: commits
+                                )
+
+        expect(commit).to be_persisted
+        expect(commit.builds.first.name).to eq("staging")
+      end
+
+      it "skips builds creation if there is [ci skip] tag in commit message and yaml is invalid" do
+        stub_ci_commit_yaml_file('invalid: file: fiile')
+        commits = [{ message: message }]
+        commit = service.execute(project, user,
+                                 ref: 'refs/tags/0_1',
+                                 before: '00000000',
+                                 after: '31das312',
+                                 commits: commits
+                                )
+        expect(commit).to be_persisted
+        expect(commit.builds.any?).to be false
+        expect(commit.status).to eq("skipped")
+        expect(commit.yaml_errors).to be_nil
+      end
+    end
+
+    it "skips build creation if there are already builds" do
+      allow_any_instance_of(Ci::Commit).to receive(:ci_yaml_file) { gitlab_ci_yaml }
+
+      commits = [{ message: "message" }]
+      commit = service.execute(project, user,
+                               ref: 'refs/heads/master',
+                               before: '00000000',
+                               after: '31das312',
+                               commits: commits
+                              )
+      expect(commit).to be_persisted
+      expect(commit.builds.count(:all)).to eq(2)
+
+      commit = service.execute(project, user,
+                               ref: 'refs/heads/master',
+                               before: '00000000',
+                               after: '31das312',
+                               commits: commits
+                              )
+      expect(commit).to be_persisted
+      expect(commit.builds.count(:all)).to eq(2)
+    end
+
+    it "creates commit with failed status if yaml is invalid" do
+      stub_ci_commit_yaml_file('invalid: file')
+
+      commits = [{ message: "some message" }]
+
+      commit = service.execute(project, user,
+                               ref: 'refs/tags/0_1',
+                               before: '00000000',
+                               after: '31das312',
+                               commits: commits
+                              )
+
+      expect(commit).to be_persisted
+      expect(commit.status).to eq("failed")
+      expect(commit.builds.any?).to be false
+    end
+  end
+end
diff --git a/spec/services/create_release_service_spec.rb b/spec/services/create_release_service_spec.rb
new file mode 100644
index 00000000000..61e5ae72f51
--- /dev/null
+++ b/spec/services/create_release_service_spec.rb
@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe CreateReleaseService, services: true do
+  let(:project) { create(:project) }
+  let(:user) { create(:user) }
+  let(:tag_name) { project.repository.tag_names.first }
+  let(:description) { 'Awesome release!' }
+  let(:service) { CreateReleaseService.new(project, user) }
+
+  it 'creates a new release' do
+    result = service.execute(tag_name, description)
+    expect(result[:status]).to eq(:success)
+    release = project.releases.find_by(tag: tag_name)
+    expect(release).not_to be_nil
+    expect(release.description).to eq(description)
+  end
+
+  it 'raises an error if the tag does not exist' do
+    result = service.execute("foobar", description)
+    expect(result[:status]).to eq(:error)
+  end
+
+  context 'there already exists a release on a tag' do
+    before do
+      service.execute(tag_name, description)
+    end
+
+    it 'raises an error and does not update the release' do
+      result = service.execute(tag_name, 'The best release!')
+      expect(result[:status]).to eq(:error)
+      expect(project.releases.find_by(tag: tag_name).description).to eq(description)
+    end
+  end
+end
diff --git a/spec/services/create_snippet_service_spec.rb b/spec/services/create_snippet_service_spec.rb
index 8edabe9450b..c800dea04fa 100644
--- a/spec/services/create_snippet_service_spec.rb
+++ b/spec/services/create_snippet_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe CreateSnippetService do
+describe CreateSnippetService, services: true do
   before do
     @user = create :user
     @admin = create :user, admin: true
diff --git a/spec/services/destroy_group_service_spec.rb b/spec/services/destroy_group_service_spec.rb
index e28564b3866..afa89b84175 100644
--- a/spec/services/destroy_group_service_spec.rb
+++ b/spec/services/destroy_group_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DestroyGroupService do
+describe DestroyGroupService, services: true do
   let!(:user) { create(:user) }
   let!(:group) { create(:group) }
   let!(:project) { create(:project, namespace: group) }
diff --git a/spec/services/event_create_service_spec.rb b/spec/services/event_create_service_spec.rb
index 7756b973ecd..f6dc9d4008f 100644
--- a/spec/services/event_create_service_spec.rb
+++ b/spec/services/event_create_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe EventCreateService do
+describe EventCreateService, services: true do
   let(:service) { EventCreateService.new }
 
   describe 'Issues' do
diff --git a/spec/services/git_hooks_service_spec.rb b/spec/services/git_hooks_service_spec.rb
new file mode 100644
index 00000000000..2bb9c3b3db3
--- /dev/null
+++ b/spec/services/git_hooks_service_spec.rb
@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe GitHooksService, services: true do
+  include RepoHelpers
+
+  let(:user)    { create :user }
+  let(:project) { create :project }
+  let(:service) { GitHooksService.new }
+
+  before do
+    @blankrev = Gitlab::Git::BLANK_SHA
+    @oldrev = sample_commit.parent_id
+    @newrev = sample_commit.id
+    @ref = 'refs/heads/feature'
+    @repo_path = project.repository.path_to_repo
+  end
+
+  describe '#execute' do
+
+    context 'when receive hooks were successful' do
+      it 'should call post-receive hook' do
+        hook = double(trigger: true)
+        expect(Gitlab::Git::Hook).to receive(:new).exactly(3).times.and_return(hook)
+
+        expect(service.execute(user, @repo_path, @blankrev, @newrev, @ref) { }).to eq(true)
+      end
+    end
+
+    context 'when pre-receive hook failed' do
+      it 'should not call post-receive hook' do
+        expect(service).to receive(:run_hook).with('pre-receive').and_return(false)
+        expect(service).not_to receive(:run_hook).with('post-receive')
+
+        expect do
+          service.execute(user, @repo_path, @blankrev, @newrev, @ref)
+        end.to raise_error(GitHooksService::PreReceiveError)
+      end
+    end
+
+    context 'when update hook failed' do
+      it 'should not call post-receive hook' do
+        expect(service).to receive(:run_hook).with('pre-receive').and_return(true)
+        expect(service).to receive(:run_hook).with('update').and_return(false)
+        expect(service).not_to receive(:run_hook).with('post-receive')
+
+        expect do
+          service.execute(user, @repo_path, @blankrev, @newrev, @ref)
+        end.to raise_error(GitHooksService::PreReceiveError)
+      end
+    end
+
+  end
+end
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index 17015d29e51..a04c242cf0e 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe GitPushService do
+describe GitPushService, services: true do
   include RepoHelpers
 
   let(:user)          { create :user }
diff --git a/spec/services/git_tag_push_service_spec.rb b/spec/services/git_tag_push_service_spec.rb
index eed50c7ebac..b982274c529 100644
--- a/spec/services/git_tag_push_service_spec.rb
+++ b/spec/services/git_tag_push_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe GitTagPushService do
+describe GitTagPushService, services: true do
   include RepoHelpers
 
   let(:user) { create :user }
@@ -58,14 +58,14 @@ describe GitTagPushService do
         it { is_expected.to include(timestamp: @commit.date.xmlschema) }
         it do
           is_expected.to include(
-                           url: [
-                             Gitlab.config.gitlab.url,
-                             project.namespace.to_param,
-                             project.to_param,
-                             'commit',
-                             @commit.id
-                           ].join('/')
-                         )
+            url: [
+             Gitlab.config.gitlab.url,
+             project.namespace.to_param,
+             project.to_param,
+             'commit',
+             @commit.id
+            ].join('/')
+          )
         end
 
         context "with a author" do
diff --git a/spec/services/issues/bulk_update_service_spec.rb b/spec/services/issues/bulk_update_service_spec.rb
index 4c62fbafd73..6a7ea4b2f44 100644
--- a/spec/services/issues/bulk_update_service_spec.rb
+++ b/spec/services/issues/bulk_update_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Issues::BulkUpdateService do
+describe Issues::BulkUpdateService, services: true do
   let(:issue) { create(:issue, project: @project) }
 
   before do
diff --git a/spec/services/issues/close_service_spec.rb b/spec/services/issues/close_service_spec.rb
index db547ce0d50..3a8daf28f5e 100644
--- a/spec/services/issues/close_service_spec.rb
+++ b/spec/services/issues/close_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Issues::CloseService do
+describe Issues::CloseService, services: true do
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let(:issue) { create(:issue, assignee: user2) }
@@ -14,7 +14,9 @@ describe Issues::CloseService do
   describe :execute do
     context "valid params" do
       before do
-        @issue = Issues::CloseService.new(project, user, {}).execute(issue)
+        perform_enqueued_jobs do
+          @issue = Issues::CloseService.new(project, user, {}).execute(issue)
+        end
       end
 
       it { expect(@issue).to be_valid }
diff --git a/spec/services/issues/create_service_spec.rb b/spec/services/issues/create_service_spec.rb
index 7f1ebcb3198..2148d091a57 100644
--- a/spec/services/issues/create_service_spec.rb
+++ b/spec/services/issues/create_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Issues::CreateService do
+describe Issues::CreateService, services: true do
   let(:project) { create(:empty_project) }
   let(:user) { create(:user) }
 
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index f55527ee9a3..87da0e9618b 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Issues::UpdateService do
+describe Issues::UpdateService, services: true do
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let(:user3) { create(:user) }
@@ -15,6 +15,17 @@ describe Issues::UpdateService do
   end
 
   describe 'execute' do
+    def find_note(starting_with)
+      @issue.notes.find do |note|
+        note && note.note.start_with?(starting_with)
+      end
+    end
+
+    def update_issue(opts)
+      @issue = Issues::UpdateService.new(project, user, opts).execute(issue)
+      @issue.reload
+    end
+
     context "valid params" do
       before do
         opts = {
@@ -25,7 +36,10 @@ describe Issues::UpdateService do
           label_ids: [label.id]
         }
 
-        @issue = Issues::UpdateService.new(project, user, opts).execute(issue)
+        perform_enqueued_jobs do
+          @issue = Issues::UpdateService.new(project, user, opts).execute(issue)
+        end
+
         @issue.reload
       end
 
@@ -44,12 +58,6 @@ describe Issues::UpdateService do
         expect(email.subject).to include(issue.title)
       end
 
-      def find_note(starting_with)
-        @issue.notes.find do |note|
-          note && note.note.start_with?(starting_with)
-        end
-      end
-
       it 'should create system note about issue reassign' do
         note = find_note('Reassigned to')
 
@@ -71,5 +79,71 @@ describe Issues::UpdateService do
         expect(note.note).to eq 'Title changed from **Old title** to **New title**'
       end
     end
+
+    context 'when Issue has tasks' do
+      before { update_issue({ description: "- [ ] Task 1\n- [ ] Task 2" }) }
+
+      it { expect(@issue.tasks?).to eq(true) }
+
+      context 'when tasks are marked as completed' do
+        before { update_issue({ description: "- [x] Task 1\n- [X] Task 2" }) }
+
+        it 'creates system note about task status change' do
+          note1 = find_note('Marked the task **Task 1** as completed')
+          note2 = find_note('Marked the task **Task 2** as completed')
+
+          expect(note1).not_to be_nil
+          expect(note2).not_to be_nil
+        end
+      end
+
+      context 'when tasks are marked as incomplete' do
+        before do
+          update_issue({ description: "- [x] Task 1\n- [X] Task 2" })
+          update_issue({ description: "- [ ] Task 1\n- [ ] Task 2" })
+        end
+
+        it 'creates system note about task status change' do
+          note1 = find_note('Marked the task **Task 1** as incomplete')
+          note2 = find_note('Marked the task **Task 2** as incomplete')
+
+          expect(note1).not_to be_nil
+          expect(note2).not_to be_nil
+        end
+      end
+
+      context 'when tasks position has been modified' do
+        before do
+          update_issue({ description: "- [x] Task 1\n- [X] Task 2" })
+          update_issue({ description: "- [x] Task 1\n- [ ] Task 3\n- [ ] Task 2" })
+        end
+
+        it 'does not create a system note' do
+          note = find_note('Marked the task **Task 2** as incomplete')
+
+          expect(note).to be_nil
+        end
+      end
+
+      context 'when a Task list with a completed item is totally replaced' do
+        before do
+          update_issue({ description: "- [ ] Task 1\n- [X] Task 2" })
+          update_issue({ description: "- [ ] One\n- [ ] Two\n- [ ] Three" })
+        end
+
+        it 'does not create a system note referencing the position the old item' do
+          note = find_note('Marked the task **Two** as incomplete')
+
+          expect(note).to be_nil
+        end
+
+        it 'should not generate a new note at all' do
+          expect do
+            update_issue({ description: "- [ ] One\n- [ ] Two\n- [ ] Three" })
+          end.not_to change { Note.count }
+        end
+      end
+    end
+
   end
 end
diff --git a/spec/services/merge_requests/close_service_spec.rb b/spec/services/merge_requests/close_service_spec.rb
index b3cbfd4b5b8..50d0c288790 100644
--- a/spec/services/merge_requests/close_service_spec.rb
+++ b/spec/services/merge_requests/close_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe MergeRequests::CloseService do
+describe MergeRequests::CloseService, services: true do
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let(:merge_request) { create(:merge_request, assignee: user2) }
@@ -18,7 +18,9 @@ describe MergeRequests::CloseService do
       before do
         allow(service).to receive(:execute_hooks)
 
-        @merge_request = service.execute(merge_request)
+        perform_enqueued_jobs do
+          @merge_request = service.execute(merge_request)
+        end
       end
 
       it { expect(@merge_request).to be_valid }
diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb
index cc64d69361e..be8f1676eeb 100644
--- a/spec/services/merge_requests/create_service_spec.rb
+++ b/spec/services/merge_requests/create_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe MergeRequests::CreateService do
+describe MergeRequests::CreateService, services: true do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
 
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index 7483f51de03..ceb3f97280e 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe MergeRequests::MergeService do
+describe MergeRequests::MergeService, services: true do
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let(:merge_request) { create(:merge_request, assignee: user2) }
@@ -13,12 +13,14 @@ describe MergeRequests::MergeService do
 
   describe :execute do
     context 'valid params' do
-      let(:service) { MergeRequests::MergeService.new(project, user, {}) }
+      let(:service) { MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message') }
 
       before do
         allow(service).to receive(:execute_hooks)
 
-        service.execute(merge_request, 'Awesome message')
+        perform_enqueued_jobs do
+          service.execute(merge_request)
+        end
       end
 
       it { expect(merge_request).to be_valid }
@@ -37,14 +39,14 @@ describe MergeRequests::MergeService do
     end
 
     context "error handling" do
-      let(:service) { MergeRequests::MergeService.new(project, user, {}) }
+      let(:service) { MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message') }
 
       it 'saves error if there is an exception' do
         allow(service).to receive(:repository).and_raise("error")
 
         allow(service).to receive(:execute_hooks)
 
-        service.execute(merge_request, 'Awesome message')
+        service.execute(merge_request)
 
         expect(merge_request.merge_error).to eq("Something went wrong during merge")
       end
diff --git a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
new file mode 100644
index 00000000000..449cecaa789
--- /dev/null
+++ b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
@@ -0,0 +1,84 @@
+require 'spec_helper'
+
+describe MergeRequests::MergeWhenBuildSucceedsService do
+  let(:user)          { create(:user) }
+  let(:merge_request) { create(:merge_request) }
+
+  let(:mr_merge_if_green_enabled) do
+    create(:merge_request, merge_when_build_succeeds: true, merge_user: user,
+                           source_branch: "source_branch", target_branch: project.default_branch,
+                           source_project: project, target_project: project, state: "opened")
+  end
+
+  let(:project) { create(:project) }
+  let(:ci_commit) { create(:ci_commit_with_one_job, ref: mr_merge_if_green_enabled.source_branch, project: project) }
+  let(:service) { MergeRequests::MergeWhenBuildSucceedsService.new(project, user, commit_message: 'Awesome message') }
+
+  describe "#execute" do
+    context 'first time enabling' do
+      before do
+        allow(merge_request).to receive(:ci_commit).and_return(ci_commit)
+        service.execute(merge_request)
+      end
+
+      it 'sets the params, merge_user, and flag' do
+        expect(merge_request).to be_valid
+        expect(merge_request.merge_when_build_succeeds).to be_truthy
+        expect(merge_request.merge_params).to eq commit_message: 'Awesome message'
+        expect(merge_request.merge_user).to be user
+      end
+
+      it 'creates a system note' do
+        note = merge_request.notes.last
+        expect(note.note).to match /Enabled an automatic merge when the build for (\w+\/\w+@)?[0-9a-z]{8}/
+      end
+    end
+
+    context 'already approved' do
+      let(:service) { MergeRequests::MergeWhenBuildSucceedsService.new(project, user, new_key: true) }
+      let(:build)   { create(:ci_build, ref: mr_merge_if_green_enabled.source_branch) }
+
+      before do
+        allow(mr_merge_if_green_enabled).to receive(:ci_commit).and_return(ci_commit)
+        allow(mr_merge_if_green_enabled).to receive(:mergeable?).and_return(true)
+        allow(ci_commit).to receive(:success?).and_return(true)
+      end
+
+      it 'updates the merge params' do
+        expect(SystemNoteService).not_to receive(:merge_when_build_succeeds)
+
+        service.execute(mr_merge_if_green_enabled)
+        expect(mr_merge_if_green_enabled.merge_params).to have_key(:new_key)
+      end
+    end
+  end
+
+  describe "#trigger" do
+    let(:build)     { create(:ci_build, ref: mr_merge_if_green_enabled.source_branch, status: "success") }
+
+    it "merges all merge requests with merge when build succeeds enabled" do
+      allow_any_instance_of(MergeRequest).to receive(:ci_commit).and_return(ci_commit)
+      allow(ci_commit).to receive(:success?).and_return(true)
+
+      expect(MergeWorker).to receive(:perform_async)
+      service.trigger(build)
+    end
+  end
+
+  describe "#cancel" do
+    before do
+      service.cancel(mr_merge_if_green_enabled)
+    end
+
+    it "resets all the merge_when_build_succeeds params" do
+      expect(mr_merge_if_green_enabled.merge_when_build_succeeds).to be_falsey
+      expect(mr_merge_if_green_enabled.merge_params).to eq({})
+      expect(mr_merge_if_green_enabled.merge_user).to be nil
+    end
+
+    it 'Posts a system note' do
+      note = mr_merge_if_green_enabled.notes.last
+      expect(note.note).to include 'Canceled the automatic merge'
+    end
+  end
+end
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index 7ee4488521d..450250ba032 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe MergeRequests::RefreshService do
+describe MergeRequests::RefreshService, services: true do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:service) { MergeRequests::RefreshService }
@@ -17,7 +17,9 @@ describe MergeRequests::RefreshService do
                               source_project: @project,
                               source_branch: 'master',
                               target_branch: 'feature',
-                              target_project: @project)
+                              target_project: @project,
+                              merge_when_build_succeeds: true,
+                              merge_user: @user)
 
       @fork_merge_request = create(:merge_request,
                                    source_project: @fork_project,
@@ -46,6 +48,7 @@ describe MergeRequests::RefreshService do
 
       it { expect(@merge_request.notes).not_to be_empty }
       it { expect(@merge_request).to be_open }
+      it { expect(@merge_request.merge_when_build_succeeds).to be_falsey}
       it { expect(@fork_merge_request).to be_open }
       it { expect(@fork_merge_request.notes).to be_empty }
     end
@@ -146,6 +149,7 @@ describe MergeRequests::RefreshService do
       end
     end
 
+
     def reload_mrs
       @merge_request.reload
       @fork_merge_request.reload
diff --git a/spec/services/merge_requests/reopen_service_spec.rb b/spec/services/merge_requests/reopen_service_spec.rb
index 9401bc3b558..ac0221998f5 100644
--- a/spec/services/merge_requests/reopen_service_spec.rb
+++ b/spec/services/merge_requests/reopen_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe MergeRequests::ReopenService do
+describe MergeRequests::ReopenService, services: true do
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let(:merge_request) { create(:merge_request, assignee: user2) }
@@ -19,7 +19,9 @@ describe MergeRequests::ReopenService do
         allow(service).to receive(:execute_hooks)
 
         merge_request.state = :closed
-        service.execute(merge_request)
+        perform_enqueued_jobs do
+          service.execute(merge_request)
+        end
       end
 
       it { expect(merge_request).to be_valid }
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index 2ed51d223b7..2e9e6e0870d 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe MergeRequests::UpdateService do
+describe MergeRequests::UpdateService, services: true do
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let(:user3) { create(:user) }
@@ -14,6 +14,17 @@ describe MergeRequests::UpdateService do
   end
 
   describe 'execute' do
+    def find_note(starting_with)
+      @merge_request.notes.find do |note|
+        note && note.note.start_with?(starting_with)
+      end
+    end
+
+    def update_merge_request(opts)
+      @merge_request = MergeRequests::UpdateService.new(project, user, opts).execute(merge_request)
+      @merge_request.reload
+    end
+
     context 'valid params' do
       let(:opts) do
         {
@@ -31,8 +42,10 @@ describe MergeRequests::UpdateService do
       before do
         allow(service).to receive(:execute_hooks)
 
-        @merge_request = service.execute(merge_request)
-        @merge_request.reload
+        perform_enqueued_jobs do
+          @merge_request = service.execute(merge_request)
+          @merge_request.reload
+        end
       end
 
       it { expect(@merge_request).to be_valid }
@@ -56,12 +69,6 @@ describe MergeRequests::UpdateService do
         expect(email.subject).to include(merge_request.title)
       end
 
-      def find_note(starting_with)
-        @merge_request.notes.find do |note|
-          note && note.note.start_with?(starting_with)
-        end
-      end
-
       it 'should create system note about merge_request reassign' do
         note = find_note('Reassigned to')
 
@@ -90,5 +97,39 @@ describe MergeRequests::UpdateService do
         expect(note.note).to eq 'Target branch changed from `master` to `target`'
       end
     end
+
+    context 'when MergeRequest has tasks' do
+      before { update_merge_request({ description: "- [ ] Task 1\n- [ ] Task 2" }) }
+
+      it { expect(@merge_request.tasks?).to eq(true) }
+
+      context 'when tasks are marked as completed' do
+        before { update_merge_request({ description: "- [x] Task 1\n- [X] Task 2" }) }
+
+        it 'creates system note about task status change' do
+          note1 = find_note('Marked the task **Task 1** as completed')
+          note2 = find_note('Marked the task **Task 2** as completed')
+
+          expect(note1).not_to be_nil
+          expect(note2).not_to be_nil
+        end
+      end
+
+      context 'when tasks are marked as incomplete' do
+        before do
+          update_merge_request({ description: "- [x] Task 1\n- [X] Task 2" })
+          update_merge_request({ description: "- [ ] Task 1\n- [ ] Task 2" })
+        end
+
+        it 'creates system note about task status change' do
+          note1 = find_note('Marked the task **Task 1** as incomplete')
+          note2 = find_note('Marked the task **Task 2** as incomplete')
+
+          expect(note1).not_to be_nil
+          expect(note2).not_to be_nil
+        end
+      end
+    end
+
   end
 end
diff --git a/spec/services/milestones/close_service_spec.rb b/spec/services/milestones/close_service_spec.rb
index 034c0f22e12..1cd6eb2ab38 100644
--- a/spec/services/milestones/close_service_spec.rb
+++ b/spec/services/milestones/close_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Milestones::CloseService do
+describe Milestones::CloseService, services: true do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let(:milestone) { create(:milestone, title: "Milestone v1.2", project: project) }
diff --git a/spec/services/milestones/create_service_spec.rb b/spec/services/milestones/create_service_spec.rb
index 757c9a226d8..c793026e300 100644
--- a/spec/services/milestones/create_service_spec.rb
+++ b/spec/services/milestones/create_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Milestones::CreateService do
+describe Milestones::CreateService, services: true do
   let(:project) { create(:empty_project) }
   let(:user) { create(:user) }
 
diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb
index cc38d257792..a797a2fe4aa 100644
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Notes::CreateService do
+describe Notes::CreateService, services: true do
   let(:project) { create(:empty_project) }
   let(:issue) { create(:issue, project: project) }
   let(:user) { create(:user) }
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 520140917aa..d7a898e85ff 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -1,8 +1,14 @@
 require 'spec_helper'
 
-describe NotificationService do
+describe NotificationService, services: true do
   let(:notification) { NotificationService.new }
 
+  around(:each) do |example|
+    perform_enqueued_jobs do
+      example.run
+    end
+  end
+
   describe 'Keys' do
     describe :new_key do
       let!(:key) { create(:personal_key) }
@@ -10,8 +16,7 @@ describe NotificationService do
       it { expect(notification.new_key(key)).to be_truthy }
 
       it 'should sent email to key owner' do
-        expect(Notify).to receive(:new_ssh_key_email).with(key.id)
-        notification.new_key(key)
+        expect{ notification.new_key(key) }.to change{ ActionMailer::Base.deliveries.size }.by(1)
       end
     end
   end
@@ -23,8 +28,7 @@ describe NotificationService do
       it { expect(notification.new_email(email)).to be_truthy }
 
       it 'should send email to email owner' do
-        expect(Notify).to receive(:new_email_email).with(email.id)
-        notification.new_email(email)
+        expect{ notification.new_email(email) }.to change{ ActionMailer::Base.deliveries.size }.by(1)
       end
     end
   end
@@ -41,24 +45,28 @@ describe NotificationService do
         project.team << [issue.author, :master]
         project.team << [issue.assignee, :master]
         project.team << [note.author, :master]
+        create(:note_on_issue, noteable: issue, project_id: issue.project_id, note: '@subscribed_participant cc this guy')
       end
 
       describe :new_note do
         it do
           add_users_with_subscription(note.project, issue)
 
-          should_email(@u_watcher.id)
-          should_email(note.noteable.author_id)
-          should_email(note.noteable.assignee_id)
-          should_email(@u_mentioned.id)
-          should_email(@subscriber.id)
-          should_not_email(note.author_id)
-          should_not_email(@u_participating.id)
-          should_not_email(@u_disabled.id)
-          should_not_email(@unsubscriber.id)
-          should_not_email(@u_outsider_mentioned)
+          ActionMailer::Base.deliveries.clear
 
           notification.new_note(note)
+
+          should_email(@u_watcher)
+          should_email(note.noteable.author)
+          should_email(note.noteable.assignee)
+          should_email(@u_mentioned)
+          should_email(@subscriber)
+          should_email(@subscribed_participant)
+          should_not_email(note.author)
+          should_not_email(@u_participating)
+          should_not_email(@u_disabled)
+          should_not_email(@unsubscriber)
+          should_not_email(@u_outsider_mentioned)
         end
 
         it 'filters out "mentioned in" notes' do
@@ -82,26 +90,20 @@ describe NotificationService do
           group_member = note.project.group.group_members.find_by_user_id(@u_watcher.id)
           group_member.notification_level = Notification::N_GLOBAL
           group_member.save
+          ActionMailer::Base.deliveries.clear
         end
 
         it do
-          should_email(note.noteable.author_id)
-          should_email(note.noteable.assignee_id)
-          should_email(@u_mentioned.id)
-          should_not_email(@u_watcher.id)
-          should_not_email(note.author_id)
-          should_not_email(@u_participating.id)
-          should_not_email(@u_disabled.id)
           notification.new_note(note)
-        end
-      end
 
-      def should_email(user_id)
-        expect(Notify).to receive(:note_issue_email).with(user_id, note.id)
-      end
-
-      def should_not_email(user_id)
-        expect(Notify).not_to receive(:note_issue_email).with(user_id, note.id)
+          should_email(note.noteable.author)
+          should_email(note.noteable.assignee)
+          should_email(@u_mentioned)
+          should_not_email(@u_watcher)
+          should_not_email(note.author)
+          should_not_email(@u_participating)
+          should_not_email(@u_disabled)
+        end
       end
     end
 
@@ -113,24 +115,26 @@ describe NotificationService do
 
       before do
         build_team(note.project)
+        ActionMailer::Base.deliveries.clear
       end
 
       describe :new_note do
         it do
+          notification.new_note(note)
+
           # Notify all team members
           note.project.team.members.each do |member|
             # User with disabled notification should not be notified
             next if member.id == @u_disabled.id
-            should_email(member.id)
+            should_email(member)
           end
-          should_email(note.noteable.author_id)
-          should_email(note.noteable.assignee_id)
 
-          should_not_email(note.author_id)
-          should_not_email(@u_mentioned.id)
-          should_not_email(@u_disabled.id)
-          should_not_email(@u_not_mentioned.id)
-          notification.new_note(note)
+          should_email(note.noteable.author)
+          should_email(note.noteable.assignee)
+          should_not_email(note.author)
+          should_email(@u_mentioned)
+          should_not_email(@u_disabled)
+          should_email(@u_not_mentioned)
         end
 
         it 'filters out "mentioned in" notes' do
@@ -140,14 +144,6 @@ describe NotificationService do
           notification.new_note(mentioned_note)
         end
       end
-
-      def should_email(user_id)
-        expect(Notify).to receive(:note_issue_email).with(user_id, note.id)
-      end
-
-      def should_not_email(user_id)
-        expect(Notify).not_to receive(:note_issue_email).with(user_id, note.id)
-      end
     end
 
     context 'commit note' do
@@ -156,43 +152,38 @@ describe NotificationService do
 
       before do
         build_team(note.project)
+        ActionMailer::Base.deliveries.clear
         allow_any_instance_of(Commit).to receive(:author).and_return(@u_committer)
       end
 
-      describe :new_note do
+      describe :new_note, :perform_enqueued_jobs do
         it do
-          should_email(@u_committer.id, note)
-          should_email(@u_watcher.id, note)
-          should_not_email(@u_mentioned.id, note)
-          should_not_email(note.author_id, note)
-          should_not_email(@u_participating.id, note)
-          should_not_email(@u_disabled.id, note)
           notification.new_note(note)
+
+          should_email(@u_committer)
+          should_email(@u_watcher)
+          should_not_email(@u_mentioned)
+          should_not_email(note.author)
+          should_not_email(@u_participating)
+          should_not_email(@u_disabled)
         end
 
         it do
           note.update_attribute(:note, '@mention referenced')
-          should_email(@u_committer.id, note)
-          should_email(@u_watcher.id, note)
-          should_email(@u_mentioned.id, note)
-          should_not_email(note.author_id, note)
-          should_not_email(@u_participating.id, note)
-          should_not_email(@u_disabled.id, note)
           notification.new_note(note)
+
+          should_email(@u_committer)
+          should_email(@u_watcher)
+          should_email(@u_mentioned)
+          should_not_email(note.author)
+          should_not_email(@u_participating)
+          should_not_email(@u_disabled)
         end
 
         it do
           @u_committer.update_attributes(notification_level: Notification::N_MENTION)
-          should_not_email(@u_committer.id, note)
           notification.new_note(note)
-        end
-
-        def should_email(user_id, n)
-          expect(Notify).to receive(:note_commit_email).with(user_id, n.id)
-        end
-
-        def should_not_email(user_id, n)
-          expect(Notify).not_to receive(:note_commit_email).with(user_id, n.id)
+          should_not_email(@u_committer)
         end
       end
     end
@@ -205,99 +196,69 @@ describe NotificationService do
     before do
       build_team(issue.project)
       add_users_with_subscription(issue.project, issue)
+      ActionMailer::Base.deliveries.clear
     end
 
     describe :new_issue do
       it do
-        should_email(issue.assignee_id)
-        should_email(@u_watcher.id)
-        should_email(@u_participant_mentioned.id)
-        should_not_email(@u_mentioned.id)
-        should_not_email(@u_participating.id)
-        should_not_email(@u_disabled.id)
         notification.new_issue(issue, @u_disabled)
+
+        should_email(issue.assignee)
+        should_email(@u_watcher)
+        should_email(@u_participant_mentioned)
+        should_not_email(@u_mentioned)
+        should_not_email(@u_participating)
+        should_not_email(@u_disabled)
       end
 
       it do
         issue.assignee.update_attributes(notification_level: Notification::N_MENTION)
-        should_not_email(issue.assignee_id)
         notification.new_issue(issue, @u_disabled)
-      end
-
-      def should_email(user_id)
-        expect(Notify).to receive(:new_issue_email).with(user_id, issue.id)
-      end
 
-      def should_not_email(user_id)
-        expect(Notify).not_to receive(:new_issue_email).with(user_id, issue.id)
+        should_not_email(issue.assignee)
       end
     end
 
     describe :reassigned_issue do
       it 'should email new assignee' do
-        should_email(issue.assignee_id)
-        should_email(@u_watcher.id)
-        should_email(@u_participant_mentioned.id)
-        should_email(@subscriber.id)
-        should_not_email(@unsubscriber.id)
-        should_not_email(@u_participating.id)
-        should_not_email(@u_disabled.id)
-
         notification.reassigned_issue(issue, @u_disabled)
-      end
-
-      def should_email(user_id)
-        expect(Notify).to receive(:reassigned_issue_email).with(user_id, issue.id, nil, @u_disabled.id)
-      end
 
-      def should_not_email(user_id)
-        expect(Notify).not_to receive(:reassigned_issue_email).with(user_id, issue.id, issue.assignee_id, @u_disabled.id)
+        should_email(issue.assignee)
+        should_email(@u_watcher)
+        should_email(@u_participant_mentioned)
+        should_email(@subscriber)
+        should_not_email(@unsubscriber)
+        should_not_email(@u_participating)
+        should_not_email(@u_disabled)
       end
     end
 
     describe :close_issue do
       it 'should sent email to issue assignee and issue author' do
-        should_email(issue.assignee_id)
-        should_email(issue.author_id)
-        should_email(@u_watcher.id)
-        should_email(@u_participant_mentioned.id)
-        should_email(@subscriber.id)
-        should_not_email(@unsubscriber.id)
-        should_not_email(@u_participating.id)
-        should_not_email(@u_disabled.id)
-
         notification.close_issue(issue, @u_disabled)
-      end
-
-      def should_email(user_id)
-        expect(Notify).to receive(:closed_issue_email).with(user_id, issue.id, @u_disabled.id)
-      end
 
-      def should_not_email(user_id)
-        expect(Notify).not_to receive(:closed_issue_email).with(user_id, issue.id, @u_disabled.id)
+        should_email(issue.assignee)
+        should_email(issue.author)
+        should_email(@u_watcher)
+        should_email(@u_participant_mentioned)
+        should_email(@subscriber)
+        should_not_email(@unsubscriber)
+        should_not_email(@u_participating)
+        should_not_email(@u_disabled)
       end
     end
 
     describe :reopen_issue do
       it 'should send email to issue assignee and issue author' do
-        should_email(issue.assignee_id)
-        should_email(issue.author_id)
-        should_email(@u_watcher.id)
-        should_email(@u_participant_mentioned.id)
-        should_email(@subscriber.id)
-        should_not_email(@unsubscriber.id)
-        should_not_email(@u_participating.id)
-        should_not_email(@u_disabled.id)
-
         notification.reopen_issue(issue, @u_disabled)
-      end
-
-      def should_email(user_id)
-        expect(Notify).to receive(:issue_status_changed_email).with(user_id, issue.id, 'reopened', @u_disabled.id)
-      end
 
-      def should_not_email(user_id)
-        expect(Notify).not_to receive(:issue_status_changed_email).with(user_id, issue.id, 'reopened', @u_disabled.id)
+        should_email(issue.assignee)
+        should_email(issue.author)
+        should_email(@u_watcher)
+        should_email(@u_participant_mentioned)
+        should_email(@subscriber)
+        should_not_email(@unsubscriber)
+        should_not_email(@u_participating)
       end
     end
   end
@@ -309,108 +270,74 @@ describe NotificationService do
     before do
       build_team(merge_request.target_project)
       add_users_with_subscription(merge_request.target_project, merge_request)
+      ActionMailer::Base.deliveries.clear
     end
 
     describe :new_merge_request do
       it do
-        should_email(merge_request.assignee_id)
-        should_email(@u_watcher.id)
-        should_email(@u_participant_mentioned.id)
-        should_not_email(@u_participating.id)
-        should_not_email(@u_disabled.id)
         notification.new_merge_request(merge_request, @u_disabled)
-      end
-
-      def should_email(user_id)
-        expect(Notify).to receive(:new_merge_request_email).with(user_id, merge_request.id)
-      end
 
-      def should_not_email(user_id)
-        expect(Notify).not_to receive(:new_merge_request_email).with(user_id, merge_request.id)
+        should_email(merge_request.assignee)
+        should_email(@u_watcher)
+        should_email(@u_participant_mentioned)
+        should_not_email(@u_participating)
+        should_not_email(@u_disabled)
       end
     end
 
     describe :reassigned_merge_request do
       it do
-        should_email(merge_request.assignee_id)
-        should_email(@u_watcher.id)
-        should_email(@u_participant_mentioned.id)
-        should_email(@subscriber.id)
-        should_not_email(@unsubscriber.id)
-        should_not_email(@u_participating.id)
-        should_not_email(@u_disabled.id)
         notification.reassigned_merge_request(merge_request, merge_request.author)
-      end
 
-      def should_email(user_id)
-        expect(Notify).to receive(:reassigned_merge_request_email).with(user_id, merge_request.id, nil, merge_request.author_id)
-      end
-
-      def should_not_email(user_id)
-        expect(Notify).not_to receive(:reassigned_merge_request_email).with(user_id, merge_request.id, merge_request.assignee_id, merge_request.author_id)
+        should_email(merge_request.assignee)
+        should_email(@u_watcher)
+        should_email(@u_participant_mentioned)
+        should_email(@subscriber)
+        should_not_email(@unsubscriber)
+        should_not_email(@u_participating)
+        should_not_email(@u_disabled)
       end
     end
 
     describe :closed_merge_request do
       it do
-        should_email(merge_request.assignee_id)
-        should_email(@u_watcher.id)
-        should_email(@u_participant_mentioned.id)
-        should_email(@subscriber.id)
-        should_not_email(@unsubscriber.id)
-        should_not_email(@u_participating.id)
-        should_not_email(@u_disabled.id)
         notification.close_mr(merge_request, @u_disabled)
-      end
-
-      def should_email(user_id)
-        expect(Notify).to receive(:closed_merge_request_email).with(user_id, merge_request.id, @u_disabled.id)
-      end
 
-      def should_not_email(user_id)
-        expect(Notify).not_to receive(:closed_merge_request_email).with(user_id, merge_request.id, @u_disabled.id)
+        should_email(merge_request.assignee)
+        should_email(@u_watcher)
+        should_email(@u_participant_mentioned)
+        should_email(@subscriber)
+        should_not_email(@unsubscriber)
+        should_not_email(@u_participating)
+        should_not_email(@u_disabled)
       end
     end
 
     describe :merged_merge_request do
       it do
-        should_email(merge_request.assignee_id)
-        should_email(@u_watcher.id)
-        should_email(@u_participant_mentioned.id)
-        should_email(@subscriber.id)
-        should_not_email(@unsubscriber.id)
-        should_not_email(@u_participating.id)
-        should_not_email(@u_disabled.id)
         notification.merge_mr(merge_request, @u_disabled)
-      end
-
-      def should_email(user_id)
-        expect(Notify).to receive(:merged_merge_request_email).with(user_id, merge_request.id, @u_disabled.id)
-      end
 
-      def should_not_email(user_id)
-        expect(Notify).not_to receive(:merged_merge_request_email).with(user_id, merge_request.id, @u_disabled.id)
+        should_email(merge_request.assignee)
+        should_email(@u_watcher)
+        should_email(@u_participant_mentioned)
+        should_email(@subscriber)
+        should_not_email(@unsubscriber)
+        should_not_email(@u_participating)
+        should_not_email(@u_disabled)
       end
     end
 
     describe :reopen_merge_request do
       it do
-        should_email(merge_request.assignee_id)
-        should_email(@u_watcher.id)
-        should_email(@u_participant_mentioned.id)
-        should_email(@subscriber.id)
-        should_not_email(@unsubscriber.id)
-        should_not_email(@u_participating.id)
-        should_not_email(@u_disabled.id)
         notification.reopen_mr(merge_request, @u_disabled)
-      end
-
-      def should_email(user_id)
-        expect(Notify).to receive(:merge_request_status_email).with(user_id, merge_request.id, 'reopened', @u_disabled.id)
-      end
 
-      def should_not_email(user_id)
-        expect(Notify).not_to receive(:merge_request_status_email).with(user_id, merge_request.id, 'reopened', @u_disabled.id)
+        should_email(merge_request.assignee)
+        should_email(@u_watcher)
+        should_email(@u_participant_mentioned)
+        should_email(@subscriber)
+        should_not_email(@unsubscriber)
+        should_not_email(@u_participating)
+        should_not_email(@u_disabled)
       end
     end
   end
@@ -420,22 +347,16 @@ describe NotificationService do
 
     before do
       build_team(project)
+      ActionMailer::Base.deliveries.clear
     end
 
     describe :project_was_moved do
       it do
-        should_email(@u_watcher.id)
-        should_email(@u_participating.id)
-        should_not_email(@u_disabled.id)
         notification.project_was_moved(project, "gitlab/gitlab")
-      end
 
-      def should_email(user_id)
-        expect(Notify).to receive(:project_was_moved_email).with(project.id, user_id, "gitlab/gitlab")
-      end
-
-      def should_not_email(user_id)
-        expect(Notify).not_to receive(:project_was_moved_email).with(project.id, user_id, "gitlab/gitlab")
+        should_email(@u_watcher)
+        should_email(@u_participating)
+        should_not_email(@u_disabled)
       end
     end
   end
@@ -462,11 +383,26 @@ describe NotificationService do
   def add_users_with_subscription(project, issuable)
     @subscriber = create :user
     @unsubscriber = create :user
+    @subscribed_participant = create(:user, username: 'subscribed_participant', notification_level: Notification::N_PARTICIPATING)
 
+    project.team << [@subscribed_participant, :master]
     project.team << [@subscriber, :master]
     project.team << [@unsubscriber, :master]
 
     issuable.subscriptions.create(user: @subscriber, subscribed: true)
+    issuable.subscriptions.create(user: @subscribed_participant, subscribed: true)
     issuable.subscriptions.create(user: @unsubscriber, subscribed: false)
   end
+
+  def sent_to_user?(user)
+    ActionMailer::Base.deliveries.map(&:to).flatten.count(user.email) == 1
+  end
+
+  def should_email(user)
+    expect(sent_to_user?(user)).to be_truthy
+  end
+
+  def should_not_email(user)
+    expect(sent_to_user?(user)).to be_falsey
+  end
 end
diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb
index e81c4edb7d8..5d0b18558b1 100644
--- a/spec/services/projects/create_service_spec.rb
+++ b/spec/services/projects/create_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Projects::CreateService do
+describe Projects::CreateService, services: true do
   describe :create_by_user do
     before do
       @user = create :user
@@ -49,6 +49,13 @@ describe Projects::CreateService do
       it { expect(@project.namespace).to eq(@group) }
     end
 
+    context 'error handling' do
+      it 'handles invalid options' do
+        @opts.merge!({ default_branch: 'master' } )
+        expect(create_project(@user, @opts)).to eq(nil)
+      end
+    end
+
     context 'wiki_enabled creates repository directory' do
       context 'wiki_enabled true creates wiki repository directory' do
         before do
diff --git a/spec/services/projects/destroy_service_spec.rb b/spec/services/projects/destroy_service_spec.rb
index e83eef0b1a2..1ec27077717 100644
--- a/spec/services/projects/destroy_service_spec.rb
+++ b/spec/services/projects/destroy_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Projects::DestroyService do
+describe Projects::DestroyService, services: true do
   let!(:user) { create(:user) }
   let!(:project) { create(:project, namespace: user.namespace) }
   let!(:path) { project.repository.path_to_repo }
diff --git a/spec/services/projects/download_service_spec.rb b/spec/services/projects/download_service_spec.rb
index ddee2e62dfc..5ceed5af9a5 100644
--- a/spec/services/projects/download_service_spec.rb
+++ b/spec/services/projects/download_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Projects::DownloadService do
+describe Projects::DownloadService, services: true do
   describe 'File service' do
     before do
       @user = create :user
diff --git a/spec/services/projects/fork_service_spec.rb b/spec/services/projects/fork_service_spec.rb
index 1feba6ce048..d1ee60a0aea 100644
--- a/spec/services/projects/fork_service_spec.rb
+++ b/spec/services/projects/fork_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Projects::ForkService do
+describe Projects::ForkService, services: true do
   describe :fork_by_user do
     before do
       @from_namespace = create(:namespace)
diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb
index 47755bfc990..c46259431aa 100644
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Projects::TransferService do
+describe Projects::TransferService, services: true do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let(:project) { create(:project, namespace: user.namespace) }
diff --git a/spec/services/projects/update_service_spec.rb b/spec/services/projects/update_service_spec.rb
index b347fa15f87..c36d4581989 100644
--- a/spec/services/projects/update_service_spec.rb
+++ b/spec/services/projects/update_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Projects::UpdateService do
+describe Projects::UpdateService, services: true do
   describe :update_by_user do
     before do
       @user = create :user
diff --git a/spec/services/projects/upload_service_spec.rb b/spec/services/projects/upload_service_spec.rb
index 1b1a80d1fe7..9268a9fb1a2 100644
--- a/spec/services/projects/upload_service_spec.rb
+++ b/spec/services/projects/upload_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Projects::UploadService do
+describe Projects::UploadService, services: true do
   describe 'File service' do
     before do
       @user = create :user
diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
index f57bfaea879..7b3a9a75d7c 100644
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Search::GlobalService' do
+describe 'Search::GlobalService', services: true do
   let(:user) { create(:user) }
   let(:public_user) { create(:user) }
   let(:internal_user) { create(:user) }
diff --git a/spec/services/system_hooks_service_spec.rb b/spec/services/system_hooks_service_spec.rb
index a31fc1e4b07..febc78d2784 100644
--- a/spec/services/system_hooks_service_spec.rb
+++ b/spec/services/system_hooks_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SystemHooksService do
+describe SystemHooksService, services: true do
   let(:user)          { create :user }
   let(:project)       { create :project }
   let(:project_member) { create :project_member }
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index a45130bd473..0a4f9b230e8 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SystemNoteService do
+describe SystemNoteService, services: true do
   let(:project)  { create(:project) }
   let(:author)   { create(:user) }
   let(:noteable) { create(:issue, project: project) }
@@ -207,6 +207,32 @@ describe SystemNoteService do
     end
   end
 
+  describe '.merge_when_build_succeeds' do
+    let(:ci_commit) { build :ci_commit_without_jobs }
+    let(:noteable) { create :merge_request }
+
+    subject { described_class.merge_when_build_succeeds(noteable, project, author, noteable.last_commit) }
+
+    it_behaves_like 'a system note'
+
+    it "posts the Merge When Build Succeeds system note" do
+      expect(subject.note).to match  /Enabled an automatic merge when the build for (\w+\/\w+@)?[0-9a-f]{40} succeeds/
+    end
+  end
+
+  describe '.cancel_merge_when_build_succeeds' do
+    let(:ci_commit) { build :ci_commit_without_jobs }
+    let(:noteable) { create :merge_request }
+
+    subject { described_class.cancel_merge_when_build_succeeds(noteable, project, author) }
+
+    it_behaves_like 'a system note'
+
+    it "posts the Merge When Build Succeeds system note" do
+      expect(subject.note).to eq  "Canceled the automatic merge"
+    end
+  end
+
   describe '.change_title' do
     subject { described_class.change_title(noteable, project, author, 'Old title') }
 
diff --git a/spec/services/test_hook_service_spec.rb b/spec/services/test_hook_service_spec.rb
index 226196eedae..f034f251ba4 100644
--- a/spec/services/test_hook_service_spec.rb
+++ b/spec/services/test_hook_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe TestHookService do
+describe TestHookService, services: true do
   let(:user)    { create :user }
   let(:project) { create :project }
   let(:hook)    { create :project_hook, project: project }
diff --git a/spec/services/update_release_service_spec.rb b/spec/services/update_release_service_spec.rb
new file mode 100644
index 00000000000..bba211089a8
--- /dev/null
+++ b/spec/services/update_release_service_spec.rb
@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe UpdateReleaseService, services: true do
+  let(:project) { create(:project) }
+  let(:user) { create(:user) }
+  let(:tag_name) { project.repository.tag_names.first }
+  let(:description) { 'Awesome release!' }
+  let(:new_description) { 'The best release!' }
+  let(:service) { UpdateReleaseService.new(project, user) }
+
+  context 'with an existing release' do
+    let(:create_service) { CreateReleaseService.new(project, user) }
+
+    before do
+      create_service.execute(tag_name, description)
+    end
+
+    it 'successfully updates an existing release' do
+      result = service.execute(tag_name, new_description)
+      expect(result[:status]).to eq(:success)
+      expect(project.releases.find_by(tag: tag_name).description).to eq(new_description)
+    end
+  end
+
+  it 'raises an error if the tag does not exist' do
+    result = service.execute("foobar", description)
+    expect(result[:status]).to eq(:error)
+  end
+
+  it 'raises an error if the release does not exist' do
+    result = service.execute(tag_name, description)
+    expect(result[:status]).to eq(:error)
+  end
+end
diff --git a/spec/services/update_snippet_service_spec.rb b/spec/services/update_snippet_service_spec.rb
index d7c516e3934..48d114896d0 100644
--- a/spec/services/update_snippet_service_spec.rb
+++ b/spec/services/update_snippet_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe UpdateSnippetService do
+describe UpdateSnippetService, services: true do
   before do
     @user = create :user
     @admin = create :user, admin: true
@@ -42,7 +42,7 @@ describe UpdateSnippetService do
     CreateSnippetService.new(project, user, opts).execute
   end
 
-  def update_snippet(project = nil, user, snippet, opts)
+  def update_snippet(project, user, snippet, opts)
     UpdateSnippetService.new(project, user, snippet, opts).execute
   end
 end