Merge branch 'master' into ci/api-builds

* master: (75 commits)
  Fix grammar
  Clarify the key generation step
  Remove misleading `ssh-dsa`
  markdown fixes
  markdown fixes
  Add `AbuseReport#notify`
  Make AbuseReportMailer responsible for knowing if it should deliver
  Redirect back to user profile page after abuse report
  Redesign the AbuseReports index
  Don't notify users twice if they are both project watchers and subscribers
  Restructure logo JS to use `setInterval`
  Decrease the logo sweep delay
  Correct the logo ID names
  Update CHANGELOG
  Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notification
  Remove jquery.blockUI.js plugin
  rempves tests for "you have master access" text
  Revert "Merge branch 'rs-remove-jquery-blockui' into 'master'
"
  removes footer message about access to project
  remove public field from namespace and refactoring
  ...

24 files changed, 326 insertions, 390 deletions

diff --git a/spec/controllers/abuse_reports_controller_spec.rb b/spec/controllers/abuse_reports_controller_spec.rb
index 15824a1c67f..80a418feb3e 100644
--- a/spec/controllers/abuse_reports_controller_spec.rb
+++ b/spec/controllers/abuse_reports_controller_spec.rb
@@ -1,76 +1,46 @@
 require 'spec_helper'
 
 describe AbuseReportsController do
-  let(:reporter)    { create(:user) }
-  let(:user)        { create(:user) }
-  let(:message)     { "This user is a spammer" }
+  let(:reporter) { create(:user) }
+  let(:user)     { create(:user) }
+  let(:attrs) do
+    attributes_for(:abuse_report) do |hash|
+      hash[:user_id] = user.id
+    end
+  end
 
   before do
     sign_in(reporter)
   end
 
-  describe "POST create" do
-    context "with admin notification email set" do
-      let(:admin_email) { "admin@example.com"}
-
-      before(:each) do
-        stub_application_setting(admin_notification_email: admin_email)
+  describe 'POST create' do
+    context 'with valid attributes' do
+      it 'saves the abuse report' do
+        expect do
+          post :create, abuse_report: attrs
+        end.to change { AbuseReport.count }.by(1)
       end
 
-      it "sends a notification email" do
-        perform_enqueued_jobs do
-          post :create,
-            abuse_report: {
-              user_id: user.id,
-              message: message
-            }
-
-          email = ActionMailer::Base.deliveries.last
+      it 'calls notify' do
+        expect_any_instance_of(AbuseReport).to receive(:notify)
 
-          expect(email.to).to eq([admin_email])
-          expect(email.subject).to include(user.username)
-          expect(email.text_part.body).to include(message)
-        end
+        post :create, abuse_report: attrs
       end
 
-      it "saves the abuse report" do
-        perform_enqueued_jobs do
-          expect do
-            post :create,
-              abuse_report: {
-                user_id: user.id,
-                message: message
-              }
-          end.to change { AbuseReport.count }.by(1)
-        end
-      end
-    end
+      it 'redirects back to the reported user' do
+        post :create, abuse_report: attrs
 
-    context "without admin notification email set" do
-      before(:each) do
-        stub_application_setting(admin_notification_email: nil)
+        expect(response).to redirect_to user
       end
+    end
 
-      it "does not send a notification email" do
-        expect do
-          post :create,
-            abuse_report: {
-              user_id: user.id,
-              message: message
-            }
-        end.not_to change { ActionMailer::Base.deliveries.count }
-      end
+    context 'with invalid attributes' do
+      it 'renders new' do
+        attrs.delete(:user_id)
+        post :create, abuse_report: attrs
 
-      it "saves the abuse report" do
-        expect do
-          post :create,
-            abuse_report: {
-              user_id: user.id,
-              message: message
-            }
-        end.to change { AbuseReport.count }.by(1)
+        expect(response).to render_template(:new)
       end
     end
   end
-
 end
diff --git a/spec/features/admin/admin_builds_spec.rb b/spec/features/admin/admin_builds_spec.rb
index 72764b1629d..b955d0b0c46 100644
--- a/spec/features/admin/admin_builds_spec.rb
+++ b/spec/features/admin/admin_builds_spec.rb
@@ -1,69 +1,98 @@
 require 'spec_helper'
 
-describe "Admin Builds" do
-  let(:commit) { FactoryGirl.create :ci_commit }
-  let(:build) { FactoryGirl.create :ci_build, commit: commit }
-
+describe 'Admin Builds' do
   before do
     login_as :admin
   end
 
-  describe "GET /admin/builds" do
-    before do
-      build
-      visit admin_builds_path
-    end
-
-    it { expect(page).to have_content "Running" }
-    it { expect(page).to have_content build.short_sha }
-  end
+  describe 'GET /admin/builds' do
+    let(:commit) { create(:ci_commit) }
 
-  describe "Tabs" do
-    it "shows all builds" do
-      FactoryGirl.create :ci_build, commit: commit, status: "pending"
-      FactoryGirl.create :ci_build, commit: commit, status: "running"
-      FactoryGirl.create :ci_build, commit: commit, status: "success"
-      FactoryGirl.create :ci_build, commit: commit, status: "failed"
+    context 'All tab' do
+      context 'when have builds' do
+        it 'shows all builds' do
+          create(:ci_build, commit: commit, status: :pending)
+          create(:ci_build, commit: commit, status: :running)
+          create(:ci_build, commit: commit, status: :success)
+          create(:ci_build, commit: commit, status: :failed)
 
-      visit admin_builds_path
+          visit admin_builds_path
 
-      within ".center-top-menu" do
-        click_on "All"
+          expect(page).to have_selector('.project-issuable-filter li.active', text: 'All')
+          expect(page.all('.build-link').size).to eq(4)
+          expect(page).to have_link 'Cancel all'
+        end
       end
 
-      expect(page.all(".build-link").size).to eq(4)
+      context 'when have no builds' do
+        it 'shows a message' do
+          visit admin_builds_path
+
+          expect(page).to have_selector('.project-issuable-filter li.active', text: 'All')
+          expect(page).to have_content 'No builds to show'
+          expect(page).not_to have_link 'Cancel all'
+        end
+      end
     end
 
-    it "shows finished builds" do
-      build = FactoryGirl.create :ci_build, commit: commit, status: "pending"
-      build1 = FactoryGirl.create :ci_build, commit: commit, status: "running"
-      build2 = FactoryGirl.create :ci_build, commit: commit, status: "success"
+    context 'Running tab' do
+      context 'when have running builds' do
+        it 'shows running builds' do
+          build1 = create(:ci_build, commit: commit, status: :pending)
+          build2 = create(:ci_build, commit: commit, status: :success)
+          build3 = create(:ci_build, commit: commit, status: :failed)
+
+          visit admin_builds_path(scope: :running)
+
+          expect(page).to have_selector('.project-issuable-filter li.active', text: 'Running')
+          expect(page.find('.build-link')).to have_content(build1.id)
+          expect(page.find('.build-link')).not_to have_content(build2.id)
+          expect(page.find('.build-link')).not_to have_content(build3.id)
+          expect(page).to have_link 'Cancel all'
+        end
+      end
 
-      visit admin_builds_path
+      context 'when have no builds running' do
+        it 'shows a message' do
+          create(:ci_build, commit: commit, status: :success)
 
-      within ".center-top-menu" do
-        click_on "Finished"
-      end
+          visit admin_builds_path(scope: :running)
 
-      expect(page.find(".build-link")).not_to have_content(build.id)
-      expect(page.find(".build-link")).not_to have_content(build1.id)
-      expect(page.find(".build-link")).to have_content(build2.id)
+          expect(page).to have_selector('.project-issuable-filter li.active', text: 'Running')
+          expect(page).to have_content 'No builds to show'
+          expect(page).not_to have_link 'Cancel all'
+        end
+      end
     end
 
-    it "shows running builds" do
-      build = FactoryGirl.create :ci_build, commit: commit, status: "pending"
-      build2 = FactoryGirl.create :ci_build, commit: commit, status: "success"
-      build3 = FactoryGirl.create :ci_build, commit: commit, status: "failed"
+    context 'Finished tab' do
+      context 'when have finished builds' do
+        it 'shows finished builds' do
+          build1 = create(:ci_build, commit: commit, status: :pending)
+          build2 = create(:ci_build, commit: commit, status: :running)
+          build3 = create(:ci_build, commit: commit, status: :success)
+
+          visit admin_builds_path(scope: :finished)
+
+          expect(page).to have_selector('.project-issuable-filter li.active', text: 'Finished')
+          expect(page.find('.build-link')).not_to have_content(build1.id)
+          expect(page.find('.build-link')).not_to have_content(build2.id)
+          expect(page.find('.build-link')).to have_content(build3.id)
+          expect(page).to have_link 'Cancel all'
+        end
+      end
 
-      visit admin_builds_path
+      context 'when have no builds finished' do
+        it 'shows a message' do
+          create(:ci_build, commit: commit, status: :running)
 
-      within ".center-top-menu" do
-        click_on "Running"
-      end
+          visit admin_builds_path(scope: :finished)
 
-      expect(page.find(".build-link")).to have_content(build.id)
-      expect(page.find(".build-link")).not_to have_content(build2.id)
-      expect(page.find(".build-link")).not_to have_content(build3.id)
+          expect(page).to have_selector('.project-issuable-filter li.active', text: 'Finished')
+          expect(page).to have_content 'No builds to show'
+          expect(page).to have_link 'Cancel all'
+        end
+      end
     end
   end
 end
diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb
index f0031a0a247..240e56839df 100644
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
@@ -15,11 +15,11 @@ describe "Builds" do
     context "Running scope" do
       before do
         @build.run!
-        visit namespace_project_builds_path(@project.namespace, @project)
+        visit namespace_project_builds_path(@project.namespace, @project, scope: :running)
       end
 
-      it { expect(page).to have_content 'Running' }
-      it { expect(page).to have_content 'Cancel running' }
+      it { expect(page).to have_selector('.project-issuable-filter li.active', text: 'Running') }
+      it { expect(page).to have_link 'Cancel running' }
       it { expect(page).to have_content @build.short_sha }
       it { expect(page).to have_content @build.ref }
       it { expect(page).to have_content @build.name }
@@ -31,21 +31,22 @@ describe "Builds" do
         visit namespace_project_builds_path(@project.namespace, @project, scope: :finished)
       end
 
+      it { expect(page).to have_selector('.project-issuable-filter li.active', text: 'Finished') }
       it { expect(page).to have_content 'No builds to show' }
-      it { expect(page).to have_content 'Cancel running' }
+      it { expect(page).to have_link 'Cancel running' }
     end
 
     context "All builds" do
       before do
         @project.builds.running_or_pending.each(&:success)
-        visit namespace_project_builds_path(@project.namespace, @project, scope: :all)
+        visit namespace_project_builds_path(@project.namespace, @project)
       end
 
-      it { expect(page).to have_content 'All' }
+      it { expect(page).to have_selector('.project-issuable-filter li.active', text: 'All') }
       it { expect(page).to have_content @build.short_sha }
       it { expect(page).to have_content @build.ref }
       it { expect(page).to have_content @build.name }
-      it { expect(page).to_not have_content 'Cancel running' }
+      it { expect(page).to_not have_link 'Cancel running' }
     end
   end
 
@@ -56,8 +57,12 @@ describe "Builds" do
       click_link "Cancel running"
     end
 
-    it { expect(page).to have_content 'No builds to show' }
-    it { expect(page).to_not have_content 'Cancel running' }
+    it { expect(page).to have_selector('.project-issuable-filter li.active', text: 'All') }
+    it { expect(page).to have_content 'canceled' }
+    it { expect(page).to have_content @build.short_sha }
+    it { expect(page).to have_content @build.ref }
+    it { expect(page).to have_content @build.name }
+    it { expect(page).to_not have_link 'Cancel running' }
   end
 
   describe "GET /:project/builds/:id" do
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb
index 74b148f5d17..9a01c89ae2a 100644
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
@@ -80,8 +80,10 @@ feature 'Project', feature: true do
       visit namespace_project_path(project.namespace, project)
     end
 
-    it { expect(page).to have_content('You have Master access to this project.') }
-    it { expect(page).to have_link('Leave this project') }
+    it 'click project-settings and find leave project' do
+      find('#project-settings-button').click
+      expect(page).to have_link('Leave Project') 
+    end
   end
 
   def remove_with_confirm(button_text, confirm_with)
diff --git a/spec/finders/groups_finder_spec.rb b/spec/finders/groups_finder_spec.rb
deleted file mode 100644
index 4f6a000822e..00000000000
--- a/spec/finders/groups_finder_spec.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require 'spec_helper'
-
-describe GroupsFinder do
-  describe '#execute' do
-    let(:user) { create(:user) }
-
-    let(:group1) { create(:group) }
-    let(:group2) { create(:group) }
-    let(:group3) { create(:group) }
-    let(:group4) { create(:group, public: true) }
-
-    let!(:public_project)   { create(:project, :public, group: group1) }
-    let!(:internal_project) { create(:project, :internal, group: group2) }
-    let!(:private_project)  { create(:project, :private, group: group3) }
-
-    let(:finder) { described_class.new }
-
-    describe 'with a user' do
-      subject { finder.execute(user) }
-
-      describe 'when the user is not a member of any groups' do
-        it { is_expected.to eq([group4, group2, group1]) }
-      end
-
-      describe 'when the user is a member of a group' do
-        before do
-          group3.add_user(user, Gitlab::Access::DEVELOPER)
-        end
-
-        it { is_expected.to eq([group4, group3, group2, group1]) }
-      end
-
-      describe 'when the user is a member of a private project' do
-        before do
-          private_project.team.add_user(user, Gitlab::Access::DEVELOPER)
-        end
-
-        it { is_expected.to eq([group4, group3, group2, group1]) }
-      end
-    end
-
-    describe 'without a user' do
-      subject { finder.execute }
-
-      it { is_expected.to eq([group4, group1]) }
-    end
-  end
-end
diff --git a/spec/finders/joined_groups_finder_spec.rb b/spec/finders/joined_groups_finder_spec.rb
deleted file mode 100644
index 2d9068cc720..00000000000
--- a/spec/finders/joined_groups_finder_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'spec_helper'
-
-describe JoinedGroupsFinder do
-  describe '#execute' do
-    let(:source_user) { create(:user) }
-    let(:current_user) { create(:user) }
-
-    let(:group1) { create(:group) }
-    let(:group2) { create(:group) }
-    let(:group3) { create(:group) }
-    let(:group4) { create(:group, public: true) }
-
-    let!(:public_project)   { create(:project, :public, group: group1) }
-    let!(:internal_project) { create(:project, :internal, group: group2) }
-    let!(:private_project)  { create(:project, :private, group: group3) }
-
-    let(:finder) { described_class.new(source_user) }
-
-    before do
-      [group1, group2, group3, group4].each do |group|
-        group.add_user(source_user, Gitlab::Access::MASTER)
-      end
-    end
-
-    describe 'with a current user' do
-      describe 'when the current user has access to the projects of the source user' do
-        before do
-          private_project.team.add_user(current_user, Gitlab::Access::DEVELOPER)
-        end
-
-        subject { finder.execute(current_user) }
-
-        it { is_expected.to eq([group4, group3, group2, group1]) }
-      end
-
-      describe 'when the current user does not have access to the projects of the source user' do
-        subject { finder.execute(current_user) }
-
-        it { is_expected.to eq([group4, group2, group1]) }
-      end
-    end
-
-    describe 'without a current user' do
-      subject { finder.execute }
-
-      it { is_expected.to eq([group4, group1]) }
-    end
-  end
-end
diff --git a/spec/helpers/search_helper_spec.rb b/spec/helpers/search_helper_spec.rb
index ebe9c29d91c..f0d553f5f1d 100644
--- a/spec/helpers/search_helper_spec.rb
+++ b/spec/helpers/search_helper_spec.rb
@@ -43,7 +43,7 @@ describe SearchHelper do
       end
 
       it "includes the public group" do
-        group = create(:group, public: true)
+        group = create(:group)
         expect(search_autocomplete_opts(group.name).size).to eq(1)
       end
 
diff --git a/spec/lib/banzai/filter/relative_link_filter_spec.rb b/spec/lib/banzai/filter/relative_link_filter_spec.rb
index 0b3e5ecbc9f..0e6685f0ffb 100644
--- a/spec/lib/banzai/filter/relative_link_filter_spec.rb
+++ b/spec/lib/banzai/filter/relative_link_filter_spec.rb
@@ -92,6 +92,14 @@ describe Banzai::Filter::RelativeLinkFilter, lib: true do
         to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
     end
 
+    it 'rebuilds relative URL for a file in the repository root' do
+      relative_link = link('../README.md')
+      doc = filter(relative_link, requested_path: 'doc/some-file.md')
+
+      expect(doc.at_css('a')['href']).
+        to eq "/#{project_path}/blob/#{ref}/README.md"
+    end
+
     it 'rebuilds relative URL for a file in the repo with an anchor' do
       doc = filter(link('README.md#section'))
       expect(doc.at_css('a')['href']).
diff --git a/spec/lib/banzai/querying_spec.rb b/spec/lib/banzai/querying_spec.rb
new file mode 100644
index 00000000000..27da2a7439c
--- /dev/null
+++ b/spec/lib/banzai/querying_spec.rb
@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Banzai::Querying do
+  describe '.css' do
+    it 'optimizes queries for elements with classes' do
+      document = double(:document)
+
+      expect(document).to receive(:xpath).with(/^descendant::a/)
+
+      described_class.css(document, 'a.gfm')
+    end
+  end
+end
diff --git a/spec/lib/gitlab/metrics/instrumentation_spec.rb b/spec/lib/gitlab/metrics/instrumentation_spec.rb
index a7eab9d11cc..2a37cd40dde 100644
--- a/spec/lib/gitlab/metrics/instrumentation_spec.rb
+++ b/spec/lib/gitlab/metrics/instrumentation_spec.rb
@@ -48,6 +48,9 @@ describe Gitlab::Metrics::Instrumentation do
         allow(described_class).to receive(:transaction).
           and_return(transaction)
 
+        expect(transaction).to receive(:increment).
+          with(:method_duration, a_kind_of(Numeric))
+
         expect(transaction).to receive(:add_metric).
           with(described_class::SERIES, an_instance_of(Hash),
                method: 'Dummy.foo')
@@ -102,6 +105,9 @@ describe Gitlab::Metrics::Instrumentation do
         allow(described_class).to receive(:transaction).
           and_return(transaction)
 
+        expect(transaction).to receive(:increment).
+          with(:method_duration, a_kind_of(Numeric))
+
         expect(transaction).to receive(:add_metric).
           with(described_class::SERIES, an_instance_of(Hash),
                method: 'Dummy#bar')
diff --git a/spec/lib/gitlab/metrics/metric_spec.rb b/spec/lib/gitlab/metrics/metric_spec.rb
index ec39bc9cce8..f718d536130 100644
--- a/spec/lib/gitlab/metrics/metric_spec.rb
+++ b/spec/lib/gitlab/metrics/metric_spec.rb
@@ -37,12 +37,6 @@ describe Gitlab::Metrics::Metric do
 
       it 'includes the tags' do
         expect(hash[:tags]).to be_an_instance_of(Hash)
-
-        expect(hash[:tags][:hostname]).to be_an_instance_of(String)
-        expect(hash[:tags][:ruby_engine]).to be_an_instance_of(String)
-        expect(hash[:tags][:ruby_version]).to be_an_instance_of(String)
-        expect(hash[:tags][:gitlab_version]).to be_an_instance_of(String)
-        expect(hash[:tags][:process_type]).to be_an_instance_of(String)
       end
 
       it 'includes the values' do
diff --git a/spec/lib/gitlab/metrics/obfuscated_sql_spec.rb b/spec/lib/gitlab/metrics/obfuscated_sql_spec.rb
deleted file mode 100644
index 2b681c9fe34..00000000000
--- a/spec/lib/gitlab/metrics/obfuscated_sql_spec.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::Metrics::ObfuscatedSQL do
-  describe '#to_s' do
-    it 'replaces newlines with a space' do
-      sql = described_class.new("SELECT x\nFROM y")
-
-      expect(sql.to_s).to eq('SELECT x FROM y')
-    end
-
-    describe 'using single values' do
-      it 'replaces a single integer' do
-        sql = described_class.new('SELECT x FROM y WHERE a = 10')
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE a = ?')
-      end
-
-      it 'replaces a single float' do
-        sql = described_class.new('SELECT x FROM y WHERE a = 10.5')
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE a = ?')
-      end
-
-      it 'replaces a single quoted string' do
-        sql = described_class.new("SELECT x FROM y WHERE a = 'foo'")
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE a = ?')
-      end
-
-      if Gitlab::Database.mysql?
-        it 'replaces a double quoted string' do
-          sql = described_class.new('SELECT x FROM y WHERE a = "foo"')
-
-          expect(sql.to_s).to eq('SELECT x FROM y WHERE a = ?')
-        end
-      end
-
-      it 'replaces a single regular expression' do
-        sql = described_class.new('SELECT x FROM y WHERE a = /foo/')
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE a = ?')
-      end
-
-      it 'replaces regular expressions using escaped slashes' do
-        sql = described_class.new('SELECT x FROM y WHERE a = /foo\/bar/')
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE a = ?')
-      end
-    end
-
-    describe 'using consecutive values' do
-      it 'replaces multiple integers' do
-        sql = described_class.new('SELECT x FROM y WHERE z IN (10, 20, 30)')
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE z IN (3 values)')
-      end
-
-      it 'replaces multiple floats' do
-        sql = described_class.new('SELECT x FROM y WHERE z IN (1.5, 2.5, 3.5)')
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE z IN (3 values)')
-      end
-
-      it 'replaces multiple single quoted strings' do
-        sql = described_class.new("SELECT x FROM y WHERE z IN ('foo', 'bar')")
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE z IN (2 values)')
-      end
-
-      if Gitlab::Database.mysql?
-        it 'replaces multiple double quoted strings' do
-          sql = described_class.new('SELECT x FROM y WHERE z IN ("foo", "bar")')
-
-          expect(sql.to_s).to eq('SELECT x FROM y WHERE z IN (2 values)')
-        end
-      end
-
-      it 'replaces multiple regular expressions' do
-        sql = described_class.new('SELECT x FROM y WHERE z IN (/foo/, /bar/)')
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE z IN (2 values)')
-      end
-    end
-
-    if Gitlab::Database.postgresql?
-      it 'replaces double quotes' do
-        sql = described_class.new('SELECT "x" FROM "y"')
-
-        expect(sql.to_s).to eq('SELECT x FROM y')
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/metrics/sampler_spec.rb b/spec/lib/gitlab/metrics/sampler_spec.rb
index 51a941c48cd..27211350fbe 100644
--- a/spec/lib/gitlab/metrics/sampler_spec.rb
+++ b/spec/lib/gitlab/metrics/sampler_spec.rb
@@ -51,8 +51,8 @@ describe Gitlab::Metrics::Sampler do
       expect(Gitlab::Metrics::System).to receive(:memory_usage).
         and_return(9000)
 
-      expect(Gitlab::Metrics::Metric).to receive(:new).
-        with('memory_usage', value: 9000).
+      expect(sampler).to receive(:add_metric).
+        with(/memory_usage/, value: 9000).
         and_call_original
 
       sampler.sample_memory_usage
@@ -64,8 +64,8 @@ describe Gitlab::Metrics::Sampler do
       expect(Gitlab::Metrics::System).to receive(:file_descriptor_count).
         and_return(4)
 
-      expect(Gitlab::Metrics::Metric).to receive(:new).
-        with('file_descriptors', value: 4).
+      expect(sampler).to receive(:add_metric).
+        with(/file_descriptors/, value: 4).
         and_call_original
 
       sampler.sample_file_descriptors
@@ -74,8 +74,8 @@ describe Gitlab::Metrics::Sampler do
 
   describe '#sample_objects' do
     it 'adds a metric containing the amount of allocated objects' do
-      expect(Gitlab::Metrics::Metric).to receive(:new).
-        with('object_counts', an_instance_of(Hash), an_instance_of(Hash)).
+      expect(sampler).to receive(:add_metric).
+        with(/object_counts/, an_instance_of(Hash), an_instance_of(Hash)).
         at_least(:once).
         and_call_original
 
@@ -87,11 +87,33 @@ describe Gitlab::Metrics::Sampler do
     it 'adds a metric containing garbage collection statistics' do
       expect(GC::Profiler).to receive(:total_time).and_return(0.24)
 
-      expect(Gitlab::Metrics::Metric).to receive(:new).
-        with('gc_statistics', an_instance_of(Hash)).
+      expect(sampler).to receive(:add_metric).
+        with(/gc_statistics/, an_instance_of(Hash)).
         and_call_original
 
       sampler.sample_gc
     end
   end
+
+  describe '#add_metric' do
+    it 'prefixes the series name for a Rails process' do
+      expect(sampler).to receive(:sidekiq?).and_return(false)
+
+      expect(Gitlab::Metrics::Metric).to receive(:new).
+        with('rails_cats', { value: 10 }, {}).
+        and_call_original
+
+      sampler.add_metric('cats', value: 10)
+    end
+
+    it 'prefixes the series name for a Sidekiq process' do
+      expect(sampler).to receive(:sidekiq?).and_return(true)
+
+      expect(Gitlab::Metrics::Metric).to receive(:new).
+        with('sidekiq_cats', { value: 10 }, {}).
+        and_call_original
+
+      sampler.add_metric('cats', value: 10)
+    end
+  end
 end
diff --git a/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb b/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
index c6cd584663f..05e4fbbeb51 100644
--- a/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
+++ b/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
@@ -28,6 +28,9 @@ describe Gitlab::Metrics::Subscribers::ActionView do
         line: 4
       }
 
+      expect(transaction).to receive(:increment).
+        with(:view_duration, 2.1)
+
       expect(transaction).to receive(:add_metric).
         with(described_class::SERIES, values, tags)
 
diff --git a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
index 05b6cc14716..7bc070a4d09 100644
--- a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
+++ b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
@@ -2,31 +2,34 @@ require 'spec_helper'
 
 describe Gitlab::Metrics::Subscribers::ActiveRecord do
   let(:transaction) { Gitlab::Metrics::Transaction.new }
-
-  let(:subscriber) { described_class.new }
+  let(:subscriber)  { described_class.new }
 
   let(:event) do
     double(:event, duration: 0.2,
                    payload:  { sql: 'SELECT * FROM users WHERE id = 10' })
   end
 
-  before do
-    allow(subscriber).to receive(:current_transaction).and_return(transaction)
+  describe '#sql' do
+    describe 'without a current transaction' do
+      it 'simply returns' do
+        expect_any_instance_of(Gitlab::Metrics::Transaction).
+          to_not receive(:increment)
 
-    allow(Gitlab::Metrics).to receive(:last_relative_application_frame).
-      and_return(['app/models/foo.rb', 4])
-  end
+        subscriber.sql(event)
+      end
+    end
 
-  describe '#sql' do
-    it 'tracks the execution of a SQL query' do
-      sql    = 'SELECT * FROM users WHERE id = ?'
-      values = { duration: 0.2 }
-      tags   = { sql: sql, file: 'app/models/foo.rb', line: 4 }
+    describe 'with a current transaction' do
+      it 'increments the :sql_duration value' do
+        expect(subscriber).to receive(:current_transaction).
+          at_least(:once).
+          and_return(transaction)
 
-      expect(transaction).to receive(:add_metric).
-        with(described_class::SERIES, values, tags)
+        expect(transaction).to receive(:increment).
+          with(:sql_duration, 0.2)
 
-      subscriber.sql(event)
+        subscriber.sql(event)
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/metrics/transaction_spec.rb b/spec/lib/gitlab/metrics/transaction_spec.rb
index 6862fc9e2d1..b9b94947afa 100644
--- a/spec/lib/gitlab/metrics/transaction_spec.rb
+++ b/spec/lib/gitlab/metrics/transaction_spec.rb
@@ -32,12 +32,24 @@ describe Gitlab::Metrics::Transaction do
   describe '#add_metric' do
     it 'adds a metric tagged with the transaction UUID' do
       expect(Gitlab::Metrics::Metric).to receive(:new).
-        with('foo', { number: 10 }, { transaction_id: transaction.uuid })
+        with('rails_foo', { number: 10 }, { transaction_id: transaction.uuid })
 
       transaction.add_metric('foo', number: 10)
     end
   end
 
+  describe '#increment' do
+    it 'increments a counter' do
+      transaction.increment(:time, 1)
+      transaction.increment(:time, 2)
+
+      expect(transaction).to receive(:add_metric).
+        with('transactions', { duration: 0.0, time: 3 }, {})
+
+      transaction.track_self
+    end
+  end
+
   describe '#add_tag' do
     it 'adds a tag' do
       transaction.add_tag(:foo, 'bar')
@@ -58,7 +70,7 @@ describe Gitlab::Metrics::Transaction do
   describe '#track_self' do
     it 'adds a metric for the transaction itself' do
       expect(transaction).to receive(:add_metric).
-        with(described_class::SERIES, { duration: transaction.duration }, {})
+        with('transactions', { duration: transaction.duration }, {})
 
       transaction.track_self
     end
diff --git a/spec/lib/gitlab/metrics_spec.rb b/spec/lib/gitlab/metrics_spec.rb
index 6c0682cac4d..c2782f95c8e 100644
--- a/spec/lib/gitlab/metrics_spec.rb
+++ b/spec/lib/gitlab/metrics_spec.rb
@@ -1,15 +1,9 @@
 require 'spec_helper'
 
 describe Gitlab::Metrics do
-  describe '.pool_size' do
-    it 'returns a Fixnum' do
-      expect(described_class.pool_size).to be_an_instance_of(Fixnum)
-    end
-  end
-
-  describe '.timeout' do
-    it 'returns a Fixnum' do
-      expect(described_class.timeout).to be_an_instance_of(Fixnum)
+  describe '.settings' do
+    it 'returns a Hash' do
+      expect(described_class.settings).to be_an_instance_of(Hash)
     end
   end
 
@@ -19,12 +13,6 @@ describe Gitlab::Metrics do
     end
   end
 
-  describe '.hostname' do
-    it 'returns a String containing the hostname' do
-      expect(described_class.hostname).to eq(Socket.gethostname)
-    end
-  end
-
   describe '.last_relative_application_frame' do
     it 'returns an Array containing a file path and line number' do
       file, line = described_class.last_relative_application_frame
diff --git a/spec/mailers/abuse_report_mailer_spec.rb b/spec/mailers/abuse_report_mailer_spec.rb
new file mode 100644
index 00000000000..eb433c38873
--- /dev/null
+++ b/spec/mailers/abuse_report_mailer_spec.rb
@@ -0,0 +1,38 @@
+require 'rails_helper'
+
+describe AbuseReportMailer do
+  include EmailSpec::Matchers
+
+  describe '.notify' do
+    context 'with admin_notification_email set' do
+      before do
+        stub_application_setting(admin_notification_email: 'admin@example.com')
+      end
+
+      it 'sends to the admin_notification_email' do
+        report = create(:abuse_report)
+
+        mail = described_class.notify(report.id)
+
+        expect(mail).to deliver_to 'admin@example.com'
+      end
+
+      it 'includes the user in the subject' do
+        report = create(:abuse_report)
+
+        mail = described_class.notify(report.id)
+
+        expect(mail).to have_subject "#{report.user.name} (#{report.user.username}) was reported for abuse"
+      end
+    end
+
+    context 'with no admin_notification_email set' do
+      it 'returns early' do
+        stub_application_setting(admin_notification_email: nil)
+
+        expect { described_class.notify(spy).deliver_now }.
+          not_to change { ActionMailer::Base.deliveries.count }
+      end
+    end
+  end
+end
diff --git a/spec/models/abuse_report_spec.rb b/spec/models/abuse_report_spec.rb
index d45319b25d4..46cab1644c7 100644
--- a/spec/models/abuse_report_spec.rb
+++ b/spec/models/abuse_report_spec.rb
@@ -28,4 +28,21 @@ RSpec.describe AbuseReport, type: :model do
     it { is_expected.to validate_presence_of(:message) }
     it { is_expected.to validate_uniqueness_of(:user_id) }
   end
+
+  describe '#notify' do
+    it 'delivers' do
+      expect(AbuseReportMailer).to receive(:notify).with(subject.id).
+        and_return(spy)
+
+      subject.notify
+    end
+
+    it 'returns early when not persisted' do
+      report = build(:abuse_report)
+
+      expect(AbuseReportMailer).not_to receive(:notify)
+
+      report.notify
+    end
+  end
 end
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 646f767e6fe..ba5acceadff 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -38,14 +38,6 @@ describe Group, models: true do
     it { is_expected.not_to validate_presence_of :owner }
   end
 
-  describe '.public_and_given_groups' do
-    let!(:public_group) { create(:group, public: true) }
-
-    subject { described_class.public_and_given_groups([group.id]) }
-
-    it { is_expected.to eq([public_group, group]) }
-  end
-
   describe '.visible_to_user' do
     let!(:group) { create(:group) }
     let!(:user)  { create(:user) }
@@ -112,23 +104,4 @@ describe Group, models: true do
       expect(group.avatar_type).to eq(["only images allowed"])
     end
   end
-
-  describe "public_profile?" do
-    it "returns true for public group" do
-      group = create(:group, public: true)
-      expect(group.public_profile?).to be_truthy
-    end
-
-    it "returns true for non-public group with public project" do
-      group = create(:group)
-      create(:project, :public, group: group)
-      expect(group.public_profile?).to be_truthy
-    end
-
-    it "returns false for non-public group with no public projects" do
-      group = create(:group)
-      create(:project, group: group)
-      expect(group.public_profile?).to be_falsy
-    end
-  end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 2f184bbaf92..a16161e673e 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -106,7 +106,7 @@ describe User, models: true do
       end
 
       it 'validates uniqueness' do
-        expect(subject).to validate_uniqueness_of(:username)
+        expect(subject).to validate_uniqueness_of(:username).case_insensitive
       end
     end
 
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 7f0f9454b10..ab2530859ea 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -382,6 +382,15 @@ describe API::API, api: true  do
       expect(response.status).to eq(404)
     end
 
+    it 'should handle users with dots' do
+      dot_user = create(:user, username: 'dot.user')
+      project = create(:project, creator_id: dot_user.id, namespace: dot_user.namespace)
+
+      get api("/projects/#{dot_user.namespace.name}%2F#{project.path}", dot_user)
+      expect(response.status).to eq(200)
+      expect(json_response['name']).to eq(project.name)
+    end
+
     describe 'permissions' do
       context 'all projects' do
         it 'Contains permission information' do
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index c103752198d..b5c7b01357a 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -52,6 +52,9 @@ describe NotificationService, services: true do
         it do
           add_users_with_subscription(note.project, issue)
 
+          # Ensure create SentNotification by noteable = issue 6 times, not noteable = note
+          expect(SentNotification).to receive(:record).with(issue, any_args).exactly(6).times
+
           ActionMailer::Base.deliveries.clear
 
           notification.new_note(note)
@@ -61,6 +64,7 @@ describe NotificationService, services: true do
           should_email(note.noteable.assignee)
           should_email(@u_mentioned)
           should_email(@subscriber)
+          should_email(@watcher_and_subscriber)
           should_email(@subscribed_participant)
           should_not_email(note.author)
           should_not_email(@u_participating)
@@ -245,6 +249,7 @@ describe NotificationService, services: true do
         should_email(@u_watcher)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
+        should_email(@watcher_and_subscriber)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
@@ -260,6 +265,7 @@ describe NotificationService, services: true do
         should_email(@u_watcher)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
+        should_email(@watcher_and_subscriber)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
       end
@@ -282,6 +288,7 @@ describe NotificationService, services: true do
 
         should_email(merge_request.assignee)
         should_email(@u_watcher)
+        should_email(@watcher_and_subscriber)
         should_email(@u_participant_mentioned)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
@@ -296,6 +303,7 @@ describe NotificationService, services: true do
         should_email(@u_watcher)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
+        should_email(@watcher_and_subscriber)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
@@ -310,6 +318,7 @@ describe NotificationService, services: true do
         should_email(@u_watcher)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
+        should_email(@watcher_and_subscriber)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
@@ -324,6 +333,7 @@ describe NotificationService, services: true do
         should_email(@u_watcher)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
+        should_email(@watcher_and_subscriber)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
@@ -338,6 +348,7 @@ describe NotificationService, services: true do
         should_email(@u_watcher)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
+        should_email(@watcher_and_subscriber)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
@@ -387,14 +398,18 @@ describe NotificationService, services: true do
     @subscriber = create :user
     @unsubscriber = create :user
     @subscribed_participant = create(:user, username: 'subscribed_participant', notification_level: Notification::N_PARTICIPATING)
+    @watcher_and_subscriber = create(:user, notification_level: Notification::N_WATCH)
 
     project.team << [@subscribed_participant, :master]
     project.team << [@subscriber, :master]
     project.team << [@unsubscriber, :master]
+    project.team << [@watcher_and_subscriber, :master]
 
     issuable.subscriptions.create(user: @subscriber, subscribed: true)
     issuable.subscriptions.create(user: @subscribed_participant, subscribed: true)
     issuable.subscriptions.create(user: @unsubscriber, subscribed: false)
+    # Make the watcher a subscriber to detect dupes
+    issuable.subscriptions.create(user: @watcher_and_subscriber, subscribed: true)
   end
 
   def sent_to_user?(user)
diff --git a/spec/services/system_hooks_service_spec.rb b/spec/services/system_hooks_service_spec.rb
index febc78d2784..4455ae7b321 100644
--- a/spec/services/system_hooks_service_spec.rb
+++ b/spec/services/system_hooks_service_spec.rb
@@ -9,37 +9,54 @@ describe SystemHooksService, services: true do
   let(:group_member)  { create(:group_member) }
 
   context 'event data' do
-    it { expect(event_data(user, :create)).to include(:event_name, :name, :created_at, :email, :user_id) }
-    it { expect(event_data(user, :destroy)).to include(:event_name, :name, :created_at, :email, :user_id) }
-    it { expect(event_data(project, :create)).to include(:event_name, :name, :created_at, :path, :project_id, :owner_name, :owner_email, :project_visibility) }
-    it { expect(event_data(project, :destroy)).to include(:event_name, :name, :created_at, :path, :project_id, :owner_name, :owner_email, :project_visibility) }
-    it { expect(event_data(project_member, :create)).to include(:event_name, :created_at, :project_name, :project_path, :project_path_with_namespace, :project_id, :user_name, :user_email, :access_level, :project_visibility) }
-    it { expect(event_data(project_member, :destroy)).to include(:event_name, :created_at, :project_name, :project_path, :project_path_with_namespace, :project_id, :user_name, :user_email, :access_level, :project_visibility) }
+    it { expect(event_data(user, :create)).to include(:event_name, :name, :created_at, :updated_at, :email, :user_id) }
+    it { expect(event_data(user, :destroy)).to include(:event_name, :name, :created_at, :updated_at, :email, :user_id) }
+    it { expect(event_data(project, :create)).to include(:event_name, :name, :created_at, :updated_at, :path, :project_id, :owner_name, :owner_email, :project_visibility) }
+    it { expect(event_data(project, :destroy)).to include(:event_name, :name, :created_at, :updated_at, :path, :project_id, :owner_name, :owner_email, :project_visibility) }
+    it { expect(event_data(project_member, :create)).to include(:event_name, :created_at, :updated_at, :project_name, :project_path, :project_path_with_namespace, :project_id, :user_name, :user_email, :access_level, :project_visibility) }
+    it { expect(event_data(project_member, :destroy)).to include(:event_name, :created_at, :updated_at, :project_name, :project_path, :project_path_with_namespace, :project_id, :user_name, :user_email, :access_level, :project_visibility) }
     it { expect(event_data(key, :create)).to include(:username, :key, :id) }
     it { expect(event_data(key, :destroy)).to include(:username, :key, :id) }
 
     it do
+      project.old_path_with_namespace = 'renamed_from_path'
+      expect(event_data(project, :rename)).to include(
+        :event_name, :name, :created_at, :updated_at, :path, :project_id, 
+        :owner_name, :owner_email, :project_visibility, 
+        :old_path_with_namespace
+      ) 
+    end
+    it do
+      project.old_path_with_namespace = 'transfered_from_path'
+      expect(event_data(project, :transfer)).to include(
+        :event_name, :name, :created_at, :updated_at, :path, :project_id, 
+        :owner_name, :owner_email, :project_visibility, 
+        :old_path_with_namespace
+      ) 
+    end
+
+    it do
       expect(event_data(group, :create)).to include(
-        :event_name, :name, :created_at, :path, :group_id, :owner_name,
-        :owner_email
+        :event_name, :name, :created_at, :updated_at, :path, :group_id, 
+        :owner_name, :owner_email
       )
     end
     it do
       expect(event_data(group, :destroy)).to include(
-        :event_name, :name, :created_at, :path, :group_id, :owner_name,
-        :owner_email
+        :event_name, :name, :created_at, :updated_at, :path, :group_id, 
+        :owner_name, :owner_email
       )
     end
     it do
       expect(event_data(group_member, :create)).to include(
-        :event_name, :created_at, :group_name, :group_path, :group_id, :user_id,
-        :user_name, :user_email, :group_access
+        :event_name, :created_at, :updated_at, :group_name, :group_path, 
+        :group_id, :user_id, :user_name, :user_email, :group_access
       )
     end
     it do
       expect(event_data(group_member, :destroy)).to include(
-        :event_name, :created_at, :group_name, :group_path, :group_id, :user_id,
-        :user_name, :user_email, :group_access
+        :event_name, :created_at, :updated_at, :group_name, :group_path, 
+        :group_id, :user_id, :user_name, :user_email, :group_access
       )
     end
   end
@@ -49,6 +66,8 @@ describe SystemHooksService, services: true do
     it { expect(event_name(user, :destroy)).to eq "user_destroy" }
     it { expect(event_name(project, :create)).to eq "project_create" }
     it { expect(event_name(project, :destroy)).to eq "project_destroy" }
+    it { expect(event_name(project, :rename)).to eq "project_rename" }
+    it { expect(event_name(project, :transfer)).to eq "project_transfer" }
     it { expect(event_name(project_member, :create)).to eq "user_add_to_team" }
     it { expect(event_name(project_member, :destroy)).to eq "user_remove_from_team" }
     it { expect(event_name(key, :create)).to eq 'key_create' }