Merge branch 'master' into sh-headless-chrome-support

238 files changed, 15203 insertions, 3871 deletions

diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 331903a5543..59a6cfbf4f5 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -8,34 +8,43 @@ describe ApplicationController do
 
     it 'redirects if the user is over their password expiry' do
       user.password_expires_at = Time.new(2002)
+
       expect(user.ldap_user?).to be_falsey
       allow(controller).to receive(:current_user).and_return(user)
       expect(controller).to receive(:redirect_to)
       expect(controller).to receive(:new_profile_password_path)
+
       controller.send(:check_password_expiration)
     end
 
     it 'does not redirect if the user is under their password expiry' do
       user.password_expires_at = Time.now + 20010101
+
       expect(user.ldap_user?).to be_falsey
       allow(controller).to receive(:current_user).and_return(user)
       expect(controller).not_to receive(:redirect_to)
+
       controller.send(:check_password_expiration)
     end
 
     it 'does not redirect if the user is over their password expiry but they are an ldap user' do
       user.password_expires_at = Time.new(2002)
+
       allow(user).to receive(:ldap_user?).and_return(true)
       allow(controller).to receive(:current_user).and_return(user)
       expect(controller).not_to receive(:redirect_to)
+
       controller.send(:check_password_expiration)
     end
 
-    it 'does not redirect if the user is over their password expiry but sign-in is disabled' do
+    it 'redirects if the user is over their password expiry and sign-in is disabled' do
       stub_application_setting(password_authentication_enabled: false)
       user.password_expires_at = Time.new(2002)
+
+      expect(user.ldap_user?).to be_falsey
       allow(controller).to receive(:current_user).and_return(user)
-      expect(controller).not_to receive(:redirect_to)
+      expect(controller).to receive(:redirect_to)
+      expect(controller).to receive(:new_profile_password_path)
 
       controller.send(:check_password_expiration)
     end
diff --git a/spec/controllers/autocomplete_controller_spec.rb b/spec/controllers/autocomplete_controller_spec.rb
index 572b567cddf..be27bbb4283 100644
--- a/spec/controllers/autocomplete_controller_spec.rb
+++ b/spec/controllers/autocomplete_controller_spec.rb
@@ -241,13 +241,10 @@ describe AutocompleteController do
 
         it 'returns projects' do
           expect(json_response).to be_kind_of(Array)
-          expect(json_response.size).to eq(2)
-
-          expect(json_response.first['id']).to eq(0)
-          expect(json_response.first['name_with_namespace']).to eq 'No project'
+          expect(json_response.size).to eq(1)
 
-          expect(json_response.last['id']).to eq authorized_project.id
-          expect(json_response.last['name_with_namespace']).to eq authorized_project.name_with_namespace
+          expect(json_response.first['id']).to eq authorized_project.id
+          expect(json_response.first['name_with_namespace']).to eq authorized_project.name_with_namespace
         end
       end
     end
@@ -265,10 +262,10 @@ describe AutocompleteController do
 
         it 'returns projects' do
           expect(json_response).to be_kind_of(Array)
-          expect(json_response.size).to eq(2)
+          expect(json_response.size).to eq(1)
 
-          expect(json_response.last['id']).to eq authorized_search_project.id
-          expect(json_response.last['name_with_namespace']).to eq authorized_search_project.name_with_namespace
+          expect(json_response.first['id']).to eq authorized_search_project.id
+          expect(json_response.first['name_with_namespace']).to eq authorized_search_project.name_with_namespace
         end
       end
     end
@@ -292,7 +289,7 @@ describe AutocompleteController do
 
         it 'returns projects' do
           expect(json_response).to be_kind_of(Array)
-          expect(json_response.size).to eq 3 # Of a total of 4
+          expect(json_response.size).to eq 2 # Of a total of 3
         end
       end
     end
@@ -312,9 +309,9 @@ describe AutocompleteController do
           get(:projects, project_id: project.id, offset_id: authorized_project.id)
         end
 
-        it 'returns "No project"' do
-          expect(json_response.detect { |item| item['id'] == 0 }).to be_nil # 'No project' is not there
-          expect(json_response.detect { |item| item['id'] == authorized_project.id }).to be_nil # Offset project is not there either
+        it 'returns projects' do
+          expect(json_response).to be_kind_of(Array)
+          expect(json_response.size).to eq 2 # Of a total of 3
         end
       end
     end
@@ -331,10 +328,9 @@ describe AutocompleteController do
           get(:projects, project_id: project.id)
         end
 
-        it 'returns a single "No project"' do
+        it 'returns no projects' do
           expect(json_response).to be_kind_of(Array)
-          expect(json_response.size).to eq(1) # 'No project'
-          expect(json_response.first['id']).to eq 0
+          expect(json_response.size).to eq(0)
         end
       end
     end
diff --git a/spec/controllers/concerns/issuable_collections_spec.rb b/spec/controllers/concerns/issuable_collections_spec.rb
new file mode 100644
index 00000000000..c9687af4dd2
--- /dev/null
+++ b/spec/controllers/concerns/issuable_collections_spec.rb
@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe IssuableCollections do
+  let(:user) { create(:user) }
+
+  let(:controller) do
+    klass = Class.new do
+      def self.helper_method(name); end
+
+      include IssuableCollections
+    end
+
+    controller = klass.new
+
+    allow(controller).to receive(:params).and_return(state: 'opened')
+
+    controller
+  end
+
+  describe '#redirect_out_of_range' do
+    before do
+      allow(controller).to receive(:url_for)
+    end
+
+    it 'returns true and redirects if the offset is out of range' do
+      relation = double(:relation, current_page: 10)
+
+      expect(controller).to receive(:redirect_to)
+      expect(controller.send(:redirect_out_of_range, relation, 2)).to eq(true)
+    end
+
+    it 'returns false if the offset is not out of range' do
+      relation = double(:relation, current_page: 1)
+
+      expect(controller).not_to receive(:redirect_to)
+      expect(controller.send(:redirect_out_of_range, relation, 2)).to eq(false)
+    end
+  end
+
+  describe '#issues_page_count' do
+    it 'returns the number of issue pages' do
+      project = create(:project, :public)
+
+      create(:issue, project: project)
+
+      finder = IssuesFinder.new(user)
+      issues = finder.execute
+
+      allow(controller).to receive(:issues_finder)
+        .and_return(finder)
+
+      expect(controller.send(:issues_page_count, issues)).to eq(1)
+    end
+  end
+
+  describe '#merge_requests_page_count' do
+    it 'returns the number of merge request pages' do
+      project = create(:project, :public)
+
+      create(:merge_request, source_project: project, target_project: project)
+
+      finder = MergeRequestsFinder.new(user)
+      merge_requests = finder.execute
+
+      allow(controller).to receive(:merge_requests_finder)
+        .and_return(finder)
+
+      pages = controller.send(:merge_requests_page_count, merge_requests)
+
+      expect(pages).to eq(1)
+    end
+  end
+
+  describe '#page_count_for_relation' do
+    it 'returns the number of pages' do
+      relation = double(:relation, limit_value: 20)
+      pages = controller.send(:page_count_for_relation, relation, 28)
+
+      expect(pages).to eq(2)
+    end
+  end
+end
diff --git a/spec/controllers/passwords_controller_spec.rb b/spec/controllers/passwords_controller_spec.rb
index 2955d01fad0..cdaa88bbf5d 100644
--- a/spec/controllers/passwords_controller_spec.rb
+++ b/spec/controllers/passwords_controller_spec.rb
@@ -1,18 +1,18 @@
 require 'spec_helper'
 
 describe PasswordsController do
-  describe '#check_password_authentication_available' do
+  describe '#prevent_ldap_reset' do
     before do
       @request.env["devise.mapping"] = Devise.mappings[:user]
     end
 
     context 'when password authentication is disabled' do
-      it 'prevents a password reset' do
+      it 'allows password reset' do
         stub_application_setting(password_authentication_enabled: false)
 
         post :create
 
-        expect(flash[:alert]).to eq 'Password authentication is unavailable.'
+        expect(response).to have_http_status(302)
       end
     end
 
@@ -22,7 +22,7 @@ describe PasswordsController do
       it 'prevents a password reset' do
         post :create, user: { email: user.email }
 
-        expect(flash[:alert]).to eq 'Password authentication is unavailable.'
+        expect(flash[:alert]).to eq('Cannot reset password for LDAP user.')
       end
     end
   end
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index da8f9e8376e..5d9403c23ac 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -233,144 +233,119 @@ describe Projects::IssuesController do
       end
     end
 
-    context 'when moving issue to another private project' do
-      let(:another_project) { create(:project, :private) }
-
-      context 'when user has access to move issue' do
-        before do
-          another_project.team << [user, :reporter]
-        end
-
-        it 'moves issue to another project' do
-          move_issue
+    context 'Akismet is enabled' do
+      let(:project) { create(:project_empty_repo, :public) }
 
-          expect(response).to have_http_status :found
-          expect(another_project.issues).not_to be_empty
-        end
+      before do
+        stub_application_setting(recaptcha_enabled: true)
+        allow_any_instance_of(SpamService).to receive(:check_for_spam?).and_return(true)
       end
 
-      context 'when user does not have access to move issue' do
-        it 'responds with 404' do
-          move_issue
+      context 'when an issue is not identified as spam' do
+        before do
+          allow_any_instance_of(described_class).to receive(:verify_recaptcha).and_return(false)
+          allow_any_instance_of(AkismetService).to receive(:spam?).and_return(false)
+        end
 
-          expect(response).to have_http_status :not_found
+        it 'normally updates the issue' do
+          expect { update_issue(title: 'Foo') }.to change { issue.reload.title }.to('Foo')
         end
       end
 
-      context 'Akismet is enabled' do
-        let(:project) { create(:project_empty_repo, :public) }
-
+      context 'when an issue is identified as spam' do
         before do
-          stub_application_setting(recaptcha_enabled: true)
-          allow_any_instance_of(SpamService).to receive(:check_for_spam?).and_return(true)
+          allow_any_instance_of(AkismetService).to receive(:spam?).and_return(true)
         end
 
-        context 'when an issue is not identified as spam' do
-          before do
-            allow_any_instance_of(described_class).to receive(:verify_recaptcha).and_return(false)
-            allow_any_instance_of(AkismetService).to receive(:spam?).and_return(false)
+        context 'when captcha is not verified' do
+          def update_spam_issue
+            update_issue(title: 'Spam Title', description: 'Spam lives here')
           end
 
-          it 'normally updates the issue' do
-            expect { update_issue(title: 'Foo') }.to change { issue.reload.title }.to('Foo')
+          before do
+            allow_any_instance_of(described_class).to receive(:verify_recaptcha).and_return(false)
           end
-        end
 
-        context 'when an issue is identified as spam' do
-          before do
-            allow_any_instance_of(AkismetService).to receive(:spam?).and_return(true)
+          it 'rejects an issue recognized as a spam' do
+            expect(Gitlab::Recaptcha).to receive(:load_configurations!).and_return(true)
+            expect { update_spam_issue }.not_to change { issue.reload.title }
           end
 
-          context 'when captcha is not verified' do
-            def update_spam_issue
-              update_issue(title: 'Spam Title', description: 'Spam lives here')
-            end
+          it 'rejects an issue recognized as a spam when recaptcha disabled' do
+            stub_application_setting(recaptcha_enabled: false)
 
-            before do
-              allow_any_instance_of(described_class).to receive(:verify_recaptcha).and_return(false)
-            end
+            expect { update_spam_issue }.not_to change { issue.reload.title }
+          end
 
-            it 'rejects an issue recognized as a spam' do
-              expect(Gitlab::Recaptcha).to receive(:load_configurations!).and_return(true)
-              expect { update_spam_issue }.not_to change { issue.reload.title }
-            end
+          it 'creates a spam log' do
+            update_spam_issue
 
-            it 'rejects an issue recognized as a spam when recaptcha disabled' do
-              stub_application_setting(recaptcha_enabled: false)
+            spam_logs = SpamLog.all
 
-              expect { update_spam_issue }.not_to change { issue.reload.title }
-            end
+            expect(spam_logs.count).to eq(1)
+            expect(spam_logs.first.title).to eq('Spam Title')
+            expect(spam_logs.first.recaptcha_verified).to be_falsey
+          end
 
-            it 'creates a spam log' do
+          context 'as HTML' do
+            it 'renders verify template' do
               update_spam_issue
 
-              spam_logs = SpamLog.all
-
-              expect(spam_logs.count).to eq(1)
-              expect(spam_logs.first.title).to eq('Spam Title')
-              expect(spam_logs.first.recaptcha_verified).to be_falsey
+              expect(response).to render_template(:verify)
             end
+          end
 
-            context 'as HTML' do
-              it 'renders verify template' do
-                update_spam_issue
-
-                expect(response).to render_template(:verify)
-              end
+          context 'as JSON' do
+            before do
+              update_issue({ title: 'Spam Title', description: 'Spam lives here' }, format: :json)
             end
 
-            context 'as JSON' do
-              before do
-                update_issue({ title: 'Spam Title', description: 'Spam lives here' }, format: :json)
-              end
-
-              it 'renders json errors' do
-                expect(json_response)
-                  .to eql("errors" => ["Your issue has been recognized as spam. Please, change the content or solve the reCAPTCHA to proceed."])
-              end
+            it 'renders json errors' do
+              expect(json_response)
+                .to eql("errors" => ["Your issue has been recognized as spam. Please, change the content or solve the reCAPTCHA to proceed."])
+            end
 
-              it 'returns 422 status' do
-                expect(response).to have_http_status(422)
-              end
+            it 'returns 422 status' do
+              expect(response).to have_http_status(422)
             end
           end
+        end
 
-          context 'when captcha is verified' do
-            let(:spammy_title) { 'Whatever' }
-            let!(:spam_logs) { create_list(:spam_log, 2, user: user, title: spammy_title) }
+        context 'when captcha is verified' do
+          let(:spammy_title) { 'Whatever' }
+          let!(:spam_logs) { create_list(:spam_log, 2, user: user, title: spammy_title) }
 
-            def update_verified_issue
-              update_issue({ title: spammy_title },
-                           { spam_log_id: spam_logs.last.id,
-                             recaptcha_verification: true })
-            end
+          def update_verified_issue
+            update_issue({ title: spammy_title },
+                         { spam_log_id: spam_logs.last.id,
+                           recaptcha_verification: true })
+          end
 
-            before do
-              allow_any_instance_of(described_class).to receive(:verify_recaptcha)
-                .and_return(true)
-            end
+          before do
+            allow_any_instance_of(described_class).to receive(:verify_recaptcha)
+              .and_return(true)
+          end
 
-            it 'redirect to issue page' do
-              update_verified_issue
+          it 'redirect to issue page' do
+            update_verified_issue
 
-              expect(response)
-                .to redirect_to(project_issue_path(project, issue))
-            end
+            expect(response)
+              .to redirect_to(project_issue_path(project, issue))
+          end
 
-            it 'accepts an issue after recaptcha is verified' do
-              expect { update_verified_issue }.to change { issue.reload.title }.to(spammy_title)
-            end
+          it 'accepts an issue after recaptcha is verified' do
+            expect { update_verified_issue }.to change { issue.reload.title }.to(spammy_title)
+          end
 
-            it 'marks spam log as recaptcha_verified' do
-              expect { update_verified_issue }.to change { SpamLog.last.recaptcha_verified }.from(false).to(true)
-            end
+          it 'marks spam log as recaptcha_verified' do
+            expect { update_verified_issue }.to change { SpamLog.last.recaptcha_verified }.from(false).to(true)
+          end
 
-            it 'does not mark spam log as recaptcha_verified when it does not belong to current_user' do
-              spam_log = create(:spam_log)
+          it 'does not mark spam log as recaptcha_verified when it does not belong to current_user' do
+            spam_log = create(:spam_log)
 
-              expect { update_issue(spam_log_id: spam_log.id, recaptcha_verification: true) }
-                .not_to change { SpamLog.last.recaptcha_verified }
-            end
+            expect { update_issue(spam_log_id: spam_log.id, recaptcha_verification: true) }
+              .not_to change { SpamLog.last.recaptcha_verified }
           end
         end
       end
@@ -385,13 +360,45 @@ describe Projects::IssuesController do
 
         put :update, params
       end
+    end
+  end
+
+  describe 'POST #move' do
+    before do
+      sign_in(user)
+      project.add_developer(user)
+    end
+
+    context 'when moving issue to another private project' do
+      let(:another_project) { create(:project, :private) }
+
+      context 'when user has access to move issue' do
+        before do
+          another_project.add_reporter(user)
+        end
+
+        it 'moves issue to another project' do
+          move_issue
+
+          expect(response).to have_http_status :ok
+          expect(another_project.issues).not_to be_empty
+        end
+      end
+
+      context 'when user does not have access to move issue' do
+        it 'responds with 404' do
+          move_issue
+
+          expect(response).to have_http_status :not_found
+        end
+      end
 
       def move_issue
-        put :update,
+        post :move,
+          format: :json,
           namespace_id: project.namespace.to_param,
           project_id: project,
           id: issue.iid,
-          issue: { title: 'New title' },
           move_to_project_id: another_project.id
       end
     end
@@ -879,4 +886,19 @@ describe Projects::IssuesController do
                                   format: :json
     end
   end
+
+  describe 'GET #discussions' do
+    let!(:discussion) { create(:discussion_note_on_issue, noteable: issue, project: issue.project) }
+
+    before do
+      project.add_developer(user)
+      sign_in(user)
+    end
+
+    it 'returns discussion json' do
+      get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid
+
+      expect(JSON.parse(response.body).first.keys).to match_array(%w[id reply_id expanded notes individual_note])
+    end
+  end
 end
diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb
index f280c55059c..6ffe41b8608 100644
--- a/spec/controllers/projects/notes_controller_spec.rb
+++ b/spec/controllers/projects/notes_controller_spec.rb
@@ -46,10 +46,13 @@ describe Projects::NotesController do
     end
 
     context 'for a discussion note' do
-      let!(:note) { create(:discussion_note_on_issue, noteable: issue, project: project) }
+      let(:project) { create(:project, :repository) }
+      let!(:note) { create(:discussion_note_on_merge_request, project: project) }
+
+      let(:params) { request_params.merge(target_type: 'merge_request', target_id: note.noteable_id) }
 
       it 'responds with the expected attributes' do
-        get :index, request_params
+        get :index, params
 
         expect(note_json[:id]).to eq(note.id)
         expect(note_json[:discussion_html]).not_to be_nil
@@ -104,10 +107,12 @@ describe Projects::NotesController do
     end
 
     context 'for a regular note' do
-      let!(:note) { create(:note, noteable: issue, project: project) }
+      let!(:note) { create(:note_on_merge_request, project: project) }
+
+      let(:params) { request_params.merge(target_type: 'merge_request', target_id: note.noteable_id) }
 
       it 'responds with the expected attributes' do
-        get :index, request_params
+        get :index, params
 
         expect(note_json[:id]).to eq(note.id)
         expect(note_json[:html]).not_to be_nil
@@ -125,7 +130,9 @@ describe Projects::NotesController do
         note: { note: 'some note', noteable_id: merge_request.id, noteable_type: 'MergeRequest' },
         namespace_id: project.namespace,
         project_id: project,
-        merge_request_diff_head_sha: 'sha'
+        merge_request_diff_head_sha: 'sha',
+        target_type: 'merge_request',
+        target_id: merge_request.id
       }
     end
 
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 5bba1dec7db..c2b59239af9 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -12,6 +12,7 @@ FactoryGirl.define do
     started_at 'Di 29. Okt 09:51:28 CET 2013'
     finished_at 'Di 29. Okt 09:53:28 CET 2013'
     commands 'ls -a'
+    protected false
 
     options do
       {
@@ -106,7 +107,7 @@ FactoryGirl.define do
     end
 
     trait :triggered do
-      trigger_request factory: :ci_trigger_request_with_variables
+      trigger_request factory: :ci_trigger_request
     end
 
     after(:build) do |build, evaluator|
@@ -226,5 +227,9 @@ FactoryGirl.define do
       status 'created'
       self.when 'manual'
     end
+
+    trait :protected do
+      protected true
+    end
   end
 end
diff --git a/spec/factories/ci/pipeline_variable_variables.rb b/spec/factories/ci/pipeline_variables.rb
index 7c1a7faec08..7c1a7faec08 100644
--- a/spec/factories/ci/pipeline_variable_variables.rb
+++ b/spec/factories/ci/pipeline_variables.rb
diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb
index e83a0e599a8..e5ea6b41ea3 100644
--- a/spec/factories/ci/pipelines.rb
+++ b/spec/factories/ci/pipelines.rb
@@ -4,6 +4,7 @@ FactoryGirl.define do
     ref 'master'
     sha '97de212e80737a608d939f648d959671fb0a0142'
     status 'pending'
+    protected false
 
     project
 
@@ -59,6 +60,10 @@ FactoryGirl.define do
       trait :failed do
         status :failed
       end
+
+      trait :protected do
+        protected true
+      end
     end
   end
 end
diff --git a/spec/factories/ci/runners.rb b/spec/factories/ci/runners.rb
index 05abf60d5ce..88bb755d068 100644
--- a/spec/factories/ci/runners.rb
+++ b/spec/factories/ci/runners.rb
@@ -5,6 +5,7 @@ FactoryGirl.define do
     platform  "darwin"
     is_shared false
     active    true
+    access_level :not_protected
 
     trait :online do
       contacted_at Time.now
@@ -21,5 +22,9 @@ FactoryGirl.define do
     trait :inactive do
       active false
     end
+
+    trait :ref_protected do
+      access_level :ref_protected
+    end
   end
 end
diff --git a/spec/factories/ci/trigger_requests.rb b/spec/factories/ci/trigger_requests.rb
index 10e0ab4fd3c..40b8848920e 100644
--- a/spec/factories/ci/trigger_requests.rb
+++ b/spec/factories/ci/trigger_requests.rb
@@ -1,14 +1,5 @@
 FactoryGirl.define do
   factory :ci_trigger_request, class: Ci::TriggerRequest do
     trigger factory: :ci_trigger
-
-    factory :ci_trigger_request_with_variables do
-      variables do
-        {
-          TRIGGER_KEY_1: 'TRIGGER_VALUE_1',
-          TRIGGER_KEY_2: 'TRIGGER_VALUE_2'
-        }
-      end
-    end
   end
 end
diff --git a/spec/factories/gpg_signature.rb b/spec/factories/gpg_signature.rb
index a5aeffbe12d..c0beecf0bea 100644
--- a/spec/factories/gpg_signature.rb
+++ b/spec/factories/gpg_signature.rb
@@ -6,6 +6,6 @@ FactoryGirl.define do
     project
     gpg_key
     gpg_key_primary_keyid { gpg_key.primary_keyid }
-    valid_signature true
+    verification_status :verified
   end
 end
diff --git a/spec/factories/keys.rb b/spec/factories/keys.rb
index a13b6e3596e..3f7c794b14a 100644
--- a/spec/factories/keys.rb
+++ b/spec/factories/keys.rb
@@ -18,5 +18,54 @@ FactoryGirl.define do
     factory :write_access_key, class: 'DeployKey' do
       can_push true
     end
+
+    factory :rsa_key_2048 do
+      key do
+        'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFf6RYK3qu/RKF/3ndJmL5xgMLp3O9' \
+        '6x8lTay+QGZ0+9FnnAXMdUqBq/ZU6d/gyMB4IaW3nHzM1w049++yAB6UPCzMB8Uo27K5' \
+        '/jyZCtj7Vm9PFNjF/8am1kp46c/SeYicQgQaSBdzIW3UDEa1Ef68qroOlvpi9PYZ/tA7' \
+        'M0YP0K5PXX+E36zaIRnJVMPT3f2k+GnrxtjafZrwFdpOP/Fol5BQLBgcsyiU+LM1SuaC' \
+        'rzd8c9vyaTA1CxrkxaZh+buAi0PmdDtaDrHd42gqZkXCKavyvgM5o2CkQ5LJHCgzpXy0' \
+        '5qNFzmThBSkb+XtoxbyagBiGbVZtSVow6Xa7qewz= dummy@gitlab.com'
+      end
+
+      factory :rsa_deploy_key_2048, class: 'DeployKey'
+    end
+
+    factory :dsa_key_2048 do
+      key do
+        'ssh-dss AAAAB3NzaC1kc3MAAAEBAO/3/NPLA/zSFkMOCaTtGo+uos1flfQ5f038Uk+G' \
+        'Y9AeLGzX+Srhw59GdVXmOQLYBrOt5HdGwqYcmLnE2VurUGmhtfeO5H+3p5pGJbkS0Gxp' \
+        'YH1HRO9lWsncF3Hh1w4lYsDjkclDiSTdfTuN8F4Kb3DXNnVSCieeonp+B25F/CXagyTQ' \
+        '/pvNmHFeYgGCVdnBtFdi+xfxaZ8NKdPrGggzokbKHElDZQ4Xo5EpdcyLajgM7nB2r2Rz' \
+        'OrmeaevKi5lV68ehRa9Yyrb7vxvwiwBwOgqR/mnN7Gnaq1jUdmJY+ct04Qwx37f5jvhv' \
+        '5gA4U40SGMoiHM8RFIN7Ksz0jsyX73MAAAAVALRWOfjfzHpK7KLz4iqDvvTUAevJAAAB' \
+        'AEa9NZ+6y9iQ5erGsdfLTXFrhSefTG0NhghoO/5IFkSGfd8V7kzTvCHaFrcfpEA5kP8t' \
+        'poeOG0TASB6tgGOxm1Bq4Wncry5RORBPJlAVpDGRcvZ931ddH7IgltEInS6za2uH6F/1' \
+        'M1QfKePSLr6xJ1ZLYfP0Og5KTp1x6yMQvfwV0a+XdA+EPgaJWLWp/pWwKWa0oLUgjsIH' \
+        'MYzuOGh5c708uZrmkzqvgtW2NgXhcIroRgynT3IfI2lP2rqqb3uuuE/qH5UCUFO+Dc3H' \
+        'nAFNeQDT/M25AERdPYBAY5a+iPjIgO+jT7BfmfByT+AZTqZySrCyc7nNZL3YgGLK0l6A' \
+        '1GgAAAEBAN9FpFOdIXE+YEZhKl1vPmbcn+b1y5zOl6N4x1B7Q8pD/pLMziWROIS8uLzb' \
+        'aZ0sMIWezHIkxuo1iROMeT+jtCubn7ragaN6AX7nMpxYUH9+mYZZs/fyElt6wCviVhTI' \
+        'zM+u7VdQsnZttOOlQfogHdL+SpeAft0DsfJjlcgQnsLlHQKv6aPqCPYUST2nE7RyW/Ex' \
+        'PrMxLtOWt0/j8RYHbwwqvyeZqBz3ESBgrS9c5tBdBfauwYUV/E7gPLOU3OZFw9ue7o+z' \
+        'wzoTZqW6Xouy5wtWvSLQSLT5XwOslmQz8QMBxD0AQyDfEFGsBCWzmbTgKv9uqrBjubsS' \
+        'Taja+Cf9kMo== dummy@gitlab.com'
+      end
+    end
+
+    factory :ecdsa_key_256 do
+      key do
+        'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYA' \
+        'AABBBJZmkzTgY0fiCQ+DVReyH/fFwTFz0XoR3RUO0u+199H19KFw7mNPxRSMOVS7tEtO' \
+        'Nj3Q7FcZXfqthHvgAzDiHsc= dummy@gitlab.com'
+      end
+    end
+
+    factory :ed25519_key_256 do
+      key do
+        'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIETnVTgzqC1gatgSlC4zH6aYt2CAQzgJOhDRvf59ohL6 dummy@gitlab.com'
+      end
+    end
   end
 end
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index 9ebda0ba03b..7493b0a8b35 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -101,8 +101,6 @@ FactoryGirl.define do
 
     # Test repository - https://gitlab.com/gitlab-org/gitlab-test
     trait :repository do
-      path { 'gitlabhq' }
-
       test_repo
 
       transient do
diff --git a/spec/features/admin/admin_active_tab_spec.rb b/spec/features/admin/admin_active_tab_spec.rb
index 07430ecd6e0..5ff791fc36a 100644
--- a/spec/features/admin/admin_active_tab_spec.rb
+++ b/spec/features/admin/admin_active_tab_spec.rb
@@ -7,15 +7,15 @@ RSpec.describe 'admin active tab' do
 
   shared_examples 'page has active tab' do |title|
     it "activates #{title} tab" do
-      expect(page).to have_selector('.layout-nav .nav-links > li.active', count: 1)
-      expect(page.find('.layout-nav li.active')).to have_content(title)
+      expect(page).to have_selector('.nav-sidebar .sidebar-top-level-items > li.active', count: 1)
+      expect(page.find('.nav-sidebar .sidebar-top-level-items > li.active')).to have_content(title)
     end
   end
 
   shared_examples 'page has active sub tab' do |title|
     it "activates #{title} sub tab" do
-      expect(page).to have_selector('.sub-nav li.active', count: 1)
-      expect(page.find('.sub-nav li.active')).to have_content(title)
+      expect(page).to have_selector('.sidebar-sub-level-items li.active', count: 1)
+      expect(page.find('.sidebar-sub-level-items li.active')).to have_content(title)
     end
   end
 
diff --git a/spec/features/admin/admin_hooks_spec.rb b/spec/features/admin/admin_hooks_spec.rb
index 30fcb334b60..91f08dbad5d 100644
--- a/spec/features/admin/admin_hooks_spec.rb
+++ b/spec/features/admin/admin_hooks_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Admin::Hooks' do
+describe 'Admin::Hooks', :js do
   before do
     @project = create(:project)
     sign_in(create(:admin))
@@ -12,7 +12,7 @@ describe 'Admin::Hooks' do
     it 'is ok' do
       visit admin_root_path
 
-      page.within '.layout-nav' do
+      page.within '.nav-sidebar' do
         click_on 'Hooks'
       end
 
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb
index dbb0ae9c86e..563818e8761 100644
--- a/spec/features/admin/admin_settings_spec.rb
+++ b/spec/features/admin/admin_settings_spec.rb
@@ -79,6 +79,22 @@ feature 'Admin updates settings' do
     end
   end
 
+  scenario 'Change Keys settings' do
+    select 'Are forbidden', from: 'RSA SSH keys'
+    select 'Are allowed', from: 'DSA SSH keys'
+    select 'Must be at least 384 bits', from: 'ECDSA SSH keys'
+    select 'Are forbidden', from: 'ED25519 SSH keys'
+    click_on 'Save'
+
+    forbidden = ApplicationSetting::FORBIDDEN_KEY_VALUE.to_s
+
+    expect(page).to have_content 'Application settings saved successfully'
+    expect(find_field('RSA SSH keys').value).to eq(forbidden)
+    expect(find_field('DSA SSH keys').value).to eq('0')
+    expect(find_field('ECDSA SSH keys').value).to eq('384')
+    expect(find_field('ED25519 SSH keys').value).to eq(forbidden)
+  end
+
   def check_all_events
     page.check('Active')
     page.check('Push')
diff --git a/spec/features/boards/add_issues_modal_spec.rb b/spec/features/boards/add_issues_modal_spec.rb
index a6ad5981f8f..c480b5b7e34 100644
--- a/spec/features/boards/add_issues_modal_spec.rb
+++ b/spec/features/boards/add_issues_modal_spec.rb
@@ -8,8 +8,8 @@ describe 'Issue Boards add issue modal', :js do
   let!(:label) { create(:label, project: project) }
   let!(:list1) { create(:list, board: board, label: planning, position: 0) }
   let!(:list2) { create(:list, board: board, label: label, position: 1) }
-  let!(:issue) { create(:issue, project: project) }
-  let!(:issue2) { create(:issue, project: project) }
+  let!(:issue) { create(:issue, project: project, title: 'abc', description: 'def') }
+  let!(:issue2) { create(:issue, project: project, title: 'hij', description: 'klm') }
 
   before do
     project.team << [user, :master]
diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index ce458431c55..e010b5f3444 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -13,6 +13,8 @@ describe 'Issue Boards', js: true do
     project.team << [user, :master]
     project.team << [user2, :master]
 
+    allow_any_instance_of(ApplicationHelper).to receive(:collapsed_sidebar?).and_return(true)
+
     sign_in(user)
   end
 
@@ -71,15 +73,15 @@ describe 'Issue Boards', js: true do
     let!(:list2) { create(:list, board: board, label: development, position: 1) }
 
     let!(:confidential_issue) { create(:labeled_issue, :confidential, project: project, author: user, labels: [planning], relative_position: 9) }
-    let!(:issue1) { create(:labeled_issue, project: project, assignees: [user], labels: [planning], relative_position: 8) }
-    let!(:issue2) { create(:labeled_issue, project: project, author: user2, labels: [planning], relative_position: 7) }
-    let!(:issue3) { create(:labeled_issue, project: project, labels: [planning], relative_position: 6) }
-    let!(:issue4) { create(:labeled_issue, project: project, labels: [planning], relative_position: 5) }
-    let!(:issue5) { create(:labeled_issue, project: project, labels: [planning], milestone: milestone, relative_position: 4) }
-    let!(:issue6) { create(:labeled_issue, project: project, labels: [planning, development], relative_position: 3) }
-    let!(:issue7) { create(:labeled_issue, project: project, labels: [development], relative_position: 2) }
-    let!(:issue8) { create(:closed_issue, project: project) }
-    let!(:issue9) { create(:labeled_issue, project: project, labels: [planning, testing, bug, accepting], relative_position: 1) }
+    let!(:issue1) { create(:labeled_issue, project: project, title: 'aaa', description: '111', assignees: [user], labels: [planning], relative_position: 8) }
+    let!(:issue2) { create(:labeled_issue, project: project, title: 'bbb', description: '222', author: user2, labels: [planning], relative_position: 7) }
+    let!(:issue3) { create(:labeled_issue, project: project, title: 'ccc', description: '333', labels: [planning], relative_position: 6) }
+    let!(:issue4) { create(:labeled_issue, project: project, title: 'ddd', description: '444', labels: [planning], relative_position: 5) }
+    let!(:issue5) { create(:labeled_issue, project: project, title: 'eee', description: '555', labels: [planning], milestone: milestone, relative_position: 4) }
+    let!(:issue6) { create(:labeled_issue, project: project, title: 'fff', description: '666', labels: [planning, development], relative_position: 3) }
+    let!(:issue7) { create(:labeled_issue, project: project, title: 'ggg', description: '777', labels: [development], relative_position: 2) }
+    let!(:issue8) { create(:closed_issue, project: project, title: 'hhh', description: '888') }
+    let!(:issue9) { create(:labeled_issue, project: project, title: 'iii', description: '999', labels: [planning, testing, bug, accepting], relative_position: 1) }
 
     before do
       visit project_board_path(project, board)
@@ -145,6 +147,8 @@ describe 'Issue Boards', js: true do
       click_button 'Add list'
       wait_for_requests
 
+      find('.dropdown-menu-close').click
+
       page.within(find('.board:nth-child(2)')) do
         find('.board-delete').click
       end
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index 0c9fcc60d30..479fb713297 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -203,105 +203,4 @@ describe 'Commits' do
       end
     end
   end
-
-  describe 'GPG signed commits', :js do
-    it 'changes from unverified to verified when the user changes his email to match the gpg key' do
-      user = create :user, email: 'unrelated.user@example.org'
-      project.team << [user, :master]
-
-      Sidekiq::Testing.inline! do
-        create :gpg_key, key: GpgHelpers::User1.public_key, user: user
-      end
-
-      sign_in(user)
-
-      visit project_commits_path(project, :'signed-commits')
-
-      within '#commits-list' do
-        expect(page).to have_content 'Unverified'
-        expect(page).not_to have_content 'Verified'
-      end
-
-      # user changes his email which makes the gpg key verified
-      Sidekiq::Testing.inline! do
-        user.skip_reconfirmation!
-        user.update_attributes!(email: GpgHelpers::User1.emails.first)
-      end
-
-      visit project_commits_path(project, :'signed-commits')
-
-      within '#commits-list' do
-        expect(page).to have_content 'Unverified'
-        expect(page).to have_content 'Verified'
-      end
-    end
-
-    it 'changes from unverified to verified when the user adds the missing gpg key' do
-      user = create :user, email: GpgHelpers::User1.emails.first
-      project.team << [user, :master]
-
-      sign_in(user)
-
-      visit project_commits_path(project, :'signed-commits')
-
-      within '#commits-list' do
-        expect(page).to have_content 'Unverified'
-        expect(page).not_to have_content 'Verified'
-      end
-
-      # user adds the gpg key which makes the signature valid
-      Sidekiq::Testing.inline! do
-        create :gpg_key, key: GpgHelpers::User1.public_key, user: user
-      end
-
-      visit project_commits_path(project, :'signed-commits')
-
-      within '#commits-list' do
-        expect(page).to have_content 'Unverified'
-        expect(page).to have_content 'Verified'
-      end
-    end
-
-    it 'shows popover badges' do
-      gpg_user = create :user, email: GpgHelpers::User1.emails.first, username: 'nannie.bernhard', name: 'Nannie Bernhard'
-      Sidekiq::Testing.inline! do
-        create :gpg_key, key: GpgHelpers::User1.public_key, user: gpg_user
-      end
-
-      user = create :user
-      project.team << [user, :master]
-
-      sign_in(user)
-      visit project_commits_path(project, :'signed-commits')
-
-      # unverified signature
-      click_on 'Unverified', match: :first
-      within '.popover' do
-        expect(page).to have_content 'This commit was signed with an unverified signature.'
-        expect(page).to have_content "GPG Key ID: #{GpgHelpers::User2.primary_keyid}"
-      end
-
-      # verified and the gpg user has a gitlab profile
-      click_on 'Verified', match: :first
-      within '.popover' do
-        expect(page).to have_content 'This commit was signed with a verified signature.'
-        expect(page).to have_content 'Nannie Bernhard'
-        expect(page).to have_content '@nannie.bernhard'
-        expect(page).to have_content "GPG Key ID: #{GpgHelpers::User1.primary_keyid}"
-      end
-
-      # verified and the gpg user's profile doesn't exist anymore
-      gpg_user.destroy!
-
-      visit project_commits_path(project, :'signed-commits')
-
-      click_on 'Verified', match: :first
-      within '.popover' do
-        expect(page).to have_content 'This commit was signed with a verified signature.'
-        expect(page).to have_content 'Nannie Bernhard'
-        expect(page).to have_content 'nannie.bernhard@example.com'
-        expect(page).to have_content "GPG Key ID: #{GpgHelpers::User1.primary_keyid}"
-      end
-    end
-  end
 end
diff --git a/spec/features/dashboard/active_tab_spec.rb b/spec/features/dashboard/active_tab_spec.rb
index ee2554cbd48..08d8cc7922b 100644
--- a/spec/features/dashboard/active_tab_spec.rb
+++ b/spec/features/dashboard/active_tab_spec.rb
@@ -7,9 +7,8 @@ RSpec.describe 'Dashboard Active Tab', js: true do
 
   shared_examples 'page has active tab' do |title|
     it "#{title} tab" do
-      find('.global-dropdown-toggle').click
-      expect(page).to have_selector('.global-dropdown-menu li.active', count: 1)
-      expect(find('.global-dropdown-menu li.active')).to have_content(title)
+      expect(page).to have_selector('.navbar-sub-nav li.active', count: 1)
+      expect(find('.navbar-sub-nav li.active')).to have_content(title)
     end
   end
 
@@ -21,27 +20,19 @@ RSpec.describe 'Dashboard Active Tab', js: true do
     it_behaves_like 'page has active tab', 'Projects'
   end
 
-  context 'on dashboard issues' do
-    before do
-      visit issues_dashboard_path
-    end
-
-    it_behaves_like 'page has active tab', 'Issues'
-  end
-
-  context 'on dashboard merge requests' do
+  context 'on dashboard groups' do
     before do
-      visit merge_requests_dashboard_path
+      visit dashboard_groups_path
     end
 
-    it_behaves_like 'page has active tab', 'Merge Requests'
+    it_behaves_like 'page has active tab', 'Groups'
   end
 
-  context 'on dashboard groups' do
+  context 'on activity projects' do
     before do
-      visit dashboard_groups_path
+      visit activity_dashboard_path
     end
 
-    it_behaves_like 'page has active tab', 'Groups'
+    it_behaves_like 'page has active tab', 'Activity'
   end
 end
diff --git a/spec/features/dashboard/issues_filter_spec.rb b/spec/features/dashboard/issues_filter_spec.rb
index facb67ae787..ebc3d196118 100644
--- a/spec/features/dashboard/issues_filter_spec.rb
+++ b/spec/features/dashboard/issues_filter_spec.rb
@@ -50,7 +50,7 @@ feature 'Dashboard Issues filtering', :js do
     it 'updates atom feed link' do
       visit_issues(milestone_title: '', assignee_id: user.id)
 
-      link = find('.nav-controls a[title="Subscribe"]')
+      link = find('.breadcrumbs a[title="Subscribe"]')
       params = CGI.parse(URI.parse(link[:href]).query)
       auto_discovery_link = find('link[type="application/atom+xml"]', visible: false)
       auto_discovery_params = CGI.parse(URI.parse(auto_discovery_link[:href]).query)
diff --git a/spec/features/dashboard/shortcuts_spec.rb b/spec/features/dashboard/shortcuts_spec.rb
index 5f1f0c10339..e41bd7a8419 100644
--- a/spec/features/dashboard/shortcuts_spec.rb
+++ b/spec/features/dashboard/shortcuts_spec.rb
@@ -50,6 +50,6 @@ feature 'Dashboard shortcuts', :js do
   end
 
   def check_page_title(title)
-    expect(find('.header-content .title')).to have_content(title)
+    expect(find('.breadcrumbs-sub-title')).to have_content(title)
   end
 end
diff --git a/spec/features/groups/group_name_toggle_spec.rb b/spec/features/groups/group_name_toggle_spec.rb
deleted file mode 100644
index a7b8b702ab7..00000000000
--- a/spec/features/groups/group_name_toggle_spec.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-require 'spec_helper'
-
-feature 'Group name toggle', js: true do
-  let(:group) { create(:group) }
-  let(:nested_group_1) { create(:group, parent: group) }
-  let(:nested_group_2) { create(:group, parent: nested_group_1) }
-  let(:nested_group_3) { create(:group, parent: nested_group_2) }
-
-  SMALL_SCREEN = 300
-
-  before do
-    sign_in(create(:user))
-  end
-
-  it 'is not present if enough horizontal space' do
-    visit group_path(nested_group_3)
-
-    container_width = page.evaluate_script("$('.title-container')[0].offsetWidth")
-    title_width = page.evaluate_script("$('.title')[0].offsetWidth")
-
-    expect(container_width).to be > title_width
-    expect(page).not_to have_css('.group-name-toggle')
-  end
-
-  it 'is present if the title is longer than the container', :nested_groups do
-    visit group_path(nested_group_3)
-    title_width = page.evaluate_script("$('.title')[0].offsetWidth")
-
-    page_height = page.current_window.size[1]
-    page.current_window.resize_to(SMALL_SCREEN, page_height)
-
-    find('.group-name-toggle')
-    container_width = page.evaluate_script("$('.title-container')[0].offsetWidth")
-
-    expect(title_width).to be > container_width
-  end
-
-  it 'should show the full group namespace when toggled', :nested_groups do
-    page_height = page.current_window.size[1]
-    page.current_window.resize_to(SMALL_SCREEN, page_height)
-    visit group_path(nested_group_3)
-
-    expect(page).not_to have_content(group.name)
-    expect(page).to have_css('.group-path.hidable', visible: false)
-
-    click_button '...'
-
-    expect(page).to have_content(group.name)
-    expect(page).to have_css('.group-path.hidable', visible: true)
-  end
-end
diff --git a/spec/features/groups/group_settings_spec.rb b/spec/features/groups/group_settings_spec.rb
index d0316cfb18d..b83bad3befb 100644
--- a/spec/features/groups/group_settings_spec.rb
+++ b/spec/features/groups/group_settings_spec.rb
@@ -65,14 +65,14 @@ feature 'Edit group settings' do
         update_path(new_group_path)
         visit new_project_full_path
         expect(current_path).to eq(new_project_full_path)
-        expect(find('h1.title')).to have_content(project.path)
+        expect(find('.breadcrumbs')).to have_content(project.path)
       end
 
       scenario 'the old project path redirects to the new path' do
         update_path(new_group_path)
         visit old_project_full_path
         expect(current_path).to eq(new_project_full_path)
-        expect(find('h1.title')).to have_content(project.path)
+        expect(find('.breadcrumbs')).to have_content(project.path)
       end
     end
   end
diff --git a/spec/features/groups/merge_requests_spec.rb b/spec/features/groups/merge_requests_spec.rb
index 9ba9f5686f7..2577d98df6f 100644
--- a/spec/features/groups/merge_requests_spec.rb
+++ b/spec/features/groups/merge_requests_spec.rb
@@ -25,7 +25,7 @@ feature 'Group merge requests page' do
     end
 
     it 'ignores archived merge request count badges in navbar' do
-      expect( page.find('[title="Merge Requests"] span.badge.count').text).to eq("1")
+      expect( page.find('[aria-label="Merge Requests"] span.badge.count').text).to eq("1")
     end
 
     it 'ignores archived merge request count badges in state-filters' do
diff --git a/spec/features/groups_spec.rb b/spec/features/groups_spec.rb
index 20f9818b08b..4ec2e7e6012 100644
--- a/spec/features/groups_spec.rb
+++ b/spec/features/groups_spec.rb
@@ -158,7 +158,7 @@ feature 'Group' do
       expect(page).to have_content 'successfully updated'
       expect(find('#group_name').value).to eq(new_name)
 
-      page.within ".navbar-gitlab" do
+      page.within ".breadcrumbs" do
         expect(page).to have_content new_name
       end
     end
diff --git a/spec/features/issues/award_emoji_spec.rb b/spec/features/issues/award_emoji_spec.rb
index 134e618feac..a29acb30163 100644
--- a/spec/features/issues/award_emoji_spec.rb
+++ b/spec/features/issues/award_emoji_spec.rb
@@ -70,13 +70,13 @@ describe 'Awards Emoji' do
       it 'toggles the smiley emoji on a note', js: true do
         toggle_smiley_emoji(true)
 
-        within('.note-awards') do
+        within('.note-body') do
           expect(find(emoji_counter)).to have_text("1")
         end
 
         toggle_smiley_emoji(false)
 
-        within('.note-awards') do
+        within('.note-body') do
           expect(page).not_to have_selector(emoji_counter)
         end
       end
diff --git a/spec/features/issues/filtered_search/filter_issues_spec.rb b/spec/features/issues/filtered_search/filter_issues_spec.rb
index 22e7becff1a..3ea6e1c8863 100644
--- a/spec/features/issues/filtered_search/filter_issues_spec.rb
+++ b/spec/features/issues/filtered_search/filter_issues_spec.rb
@@ -1,26 +1,24 @@
 require 'spec_helper'
 
 describe 'Filter issues', js: true do
-  include Devise::Test::IntegrationHelpers
   include FilteredSearchHelpers
 
-  let!(:group) { create(:group) }
-  let!(:project) { create(:project, group: group) }
-  let!(:user) { create(:user, username: 'joe', name: 'Joe') }
-  let!(:user2) { create(:user, username: 'jane') }
-  let!(:label) { create(:label, project: project) }
-  let!(:wontfix) { create(:label, project: project, title: "Won't fix") }
+  let(:project) { create(:project) }
+
+  # NOTE: The short name here is actually important
+  #
+  # When the name is longer, the filtered search input can end up scrolling
+  # horizontally, and PhantomJS can't handle it.
+  let(:user) { create(:user, name: 'Ann') }
 
   let!(:bug_label) { create(:label, project: project, title: 'bug') }
   let!(:caps_sensitive_label) { create(:label, project: project, title: 'CaPs') }
-  let!(:milestone) { create(:milestone, title: "8", project: project, start_date: 2.days.ago) }
   let!(:multiple_words_label) { create(:label, project: project, title: "Two words") }
-
-  let!(:closed_issue) { create(:issue, title: 'bug that is closed', project: project, state: :closed) }
+  let!(:milestone) { create(:milestone, title: "8", project: project, start_date: 2.days.ago) }
 
   def expect_no_issues_list
     page.within '.issues-list' do
-      expect(page).not_to have_selector('.issue')
+      expect(page).to have_no_selector('.issue')
     end
   end
 
@@ -33,63 +31,62 @@ describe 'Filter issues', js: true do
     end
   end
 
-  def select_search_at_index(pos)
-    evaluate_script("el = document.querySelector('.filtered-search'); el.focus(); el.setSelectionRange(#{pos}, #{pos});")
-  end
-
   before do
-    project.team << [user, :master]
-    project.team << [user2, :master]
-    group.add_developer(user)
-    group.add_developer(user2)
+    project.add_master(user)
 
-    sign_in(user)
+    user2 = create(:user)
 
-    create(:issue, project: project)
-    create(:issue, project: project, title: "Bug report 1")
-    create(:issue, project: project, title: "Bug report 2")
-    create(:issue, project: project, title: "issue with 'single quotes'")
-    create(:issue, project: project, title: "issue with \"double quotes\"")
-    create(:issue, project: project, title: "issue with !@\#{$%^&*()-+")
-    create(:issue, project: project, title: "issue by assignee", milestone: milestone, author: user, assignees: [user])
-    create(:issue, project: project, title: "issue by assignee with searchTerm", milestone: milestone, author: user, assignees: [user])
+    create(:issue, project: project, author: user2, title: "Bug report 1")
+    create(:issue, project: project, author: user2, title: "Bug report 2")
 
-    issue = create(:issue,
+    create(:issue, project: project, author: user,  title: "issue by assignee", milestone: milestone, assignees: [user])
+    create(:issue, project: project, author: user,  title: "issue by assignee with searchTerm", milestone: milestone, assignees: [user])
+
+    create(:labeled_issue,
       title: "Bug 2",
       project: project,
       milestone: milestone,
       author: user,
-      assignees: [user])
-    issue.labels << bug_label
+      assignees: [user],
+      labels: [bug_label])
 
-    issue_with_caps_label = create(:issue,
+    create(:labeled_issue,
       title: "issue by assignee with searchTerm and label",
       project: project,
       milestone: milestone,
       author: user,
-      assignees: [user])
-    issue_with_caps_label.labels << caps_sensitive_label
+      assignees: [user],
+      labels: [caps_sensitive_label])
 
-    issue_with_everything = create(:issue,
+    create(:labeled_issue,
       title: "Bug report foo was possible",
       project: project,
       milestone: milestone,
       author: user,
-      assignees: [user])
-    issue_with_everything.labels << bug_label
-    issue_with_everything.labels << caps_sensitive_label
+      assignees: [user],
+      labels: [bug_label, caps_sensitive_label])
+
+    create(:labeled_issue, title: "Issue with multiple words label", project: project, labels: [multiple_words_label])
 
-    multiple_words_label_issue = create(:issue, title: "Issue with multiple words label", project: project)
-    multiple_words_label_issue.labels << multiple_words_label
+    sign_in(user)
+    visit project_issues_path(project)
+  end
 
-    future_milestone = create(:milestone, title: "future", project: project, due_date: Time.now + 1.month)
+  it 'filters by all available tokens' do
+    search_term = 'issue'
 
-    create(:issue,
-      title: "Issue with future milestone",
-      milestone: future_milestone,
-      project: project)
+    input_filtered_search("assignee:@#{user.username} author:@#{user.username} label:~#{caps_sensitive_label.title} milestone:%#{milestone.title} #{search_term}")
 
-    visit project_issues_path(project)
+    wait_for_requests
+
+    expect_tokens([
+      assignee_token(user.name),
+      author_token(user.name),
+      label_token(caps_sensitive_label.title),
+      milestone_token(milestone.title)
+    ])
+    expect_issues_list_count(1)
+    expect_filtered_search_input(search_term)
   end
 
   describe 'filter issues by author' do
@@ -104,59 +101,6 @@ describe 'Filter issues', js: true do
         expect_filtered_search_input_empty
       end
     end
-
-    context 'author with other filters' do
-      let(:search_term) { 'issue' }
-
-      it 'filters issues by searched author and text' do
-        input_filtered_search("author:@#{user.username} #{search_term}")
-
-        wait_for_requests
-
-        expect_tokens([author_token(user.name)])
-        expect_issues_list_count(3)
-        expect_filtered_search_input(search_term)
-      end
-
-      it 'filters issues by searched author, assignee and text' do
-        input_filtered_search("author:@#{user.username} assignee:@#{user.username} #{search_term}")
-
-        wait_for_requests
-
-        expect_tokens([author_token(user.name), assignee_token(user.name)])
-        expect_issues_list_count(3)
-        expect_filtered_search_input(search_term)
-      end
-
-      it 'filters issues by searched author, assignee, label, and text' do
-        input_filtered_search("author:@#{user.username} assignee:@#{user.username} label:~#{caps_sensitive_label.title} #{search_term}")
-
-        wait_for_requests
-
-        expect_tokens([
-          author_token(user.name),
-          assignee_token(user.name),
-          label_token(caps_sensitive_label.title)
-        ])
-        expect_issues_list_count(1)
-        expect_filtered_search_input(search_term)
-      end
-
-      it 'filters issues by searched author, assignee, label, milestone and text' do
-        input_filtered_search("author:@#{user.username} assignee:@#{user.username} label:~#{caps_sensitive_label.title} milestone:%#{milestone.title} #{search_term}")
-
-        wait_for_requests
-
-        expect_tokens([
-          author_token(user.name),
-          assignee_token(user.name),
-          label_token(caps_sensitive_label.title),
-          milestone_token(milestone.title)
-        ])
-        expect_issues_list_count(1)
-        expect_filtered_search_input(search_term)
-      end
-    end
   end
 
   describe 'filter issues by assignee' do
@@ -175,66 +119,13 @@ describe 'Filter issues', js: true do
         input_filtered_search('assignee:none')
 
         expect_tokens([assignee_token('none')])
-        expect_issues_list_count(8, 1)
+        expect_issues_list_count(3)
         expect_filtered_search_input_empty
       end
     end
-
-    context 'assignee with other filters' do
-      let(:search_term) { 'searchTerm' }
-
-      it 'filters issues by searched assignee and text' do
-        input_filtered_search("assignee:@#{user.username} #{search_term}")
-
-        wait_for_requests
-
-        expect_tokens([assignee_token(user.name)])
-        expect_issues_list_count(2)
-        expect_filtered_search_input(search_term)
-      end
-
-      it 'filters issues by searched assignee, author and text' do
-        input_filtered_search("assignee:@#{user.username} author:@#{user.username} #{search_term}")
-
-        wait_for_requests
-
-        expect_tokens([assignee_token(user.name), author_token(user.name)])
-        expect_issues_list_count(2)
-        expect_filtered_search_input(search_term)
-      end
-
-      it 'filters issues by searched assignee, author, label, text' do
-        input_filtered_search("assignee:@#{user.username} author:@#{user.username} label:~#{caps_sensitive_label.title} #{search_term}")
-
-        wait_for_requests
-
-        expect_tokens([
-          assignee_token(user.name),
-          author_token(user.name),
-          label_token(caps_sensitive_label.title)
-        ])
-        expect_issues_list_count(1)
-        expect_filtered_search_input(search_term)
-      end
-
-      it 'filters issues by searched assignee, author, label, milestone and text' do
-        input_filtered_search("assignee:@#{user.username} author:@#{user.username} label:~#{caps_sensitive_label.title} milestone:%#{milestone.title} #{search_term}")
-
-        expect_tokens([
-          assignee_token(user.name),
-          author_token(user.name),
-          label_token(caps_sensitive_label.title),
-          milestone_token(milestone.title)
-        ])
-        expect_issues_list_count(1)
-        expect_filtered_search_input(search_term)
-      end
-    end
   end
 
   describe 'filter issues by label' do
-    let(:search_term) { 'bug' }
-
     context 'only label' do
       it 'filters issues by searched label' do
         input_filtered_search("label:~#{bug_label.title}")
@@ -248,7 +139,7 @@ describe 'Filter issues', js: true do
         input_filtered_search('label:none')
 
         expect_tokens([label_token('none', false)])
-        expect_issues_list_count(9, 1)
+        expect_issues_list_count(8)
         expect_filtered_search_input_empty
       end
 
@@ -275,13 +166,13 @@ describe 'Filter issues', js: true do
         expect_filtered_search_input_empty
       end
 
-      it 'does not show issues' do
+      it 'does not show issues for unused labels' do
         new_label = create(:label, project: project, title: 'new_label')
 
         input_filtered_search("label:~#{new_label.title}")
 
         expect_tokens([label_token(new_label.title)])
-        expect_no_issues_list()
+        expect_no_issues_list
         expect_filtered_search_input_empty
       end
     end
@@ -344,95 +235,10 @@ describe 'Filter issues', js: true do
       end
     end
 
-    context 'label with other filters' do
-      it 'filters issues by searched label and text' do
-        input_filtered_search("label:~#{caps_sensitive_label.title} #{search_term}")
-
-        expect_tokens([label_token(caps_sensitive_label.title)])
-        expect_issues_list_count(1)
-        expect_filtered_search_input(search_term)
-      end
-
-      it 'filters issues by searched label, author and text' do
-        input_filtered_search("label:~#{caps_sensitive_label.title} author:@#{user.username} #{search_term}")
-
-        wait_for_requests
-
-        expect_tokens([label_token(caps_sensitive_label.title), author_token(user.name)])
-        expect_issues_list_count(1)
-        expect_filtered_search_input(search_term)
-      end
-
-      it 'filters issues by searched label, author, assignee and text' do
-        input_filtered_search("label:~#{caps_sensitive_label.title} author:@#{user.username} assignee:@#{user.username} #{search_term}")
-
-        wait_for_requests
-
-        expect_tokens([
-          label_token(caps_sensitive_label.title),
-          author_token(user.name),
-          assignee_token(user.name)
-        ])
-        expect_issues_list_count(1)
-        expect_filtered_search_input(search_term)
-      end
-
-      it 'filters issues by searched label, author, assignee, milestone and text' do
-        input_filtered_search("label:~#{caps_sensitive_label.title} author:@#{user.username} assignee:@#{user.username} milestone:%#{milestone.title} #{search_term}")
-
-        expect_tokens([
-          label_token(caps_sensitive_label.title),
-          author_token(user.name),
-          assignee_token(user.name),
-          milestone_token(milestone.title)
-        ])
-        expect_issues_list_count(1)
-        expect_filtered_search_input(search_term)
-      end
-    end
-
     context 'multiple labels with other filters' do
-      it 'filters issues by searched label, label2, and text' do
-        input_filtered_search("label:~#{bug_label.title} label:~#{caps_sensitive_label.title} #{search_term}")
-
-        expect_tokens([
-          label_token(bug_label.title),
-          label_token(caps_sensitive_label.title)
-        ])
-        expect_issues_list_count(1)
-        expect_filtered_search_input(search_term)
-      end
-
-      it 'filters issues by searched label, label2, author and text' do
-        input_filtered_search("label:~#{bug_label.title} label:~#{caps_sensitive_label.title} author:@#{user.username} #{search_term}")
-
-        wait_for_requests
-
-        expect_tokens([
-          label_token(bug_label.title),
-          label_token(caps_sensitive_label.title),
-          author_token(user.name)
-        ])
-        expect_issues_list_count(1)
-        expect_filtered_search_input(search_term)
-      end
-
-      it 'filters issues by searched label, label2, author, assignee and text' do
-        input_filtered_search("label:~#{bug_label.title} label:~#{caps_sensitive_label.title} author:@#{user.username} assignee:@#{user.username} #{search_term}")
-
-        wait_for_requests
-
-        expect_tokens([
-          label_token(bug_label.title),
-          label_token(caps_sensitive_label.title),
-          author_token(user.name),
-          assignee_token(user.name)
-        ])
-        expect_issues_list_count(1)
-        expect_filtered_search_input(search_term)
-      end
-
       it 'filters issues by searched label, label2, author, assignee, milestone and text' do
+        search_term = 'bug'
+
         input_filtered_search("label:~#{bug_label.title} label:~#{caps_sensitive_label.title} author:@#{user.username} assignee:@#{user.username} milestone:%#{milestone.title} #{search_term}")
 
         wait_for_requests
@@ -450,15 +256,10 @@ describe 'Filter issues', js: true do
     end
 
     context 'issue label clicked' do
-      before do
+      it 'filters and displays in search bar' do
         find('.issues-list .issue .issue-main-info .issuable-info a .label', text: multiple_words_label.title).click
-      end
 
-      it 'filters' do
         expect_issues_list_count(1)
-      end
-
-      it 'displays in search bar' do
         expect_tokens([label_token("\"#{multiple_words_label.title}\"")])
         expect_filtered_search_input_empty
       end
@@ -479,11 +280,15 @@ describe 'Filter issues', js: true do
         input_filtered_search("milestone:none")
 
         expect_tokens([milestone_token('none', false)])
-        expect_issues_list_count(7, 1)
+        expect_issues_list_count(3)
         expect_filtered_search_input_empty
       end
 
       it 'filters issues by upcoming milestones' do
+        create(:milestone, project: project, due_date: 1.month.from_now) do |future_milestone|
+          create(:issue, project: project, milestone: future_milestone, author: user)
+        end
+
         input_filtered_search("milestone:upcoming")
 
         expect_tokens([milestone_token('upcoming', false)])
@@ -501,7 +306,7 @@ describe 'Filter issues', js: true do
 
       it 'filters issues by milestone containing special characters' do
         special_milestone = create(:milestone, title: '!@\#{$%^&*()}', project: project)
-        create(:issue, title: "Issue with special character milestone", project: project, milestone: special_milestone)
+        create(:issue, project: project, milestone: special_milestone)
 
         input_filtered_search("milestone:%#{special_milestone.title}")
 
@@ -510,70 +315,16 @@ describe 'Filter issues', js: true do
         expect_filtered_search_input_empty
       end
 
-      it 'does not show issues' do
-        new_milestone = create(:milestone, title: "new", project: project)
+      it 'does not show issues for unused milestones' do
+        new_milestone = create(:milestone, title: 'new', project: project)
 
         input_filtered_search("milestone:%#{new_milestone.title}")
 
         expect_tokens([milestone_token(new_milestone.title)])
-        expect_no_issues_list()
+        expect_no_issues_list
         expect_filtered_search_input_empty
       end
     end
-
-    context 'milestone with other filters' do
-      let(:search_term) { 'bug' }
-
-      it 'filters issues by searched milestone and text' do
-        input_filtered_search("milestone:%#{milestone.title} #{search_term}")
-
-        expect_tokens([milestone_token(milestone.title)])
-        expect_issues_list_count(2)
-        expect_filtered_search_input(search_term)
-      end
-
-      it 'filters issues by searched milestone, author and text' do
-        input_filtered_search("milestone:%#{milestone.title} author:@#{user.username} #{search_term}")
-
-        wait_for_requests
-
-        expect_tokens([
-          milestone_token(milestone.title),
-          author_token(user.name)
-        ])
-        expect_issues_list_count(2)
-        expect_filtered_search_input(search_term)
-      end
-
-      it 'filters issues by searched milestone, author, assignee and text' do
-        input_filtered_search("milestone:%#{milestone.title} author:@#{user.username} assignee:@#{user.username} #{search_term}")
-
-        wait_for_requests
-
-        expect_tokens([
-          milestone_token(milestone.title),
-          author_token(user.name),
-          assignee_token(user.name)
-        ])
-        expect_issues_list_count(2)
-        expect_filtered_search_input(search_term)
-      end
-
-      it 'filters issues by searched milestone, author, assignee, label and text' do
-        input_filtered_search("milestone:%#{milestone.title} author:@#{user.username} assignee:@#{user.username} label:~#{bug_label.title} #{search_term}")
-
-        wait_for_requests
-
-        expect_tokens([
-          milestone_token(milestone.title),
-          author_token(user.name),
-          assignee_token(user.name),
-          label_token(bug_label.title)
-        ])
-        expect_issues_list_count(2)
-        expect_filtered_search_input(search_term)
-      end
-    end
   end
 
   describe 'filter issues by text' do
@@ -582,7 +333,7 @@ describe 'Filter issues', js: true do
         search = 'Bug'
         input_filtered_search(search)
 
-        expect_issues_list_count(4, 1)
+        expect_issues_list_count(4)
         expect_filtered_search_input(search)
       end
 
@@ -603,112 +354,50 @@ describe 'Filter issues', js: true do
       end
 
       it 'filters issues by searched text containing single quotes' do
-        search = '\'single quotes\''
+        issue = create(:issue, project: project, author: user, title: "issue with 'single quotes'")
+
+        search = "'single quotes'"
         input_filtered_search(search)
 
         expect_issues_list_count(1)
         expect_filtered_search_input(search)
+        expect(page).to have_content(issue.title)
       end
 
       it 'filters issues by searched text containing double quotes' do
+        issue = create(:issue, project: project, author: user, title: "issue with \"double quotes\"")
+
         search = '"double quotes"'
         input_filtered_search(search)
 
         expect_issues_list_count(1)
         expect_filtered_search_input(search)
+        expect(page).to have_content(issue.title)
       end
 
       it 'filters issues by searched text containing special characters' do
+        issue = create(:issue, project: project, author: user, title: "issue with !@\#{$%^&*()-+")
+
         search = '!@#{$%^&*()-+'
         input_filtered_search(search)
 
         expect_issues_list_count(1)
         expect_filtered_search_input(search)
+        expect(page).to have_content(issue.title)
       end
 
       it 'does not show any issues' do
         search = 'testing'
         input_filtered_search(search)
 
-        expect_no_issues_list()
+        expect_no_issues_list
         expect_filtered_search_input(search)
       end
     end
 
     context 'searched text with other filters' do
-      it 'filters issues by searched text and author' do
-        # After searching, all search terms are placed at the end
-        input_filtered_search("bug author:@#{user.username}")
-
-        expect_issues_list_count(2)
-        expect_filtered_search_input('bug')
-      end
-
-      it 'filters issues by searched text, author and more text' do
-        input_filtered_search("bug author:@#{user.username} report")
-
-        expect_issues_list_count(1)
-        expect_filtered_search_input('bug report')
-      end
-
-      it 'filters issues by searched text, author and assignee' do
-        input_filtered_search("bug author:@#{user.username} assignee:@#{user.username}")
-
-        expect_issues_list_count(2)
-        expect_filtered_search_input('bug')
-      end
-
-      it 'filters issues by searched text, author, more text and assignee' do
-        input_filtered_search("bug author:@#{user.username} report assignee:@#{user.username}")
-
-        expect_issues_list_count(1)
-        expect_filtered_search_input('bug report')
-      end
-
-      it 'filters issues by searched text, author, more text, assignee and even more text' do
-        input_filtered_search("bug author:@#{user.username} report assignee:@#{user.username} foo")
-
-        expect_issues_list_count(1)
-        expect_filtered_search_input('bug report foo')
-      end
-
-      it 'filters issues by searched text, author, assignee and label' do
-        input_filtered_search("bug author:@#{user.username} assignee:@#{user.username} label:~#{bug_label.title}")
-
-        expect_issues_list_count(2)
-        expect_filtered_search_input('bug')
-      end
-
-      it 'filters issues by searched text, author, text, assignee, text, label and text' do
-        input_filtered_search("bug author:@#{user.username} assignee:@#{user.username} report label:~#{bug_label.title} foo")
-
-        expect_issues_list_count(1)
-        expect_filtered_search_input('bug report foo')
-      end
-
-      it 'filters issues by searched text, author, assignee, label and milestone' do
-        input_filtered_search("bug author:@#{user.username} assignee:@#{user.username} label:~#{bug_label.title} milestone:%#{milestone.title}")
-
-        expect_issues_list_count(2)
-        expect_filtered_search_input('bug')
-      end
-
-      it 'filters issues by searched text, author, text, assignee, text, label, text, milestone and text' do
-        input_filtered_search("bug author:@#{user.username} assignee:@#{user.username} report label:~#{bug_label.title} milestone:%#{milestone.title} foo")
-
-        expect_issues_list_count(1)
-        expect_filtered_search_input('bug report foo')
-      end
-
-      it 'filters issues by searched text, author, assignee, multiple labels and milestone' do
-        input_filtered_search("bug author:@#{user.username} assignee:@#{user.username} label:~#{bug_label.title} label:~#{caps_sensitive_label.title} milestone:%#{milestone.title}")
-
-        expect_issues_list_count(1)
-        expect_filtered_search_input('bug')
-      end
-
       it 'filters issues by searched text, author, text, assignee, text, label1, text, label2, text, milestone and text' do
-        input_filtered_search("bug author:@#{user.username} assignee:@#{user.username} report label:~#{bug_label.title} label:~#{caps_sensitive_label.title} milestone:%#{milestone.title} foo")
+        input_filtered_search("bug author:@#{user.username} report label:~#{bug_label.title} label:~#{caps_sensitive_label.title} milestone:%#{milestone.title} foo")
 
         expect_issues_list_count(1)
         expect_filtered_search_input('bug report foo')
@@ -746,7 +435,9 @@ describe 'Filter issues', js: true do
     end
   end
 
-  describe 'retains filter when switching issue states' do
+  describe 'switching issue states' do
+    let!(:closed_issue) { create(:issue, :closed, project: project, title: 'closed bug') }
+
     before do
       input_filtered_search('bug')
 
@@ -754,25 +445,21 @@ describe 'Filter issues', js: true do
       expect_issues_list_count(4, 1)
     end
 
-    it 'open state' do
+    it 'maintains filter' do
+      # Closed
       find('.issues-state-filters [data-state="closed"]').click
       wait_for_requests
 
+      expect(page).to have_selector('.issues-list .issue', count: 1)
+      expect(page).to have_link(closed_issue.title)
+
+      # Opened
       find('.issues-state-filters [data-state="opened"]').click
       wait_for_requests
 
       expect(page).to have_selector('.issues-list .issue', count: 4)
-    end
 
-    it 'closed state' do
-      find('.issues-state-filters [data-state="closed"]').click
-      wait_for_requests
-
-      expect(page).to have_selector('.issues-list .issue', count: 1)
-      expect(find('.issues-list .issue:first-of-type .issue-title-text a')).to have_content(closed_issue.title)
-    end
-
-    it 'all state' do
+      # All
       find('.issues-state-filters [data-state="all"]').click
       wait_for_requests
 
@@ -781,34 +468,39 @@ describe 'Filter issues', js: true do
   end
 
   describe 'RSS feeds' do
-    it 'updates atom feed link for project issues' do
-      visit project_issues_path(project, milestone_title: milestone.title, assignee_id: user.id)
-      link = find_link('Subscribe')
-      params = CGI.parse(URI.parse(link[:href]).query)
-      auto_discovery_link = find('link[type="application/atom+xml"]', visible: false)
-      auto_discovery_params = CGI.parse(URI.parse(auto_discovery_link[:href]).query)
-
-      expect(params).to include('rss_token' => [user.rss_token])
-      expect(params).to include('milestone_title' => [milestone.title])
-      expect(params).to include('assignee_id' => [user.id.to_s])
-      expect(auto_discovery_params).to include('rss_token' => [user.rss_token])
-      expect(auto_discovery_params).to include('milestone_title' => [milestone.title])
-      expect(auto_discovery_params).to include('assignee_id' => [user.id.to_s])
+    let(:group) { create(:group) }
+    let(:project) { create(:project, group: group) }
+
+    before do
+      group.add_developer(user)
+    end
+
+    shared_examples 'updates atom feed link' do |type|
+      it "for #{type}" do
+        visit path
+
+        link = find_link('Subscribe')
+        params = CGI.parse(URI.parse(link[:href]).query)
+        auto_discovery_link = find('link[type="application/atom+xml"]', visible: false)
+        auto_discovery_params = CGI.parse(URI.parse(auto_discovery_link[:href]).query)
+
+        expected = {
+          'rss_token' => [user.rss_token],
+          'milestone_title' => [milestone.title],
+          'assignee_id' => [user.id.to_s]
+        }
+
+        expect(params).to include(expected)
+        expect(auto_discovery_params).to include(expected)
+      end
+    end
+
+    it_behaves_like 'updates atom feed link', :project do
+      let(:path) { project_issues_path(project, milestone_title: milestone.title, assignee_id: user.id) }
     end
 
-    it 'updates atom feed link for group issues' do
-      visit issues_group_path(group, milestone_title: milestone.title, assignee_id: user.id)
-      link = find_link('Subscribe')
-      params = CGI.parse(URI.parse(link[:href]).query)
-      auto_discovery_link = find('link[type="application/atom+xml"]', visible: false)
-      auto_discovery_params = CGI.parse(URI.parse(auto_discovery_link[:href]).query)
-
-      expect(params).to include('rss_token' => [user.rss_token])
-      expect(params).to include('milestone_title' => [milestone.title])
-      expect(params).to include('assignee_id' => [user.id.to_s])
-      expect(auto_discovery_params).to include('rss_token' => [user.rss_token])
-      expect(auto_discovery_params).to include('milestone_title' => [milestone.title])
-      expect(auto_discovery_params).to include('assignee_id' => [user.id.to_s])
+    it_behaves_like 'updates atom feed link', :group do
+      let(:path) { issues_group_path(group, milestone_title: milestone.title, assignee_id: user.id) }
     end
   end
 
@@ -821,7 +513,7 @@ describe 'Filter issues', js: true do
       input_filtered_search("milestone:", submit: false)
 
       within('#js-dropdown-milestone') do
-        expect(page).to have_selector('.filter-dropdown .filter-dropdown-item', count: 2)
+        expect(page).to have_selector('.filter-dropdown .filter-dropdown-item', count: 1)
       end
     end
 
@@ -829,7 +521,7 @@ describe 'Filter issues', js: true do
       input_filtered_search("label:", submit: false)
 
       within('#js-dropdown-label') do
-        expect(page).to have_selector('.filter-dropdown .filter-dropdown-item', count: 5)
+        expect(page).to have_selector('.filter-dropdown .filter-dropdown-item', count: 3)
       end
     end
   end
diff --git a/spec/features/issues/filtered_search/visual_tokens_spec.rb b/spec/features/issues/filtered_search/visual_tokens_spec.rb
index 14a555fde10..4ae54fd6f4e 100644
--- a/spec/features/issues/filtered_search/visual_tokens_spec.rb
+++ b/spec/features/issues/filtered_search/visual_tokens_spec.rb
@@ -28,6 +28,8 @@ describe 'Visual tokens', js: true do
     sign_in(user)
     create(:issue, project: project)
 
+    allow_any_instance_of(ApplicationHelper).to receive(:collapsed_sidebar?).and_return(true)
+
     visit project_issues_path(project)
   end
 
diff --git a/spec/features/issues/gfm_autocomplete_spec.rb b/spec/features/issues/gfm_autocomplete_spec.rb
index 2c1ba207ede..62e9d3a9f91 100644
--- a/spec/features/issues/gfm_autocomplete_spec.rb
+++ b/spec/features/issues/gfm_autocomplete_spec.rb
@@ -28,8 +28,8 @@ feature 'GFM autocomplete', js: true do
 
   it 'opens autocomplete menu when field starts with text' do
     page.within '.timeline-content-form' do
-      find('#note_note').native.send_keys('')
-      find('#note_note').native.send_keys('@')
+      find('#note-body').native.send_keys('')
+      find('#note-body').native.send_keys('@')
     end
 
     expect(page).to have_selector('.atwho-container')
@@ -37,8 +37,8 @@ feature 'GFM autocomplete', js: true do
 
   it 'doesnt open autocomplete menu character is prefixed with text' do
     page.within '.timeline-content-form' do
-      find('#note_note').native.send_keys('testing')
-      find('#note_note').native.send_keys('@')
+      find('#note-body').native.send_keys('testing')
+      find('#note-body').native.send_keys('@')
     end
 
     expect(page).not_to have_selector('.atwho-view')
@@ -46,8 +46,8 @@ feature 'GFM autocomplete', js: true do
 
   it 'doesnt select the first item for non-assignee dropdowns' do
     page.within '.timeline-content-form' do
-      find('#note_note').native.send_keys('')
-      find('#note_note').native.send_keys(':')
+      find('#note-body').native.send_keys('')
+      find('#note-body').native.send_keys(':')
     end
 
     expect(page).to have_selector('.atwho-container')
@@ -58,7 +58,7 @@ feature 'GFM autocomplete', js: true do
   end
 
   it 'does not open autocomplete menu when ":" is prefixed by a number and letters' do
-    note = find('#note_note')
+    note = find('#note-body')
 
     # Number.
     page.within '.timeline-content-form' do
@@ -86,8 +86,8 @@ feature 'GFM autocomplete', js: true do
 
   it 'selects the first item for assignee dropdowns' do
     page.within '.timeline-content-form' do
-      find('#note_note').native.send_keys('')
-      find('#note_note').native.send_keys('@')
+      find('#note-body').native.send_keys('')
+      find('#note-body').native.send_keys('@')
     end
 
     expect(page).to have_selector('.atwho-container')
@@ -99,8 +99,8 @@ feature 'GFM autocomplete', js: true do
 
   it 'includes items for assignee dropdowns with non-ASCII characters in name' do
     page.within '.timeline-content-form' do
-      find('#note_note').native.send_keys('')
-      find('#note_note').native.send_keys("@#{user.name[0...8]}")
+      find('#note-body').native.send_keys('')
+      find('#note-body').native.send_keys("@#{user.name[0...8]}")
     end
 
     expect(page).to have_selector('.atwho-container')
@@ -112,8 +112,8 @@ feature 'GFM autocomplete', js: true do
 
   it 'selects the first item for non-assignee dropdowns if a query is entered' do
     page.within '.timeline-content-form' do
-      find('#note_note').native.send_keys('')
-      find('#note_note').native.send_keys(':1')
+      find('#note-body').native.send_keys('')
+      find('#note-body').native.send_keys(':1')
     end
 
     expect(page).to have_selector('.atwho-container')
@@ -125,7 +125,7 @@ feature 'GFM autocomplete', js: true do
 
   context 'if a selected value has special characters' do
     it 'wraps the result in double quotes' do
-      note = find('#note_note')
+      note = find('#note-body')
       page.within '.timeline-content-form' do
         note.native.send_keys('')
         note.native.send_keys("~#{label.title[0]}")
@@ -138,7 +138,7 @@ feature 'GFM autocomplete', js: true do
     end
 
     it "shows dropdown after a new line" do
-      note = find('#note_note')
+      note = find('#note-body')
       page.within '.timeline-content-form' do
         note.native.send_keys('test')
         note.native.send_keys(:enter)
@@ -150,7 +150,7 @@ feature 'GFM autocomplete', js: true do
     end
 
     it "does not show dropdown when preceded with a special character" do
-      note = find('#note_note')
+      note = find('#note-body')
       page.within '.timeline-content-form' do
         note.native.send_keys('')
         note.native.send_keys("@")
@@ -168,7 +168,7 @@ feature 'GFM autocomplete', js: true do
     end
 
     it "does not throw an error if no labels exist" do
-      note = find('#note_note')
+      note = find('#note-body')
       page.within '.timeline-content-form' do
         note.native.send_keys('')
         note.native.send_keys('~')
@@ -179,7 +179,7 @@ feature 'GFM autocomplete', js: true do
     end
 
     it 'doesn\'t wrap for assignee values' do
-      note = find('#note_note')
+      note = find('#note-body')
       page.within '.timeline-content-form' do
         note.native.send_keys('')
         note.native.send_keys("@#{user.username[0]}")
@@ -192,7 +192,7 @@ feature 'GFM autocomplete', js: true do
     end
 
     it 'doesn\'t wrap for emoji values' do
-      note = find('#note_note')
+      note = find('#note-body')
       page.within '.timeline-content-form' do
         note.native.send_keys('')
         note.native.send_keys(":cartwheel")
@@ -206,7 +206,7 @@ feature 'GFM autocomplete', js: true do
 
     it 'doesn\'t open autocomplete after non-word character' do
       page.within '.timeline-content-form' do
-        find('#note_note').native.send_keys("@#{user.username[0..2]}!")
+        find('#note-body').native.send_keys("@#{user.username[0..2]}!")
       end
 
       expect(page).not_to have_selector('.atwho-view')
@@ -214,14 +214,14 @@ feature 'GFM autocomplete', js: true do
 
     it 'doesn\'t open autocomplete if there is no space before' do
       page.within '.timeline-content-form' do
-        find('#note_note').native.send_keys("hello:#{user.username[0..2]}")
+        find('#note-body').native.send_keys("hello:#{user.username[0..2]}")
       end
 
       expect(page).not_to have_selector('.atwho-view')
     end
 
     it 'triggers autocomplete after selecting a quick action' do
-      note = find('#note_note')
+      note = find('#note-body')
       page.within '.timeline-content-form' do
         note.native.send_keys('')
         note.native.send_keys('/as')
diff --git a/spec/features/issues/markdown_toolbar_spec.rb b/spec/features/issues/markdown_toolbar_spec.rb
index 8c23fcd483b..634ea111dc1 100644
--- a/spec/features/issues/markdown_toolbar_spec.rb
+++ b/spec/features/issues/markdown_toolbar_spec.rb
@@ -12,26 +12,26 @@ feature 'Issue markdown toolbar', js: true do
   end
 
   it "doesn't include first new line when adding bold" do
-    find('#note_note').native.send_keys('test')
-    find('#note_note').native.send_key(:enter)
-    find('#note_note').native.send_keys('bold')
+    find('#note-body').native.send_keys('test')
+    find('#note-body').native.send_key(:enter)
+    find('#note-body').native.send_keys('bold')
 
-    page.evaluate_script('document.querySelectorAll(".js-main-target-form #note_note")[0].setSelectionRange(4, 9)')
+    page.evaluate_script('document.querySelectorAll(".js-main-target-form #note-body")[0].setSelectionRange(4, 9)')
 
     first('.toolbar-btn').click
 
-    expect(find('#note_note')[:value]).to eq("test\n**bold**\n")
+    expect(find('#note-body')[:value]).to eq("test\n**bold**\n")
   end
 
   it "doesn't include first new line when adding underline" do
-    find('#note_note').native.send_keys('test')
-    find('#note_note').native.send_key(:enter)
-    find('#note_note').native.send_keys('underline')
+    find('#note-body').native.send_keys('test')
+    find('#note-body').native.send_key(:enter)
+    find('#note-body').native.send_keys('underline')
 
-    page.evaluate_script('document.querySelectorAll(".js-main-target-form #note_note")[0].setSelectionRange(4, 50)')
+    page.evaluate_script('document.querySelectorAll(".js-main-target-form #note-body")[0].setSelectionRange(4, 50)')
 
     find('.toolbar-btn:nth-child(2)').click
 
-    expect(find('#note_note')[:value]).to eq("test\n*underline*\n")
+    expect(find('#note-body')[:value]).to eq("test\n*underline*\n")
   end
 end
diff --git a/spec/features/issues/move_spec.rb b/spec/features/issues/move_spec.rb
index 494c309c9ea..b2724945da4 100644
--- a/spec/features/issues/move_spec.rb
+++ b/spec/features/issues/move_spec.rb
@@ -15,11 +15,11 @@ feature 'issue move to another project' do
     background do
       old_project.team << [user, :guest]
 
-      edit_issue(issue)
+      visit issue_path(issue)
     end
 
     scenario 'moving issue to another project not allowed' do
-      expect(page).to have_no_selector('#move_to_project_id')
+      expect(page).to have_no_selector('.js-sidebar-move-issue-block')
     end
   end
 
@@ -34,12 +34,14 @@ feature 'issue move to another project' do
       old_project.team << [user, :reporter]
       new_project.team << [user, :reporter]
 
-      edit_issue(issue)
+      visit issue_path(issue)
     end
 
     scenario 'moving issue to another project', js: true do
-      find('#issuable-move', visible: false).set(new_project.id)
-      click_button('Save changes')
+      find('.js-move-issue').trigger('click')
+      wait_for_requests
+      all('.js-move-issue-dropdown-item')[0].click
+      find('.js-move-issue-confirmation-button').click
 
       expect(page).to have_content("Text with #{cross_reference}#{mr.to_reference}")
       expect(page).to have_content("moved from #{cross_reference}#{issue.to_reference}")
@@ -50,13 +52,12 @@ feature 'issue move to another project' do
     scenario 'searching project dropdown', js: true do
       new_project_search.team << [user, :reporter]
 
-      page.within '.detail-page-description' do
-        first('.select2-choice').click
-      end
+      find('.js-move-issue').trigger('click')
+      wait_for_requests
 
-      fill_in('s2id_autogen1_search', with: new_project_search.name)
+      page.within '.js-sidebar-move-issue-block' do
+        fill_in('sidebar-move-issue-dropdown-search', with: new_project_search.name)
 
-      page.within '.select2-drop' do
         expect(page).to have_content(new_project_search.name)
         expect(page).not_to have_content(new_project.name)
       end
@@ -68,10 +69,10 @@ feature 'issue move to another project' do
       background { another_project.team << [user, :guest] }
 
       scenario 'browsing projects in projects select' do
-        click_link 'Move to a different project'
+        find('.js-move-issue').trigger('click')
+        wait_for_requests
 
-        page.within '.select2-results' do
-          expect(page).to have_content 'No project'
+        page.within '.js-sidebar-move-issue-block' do
           expect(page).to have_content new_project.name_with_namespace
         end
       end
@@ -89,11 +90,6 @@ feature 'issue move to another project' do
     end
   end
 
-  def edit_issue(issue)
-    visit issue_path(issue)
-    page.within('.issuable-actions') { first(:link, 'Edit').click }
-  end
-
   def issue_path(issue)
     project_issue_path(issue.project, issue)
   end
diff --git a/spec/features/issues/note_polling_spec.rb b/spec/features/issues/note_polling_spec.rb
index 62dbc3efb01..793572851da 100644
--- a/spec/features/issues/note_polling_spec.rb
+++ b/spec/features/issues/note_polling_spec.rb
@@ -13,7 +13,7 @@ feature 'Issue notes polling', :js do
 
     it 'displays the new comment' do
       note = create(:note, noteable: issue, project: project, note: 'Looks good!')
-      page.execute_script('notes.refresh();')
+      wait_for_requests
 
       expect(page).to have_selector("#note_#{note.id}", text: 'Looks good!')
     end
@@ -31,16 +31,6 @@ feature 'Issue notes polling', :js do
         visit project_issue_path(project, issue)
       end
 
-      it 'has .original-note-content to compare against' do
-        expect(page).to have_selector("#note_#{existing_note.id}", text: note_text)
-        expect(page).to have_selector("#note_#{existing_note.id} .original-note-content", count: 1, visible: false)
-
-        update_note(existing_note, updated_text)
-
-        expect(page).to have_selector("#note_#{existing_note.id}", text: updated_text)
-        expect(page).to have_selector("#note_#{existing_note.id} .original-note-content", count: 1, visible: false)
-      end
-
       it 'displays the updated content' do
         expect(page).to have_selector("#note_#{existing_note.id}", text: note_text)
 
@@ -49,24 +39,14 @@ feature 'Issue notes polling', :js do
         expect(page).to have_selector("#note_#{existing_note.id}", text: updated_text)
       end
 
-      it 'when editing but have not changed anything, and an update comes in, show the updated content in the textarea' do
+      it 'when editing but have not changed anything, and an update comes in, show warning and does not update the note' do
         click_edit_action(existing_note)
 
         expect(page).to have_field("note[note]", with: note_text)
 
         update_note(existing_note, updated_text)
 
-        expect(page).to have_field("note[note]", with: updated_text)
-      end
-
-      it 'when editing but you changed some things, and an update comes in, show a warning' do
-        click_edit_action(existing_note)
-
-        expect(page).to have_field("note[note]", with: note_text)
-
-        find("#note_#{existing_note.id} .js-note-text").set('something random')
-        update_note(existing_note, updated_text)
-
+        expect(page).not_to have_field("note[note]", with: updated_text)
         expect(page).to have_selector(".alert")
       end
 
@@ -75,8 +55,6 @@ feature 'Issue notes polling', :js do
 
         expect(page).to have_field("note[note]", with: note_text)
 
-        find("#note_#{existing_note.id} .js-note-text").set('something random')
-
         update_note(existing_note, updated_text)
 
         find("#note_#{existing_note.id} .note-edit-cancel").click
@@ -97,14 +75,12 @@ feature 'Issue notes polling', :js do
         visit project_issue_path(project, issue)
       end
 
-      it 'has .original-note-content to compare against' do
+      it 'displays the updated content' do
         expect(page).to have_selector("#note_#{existing_note.id}", text: note_text)
-        expect(page).to have_selector("#note_#{existing_note.id} .original-note-content", count: 1, visible: false)
 
         update_note(existing_note, updated_text)
 
         expect(page).to have_selector("#note_#{existing_note.id}", text: updated_text)
-        expect(page).to have_selector("#note_#{existing_note.id} .original-note-content", count: 1, visible: false)
       end
     end
 
@@ -118,16 +94,15 @@ feature 'Issue notes polling', :js do
         visit project_issue_path(project, issue)
       end
 
-      it 'has .original-note-content to compare against' do
+      it 'shows the system note' do
         expect(page).to have_selector("#note_#{system_note.id}", text: note_text)
-        expect(page).to have_selector("#note_#{system_note.id} .original-note-content", count: 1, visible: false)
       end
     end
   end
 
   def update_note(note, new_text)
     note.update(note: new_text)
-    page.execute_script('notes.refresh();')
+    wait_for_requests
   end
 
   def click_edit_action(note)
diff --git a/spec/features/issues/user_uses_slash_commands_spec.rb b/spec/features/issues/user_uses_slash_commands_spec.rb
index 4b63cc844f3..9261acda9dc 100644
--- a/spec/features/issues/user_uses_slash_commands_spec.rb
+++ b/spec/features/issues/user_uses_slash_commands_spec.rb
@@ -155,5 +155,114 @@ feature 'Issues > User uses quick actions', js: true do
         end
       end
     end
+
+    describe 'move the issue to another project' do
+      let(:issue) { create(:issue, project: project) }
+
+      context 'when the project is valid', js: true do
+        let(:target_project) { create(:project, :public) }
+
+        before do
+          target_project.team << [user, :master]
+          sign_in(user)
+          visit project_issue_path(project, issue)
+        end
+
+        it 'moves the issue' do
+          write_note("/move #{target_project.full_path}")
+
+          expect(page).to have_content 'Commands applied'
+          expect(issue.reload).to be_closed
+
+          visit project_issue_path(target_project, issue)
+
+          expect(page).to have_content 'Issues 1'
+        end
+      end
+
+      context 'when the project is valid but the user not authorized', js: true do
+        let(:project_unauthorized) {create(:project, :public)}
+
+        before do
+          sign_in(user)
+          visit project_issue_path(project, issue)
+        end
+
+        it 'does not move the issue' do
+          write_note("/move #{project_unauthorized.full_path}")
+
+          expect(page).not_to have_content 'Commands applied'
+          expect(issue.reload).to be_open
+        end
+      end
+
+      context 'when the project is invalid', js: true do
+        before do
+          sign_in(user)
+          visit project_issue_path(project, issue)
+        end
+
+        it 'does not move the issue' do
+          write_note("/move not/valid")
+
+          expect(page).not_to have_content 'Commands applied'
+          expect(issue.reload).to be_open
+        end
+      end
+
+      context 'when the user issues multiple commands', js: true do
+        let(:target_project) { create(:project, :public) }
+        let(:milestone) { create(:milestone, title: '1.0', project: project) }
+        let(:target_milestone) { create(:milestone, title: '1.0', project: target_project) }
+        let(:bug)      { create(:label, project: project, title: 'bug') }
+        let(:wontfix)  { create(:label, project: project, title: 'wontfix') }
+        let(:bug_target)      { create(:label, project: target_project, title: 'bug') }
+        let(:wontfix_target)  { create(:label, project: target_project, title: 'wontfix') }
+
+        before do
+          target_project.team << [user, :master]
+          sign_in(user)
+          visit project_issue_path(project, issue)
+        end
+
+        it 'applies the commands to both issues and moves the issue' do
+          write_note("/label ~#{bug.title} ~#{wontfix.title}\n/milestone %\"#{milestone.title}\"\n/move #{target_project.full_path}")
+
+          expect(page).to have_content 'Commands applied'
+          expect(issue.reload).to be_closed
+
+          visit project_issue_path(target_project, issue)
+
+          expect(page).to have_content 'bug'
+          expect(page).to have_content 'wontfix'
+          expect(page).to have_content '1.0'
+
+          visit project_issue_path(project, issue)
+          expect(page).to have_content 'Closed'
+          expect(page).to have_content 'bug'
+          expect(page).to have_content 'wontfix'
+          expect(page).to have_content '1.0'
+        end
+
+        it 'moves the issue and applies the commands to both issues' do
+          write_note("/move #{target_project.full_path}\n/label ~#{bug.title} ~#{wontfix.title}\n/milestone %\"#{milestone.title}\"")
+
+          expect(page).to have_content 'Commands applied'
+          expect(issue.reload).to be_closed
+
+          visit project_issue_path(target_project, issue)
+
+          expect(page).to have_content 'bug'
+          expect(page).to have_content 'wontfix'
+          expect(page).to have_content '1.0'
+
+          visit project_issue_path(project, issue)
+          expect(page).to have_content 'Closed'
+          expect(page).to have_content 'bug'
+          expect(page).to have_content 'wontfix'
+          expect(page).to have_content '1.0'
+        end
+      end
+    end
   end
 end
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 9b91495ee3d..6c070e44269 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -271,17 +271,21 @@ describe 'Issues' do
       it 'filters by none' do
         visit project_issues_path(project, due_date: Issue::NoDueDate.name)
 
-        expect(page).not_to have_content('foo')
-        expect(page).not_to have_content('bar')
-        expect(page).to have_content('baz')
+        page.within '.issues-holder' do
+          expect(page).not_to have_content('foo')
+          expect(page).not_to have_content('bar')
+          expect(page).to have_content('baz')
+        end
       end
 
       it 'filters by any' do
         visit project_issues_path(project, due_date: Issue::AnyDueDate.name)
 
-        expect(page).to have_content('foo')
-        expect(page).to have_content('bar')
-        expect(page).to have_content('baz')
+        page.within '.issues-holder' do
+          expect(page).to have_content('foo')
+          expect(page).to have_content('bar')
+          expect(page).to have_content('baz')
+        end
       end
 
       it 'filters by due this week' do
@@ -291,9 +295,11 @@ describe 'Issues' do
 
         visit project_issues_path(project, due_date: Issue::DueThisWeek.name)
 
-        expect(page).to have_content('foo')
-        expect(page).to have_content('bar')
-        expect(page).not_to have_content('baz')
+        page.within '.issues-holder' do
+          expect(page).to have_content('foo')
+          expect(page).to have_content('bar')
+          expect(page).not_to have_content('baz')
+        end
       end
 
       it 'filters by due this month' do
@@ -303,9 +309,11 @@ describe 'Issues' do
 
         visit project_issues_path(project, due_date: Issue::DueThisMonth.name)
 
-        expect(page).to have_content('foo')
-        expect(page).to have_content('bar')
-        expect(page).not_to have_content('baz')
+        page.within '.issues-holder' do
+          expect(page).to have_content('foo')
+          expect(page).to have_content('bar')
+          expect(page).not_to have_content('baz')
+        end
       end
 
       it 'filters by overdue' do
@@ -315,9 +323,11 @@ describe 'Issues' do
 
         visit project_issues_path(project, due_date: Issue::Overdue.name)
 
-        expect(page).not_to have_content('foo')
-        expect(page).not_to have_content('bar')
-        expect(page).to have_content('baz')
+        page.within '.issues-holder' do
+          expect(page).not_to have_content('foo')
+          expect(page).not_to have_content('bar')
+          expect(page).to have_content('baz')
+        end
       end
     end
 
@@ -567,7 +577,9 @@ describe 'Issues' do
       it 'redirects to signin then back to new issue after signin' do
         visit project_issues_path(project)
 
-        click_link 'New issue'
+        page.within '.breadcrumbs' do
+          click_link 'New issue'
+        end
 
         expect(current_path).to eq new_user_session_path
 
diff --git a/spec/features/merge_requests/create_new_mr_spec.rb b/spec/features/merge_requests/create_new_mr_spec.rb
index d7f3d91e625..96e8027a54d 100644
--- a/spec/features/merge_requests/create_new_mr_spec.rb
+++ b/spec/features/merge_requests/create_new_mr_spec.rb
@@ -13,7 +13,9 @@ feature 'Create New Merge Request', js: true do
   it 'selects the source branch sha when a tag with the same name exists' do
     visit project_merge_requests_path(project)
 
-    click_link 'New merge request'
+    page.within '.content' do
+      click_link 'New merge request'
+    end
     expect(page).to have_content('Source branch')
     expect(page).to have_content('Target branch')
 
@@ -26,7 +28,9 @@ feature 'Create New Merge Request', js: true do
   it 'selects the target branch sha when a tag with the same name exists' do
     visit project_merge_requests_path(project)
 
-    click_link 'New merge request'
+    page.within '.content' do
+      click_link 'New merge request'
+    end
 
     expect(page).to have_content('Source branch')
     expect(page).to have_content('Target branch')
@@ -40,7 +44,9 @@ feature 'Create New Merge Request', js: true do
   it 'generates a diff for an orphaned branch' do
     visit project_merge_requests_path(project)
 
-    page.has_link?('New Merge Request') ? click_link("New Merge Request") : click_link('New merge request')
+    page.within '.content' do
+      click_link 'New merge request'
+    end
     expect(page).to have_content('Source branch')
     expect(page).to have_content('Target branch')
 
diff --git a/spec/features/merge_requests/diff_notes_avatars_spec.rb b/spec/features/merge_requests/diff_notes_avatars_spec.rb
index 13721b72584..166e98238e8 100644
--- a/spec/features/merge_requests/diff_notes_avatars_spec.rb
+++ b/spec/features/merge_requests/diff_notes_avatars_spec.rb
@@ -21,6 +21,8 @@ feature 'Diff note avatars', js: true do
   before do
     project.team << [user, :master]
     sign_in user
+
+    allow_any_instance_of(ApplicationHelper).to receive(:collapsed_sidebar?).and_return(true)
   end
 
   context 'discussion tab' do
diff --git a/spec/features/merge_requests/diffs_spec.rb b/spec/features/merge_requests/diffs_spec.rb
index a8f5dc275e4..e9068f722d5 100644
--- a/spec/features/merge_requests/diffs_spec.rb
+++ b/spec/features/merge_requests/diffs_spec.rb
@@ -88,7 +88,7 @@ feature 'Diffs URL', js: true do
         visit diffs_project_merge_request_path(project, merge_request)
 
         # Throws `Capybara::Poltergeist::InvalidSelector` if we try to use `#hash` syntax
-        find("[id=\"#{changelog_id}\"] .js-edit-blob").click
+        find("[id=\"#{changelog_id}\"] .js-edit-blob").trigger('click')
 
         expect(page).to have_selector('.js-fork-suggestion-button', count: 1)
         expect(page).to have_selector('.js-cancel-fork-suggestion-button', count: 1)
diff --git a/spec/features/merge_requests/mini_pipeline_graph_spec.rb b/spec/features/merge_requests/mini_pipeline_graph_spec.rb
index 24abebb3995..27b5e3cfec6 100644
--- a/spec/features/merge_requests/mini_pipeline_graph_spec.rb
+++ b/spec/features/merge_requests/mini_pipeline_graph_spec.rb
@@ -70,7 +70,7 @@ feature 'Mini Pipeline Graph', :js do
     it 'should show tooltip when hovered' do
       toggle.hover
 
-      expect(toggle.find(:xpath, '..')).to have_selector('.tooltip')
+      expect(page).to have_selector('.tooltip')
     end
   end
 
@@ -117,7 +117,7 @@ feature 'Mini Pipeline Graph', :js do
       it 'should show tooltip when hovered' do
         build_item.hover
 
-        expect(build_item.find(:xpath, '..')).to have_selector('.tooltip')
+        expect(page).to have_selector('.tooltip')
       end
     end
   end
diff --git a/spec/features/merge_requests/user_posts_diff_notes_spec.rb b/spec/features/merge_requests/user_posts_diff_notes_spec.rb
index 9cee21bc333..996f9636491 100644
--- a/spec/features/merge_requests/user_posts_diff_notes_spec.rb
+++ b/spec/features/merge_requests/user_posts_diff_notes_spec.rb
@@ -6,6 +6,8 @@ feature 'Merge requests > User posts diff notes', :js do
   let(:project) { merge_request.source_project }
 
   before do
+    allow_any_instance_of(ApplicationHelper).to receive(:collapsed_sidebar?).and_return(true)
+
     project.add_developer(user)
     sign_in(user)
   end
@@ -95,6 +97,16 @@ feature 'Merge requests > User posts diff notes', :js do
       visit diffs_project_merge_request_path(project, merge_request, view: 'inline')
     end
 
+    context 'after deleteing a note' do
+      it 'allows commenting' do
+        should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_9"]'))
+
+        first('.js-note-delete', visible: false).trigger('click')
+
+        should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_9"]'))
+      end
+    end
+
     context 'with a new line' do
       it 'allows commenting' do
         should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_9"]'))
diff --git a/spec/features/participants_autocomplete_spec.rb b/spec/features/participants_autocomplete_spec.rb
index a22d548eef3..96f6df587e1 100644
--- a/spec/features/participants_autocomplete_spec.rb
+++ b/spec/features/participants_autocomplete_spec.rb
@@ -11,10 +11,14 @@ feature 'Member autocomplete', :js do
     sign_in(user)
   end
 
-  shared_examples "open suggestions when typing @" do
+  shared_examples "open suggestions when typing @" do |resource_name|
     before do
       page.within('.new-note') do
-        find('#note_note').send_keys('@')
+        if resource_name == 'issue'
+          find('#note-body').send_keys('@')
+        else
+          find('#note_note').send_keys('@')
+        end
       end
     end
 
@@ -32,7 +36,7 @@ feature 'Member autocomplete', :js do
       visit project_issue_path(project, noteable)
     end
 
-    include_examples "open suggestions when typing @"
+    include_examples "open suggestions when typing @", 'issue'
   end
 
   context 'adding a new note on a Merge Request' do
@@ -45,7 +49,7 @@ feature 'Member autocomplete', :js do
       visit project_merge_request_path(project, noteable)
     end
 
-    include_examples "open suggestions when typing @"
+    include_examples "open suggestions when typing @", 'merge_request'
   end
 
   context 'adding a new note on a Commit' do
@@ -60,6 +64,6 @@ feature 'Member autocomplete', :js do
       visit project_commit_path(project, noteable)
     end
 
-    include_examples "open suggestions when typing @"
+    include_examples "open suggestions when typing @", 'commit'
   end
 end
diff --git a/spec/features/profiles/account_spec.rb b/spec/features/profiles/account_spec.rb
index dcd0449dbcb..171e061e60e 100644
--- a/spec/features/profiles/account_spec.rb
+++ b/spec/features/profiles/account_spec.rb
@@ -43,14 +43,14 @@ feature 'Profile > Account' do
         update_username(new_username)
         visit new_project_path
         expect(current_path).to eq(new_project_path)
-        expect(find('h1.title')).to have_content(project.path)
+        expect(find('.breadcrumbs-sub-title')).to have_content(project.path)
       end
 
       scenario 'the old project path redirects to the new path' do
         update_username(new_username)
         visit old_project_path
         expect(current_path).to eq(new_project_path)
-        expect(find('h1.title')).to have_content(project.path)
+        expect(find('.breadcrumbs-sub-title')).to have_content(project.path)
       end
     end
   end
diff --git a/spec/features/profiles/gpg_keys_spec.rb b/spec/features/profiles/gpg_keys_spec.rb
index 6edc482b47e..623e4f341c5 100644
--- a/spec/features/profiles/gpg_keys_spec.rb
+++ b/spec/features/profiles/gpg_keys_spec.rb
@@ -42,7 +42,7 @@ feature 'Profile > GPG Keys' do
 
   scenario 'User revokes a key via the key index' do
     gpg_key = create :gpg_key, user: user, key: GpgHelpers::User2.public_key
-    gpg_signature = create :gpg_signature, gpg_key: gpg_key, valid_signature: true
+    gpg_signature = create :gpg_signature, gpg_key: gpg_key, verification_status: :verified
 
     visit profile_gpg_keys_path
 
@@ -51,7 +51,7 @@ feature 'Profile > GPG Keys' do
     expect(page).to have_content('Your GPG keys (0)')
 
     expect(gpg_signature.reload).to have_attributes(
-      valid_signature: false,
+      verification_status: 'unknown_key',
       gpg_key: nil
     )
   end
diff --git a/spec/features/profiles/keys_spec.rb b/spec/features/profiles/keys_spec.rb
index 6541ea6bf57..aa71c4dbba4 100644
--- a/spec/features/profiles/keys_spec.rb
+++ b/spec/features/profiles/keys_spec.rb
@@ -28,6 +28,23 @@ feature 'Profile > SSH Keys' do
       expect(page).to have_content("Title: #{attrs[:title]}")
       expect(page).to have_content(attrs[:key])
     end
+
+    context 'when only DSA and ECDSA keys are allowed' do
+      before do
+        forbidden = ApplicationSetting::FORBIDDEN_KEY_VALUE
+        stub_application_setting(rsa_key_restriction: forbidden, ed25519_key_restriction: forbidden)
+      end
+
+      scenario 'shows a validation error' do
+        attrs = attributes_for(:key)
+
+        fill_in('Key', with: attrs[:key])
+        fill_in('Title', with: attrs[:title])
+        click_button('Add key')
+
+        expect(page).to have_content('Key type is forbidden. Must be DSA or ECDSA')
+      end
+    end
   end
 
   scenario 'User sees their keys' do
diff --git a/spec/features/profiles/password_spec.rb b/spec/features/profiles/password_spec.rb
index 2c757f99a27..225d4c16841 100644
--- a/spec/features/profiles/password_spec.rb
+++ b/spec/features/profiles/password_spec.rb
@@ -53,12 +53,12 @@ describe 'Profile > Password' do
     context 'Regular user' do
       let(:user) { create(:user) }
 
-      it 'renders 404 when sign-in is disabled' do
+      it 'renders 200 when sign-in is disabled' do
         stub_application_setting(password_authentication_enabled: false)
 
         visit edit_profile_password_path
 
-        expect(page).to have_http_status(404)
+        expect(page).to have_http_status(200)
       end
     end
 
diff --git a/spec/features/projects/guest_navigation_menu_spec.rb b/spec/features/projects/guest_navigation_menu_spec.rb
index 2385e1d9333..98c7ef57a51 100644
--- a/spec/features/projects/guest_navigation_menu_spec.rb
+++ b/spec/features/projects/guest_navigation_menu_spec.rb
@@ -13,8 +13,8 @@ describe 'Guest navigation menu' do
   it 'shows allowed tabs only' do
     visit project_path(project)
 
-    within('.layout-nav') do
-      expect(page).to have_content 'Project'
+    within('.nav-sidebar') do
+      expect(page).to have_content 'Overview'
       expect(page).to have_content 'Issues'
       expect(page).to have_content 'Wiki'
 
diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb
index 2eb6fab129d..ad2db1a34f4 100644
--- a/spec/features/projects/import_export/import_file_spec.rb
+++ b/spec/features/projects/import_export/import_file_spec.rb
@@ -18,23 +18,25 @@ feature 'Import/Export - project import integration test', js: true do
 
   context 'when selecting the namespace' do
     let(:user) { create(:admin) }
-    let!(:namespace) { create(:namespace, name: "asd", owner: user) }
+    let!(:namespace) { create(:namespace, name: 'asd', owner: user) }
+    let(:project_path) { 'test-project-path' + SecureRandom.hex }
 
     context 'prefilled the path' do
       scenario 'user imports an exported project successfully' do
         visit new_project_path
 
         select2(namespace.id, from: '#project_namespace_id')
-        fill_in :project_path, with: 'test-project-path', visible: true
+        fill_in :project_path, with: project_path, visible: true
         click_link 'GitLab export'
 
         expect(page).to have_content('Import an exported GitLab project')
-        expect(URI.parse(current_url).query).to eq("namespace_id=#{namespace.id}&path=test-project-path")
-        expect(Gitlab::ImportExport).to receive(:import_upload_path).with(filename: /\A\h{32}_test-project-path\z/).and_call_original
+        expect(URI.parse(current_url).query).to eq("namespace_id=#{namespace.id}&path=#{project_path}")
+        expect(Gitlab::ImportExport).to receive(:import_upload_path).with(filename: /\A\h{32}_test-project-path\h*\z/).and_call_original
 
         attach_file('file', file)
+        click_on 'Import project'
 
-        expect { click_on 'Import project' }.to change { Project.count }.by(1)
+        expect(Project.count).to eq(1)
 
         project = Project.last
         expect(project).not_to be_nil
@@ -64,7 +66,7 @@ feature 'Import/Export - project import integration test', js: true do
   end
 
   scenario 'invalid project' do
-    namespace = create(:namespace, name: "asd", owner: user)
+    namespace = create(:namespace, name: 'asdf', owner: user)
     project = create(:project, namespace: namespace)
 
     visit new_project_path
diff --git a/spec/features/projects/issuable_counts_caching_spec.rb b/spec/features/projects/issuable_counts_caching_spec.rb
deleted file mode 100644
index 1804d9dc244..00000000000
--- a/spec/features/projects/issuable_counts_caching_spec.rb
+++ /dev/null
@@ -1,132 +0,0 @@
-require 'spec_helper'
-
-describe 'Issuable counts caching', :use_clean_rails_memory_store_caching do
-  let!(:member) { create(:user) }
-  let!(:member_2) { create(:user) }
-  let!(:non_member) { create(:user) }
-  let!(:project) { create(:project, :public) }
-  let!(:open_issue) { create(:issue, project: project) }
-  let!(:confidential_issue) { create(:issue, :confidential, project: project, author: non_member) }
-  let!(:closed_issue) { create(:issue, :closed, project: project) }
-
-  before do
-    project.add_developer(member)
-    project.add_developer(member_2)
-  end
-
-  it 'caches issuable counts correctly for non-members' do
-    # We can't use expect_any_instance_of because that uses a single instance.
-    counts = 0
-
-    allow_any_instance_of(IssuesFinder).to receive(:count_by_state).and_wrap_original do |m, *args|
-      counts += 1
-
-      m.call(*args)
-    end
-
-    aggregate_failures 'only counts once on first load with no params, and caches for later loads' do
-      expect { visit project_issues_path(project) }
-        .to change { counts }.by(1)
-
-      expect { visit project_issues_path(project) }
-        .not_to change { counts }
-    end
-
-    aggregate_failures 'uses counts from cache on load from non-member' do
-      sign_in(non_member)
-
-      expect { visit project_issues_path(project) }
-        .not_to change { counts }
-
-      sign_out(non_member)
-    end
-
-    aggregate_failures 'does not use the same cache for a member' do
-      sign_in(member)
-
-      expect { visit project_issues_path(project) }
-        .to change { counts }.by(1)
-
-      sign_out(member)
-    end
-
-    aggregate_failures 'uses the same cache for all members' do
-      sign_in(member_2)
-
-      expect { visit project_issues_path(project) }
-        .not_to change { counts }
-
-      sign_out(member_2)
-    end
-
-    aggregate_failures 'shares caches when params are passed' do
-      expect { visit project_issues_path(project, author_username: non_member.username) }
-        .to change { counts }.by(1)
-
-      sign_in(member)
-
-      expect { visit project_issues_path(project, author_username: non_member.username) }
-        .to change { counts }.by(1)
-
-      sign_in(non_member)
-
-      expect { visit project_issues_path(project, author_username: non_member.username) }
-        .not_to change { counts }
-
-      sign_in(member_2)
-
-      expect { visit project_issues_path(project, author_username: non_member.username) }
-        .not_to change { counts }
-
-      sign_out(member_2)
-    end
-
-    aggregate_failures 'resets caches on issue close' do
-      Issues::CloseService.new(project, member).execute(open_issue)
-
-      expect { visit project_issues_path(project) }
-        .to change { counts }.by(1)
-
-      sign_in(member)
-
-      expect { visit project_issues_path(project) }
-        .to change { counts }.by(1)
-
-      sign_in(non_member)
-
-      expect { visit project_issues_path(project) }
-        .not_to change { counts }
-
-      sign_in(member_2)
-
-      expect { visit project_issues_path(project) }
-        .not_to change { counts }
-
-      sign_out(member_2)
-    end
-
-    aggregate_failures 'does not reset caches on issue update' do
-      Issues::UpdateService.new(project, member, title: 'new title').execute(open_issue)
-
-      expect { visit project_issues_path(project) }
-        .not_to change { counts }
-
-      sign_in(member)
-
-      expect { visit project_issues_path(project) }
-        .not_to change { counts }
-
-      sign_in(non_member)
-
-      expect { visit project_issues_path(project) }
-        .not_to change { counts }
-
-      sign_in(member_2)
-
-      expect { visit project_issues_path(project) }
-        .not_to change { counts }
-
-      sign_out(member_2)
-    end
-  end
-end
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index 3fa32e2d10b..9ed82f5a67f 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -292,26 +292,44 @@ feature 'Jobs' do
     end
 
     feature 'Variables' do
-      let(:trigger_request) { create(:ci_trigger_request_with_variables) }
+      let(:trigger_request) { create(:ci_trigger_request) }
 
       let(:job) do
         create :ci_build, pipeline: pipeline, trigger_request: trigger_request
       end
 
-      before do
-        visit project_job_path(project, job)
+      shared_examples 'expected variables behavior' do
+        it 'shows variable key and value after click', js: true do
+          expect(page).to have_css('.reveal-variables')
+          expect(page).not_to have_css('.js-build-variable')
+          expect(page).not_to have_css('.js-build-value')
+
+          click_button 'Reveal Variables'
+
+          expect(page).not_to have_css('.reveal-variables')
+          expect(page).to have_selector('.js-build-variable', text: 'TRIGGER_KEY_1')
+          expect(page).to have_selector('.js-build-value', text: 'TRIGGER_VALUE_1')
+        end
       end
 
-      it 'shows variable key and value after click', js: true do
-        expect(page).to have_css('.reveal-variables')
-        expect(page).not_to have_css('.js-build-variable')
-        expect(page).not_to have_css('.js-build-value')
+      context 'when variables are stored in trigger_request' do
+        before do
+          trigger_request.update_attribute(:variables, { 'TRIGGER_KEY_1' => 'TRIGGER_VALUE_1' } )
 
-        click_button 'Reveal Variables'
+          visit project_job_path(project, job)
+        end
+
+        it_behaves_like 'expected variables behavior'
+      end
+
+      context 'when variables are stored in pipeline_variables' do
+        before do
+          create(:ci_pipeline_variable, pipeline: pipeline, key: 'TRIGGER_KEY_1', value: 'TRIGGER_VALUE_1')
+
+          visit project_job_path(project, job)
+        end
 
-        expect(page).not_to have_css('.reveal-variables')
-        expect(page).to have_selector('.js-build-variable', text: 'TRIGGER_KEY_1')
-        expect(page).to have_selector('.js-build-value', text: 'TRIGGER_VALUE_1')
+        it_behaves_like 'expected variables behavior'
       end
     end
 
diff --git a/spec/features/projects/members/user_requests_access_spec.rb b/spec/features/projects/members/user_requests_access_spec.rb
index 24c9f708456..0fbe1ddb2a5 100644
--- a/spec/features/projects/members/user_requests_access_spec.rb
+++ b/spec/features/projects/members/user_requests_access_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Projects > Members > User requests access' do
+feature 'Projects > Members > User requests access', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public, :access_requestable, :repository) }
   let(:master) { project.owner }
@@ -46,11 +46,10 @@ feature 'Projects > Members > User requests access' do
 
     expect(project.requesters.exists?(user_id: user)).to be_truthy
 
-    page.within('.layout-nav .nav-links') do
+    page.within('.nav-sidebar') do
       click_link('Members')
     end
 
-    visit project_project_members_path(project)
     page.within('.content') do
       expect(page).not_to have_content(user.name)
     end
diff --git a/spec/features/projects/project_settings_spec.rb b/spec/features/projects/project_settings_spec.rb
index 80d91e5915f..5d77cd1ccd5 100644
--- a/spec/features/projects/project_settings_spec.rb
+++ b/spec/features/projects/project_settings_spec.rb
@@ -46,7 +46,7 @@ describe 'Edit Project Settings' do
     context 'when changing project name' do
       it 'renames the repository' do
         rename_project(project, name: 'bar')
-        expect(find('h1.title')).to have_content(project.name)
+        expect(find('.breadcrumbs')).to have_content(project.name)
       end
 
       context 'with emojis' do
@@ -74,7 +74,7 @@ describe 'Edit Project Settings' do
         new_path = namespace_project_path(project.namespace, 'bar')
         visit new_path
         expect(current_path).to eq(new_path)
-        expect(find('h1.title')).to have_content(project.name)
+        expect(find('.breadcrumbs')).to have_content(project.name)
       end
 
       specify 'the project is accessible via a redirect from the old path' do
@@ -83,7 +83,7 @@ describe 'Edit Project Settings' do
         new_path = namespace_project_path(project.namespace, 'bar')
         visit old_path
         expect(current_path).to eq(new_path)
-        expect(find('h1.title')).to have_content(project.name)
+        expect(find('.breadcrumbs')).to have_content(project.name)
       end
 
       context 'and a new project is added with the same path' do
@@ -93,7 +93,7 @@ describe 'Edit Project Settings' do
           new_project = create(:project, namespace: user.namespace, path: 'gitlabhq', name: 'quz')
           visit old_path
           expect(current_path).to eq(old_path)
-          expect(find('h1.title')).to have_content(new_project.name)
+          expect(find('.breadcrumbs')).to have_content(new_project.name)
         end
       end
     end
@@ -120,7 +120,7 @@ describe 'Edit Project Settings' do
       new_path = namespace_project_path(group, project)
       visit new_path
       expect(current_path).to eq(new_path)
-      expect(find('h1.title')).to have_content(project.name)
+      expect(find('.breadcrumbs')).to have_content(project.name)
     end
 
     specify 'the project is accessible via a redirect from the old path' do
@@ -129,7 +129,7 @@ describe 'Edit Project Settings' do
       new_path = namespace_project_path(group, project)
       visit old_path
       expect(current_path).to eq(new_path)
-      expect(find('h1.title')).to have_content(project.name)
+      expect(find('.breadcrumbs')).to have_content(project.name)
     end
 
     context 'and a new project is added with the same path' do
@@ -139,7 +139,7 @@ describe 'Edit Project Settings' do
         new_project = create(:project, namespace: user.namespace, path: 'gitlabhq', name: 'quz')
         visit old_path
         expect(current_path).to eq(old_path)
-        expect(find('h1.title')).to have_content(new_project.name)
+        expect(find('.breadcrumbs')).to have_content(new_project.name)
       end
     end
   end
diff --git a/spec/features/projects/sub_group_issuables_spec.rb b/spec/features/projects/sub_group_issuables_spec.rb
index aaf64d42515..b2b39dbd24c 100644
--- a/spec/features/projects/sub_group_issuables_spec.rb
+++ b/spec/features/projects/sub_group_issuables_spec.rb
@@ -24,7 +24,7 @@ describe 'Subgroup Issuables', :js, :nested_groups do
   end
 
   def expect_to_have_full_subgroup_title
-    title = find('.title-container')
+    title = find('.breadcrumbs-links')
 
     expect(title).not_to have_selector '.initializing'
     expect(title).to have_content 'group / subgroup / project'
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb
index baf3d29e6c5..81f7ab80a04 100644
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
@@ -95,49 +95,6 @@ feature 'Project' do
     end
   end
 
-  describe 'project title' do
-    let(:user)    { create(:user) }
-    let(:project) { create(:project, namespace: user.namespace) }
-
-    before do
-      sign_in(user)
-      project.add_user(user, Gitlab::Access::MASTER)
-      visit project_path(project)
-    end
-
-    it 'clicks toggle and shows dropdown', js: true do
-      find('.js-projects-dropdown-toggle').click
-      expect(page).to have_css('.dropdown-menu-projects .dropdown-content li', count: 1)
-    end
-  end
-
-  describe 'project title' do
-    let(:user)    { create(:user) }
-    let(:project) { create(:project, namespace: user.namespace) }
-    let(:project2) { create(:project, namespace: user.namespace, path: 'test') }
-    let(:issue) { create(:issue, project: project) }
-
-    context 'on issues page', js: true do
-      before do
-        sign_in(user)
-        project.add_user(user, Gitlab::Access::MASTER)
-        project2.add_user(user, Gitlab::Access::MASTER)
-        visit project_issue_path(project, issue)
-      end
-
-      it 'clicks toggle and shows dropdown' do
-        find('.js-projects-dropdown-toggle').click
-        expect(page).to have_css('.dropdown-menu-projects .dropdown-content li', count: 2)
-
-        page.within '.dropdown-menu-projects' do
-          click_link project.name_with_namespace
-        end
-
-        expect(page).to have_content project.name
-      end
-    end
-  end
-
   describe 'tree view (default view is set to Files)' do
     let(:user) { create(:user, project_view: 'files') }
     let(:project) { create(:forked_project_with_submodules) }
diff --git a/spec/features/reportable_note/commit_spec.rb b/spec/features/reportable_note/commit_spec.rb
index 3bf25221e36..9b6864eb90f 100644
--- a/spec/features/reportable_note/commit_spec.rb
+++ b/spec/features/reportable_note/commit_spec.rb
@@ -18,7 +18,7 @@ describe 'Reportable note on commit', :js do
       visit project_commit_path(project, sample_commit.id)
     end
 
-    it_behaves_like 'reportable note'
+    it_behaves_like 'reportable note', 'commit'
   end
 
   context 'a diff note' do
@@ -28,6 +28,6 @@ describe 'Reportable note on commit', :js do
       visit project_commit_path(project, sample_commit.id)
     end
 
-    it_behaves_like 'reportable note'
+    it_behaves_like 'reportable note', 'commit'
   end
 end
diff --git a/spec/features/reportable_note/issue_spec.rb b/spec/features/reportable_note/issue_spec.rb
index 21e96f6f103..f5a1950e48e 100644
--- a/spec/features/reportable_note/issue_spec.rb
+++ b/spec/features/reportable_note/issue_spec.rb
@@ -13,5 +13,5 @@ describe 'Reportable note on issue', :js do
     visit project_issue_path(project, issue)
   end
 
-  it_behaves_like 'reportable note'
+  it_behaves_like 'reportable note', 'issue'
 end
diff --git a/spec/features/reportable_note/merge_request_spec.rb b/spec/features/reportable_note/merge_request_spec.rb
index bb296546e06..1f69257f7ed 100644
--- a/spec/features/reportable_note/merge_request_spec.rb
+++ b/spec/features/reportable_note/merge_request_spec.rb
@@ -15,12 +15,12 @@ describe 'Reportable note on merge request', :js do
   context 'a normal note' do
     let!(:note) { create(:note_on_merge_request, noteable: merge_request, project: project) }
 
-    it_behaves_like 'reportable note'
+    it_behaves_like 'reportable note', 'merge_request'
   end
 
   context 'a diff note' do
     let!(:note) { create(:diff_note_on_merge_request, noteable: merge_request, project: project) }
 
-    it_behaves_like 'reportable note'
+    it_behaves_like 'reportable note', 'merge_request'
   end
 end
diff --git a/spec/features/reportable_note/snippets_spec.rb b/spec/features/reportable_note/snippets_spec.rb
index f1e48ed46be..98ef50b78de 100644
--- a/spec/features/reportable_note/snippets_spec.rb
+++ b/spec/features/reportable_note/snippets_spec.rb
@@ -17,6 +17,6 @@ describe 'Reportable note on snippets', :js do
       visit project_snippet_path(project, snippet)
     end
 
-    it_behaves_like 'reportable note'
+    it_behaves_like 'reportable note', 'snippet'
   end
 end
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index 785cfeb34bd..c7f0e342809 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -43,6 +43,21 @@ feature 'Runners' do
         expect(page).not_to have_content(specific_runner.display_name)
       end
 
+      scenario 'user edits the runner to be protected' do
+        visit runners_path(project)
+
+        within '.activated-specific-runners' do
+          first('.edit-runner > a').click
+        end
+
+        expect(page.find_field('runner[access_level]')).not_to be_checked
+
+        check 'runner_access_level'
+        click_button 'Save changes'
+
+        expect(page).to have_content 'Protected Yes'
+      end
+
       context 'when a runner has a tag' do
         background do
           specific_runner.update(tag_list: ['tag'])
diff --git a/spec/features/search_spec.rb b/spec/features/search_spec.rb
index 979e36e7e86..49f6ce91bbd 100644
--- a/spec/features/search_spec.rb
+++ b/spec/features/search_spec.rb
@@ -160,7 +160,7 @@ describe "Search"  do
       fill_in 'search', with: 'gitlab'
       find('#search').native.send_keys(:enter)
 
-      page.within '.title' do
+      page.within '.breadcrumbs-sub-title' do
         expect(page).to have_content 'Search'
       end
     end
diff --git a/spec/features/signed_commits_spec.rb b/spec/features/signed_commits_spec.rb
new file mode 100644
index 00000000000..8efa5b58141
--- /dev/null
+++ b/spec/features/signed_commits_spec.rb
@@ -0,0 +1,179 @@
+require 'spec_helper'
+
+describe 'GPG signed commits', :js do
+  let(:project) { create(:project, :repository) }
+
+  it 'changes from unverified to verified when the user changes his email to match the gpg key' do
+    user = create :user, email: 'unrelated.user@example.org'
+    project.team << [user, :master]
+
+    Sidekiq::Testing.inline! do
+      create :gpg_key, key: GpgHelpers::User1.public_key, user: user
+    end
+
+    sign_in(user)
+
+    visit project_commits_path(project, :'signed-commits')
+
+    within '#commits-list' do
+      expect(page).to have_content 'Unverified'
+      expect(page).not_to have_content 'Verified'
+    end
+
+    # user changes his email which makes the gpg key verified
+    Sidekiq::Testing.inline! do
+      user.skip_reconfirmation!
+      user.update_attributes!(email: GpgHelpers::User1.emails.first)
+    end
+
+    visit project_commits_path(project, :'signed-commits')
+
+    within '#commits-list' do
+      expect(page).to have_content 'Unverified'
+      expect(page).to have_content 'Verified'
+    end
+  end
+
+  it 'changes from unverified to verified when the user adds the missing gpg key' do
+    user = create :user, email: GpgHelpers::User1.emails.first
+    project.team << [user, :master]
+
+    sign_in(user)
+
+    visit project_commits_path(project, :'signed-commits')
+
+    within '#commits-list' do
+      expect(page).to have_content 'Unverified'
+      expect(page).not_to have_content 'Verified'
+    end
+
+    # user adds the gpg key which makes the signature valid
+    Sidekiq::Testing.inline! do
+      create :gpg_key, key: GpgHelpers::User1.public_key, user: user
+    end
+
+    visit project_commits_path(project, :'signed-commits')
+
+    within '#commits-list' do
+      expect(page).to have_content 'Unverified'
+      expect(page).to have_content 'Verified'
+    end
+  end
+
+  context 'shows popover badges' do
+    let(:user_1) do
+      create :user, email: GpgHelpers::User1.emails.first, username: 'nannie.bernhard', name: 'Nannie Bernhard'
+    end
+
+    let(:user_1_key) do
+      Sidekiq::Testing.inline! do
+        create :gpg_key, key: GpgHelpers::User1.public_key, user: user_1
+      end
+    end
+
+    let(:user_2) do
+      create(:user, email: GpgHelpers::User2.emails.first, username: 'bette.cartwright', name: 'Bette Cartwright').tap do |user|
+        # secondary, unverified email
+        create :email, user: user, email: GpgHelpers::User2.emails.last
+      end
+    end
+
+    let(:user_2_key) do
+      Sidekiq::Testing.inline! do
+        create :gpg_key, key: GpgHelpers::User2.public_key, user: user_2
+      end
+    end
+
+    before do
+      user = create :user
+      project.team << [user, :master]
+
+      sign_in(user)
+    end
+
+    it 'unverified signature' do
+      visit project_commits_path(project, :'signed-commits')
+
+      within(find('.commit', text: 'signed commit by bette cartwright')) do
+        click_on 'Unverified'
+        within '.popover' do
+          expect(page).to have_content 'This commit was signed with an unverified signature.'
+          expect(page).to have_content "GPG Key ID: #{GpgHelpers::User2.primary_keyid}"
+        end
+      end
+    end
+
+    it 'unverified signature: user email does not match the committer email, but is the same user' do
+      user_2_key
+
+      visit project_commits_path(project, :'signed-commits')
+
+      within(find('.commit', text: 'signed and authored commit by bette cartwright, different email')) do
+        click_on 'Unverified'
+        within '.popover' do
+          expect(page).to have_content 'This commit was signed with a verified signature, but the committer email is not verified to belong to the same user.'
+          expect(page).to have_content 'Bette Cartwright'
+          expect(page).to have_content '@bette.cartwright'
+          expect(page).to have_content "GPG Key ID: #{GpgHelpers::User2.primary_keyid}"
+        end
+      end
+    end
+
+    it 'unverified signature: user email does not match the committer email' do
+      user_2_key
+
+      visit project_commits_path(project, :'signed-commits')
+
+      within(find('.commit', text: 'signed commit by bette cartwright')) do
+        click_on 'Unverified'
+        within '.popover' do
+          expect(page).to have_content "This commit was signed with a different user's verified signature."
+          expect(page).to have_content 'Bette Cartwright'
+          expect(page).to have_content '@bette.cartwright'
+          expect(page).to have_content "GPG Key ID: #{GpgHelpers::User2.primary_keyid}"
+        end
+      end
+    end
+
+    it 'verified and the gpg user has a gitlab profile' do
+      user_1_key
+
+      visit project_commits_path(project, :'signed-commits')
+
+      within(find('.commit', text: 'signed and authored commit by nannie bernhard')) do
+        click_on 'Verified'
+        within '.popover' do
+          expect(page).to have_content 'This commit was signed with a verified signature and the committer email is verified to belong to the same user.'
+          expect(page).to have_content 'Nannie Bernhard'
+          expect(page).to have_content '@nannie.bernhard'
+          expect(page).to have_content "GPG Key ID: #{GpgHelpers::User1.primary_keyid}"
+        end
+      end
+    end
+
+    it "verified and the gpg user's profile doesn't exist anymore" do
+      user_1_key
+
+      visit project_commits_path(project, :'signed-commits')
+
+      # wait for the signature to get generated
+      within(find('.commit', text: 'signed and authored commit by nannie bernhard')) do
+        expect(page).to have_content 'Verified'
+      end
+
+      user_1.destroy!
+
+      refresh
+
+      within(find('.commit', text: 'signed and authored commit by nannie bernhard')) do
+        click_on 'Verified'
+        within '.popover' do
+          expect(page).to have_content 'This commit was signed with a verified signature and the committer email is verified to belong to the same user.'
+          expect(page).to have_content 'Nannie Bernhard'
+          expect(page).to have_content 'nannie.bernhard@example.com'
+          expect(page).to have_content "GPG Key ID: #{GpgHelpers::User1.primary_keyid}"
+        end
+      end
+    end
+  end
+end
diff --git a/spec/features/task_lists_spec.rb b/spec/features/task_lists_spec.rb
index 580258f77eb..aeb0534b733 100644
--- a/spec/features/task_lists_spec.rb
+++ b/spec/features/task_lists_spec.rb
@@ -181,7 +181,7 @@ feature 'Task Lists' do
                       project: project, author: user)
       end
 
-      it 'renders for note body' do
+      it 'renders for note body', :js do
         visit_issue(project, issue)
 
         expect(page).to have_selector('.note ul.task-list',      count: 1)
@@ -189,21 +189,20 @@ feature 'Task Lists' do
         expect(page).to have_selector('.note ul input[checked]', count: 2)
       end
 
-      it 'contains the required selectors' do
+      it 'contains the required selectors', :js do
         visit_issue(project, issue)
 
         expect(page).to have_selector('.note .js-task-list-container')
         expect(page).to have_selector('.note .js-task-list-container .task-list .task-list-item .task-list-item-checkbox')
-        expect(page).to have_selector('.note .js-task-list-container .js-task-list-field')
       end
 
-      it 'is only editable by author' do
+      it 'is only editable by author', :js do
         visit_issue(project, issue)
         expect(page).to have_selector('.js-task-list-container')
 
-        logout(:user)
+        gitlab_sign_out
 
-        login_as(user2)
+        gitlab_sign_in(user2)
         visit current_path
         expect(page).not_to have_selector('.js-task-list-container')
       end
@@ -215,7 +214,7 @@ feature 'Task Lists' do
                       project: project, author: user)
       end
 
-      it 'renders for note body' do
+      it 'renders for note body', :js do
         visit_issue(project, issue)
 
         expect(page).to have_selector('.note ul.task-list',      count: 1)
@@ -230,7 +229,7 @@ feature 'Task Lists' do
                       project: project, author: user)
       end
 
-      it 'renders for note body' do
+      it 'renders for note body', :js do
         visit_issue(project, issue)
 
         expect(page).to have_selector('.note ul.task-list',      count: 1)
diff --git a/spec/features/uploads/user_uploads_file_to_note_spec.rb b/spec/features/uploads/user_uploads_file_to_note_spec.rb
index 53cad623a35..e1c95590af1 100644
--- a/spec/features/uploads/user_uploads_file_to_note_spec.rb
+++ b/spec/features/uploads/user_uploads_file_to_note_spec.rb
@@ -10,6 +10,7 @@ feature 'User uploads file to note' do
   before do
     sign_in(user)
     visit project_issue_path(project, issue)
+    wait_for_requests
   end
 
   context 'before uploading' do
diff --git a/spec/finders/issues_finder_spec.rb b/spec/finders/issues_finder_spec.rb
index 0e80df94e18..47b173dea0a 100644
--- a/spec/finders/issues_finder_spec.rb
+++ b/spec/finders/issues_finder_spec.rb
@@ -15,8 +15,8 @@ describe IssuesFinder do
   set(:award_emoji3) { create(:award_emoji, name: 'thumbsdown', user: user, awardable: issue3) }
 
   describe '#execute' do
-    set(:closed_issue) { create(:issue, author: user2, assignees: [user2], project: project2, state: 'closed') }
-    set(:label_link) { create(:label_link, label: label, target: issue2) }
+    let!(:closed_issue) { create(:issue, author: user2, assignees: [user2], project: project2, state: 'closed') }
+    let!(:label_link) { create(:label_link, label: label, target: issue2) }
     let(:search_user) { user }
     let(:params) { {} }
     let(:issues) { described_class.new(search_user, params.reverse_merge(scope: scope, state: 'opened')).execute }
@@ -347,6 +347,20 @@ describe IssuesFinder do
     end
   end
 
+  describe '#row_count', :request_store do
+    it 'returns the number of rows for the default state' do
+      finder = described_class.new(user)
+
+      expect(finder.row_count).to eq(3)
+    end
+
+    it 'returns the number of rows for a given state' do
+      finder = described_class.new(user, state: 'closed')
+
+      expect(finder.row_count).to be_zero
+    end
+  end
+
   describe '#with_confidentiality_access_check' do
     let(:guest) { create(:user) }
     set(:authorized_user) { create(:user) }
diff --git a/spec/finders/merge_requests_finder_spec.rb b/spec/finders/merge_requests_finder_spec.rb
index b54155a6704..95f445e7905 100644
--- a/spec/finders/merge_requests_finder_spec.rb
+++ b/spec/finders/merge_requests_finder_spec.rb
@@ -108,4 +108,18 @@ describe MergeRequestsFinder do
       end
     end
   end
+
+  describe '#row_count', :request_store do
+    it 'returns the number of rows for the default state' do
+      finder = described_class.new(user)
+
+      expect(finder.row_count).to eq(3)
+    end
+
+    it 'returns the number of rows for a given state' do
+      finder = described_class.new(user, state: 'closed')
+
+      expect(finder.row_count).to eq(1)
+    end
+  end
 end
diff --git a/spec/fixtures/api/schemas/entities/merge_request.json b/spec/fixtures/api/schemas/entities/merge_request.json
index 2f12b671dec..1030f323a1f 100644
--- a/spec/fixtures/api/schemas/entities/merge_request.json
+++ b/spec/fixtures/api/schemas/entities/merge_request.json
@@ -18,6 +18,8 @@
     "total_time_spent": { "type": "integer" },
     "human_time_estimate": { "type": ["integer", "null"] },
     "human_total_time_spent": { "type": ["integer", "null"] },
+    "milestone": { "type": ["object", "null"] },
+    "labels": { "type": ["array", "null"] },
     "in_progress_merge_commit_sha": { "type": ["string", "null"] },
     "merge_error": { "type": ["string", "null"] },
     "merge_commit_sha": { "type": ["string", "null"] },
diff --git a/spec/fixtures/api/schemas/pipeline_schedule.json b/spec/fixtures/api/schemas/pipeline_schedule.json
index f6346bd0fb6..c76c6945117 100644
--- a/spec/fixtures/api/schemas/pipeline_schedule.json
+++ b/spec/fixtures/api/schemas/pipeline_schedule.json
@@ -31,6 +31,10 @@
         "web_url": { "type": "uri" }
       },
       "additionalProperties": false
+    },
+    "variables": {
+      "type": ["array", "null"],
+      "items": { "$ref": "pipeline_schedule_variable.json" }
     }
   },
   "required": [
diff --git a/spec/fixtures/api/schemas/pipeline_schedule_variable.json b/spec/fixtures/api/schemas/pipeline_schedule_variable.json
new file mode 100644
index 00000000000..f7ccb2d44a0
--- /dev/null
+++ b/spec/fixtures/api/schemas/pipeline_schedule_variable.json
@@ -0,0 +1,8 @@
+{
+  "type": ["object", "null"],
+  "properties": {
+    "key": { "type": "string" },
+    "value": { "type": "string" }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/fuzzy.po b/spec/fixtures/fuzzy.po
new file mode 100644
index 00000000000..99b7d12b91a
--- /dev/null
+++ b/spec/fixtures/fuzzy.po
@@ -0,0 +1,27 @@
+# Spanish translations for gitlab package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the gitlab package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gitlab 1.0.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2017-07-12 12:35-0500\n"
+"Language-Team: Spanish\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Last-Translator: Bob Van Landuyt <bob@gitlab.com>\n"
+"X-Generator: Poedit 2.0.2\n"
+
+msgid "1 commit"
+msgid_plural "%d commits"
+msgstr[0] "1 cambio"
+msgstr[1] "%d cambios"
+
+#, fuzzy
+msgid "PipelineSchedules|Remove variable row"
+msgstr "Схема"
diff --git a/spec/fixtures/invalid.po b/spec/fixtures/invalid.po
new file mode 100644
index 00000000000..039a56e9fc0
--- /dev/null
+++ b/spec/fixtures/invalid.po
@@ -0,0 +1,25 @@
+# Spanish translations for gitlab package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the gitlab package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gitlab 1.0.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2017-07-12 12:35-0500\n"
+"Language-Team: Spanish\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Last-Translator: Bob Van Landuyt <bob@gitlab.com>\n"
+"X-Generator: Poedit 2.0.2\n"
+
+msgid "%d commit"
+msgid_plural "%d commits"
+msgstr[0] "%d cambio"
+msgstr[1] "%d cambios"
+
+But this doesn't even look like an PO-entry
\ No newline at end of file
diff --git a/spec/fixtures/missing_metadata.po b/spec/fixtures/missing_metadata.po
new file mode 100644
index 00000000000..b1999c933f1
--- /dev/null
+++ b/spec/fixtures/missing_metadata.po
@@ -0,0 +1,4 @@
+msgid "1 commit"
+msgid_plural "%d commits"
+msgstr[0] "1 cambio"
+msgstr[1] "%d cambios"
diff --git a/spec/fixtures/missing_plurals.po b/spec/fixtures/missing_plurals.po
new file mode 100644
index 00000000000..09ca0c82718
--- /dev/null
+++ b/spec/fixtures/missing_plurals.po
@@ -0,0 +1,22 @@
+# Spanish translations for gitlab package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the gitlab package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gitlab 1.0.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2017-07-13 12:10-0500\n"
+"Language-Team: Spanish\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Last-Translator: Bob Van Landuyt <bob@gitlab.com>\n"
+"X-Generator: Poedit 2.0.2\n"
+
+msgid "%d commit"
+msgid_plural "%d commits"
+msgstr[0] "%d cambio"
diff --git a/spec/fixtures/multiple_plurals.po b/spec/fixtures/multiple_plurals.po
new file mode 100644
index 00000000000..84b17b13ffa
--- /dev/null
+++ b/spec/fixtures/multiple_plurals.po
@@ -0,0 +1,26 @@
+# Arthur Charron <arthur.charron@hotmail.fr>, 2017. #zanata
+# Huang Tao <htve@outlook.com>, 2017. #zanata
+# Kohei Ota <inductor@kela.jp>, 2017. #zanata
+# Taisuke Inoue <taisuke.inoue.jp@gmail.com>, 2017. #zanata
+# Takuya Noguchi <takninnovationresearch@gmail.com>, 2017. #zanata
+# YANO  Tethurou <tetuyano+zana@gmail.com>, 2017. #zanata
+msgid ""
+msgstr ""
+"Project-Id-Version: gitlab 1.0.0\n"
+"Report-Msgid-Bugs-To: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2017-08-06 11:23-0400\n"
+"Last-Translator: Taisuke Inoue <taisuke.inoue.jp@gmail.com>\n"
+"Language-Team: Japanese \"Language-Team: Russian (https://translate.zanata.org/"
+"project/view/GitLab)\n"
+"Language: ja\n"
+"X-Generator: Zanata 3.9.6\n"
+"Plural-Forms: nplurals=3; plural=n\n"
+
+msgid "%d commit"
+msgid_plural "%d commits"
+msgstr[0] "%d個のコミット"
+msgstr[1] "%d個のコミット"
+msgstr[2] "missing a variable"
diff --git a/spec/fixtures/newlines.po b/spec/fixtures/newlines.po
new file mode 100644
index 00000000000..f5bc86f39a7
--- /dev/null
+++ b/spec/fixtures/newlines.po
@@ -0,0 +1,48 @@
+# Spanish translations for gitlab package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the gitlab package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gitlab 1.0.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2017-07-12 12:35-0500\n"
+"Language-Team: Spanish\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Last-Translator: Bob Van Landuyt <bob@gitlab.com>\n"
+"X-Generator: Poedit 2.0.2\n"
+
+msgid "1 commit"
+msgid_plural "%d commits"
+msgstr[0] "1 cambio"
+msgstr[1] "%d cambios"
+
+msgid ""
+"You are going to remove %{group_name}.\n"
+"Removed groups CANNOT be restored!\n"
+"Are you ABSOLUTELY sure?"
+msgstr ""
+"Va a eliminar %{group_name}.\n"
+"¡El grupo eliminado NO puede ser restaurado!\n"
+"¿Estás TOTALMENTE seguro?"
+
+msgid "With plural"
+msgid_plural "with plurals"
+msgstr[0] "first"
+msgstr[1] "second"
+msgstr[2] ""
+"with"
+"multiple"
+"lines"
+
+msgid "multiline plural id"
+msgid_plural ""
+"Plural"
+"Id"
+msgstr[0] "first"
+msgstr[1] "second"
diff --git a/spec/fixtures/unescaped_chars.po b/spec/fixtures/unescaped_chars.po
new file mode 100644
index 00000000000..fbafe523fb3
--- /dev/null
+++ b/spec/fixtures/unescaped_chars.po
@@ -0,0 +1,21 @@
+# Spanish translations for gitlab package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the gitlab package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gitlab 1.0.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2017-07-13 12:10-0500\n"
+"Language-Team: Spanish\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Last-Translator: Bob Van Landuyt <bob@gitlab.com>\n"
+"X-Generator: Poedit 2.0.2\n"
+
+msgid "You are going to transfer %{project_name_with_namespace} to another owner. Are you ABSOLUTELY sure?"
+msgstr "將要把 %{project_name_with_namespace} 的所有權轉移給另一個人。真的「100%確定」要這麼做嗎？"
diff --git a/spec/fixtures/valid.po b/spec/fixtures/valid.po
new file mode 100644
index 00000000000..e43fd5fea15
--- /dev/null
+++ b/spec/fixtures/valid.po
@@ -0,0 +1,1136 @@
+# Spanish translations for gitlab package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the gitlab package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gitlab 1.0.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2017-07-13 12:10-0500\n"
+"Language-Team: Spanish\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Last-Translator: Bob Van Landuyt <bob@gitlab.com>\n"
+"X-Generator: Poedit 2.0.2\n"
+
+msgid "%d commit"
+msgid_plural "%d commits"
+msgstr[0] "%d cambio"
+msgstr[1] "%d cambios"
+
+msgid "%s additional commit has been omitted to prevent performance issues."
+msgid_plural "%s additional commits have been omitted to prevent performance issues."
+msgstr[0] "%s cambio adicional ha sido omitido para evitar problemas de rendimiento."
+msgstr[1] "%s cambios adicionales han sido omitidos para evitar problemas de rendimiento."
+
+msgid "%{commit_author_link} committed %{commit_timeago}"
+msgstr "%{commit_author_link} cambió %{commit_timeago}"
+
+msgid "1 pipeline"
+msgid_plural "%d pipelines"
+msgstr[0] "1 pipeline"
+msgstr[1] "%d pipelines"
+
+msgid "A collection of graphs regarding Continuous Integration"
+msgstr "Una colección de gráficos sobre Integración Continua"
+
+msgid "About auto deploy"
+msgstr "Acerca del auto despliegue"
+
+msgid "Active"
+msgstr "Activo"
+
+msgid "Activity"
+msgstr "Actividad"
+
+msgid "Add Changelog"
+msgstr "Agregar Changelog"
+
+msgid "Add Contribution guide"
+msgstr "Agregar guía de contribución"
+
+msgid "Add License"
+msgstr "Agregar Licencia"
+
+msgid "Add an SSH key to your profile to pull or push via SSH."
+msgstr "Agregar una clave SSH a tu perfil para actualizar o enviar a través de SSH."
+
+msgid "Add new directory"
+msgstr "Agregar nuevo directorio"
+
+msgid "Archived project! Repository is read-only"
+msgstr "¡Proyecto archivado! El repositorio es de solo lectura"
+
+msgid "Are you sure you want to delete this pipeline schedule?"
+msgstr "¿Estás seguro que deseas eliminar esta programación del pipeline?"
+
+msgid "Attach a file by drag &amp; drop or %{upload_link}"
+msgstr "Adjunte un archivo arrastrando &amp; soltando o %{upload_link}"
+
+msgid "Branch"
+msgid_plural "Branches"
+msgstr[0] "Rama"
+msgstr[1] "Ramas"
+
+msgid "Branch <strong>%{branch_name}</strong> was created. To set up auto deploy, choose a GitLab CI Yaml template and commit your changes. %{link_to_autodeploy_doc}"
+msgstr "La rama <strong>%{branch_name}</strong> fue creada. Para configurar el auto despliegue, escoge una plantilla Yaml para GitLab CI y envía tus cambios. %{link_to_autodeploy_doc}"
+
+msgid "BranchSwitcherPlaceholder|Search branches"
+msgstr "Buscar ramas"
+
+msgid "BranchSwitcherTitle|Switch branch"
+msgstr "Cambiar rama"
+
+msgid "Branches"
+msgstr "Ramas"
+
+msgid "Browse Directory"
+msgstr "Examinar directorio"
+
+msgid "Browse File"
+msgstr "Examinar archivo"
+
+msgid "Browse Files"
+msgstr "Examinar archivos"
+
+msgid "Browse files"
+msgstr "Examinar archivos"
+
+msgid "ByAuthor|by"
+msgstr "por"
+
+msgid "CI configuration"
+msgstr "Configuración de CI"
+
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgid "ChangeTypeActionLabel|Pick into branch"
+msgstr "Escoger en la rama"
+
+msgid "ChangeTypeActionLabel|Revert in branch"
+msgstr "Revertir en la rama"
+
+msgid "ChangeTypeAction|Cherry-pick"
+msgstr "Cherry-pick"
+
+msgid "ChangeTypeAction|Revert"
+msgstr "Revertir"
+
+msgid "Changelog"
+msgstr "Changelog"
+
+msgid "Charts"
+msgstr "Gráficos"
+
+msgid "Cherry-pick this commit"
+msgstr "Escoger este cambio"
+
+msgid "Cherry-pick this merge request"
+msgstr "Escoger esta solicitud de fusión"
+
+msgid "CiStatusLabel|canceled"
+msgstr "cancelado"
+
+msgid "CiStatusLabel|created"
+msgstr "creado"
+
+msgid "CiStatusLabel|failed"
+msgstr "fallido"
+
+msgid "CiStatusLabel|manual action"
+msgstr "acción manual"
+
+msgid "CiStatusLabel|passed"
+msgstr "pasó"
+
+msgid "CiStatusLabel|passed with warnings"
+msgstr "pasó con advertencias"
+
+msgid "CiStatusLabel|pending"
+msgstr "pendiente"
+
+msgid "CiStatusLabel|skipped"
+msgstr "omitido"
+
+msgid "CiStatusLabel|waiting for manual action"
+msgstr "esperando acción manual"
+
+msgid "CiStatusText|blocked"
+msgstr "bloqueado"
+
+msgid "CiStatusText|canceled"
+msgstr "cancelado"
+
+msgid "CiStatusText|created"
+msgstr "creado"
+
+msgid "CiStatusText|failed"
+msgstr "fallado"
+
+msgid "CiStatusText|manual"
+msgstr "manual"
+
+msgid "CiStatusText|passed"
+msgstr "pasó"
+
+msgid "CiStatusText|pending"
+msgstr "pendiente"
+
+msgid "CiStatusText|skipped"
+msgstr "omitido"
+
+msgid "CiStatus|running"
+msgstr "en ejecución"
+
+msgid "Commit"
+msgid_plural "Commits"
+msgstr[0] "Cambio"
+msgstr[1] "Cambios"
+
+msgid "Commit duration in minutes for last 30 commits"
+msgstr "Duración de los cambios en minutos para los últimos 30"
+
+msgid "Commit message"
+msgstr "Mensaje del cambio"
+
+msgid "CommitBoxTitle|Commit"
+msgstr "Cambio"
+
+msgid "CommitMessage|Add %{file_name}"
+msgstr "Agregar %{file_name}"
+
+msgid "Commits"
+msgstr "Cambios"
+
+msgid "Commits feed"
+msgstr "Feed de cambios"
+
+msgid "Commits|History"
+msgstr "Historial"
+
+msgid "Committed by"
+msgstr "Enviado por"
+
+msgid "Compare"
+msgstr "Comparar"
+
+msgid "Contribution guide"
+msgstr "Guía de contribución"
+
+msgid "Contributors"
+msgstr "Contribuidores"
+
+msgid "Copy URL to clipboard"
+msgstr "Copiar URL al portapapeles"
+
+msgid "Copy commit SHA to clipboard"
+msgstr "Copiar SHA del cambio al portapapeles"
+
+msgid "Create New Directory"
+msgstr "Crear Nuevo Directorio"
+
+msgid "Create a personal access token on your account to pull or push via %{protocol}."
+msgstr "Crear un token de acceso personal en tu cuenta para actualizar o enviar a través de %{protocol}."
+
+msgid "Create directory"
+msgstr "Crear directorio"
+
+msgid "Create empty bare repository"
+msgstr "Crear repositorio vacío"
+
+msgid "Create merge request"
+msgstr "Crear solicitud de fusión"
+
+msgid "Create new..."
+msgstr "Crear nuevo..."
+
+msgid "CreateNewFork|Fork"
+msgstr "Bifurcar"
+
+msgid "CreateTag|Tag"
+msgstr "Etiqueta"
+
+msgid "CreateTokenToCloneLink|create a personal access token"
+msgstr "crear un token de acceso personal"
+
+msgid "Cron Timezone"
+msgstr "Zona horaria del Cron"
+
+msgid "Cron syntax"
+msgstr "Sintaxis de Cron"
+
+msgid "Custom notification events"
+msgstr "Eventos de notificaciones personalizadas"
+
+msgid "Custom notification levels are the same as participating levels. With custom notification levels you will also receive notifications for select events. To find out more, check out %{notification_link}."
+msgstr "Los niveles de notificación personalizados son los mismos que los niveles participantes. Con los niveles de notificación personalizados, también recibirá notificaciones para eventos seleccionados. Para obtener más información, consulte %{notification_link}."
+
+msgid "Cycle Analytics"
+msgstr "Cycle Analytics"
+
+msgid "Cycle Analytics gives an overview of how much time it takes to go from idea to production in your project."
+msgstr "Cycle Analytics ofrece una visión general de cuánto tiempo tarda en pasar de idea a producción en su proyecto."
+
+msgid "CycleAnalyticsStage|Code"
+msgstr "Código"
+
+msgid "CycleAnalyticsStage|Issue"
+msgstr "Incidencia"
+
+msgid "CycleAnalyticsStage|Plan"
+msgstr "Planificación"
+
+msgid "CycleAnalyticsStage|Production"
+msgstr "Producción"
+
+msgid "CycleAnalyticsStage|Review"
+msgstr "Revisión"
+
+msgid "CycleAnalyticsStage|Staging"
+msgstr "Puesta en escena"
+
+msgid "CycleAnalyticsStage|Test"
+msgstr "Pruebas"
+
+msgid "Define a custom pattern with cron syntax"
+msgstr "Definir un patrón personalizado con la sintaxis de cron"
+
+msgid "Delete"
+msgstr "Eliminar"
+
+msgid "Deploy"
+msgid_plural "Deploys"
+msgstr[0] "Despliegue"
+msgstr[1] "Despliegues"
+
+msgid "Description"
+msgstr "Descripción"
+
+msgid "Directory name"
+msgstr "Nombre del directorio"
+
+msgid "Don't show again"
+msgstr "No mostrar de nuevo"
+
+msgid "Download"
+msgstr "Descargar"
+
+msgid "Download tar"
+msgstr "Descargar tar"
+
+msgid "Download tar.bz2"
+msgstr "Descargar tar.bz2"
+
+msgid "Download tar.gz"
+msgstr "Descargar tar.gz"
+
+msgid "Download zip"
+msgstr "Descargar zip"
+
+msgid "DownloadArtifacts|Download"
+msgstr "Descargar"
+
+msgid "DownloadCommit|Email Patches"
+msgstr "Parches por correo electrónico"
+
+msgid "DownloadCommit|Plain Diff"
+msgstr "Diferencias en texto plano"
+
+msgid "DownloadSource|Download"
+msgstr "Descargar"
+
+msgid "Edit"
+msgstr "Editar"
+
+msgid "Edit Pipeline Schedule %{id}"
+msgstr "Editar Programación del Pipeline %{id}"
+
+msgid "Every day (at 4:00am)"
+msgstr "Todos los días (a las 4:00 am)"
+
+msgid "Every month (on the 1st at 4:00am)"
+msgstr "Todos los meses (el día 1 a las 4:00 am)"
+
+msgid "Every week (Sundays at 4:00am)"
+msgstr "Todas las semanas (domingos a las 4:00 am)"
+
+msgid "Failed to change the owner"
+msgstr "Error al cambiar el propietario"
+
+msgid "Failed to remove the pipeline schedule"
+msgstr "Error al eliminar la programación del pipeline"
+
+msgid "Files"
+msgstr "Archivos"
+
+msgid "Filter by commit message"
+msgstr "Filtrar por mensaje del cambio"
+
+msgid "Find by path"
+msgstr "Buscar por ruta"
+
+msgid "Find file"
+msgstr "Buscar archivo"
+
+msgid "FirstPushedBy|First"
+msgstr "Primer"
+
+msgid "FirstPushedBy|pushed by"
+msgstr "enviado por"
+
+msgid "Fork"
+msgid_plural "Forks"
+msgstr[0] "Bifurcación"
+msgstr[1] "Bifurcaciones"
+
+msgid "ForkedFromProjectPath|Forked from"
+msgstr "Bifurcado de"
+
+msgid "From issue creation until deploy to production"
+msgstr "Desde la creación de la incidencia hasta el despliegue a producción"
+
+msgid "From merge request merge until deploy to production"
+msgstr "Desde la integración de la solicitud de fusión hasta el despliegue a producción"
+
+msgid "Go to your fork"
+msgstr "Ir a tu bifurcación"
+
+msgid "GoToYourFork|Fork"
+msgstr "Bifurcación"
+
+msgid "Home"
+msgstr "Inicio"
+
+msgid "Housekeeping successfully started"
+msgstr "Servicio de limpieza iniciado con éxito"
+
+msgid "Import repository"
+msgstr "Importar repositorio"
+
+msgid "Interval Pattern"
+msgstr "Patrón de intervalo"
+
+msgid "Introducing Cycle Analytics"
+msgstr "Introducción a Cycle Analytics"
+
+msgid "Jobs for last month"
+msgstr "Trabajos del mes pasado"
+
+msgid "Jobs for last week"
+msgstr "Trabajos de la semana pasada"
+
+msgid "Jobs for last year"
+msgstr "Trabajos del año pasado"
+
+msgid "LFSStatus|Disabled"
+msgstr "Deshabilitado"
+
+msgid "LFSStatus|Enabled"
+msgstr "Habilitado"
+
+msgid "Last %d day"
+msgid_plural "Last %d days"
+msgstr[0] "Último %d día"
+msgstr[1] "Últimos %d días"
+
+msgid "Last Pipeline"
+msgstr "Último Pipeline"
+
+msgid "Last Update"
+msgstr "Última actualización"
+
+msgid "Last commit"
+msgstr "Último cambio"
+
+msgid "Learn more in the"
+msgstr "Más información en la"
+
+msgid "Learn more in the|pipeline schedules documentation"
+msgstr "documentación sobre la programación de pipelines"
+
+msgid "Leave group"
+msgstr "Abandonar grupo"
+
+msgid "Leave project"
+msgstr "Abandonar proyecto"
+
+msgid "Limited to showing %d event at most"
+msgid_plural "Limited to showing %d events at most"
+msgstr[0] "Limitado a mostrar máximo %d evento"
+msgstr[1] "Limitado a mostrar máximo %d eventos"
+
+msgid "Median"
+msgstr "Mediana"
+
+msgid "MissingSSHKeyWarningLink|add an SSH key"
+msgstr "agregar una clave SSH"
+
+msgid "New Issue"
+msgid_plural "New Issues"
+msgstr[0] "Nueva incidencia"
+msgstr[1] "Nuevas incidencias"
+
+msgid "New Pipeline Schedule"
+msgstr "Nueva Programación del Pipeline"
+
+msgid "New branch"
+msgstr "Nueva rama"
+
+msgid "New directory"
+msgstr "Nuevo directorio"
+
+msgid "New file"
+msgstr "Nuevo archivo"
+
+msgid "New issue"
+msgstr "Nueva incidencia"
+
+msgid "New merge request"
+msgstr "Nueva solicitud de fusión"
+
+msgid "New schedule"
+msgstr "Nueva programación"
+
+msgid "New snippet"
+msgstr "Nuevo fragmento de código"
+
+msgid "New tag"
+msgstr "Nueva etiqueta"
+
+msgid "No repository"
+msgstr "No hay repositorio"
+
+msgid "No schedules"
+msgstr "No hay programaciones"
+
+msgid "Not available"
+msgstr "No disponible"
+
+msgid "Not enough data"
+msgstr "No hay suficientes datos"
+
+msgid "Notification events"
+msgstr "Eventos de notificación"
+
+msgid "NotificationEvent|Close issue"
+msgstr "Cerrar incidencia"
+
+msgid "NotificationEvent|Close merge request"
+msgstr "Cerrar solicitud de fusión"
+
+msgid "NotificationEvent|Failed pipeline"
+msgstr "Pipeline fallido"
+
+msgid "NotificationEvent|Merge merge request"
+msgstr "Integrar solicitud de fusión"
+
+msgid "NotificationEvent|New issue"
+msgstr "Nueva incidencia"
+
+msgid "NotificationEvent|New merge request"
+msgstr "Nueva solicitud de fusión"
+
+msgid "NotificationEvent|New note"
+msgstr "Nueva nota"
+
+msgid "NotificationEvent|Reassign issue"
+msgstr "Reasignar incidencia"
+
+msgid "NotificationEvent|Reassign merge request"
+msgstr "Reasignar solicitud de fusión"
+
+msgid "NotificationEvent|Reopen issue"
+msgstr "Reabrir incidencia"
+
+msgid "NotificationEvent|Successful pipeline"
+msgstr "Pipeline exitoso"
+
+msgid "NotificationLevel|Custom"
+msgstr "Personalizado"
+
+msgid "NotificationLevel|Disabled"
+msgstr "Deshabilitado"
+
+msgid "NotificationLevel|Global"
+msgstr "Global"
+
+msgid "NotificationLevel|On mention"
+msgstr "Cuando me mencionan"
+
+msgid "NotificationLevel|Participate"
+msgstr "Participación"
+
+msgid "NotificationLevel|Watch"
+msgstr "Vigilancia"
+
+msgid "OfSearchInADropdown|Filter"
+msgstr "Filtrar"
+
+msgid "OpenedNDaysAgo|Opened"
+msgstr "Abierto"
+
+msgid "Options"
+msgstr "Opciones"
+
+msgid "Owner"
+msgstr "Propietario"
+
+msgid "Pipeline"
+msgstr "Pipeline"
+
+msgid "Pipeline Health"
+msgstr "Estado del Pipeline"
+
+msgid "Pipeline Schedule"
+msgstr "Programación del Pipeline"
+
+msgid "Pipeline Schedules"
+msgstr "Programaciones de los Pipelines"
+
+msgid "PipelineCharts|Failed:"
+msgstr "Fallidos:"
+
+msgid "PipelineCharts|Overall statistics"
+msgstr "Estadísticas generales"
+
+msgid "PipelineCharts|Success ratio:"
+msgstr "Ratio de éxito"
+
+msgid "PipelineCharts|Successful:"
+msgstr "Exitosos:"
+
+msgid "PipelineCharts|Total:"
+msgstr "Total:"
+
+msgid "PipelineSchedules|Activated"
+msgstr "Activado"
+
+msgid "PipelineSchedules|Active"
+msgstr "Activos"
+
+msgid "PipelineSchedules|All"
+msgstr "Todos"
+
+msgid "PipelineSchedules|Inactive"
+msgstr "Inactivos"
+
+msgid "PipelineSchedules|Input variable key"
+msgstr "Ingrese nombre de clave"
+
+msgid "PipelineSchedules|Input variable value"
+msgstr "Ingrese el valor de la variable"
+
+msgid "PipelineSchedules|Next Run"
+msgstr "Próxima Ejecución"
+
+msgid "PipelineSchedules|None"
+msgstr "Ninguno"
+
+msgid "PipelineSchedules|Provide a short description for this pipeline"
+msgstr "Proporcione una descripción breve para este pipeline"
+
+msgid "PipelineSchedules|Remove variable row"
+msgstr "Eliminar fila de variable"
+
+msgid "PipelineSchedules|Take ownership"
+msgstr "Tomar posesión"
+
+msgid "PipelineSchedules|Target"
+msgstr "Destino"
+
+msgid "PipelineSchedules|Variables"
+msgstr "Variables"
+
+msgid "PipelineSheduleIntervalPattern|Custom"
+msgstr "Personalizado"
+
+msgid "Pipelines"
+msgstr "Pipelines"
+
+msgid "Pipelines charts"
+msgstr "Gráficos de los pipelines"
+
+msgid "Pipeline|all"
+msgstr "todos"
+
+msgid "Pipeline|success"
+msgstr "exitósos"
+
+msgid "Pipeline|with stage"
+msgstr "con etapa"
+
+msgid "Pipeline|with stages"
+msgstr "con etapas"
+
+msgid "Project '%{project_name}' queued for deletion."
+msgstr "Proyecto ‘%{project_name}’ en cola para eliminación."
+
+msgid "Project '%{project_name}' was successfully created."
+msgstr "Proyecto ‘%{project_name}’ fue creado satisfactoriamente."
+
+msgid "Project '%{project_name}' was successfully updated."
+msgstr "Proyecto ‘%{project_name}’ fue actualizado satisfactoriamente."
+
+msgid "Project '%{project_name}' will be deleted."
+msgstr "Proyecto ‘%{project_name}’ será eliminado."
+
+msgid "Project access must be granted explicitly to each user."
+msgstr "El acceso al proyecto debe concederse explícitamente a cada usuario."
+
+msgid "Project export could not be deleted."
+msgstr "No se pudo eliminar la exportación del proyecto."
+
+msgid "Project export has been deleted."
+msgstr "La exportación del proyecto ha sido eliminada."
+
+msgid "Project export link has expired. Please generate a new export from your project settings."
+msgstr "El enlace de exportación del proyecto ha caducado. Por favor, genera una nueva exportación desde la configuración del proyecto."
+
+msgid "Project export started. A download link will be sent by email."
+msgstr "Se inició la exportación del proyecto. Se enviará un enlace de descarga por correo electrónico."
+
+msgid "Project home"
+msgstr "Inicio del proyecto"
+
+msgid "ProjectFeature|Disabled"
+msgstr "Deshabilitada"
+
+msgid "ProjectFeature|Everyone with access"
+msgstr "Todos con acceso"
+
+msgid "ProjectFeature|Only team members"
+msgstr "Solo miembros del equipo"
+
+msgid "ProjectFileTree|Name"
+msgstr "Nombre"
+
+msgid "ProjectLastActivity|Never"
+msgstr "Nunca"
+
+msgid "ProjectLifecycle|Stage"
+msgstr "Etapa"
+
+msgid "ProjectNetworkGraph|Graph"
+msgstr "Historial gráfico"
+
+msgid "Read more"
+msgstr "Leer más"
+
+msgid "Readme"
+msgstr "Léeme"
+
+msgid "RefSwitcher|Branches"
+msgstr "Ramas"
+
+msgid "RefSwitcher|Tags"
+msgstr "Etiquetas"
+
+msgid "Related Commits"
+msgstr "Cambios Relacionados"
+
+msgid "Related Deployed Jobs"
+msgstr "Trabajos Desplegados Relacionados"
+
+msgid "Related Issues"
+msgstr "Incidencias Relacionadas"
+
+msgid "Related Jobs"
+msgstr "Trabajos Relacionados"
+
+msgid "Related Merge Requests"
+msgstr "Solicitudes de fusión Relacionadas"
+
+msgid "Related Merged Requests"
+msgstr "Solicitudes de fusión Relacionadas"
+
+msgid "Remind later"
+msgstr "Recordar después"
+
+msgid "Remove project"
+msgstr "Eliminar proyecto"
+
+msgid "Request Access"
+msgstr "Solicitar acceso"
+
+msgid "Revert this commit"
+msgstr "Revertir este cambio"
+
+msgid "Revert this merge request"
+msgstr "Revertir esta solicitud de fusión"
+
+msgid "Save pipeline schedule"
+msgstr "Guardar programación del pipeline"
+
+msgid "Schedule a new pipeline"
+msgstr "Programar un nuevo pipeline"
+
+msgid "Scheduling Pipelines"
+msgstr "Programación de Pipelines"
+
+msgid "Search branches and tags"
+msgstr "Buscar ramas y etiquetas"
+
+msgid "Select Archive Format"
+msgstr "Seleccionar formato de archivo"
+
+msgid "Select a timezone"
+msgstr "Selecciona una zona horaria"
+
+msgid "Select target branch"
+msgstr "Selecciona una rama de destino"
+
+msgid "Set a password on your account to pull or push via %{protocol}."
+msgstr "Establezca una contraseña en su cuenta para actualizar o enviar a través de %{protocol}."
+
+msgid "Set up CI"
+msgstr "Configurar CI"
+
+msgid "Set up Koding"
+msgstr "Configurar Koding"
+
+msgid "Set up auto deploy"
+msgstr "Configurar auto despliegue"
+
+msgid "SetPasswordToCloneLink|set a password"
+msgstr "establecer una contraseña"
+
+msgid "Showing %d event"
+msgid_plural "Showing %d events"
+msgstr[0] "Mostrando %d evento"
+msgstr[1] "Mostrando %d eventos"
+
+msgid "Source code"
+msgstr "Código fuente"
+
+msgid "StarProject|Star"
+msgstr "Destacar"
+
+msgid "Start a %{new_merge_request} with these changes"
+msgstr "Iniciar una %{new_merge_request} con estos cambios"
+
+msgid "Switch branch/tag"
+msgstr "Cambiar rama/etiqueta"
+
+msgid "Tag"
+msgid_plural "Tags"
+msgstr[0] "Etiqueta"
+msgstr[1] "Etiquetas"
+
+msgid "Tags"
+msgstr "Etiquetas"
+
+msgid "Target Branch"
+msgstr "Rama de destino"
+
+msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request."
+msgstr "La etapa de desarrollo muestra el tiempo desde el primer cambio hasta la creación de la solicitud de fusión. Los datos serán automáticamente incorporados aquí una vez creada tu primera solicitud de fusión."
+
+msgid "The collection of events added to the data gathered for that stage."
+msgstr "La colección de eventos agregados a los datos recopilados para esa etapa."
+
+msgid "The fork relationship has been removed."
+msgstr "La relación con la bifurcación se ha eliminado."
+
+msgid "The issue stage shows the time it takes from creating an issue to assigning the issue to a milestone, or add the issue to a list on your Issue Board. Begin creating issues to see data for this stage."
+msgstr "La etapa de incidencia muestra el tiempo que toma desde la creación de un tema hasta asignar el tema a un hito, o añadir el tema a una lista en el panel de temas. Empieza a crear temas para ver los datos de esta etapa."
+
+msgid "The phase of the development lifecycle."
+msgstr "La etapa del ciclo de vida de desarrollo."
+
+msgid "The pipelines schedule runs pipelines in the future, repeatedly, for specific branches or tags. Those scheduled pipelines will inherit limited project access based on their associated user."
+msgstr "La programación de pipelines ejecuta pipelines en el futuro, repetidamente, para ramas o etiquetas específicas. Los pipelines programados heredarán acceso limitado al proyecto basado en su usuario asociado."
+
+msgid "The planning stage shows the time from the previous step to pushing your first commit. This time will be added automatically once you push your first commit."
+msgstr "La etapa de planificación muestra el tiempo desde el paso anterior hasta el envío de tu primera confirmación. Este tiempo se añadirá automáticamente una vez que usted envíe el primer cambio."
+
+msgid "The production stage shows the total time it takes between creating an issue and deploying the code to production. The data will be automatically added once you have completed the full idea to production cycle."
+msgstr "La etapa de producción muestra el tiempo total que tarda entre la creación de una incidencia y el despliegue del código a producción. Los datos se añadirán automáticamente una vez haya finalizado por completo el ciclo de idea a producción."
+
+msgid "The project can be accessed by any logged in user."
+msgstr "El proyecto puede ser accedido por cualquier usuario conectado."
+
+msgid "The project can be accessed without any authentication."
+msgstr "El proyecto puede accederse sin ninguna autenticación."
+
+msgid "The repository for this project does not exist."
+msgstr "El repositorio para este proyecto no existe."
+
+msgid "The review stage shows the time from creating the merge request to merging it. The data will automatically be added after you merge your first merge request."
+msgstr "La etapa de revisión muestra el tiempo desde la creación de la solicitud de fusión hasta que los cambios se fusionaron. Los datos se añadirán automáticamente después de fusionar su primera solicitud de fusión."
+
+msgid "The staging stage shows the time between merging the MR and deploying code to the production environment. The data will be automatically added once you deploy to production for the first time."
+msgstr "La etapa de puesta en escena muestra el tiempo entre la fusión y el despliegue de código en el entorno de producción. Los datos se añadirán automáticamente una vez que se despliega a producción por primera vez."
+
+msgid "The testing stage shows the time GitLab CI takes to run every pipeline for the related merge request. The data will automatically be added after your first pipeline finishes running."
+msgstr "La etapa de pruebas muestra el tiempo que GitLab CI toma para ejecutar cada pipeline para la solicitud de fusión relacionada. Los datos se añadirán automáticamente luego de que el primer pipeline termine de ejecutarse."
+
+msgid "The time taken by each data entry gathered by that stage."
+msgstr "El tiempo utilizado por cada entrada de datos obtenido por esa etapa."
+
+msgid "The value lying at the midpoint of a series of observed values. E.g., between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 = 6."
+msgstr "El valor en el punto medio de una serie de valores observados. Por ejemplo, entre 3, 5, 9, la mediana es 5. Entre 3, 5, 7, 8, la mediana es (5 + 7) / 2 = 6."
+
+msgid "This means you can not push code until you create an empty repository or import existing one."
+msgstr "Esto significa que no puede enviar código hasta que cree un repositorio vacío o importe uno existente."
+
+msgid "Time before an issue gets scheduled"
+msgstr "Tiempo antes de que una incidencia sea programada"
+
+msgid "Time before an issue starts implementation"
+msgstr "Tiempo antes de que empieze la implementación de una incidencia"
+
+msgid "Time between merge request creation and merge/close"
+msgstr "Tiempo entre la creación de la solicitud de fusión y la integración o cierre de ésta"
+
+msgid "Time until first merge request"
+msgstr "Tiempo hasta la primera solicitud de fusión"
+
+msgid "Timeago|%s days ago"
+msgstr "hace %s días"
+
+msgid "Timeago|%s days remaining"
+msgstr "%s días restantes"
+
+msgid "Timeago|%s hours remaining"
+msgstr "%s horas restantes"
+
+msgid "Timeago|%s minutes ago"
+msgstr "hace %s minutos"
+
+msgid "Timeago|%s minutes remaining"
+msgstr "%s minutos restantes"
+
+msgid "Timeago|%s months ago"
+msgstr "hace %s meses"
+
+msgid "Timeago|%s months remaining"
+msgstr "%s meses restantes"
+
+msgid "Timeago|%s seconds remaining"
+msgstr "%s segundos restantes"
+
+msgid "Timeago|%s weeks ago"
+msgstr "hace %s semanas"
+
+msgid "Timeago|%s weeks remaining"
+msgstr "%s semanas restantes"
+
+msgid "Timeago|%s years ago"
+msgstr "hace %s años"
+
+msgid "Timeago|%s years remaining"
+msgstr "%s años restantes"
+
+msgid "Timeago|1 day remaining"
+msgstr "1 día restante"
+
+msgid "Timeago|1 hour remaining"
+msgstr "1 hora restante"
+
+msgid "Timeago|1 minute remaining"
+msgstr "1 minuto restante"
+
+msgid "Timeago|1 month remaining"
+msgstr "1 mes restante"
+
+msgid "Timeago|1 week remaining"
+msgstr "1 semana restante"
+
+msgid "Timeago|1 year remaining"
+msgstr "1 año restante"
+
+msgid "Timeago|Past due"
+msgstr "Atrasado"
+
+msgid "Timeago|a day ago"
+msgstr "hace un día"
+
+msgid "Timeago|a month ago"
+msgstr "hace un mes"
+
+msgid "Timeago|a week ago"
+msgstr "hace una semana"
+
+msgid "Timeago|a while"
+msgstr "hace un momento"
+
+msgid "Timeago|a year ago"
+msgstr "hace un año"
+
+msgid "Timeago|about %s hours ago"
+msgstr "hace alrededor de %s horas"
+
+msgid "Timeago|about a minute ago"
+msgstr "hace alrededor de 1 minuto"
+
+msgid "Timeago|about an hour ago"
+msgstr "hace alrededor de 1 hora"
+
+msgid "Timeago|in %s days"
+msgstr "en %s días"
+
+msgid "Timeago|in %s hours"
+msgstr "en %s horas"
+
+msgid "Timeago|in %s minutes"
+msgstr "en %s minutos"
+
+msgid "Timeago|in %s months"
+msgstr "en %s meses"
+
+msgid "Timeago|in %s seconds"
+msgstr "en %s segundos"
+
+msgid "Timeago|in %s weeks"
+msgstr "en %s semanas"
+
+msgid "Timeago|in %s years"
+msgstr "en %s años"
+
+msgid "Timeago|in 1 day"
+msgstr "en 1 día"
+
+msgid "Timeago|in 1 hour"
+msgstr "en 1 hora"
+
+msgid "Timeago|in 1 minute"
+msgstr "en 1 minuto"
+
+msgid "Timeago|in 1 month"
+msgstr "en 1 mes"
+
+msgid "Timeago|in 1 week"
+msgstr "en 1 semana"
+
+msgid "Timeago|in 1 year"
+msgstr "en 1 año"
+
+msgid "Timeago|less than a minute ago"
+msgstr "hace menos de 1 minuto"
+
+msgid "Time|hr"
+msgid_plural "Time|hrs"
+msgstr[0] "hr"
+msgstr[1] "hrs"
+
+msgid "Time|min"
+msgid_plural "Time|mins"
+msgstr[0] "min"
+msgstr[1] "mins"
+
+msgid "Time|s"
+msgstr "s"
+
+msgid "Total Time"
+msgstr "Tiempo Total"
+
+msgid "Total test time for all commits/merges"
+msgstr "Tiempo total de pruebas para todos los cambios o integraciones"
+
+msgid "Unstar"
+msgstr "No Destacar"
+
+msgid "Upload New File"
+msgstr "Subir nuevo archivo"
+
+msgid "Upload file"
+msgstr "Subir archivo"
+
+msgid "UploadLink|click to upload"
+msgstr "Hacer clic para subir"
+
+msgid "Use your global notification setting"
+msgstr "Utiliza tu configuración de notificación global"
+
+msgid "View open merge request"
+msgstr "Ver solicitud de fusión abierta"
+
+msgid "VisibilityLevel|Internal"
+msgstr "Interno"
+
+msgid "VisibilityLevel|Private"
+msgstr "Privado"
+
+msgid "VisibilityLevel|Public"
+msgstr "Público"
+
+msgid "VisibilityLevel|Unknown"
+msgstr "Desconocido"
+
+msgid "Want to see the data? Please ask an administrator for access."
+msgstr "¿Quieres ver los datos? Por favor pide acceso al administrador."
+
+msgid "We don't have enough data to show this stage."
+msgstr "No hay suficientes datos para mostrar en esta etapa."
+
+msgid "Withdraw Access Request"
+msgstr "Retirar Solicitud de Acceso"
+
+msgid "You are going to remove %{group_name}. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?"
+msgstr "Va a eliminar %{group_name}. ¡El grupo eliminado NO puede ser restaurado! ¿Estás TOTALMENTE seguro?"
+
+msgid "You are going to remove %{project_name_with_namespace}. Removed project CANNOT be restored! Are you ABSOLUTELY sure?"
+msgstr "Va a eliminar %{project_name_with_namespace}. ¡El proyecto eliminado NO puede ser restaurado! ¿Estás TOTALMENTE seguro?"
+
+msgid "You are going to remove the fork relationship to source project %{forked_from_project}. Are you ABSOLUTELY sure?"
+msgstr "Vas a eliminar el enlace de la bifurcación con el proyecto original %{forked_from_project}. ¿Estás TOTALMENTE seguro?"
+
+msgid "You are going to transfer %{project_name_with_namespace} to another owner. Are you ABSOLUTELY sure?"
+msgstr "Vas a transferir %{project_name_with_namespace} a otro propietario. ¿Estás TOTALMENTE seguro?"
+
+msgid "You can only add files when you are on a branch"
+msgstr "Solo puedes agregar archivos cuando estás en una rama"
+
+msgid "You have reached your project limit"
+msgstr "Has alcanzado el límite de tu proyecto"
+
+msgid "You must sign in to star a project"
+msgstr "Debes iniciar sesión para destacar un proyecto"
+
+msgid "You need permission."
+msgstr "Necesitas permisos."
+
+msgid "You will not get any notifications via email"
+msgstr "No recibirás ninguna notificación por correo electrónico"
+
+msgid "You will only receive notifications for the events you choose"
+msgstr "Solo recibirás notificaciones de los eventos que elijas"
+
+msgid "You will only receive notifications for threads you have participated in"
+msgstr "Solo recibirás notificaciones de los temas en los que has participado"
+
+msgid "You will receive notifications for any activity"
+msgstr "Recibirás notificaciones por cualquier actividad"
+
+msgid "You will receive notifications only for comments in which you were @mentioned"
+msgstr "Recibirás notificaciones solo para los comentarios en los que se te mencionó"
+
+msgid "You won't be able to pull or push project code via %{protocol} until you %{set_password_link} on your account"
+msgstr "No podrás actualizar o enviar código al proyecto a través de %{protocol} hasta que %{set_password_link} en tu cuenta"
+
+msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile"
+msgstr "No podrás actualizar o enviar código al proyecto a través de SSH hasta que %{add_ssh_key_link} en su perfil"
+
+msgid "Your name"
+msgstr "Tu nombre"
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] "día"
+msgstr[1] "días"
+
+msgid "new merge request"
+msgstr "nueva solicitud de fusión"
+
+msgid "notification emails"
+msgstr "correos electrónicos de notificación"
+
+msgid "parent"
+msgid_plural "parents"
+msgstr[0] "padre"
+msgstr[1] "padres"
diff --git a/spec/helpers/blob_helper_spec.rb b/spec/helpers/blob_helper_spec.rb
index c654151564e..04620f6d88c 100644
--- a/spec/helpers/blob_helper_spec.rb
+++ b/spec/helpers/blob_helper_spec.rb
@@ -95,13 +95,13 @@ describe BlobHelper do
     it 'returns a link with the proper route' do
       link = edit_blob_link(project, 'master', 'README.md')
 
-      expect(Capybara.string(link).find_link('Edit')[:href]).to eq('/gitlab/gitlabhq/edit/master/README.md')
+      expect(Capybara.string(link).find_link('Edit')[:href]).to eq("/#{project.full_path}/edit/master/README.md")
     end
 
     it 'returns a link with the passed link_opts on the expected route' do
       link = edit_blob_link(project, 'master', 'README.md', link_opts: { mr_id: 10 })
 
-      expect(Capybara.string(link).find_link('Edit')[:href]).to eq('/gitlab/gitlabhq/edit/master/README.md?mr_id=10')
+      expect(Capybara.string(link).find_link('Edit')[:href]).to eq("/#{project.full_path}/edit/master/README.md?mr_id=10")
     end
   end
 
diff --git a/spec/helpers/issuables_helper_spec.rb b/spec/helpers/issuables_helper_spec.rb
index 7789cfa3554..ead3e28438e 100644
--- a/spec/helpers/issuables_helper_spec.rb
+++ b/spec/helpers/issuables_helper_spec.rb
@@ -59,112 +59,6 @@ describe IssuablesHelper do
           .to eq('<span>All</span> <span class="badge">42</span>')
       end
     end
-
-    describe 'counter caching based on issuable type and params', :use_clean_rails_memory_store_caching do
-      let(:params) do
-        {
-          scope: 'created-by-me',
-          state: 'opened',
-          utf8: '✓',
-          author_id: '11',
-          assignee_id: '18',
-          label_name: %w(bug discussion documentation),
-          milestone_title: 'v4.0',
-          sort: 'due_date_asc',
-          namespace_id: 'gitlab-org',
-          project_id: 'gitlab-ce',
-          page: 2
-        }.with_indifferent_access
-      end
-
-      let(:issues_finder) { IssuesFinder.new(nil, params) }
-      let(:merge_requests_finder) { MergeRequestsFinder.new(nil, params) }
-
-      before do
-        allow(helper).to receive(:issues_finder).and_return(issues_finder)
-        allow(helper).to receive(:merge_requests_finder).and_return(merge_requests_finder)
-      end
-
-      it 'returns the cached value when called for the same issuable type & with the same params' do
-        expect(issues_finder).to receive(:count_by_state).and_return(opened: 42)
-
-        expect(helper.issuables_state_counter_text(:issues, :opened))
-          .to eq('<span>Open</span> <span class="badge">42</span>')
-
-        expect(issues_finder).not_to receive(:count_by_state)
-
-        expect(helper.issuables_state_counter_text(:issues, :opened))
-          .to eq('<span>Open</span> <span class="badge">42</span>')
-      end
-
-      it 'takes confidential status into account when searching for issues' do
-        expect(issues_finder).to receive(:count_by_state).and_return(opened: 42)
-
-        expect(helper.issuables_state_counter_text(:issues, :opened))
-          .to include('42')
-
-        expect(issues_finder).to receive(:user_cannot_see_confidential_issues?).twice.and_return(false)
-        expect(issues_finder).to receive(:count_by_state).and_return(opened: 40)
-
-        expect(helper.issuables_state_counter_text(:issues, :opened))
-          .to include('40')
-
-        expect(issues_finder).to receive(:user_can_see_all_confidential_issues?).and_return(true)
-        expect(issues_finder).to receive(:count_by_state).and_return(opened: 45)
-
-        expect(helper.issuables_state_counter_text(:issues, :opened))
-          .to include('45')
-      end
-
-      it 'does not take confidential status into account when searching for merge requests' do
-        expect(merge_requests_finder).to receive(:count_by_state).and_return(opened: 42)
-        expect(merge_requests_finder).not_to receive(:user_cannot_see_confidential_issues?)
-        expect(merge_requests_finder).not_to receive(:user_can_see_all_confidential_issues?)
-
-        expect(helper.issuables_state_counter_text(:merge_requests, :opened))
-          .to include('42')
-      end
-
-      it 'does not take some keys into account in the cache key' do
-        expect(issues_finder).to receive(:count_by_state).and_return(opened: 42)
-        expect(issues_finder).to receive(:params).and_return({
-          author_id: '11',
-          state: 'foo',
-          sort: 'foo',
-          utf8: 'foo',
-          page: 'foo'
-        }.with_indifferent_access)
-
-        expect(helper.issuables_state_counter_text(:issues, :opened))
-          .to eq('<span>Open</span> <span class="badge">42</span>')
-
-        expect(issues_finder).not_to receive(:count_by_state)
-        expect(issues_finder).to receive(:params).and_return({
-          author_id: '11',
-          state: 'bar',
-          sort: 'bar',
-          utf8: 'bar',
-          page: 'bar'
-        }.with_indifferent_access)
-
-        expect(helper.issuables_state_counter_text(:issues, :opened))
-          .to eq('<span>Open</span> <span class="badge">42</span>')
-      end
-
-      it 'does not take params order into account in the cache key' do
-        expect(issues_finder).to receive(:params).and_return('author_id' => '11', 'state' => 'opened')
-        expect(issues_finder).to receive(:count_by_state).and_return(opened: 42)
-
-        expect(helper.issuables_state_counter_text(:issues, :opened))
-          .to eq('<span>Open</span> <span class="badge">42</span>')
-
-        expect(issues_finder).to receive(:params).and_return('state' => 'opened', 'author_id' => '11')
-        expect(issues_finder).not_to receive(:count_by_state)
-
-        expect(helper.issuables_state_counter_text(:issues, :opened))
-          .to eq('<span>Open</span> <span class="badge">42</span>')
-      end
-    end
   end
 
   describe '#issuable_reference' do
diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb
index dc3100311f8..ddf881a7b6f 100644
--- a/spec/helpers/issues_helper_spec.rb
+++ b/spec/helpers/issues_helper_spec.rb
@@ -58,16 +58,6 @@ describe IssuesHelper do
     end
   end
 
-  describe "merge_requests_sentence" do
-    subject { merge_requests_sentence(merge_requests)}
-    let(:merge_requests) do
-      [build(:merge_request, iid: 1), build(:merge_request, iid: 2),
-       build(:merge_request, iid: 3)]
-    end
-
-    it { is_expected.to eq("!1, !2, or !3") }
-  end
-
   describe '#award_user_list' do
     it "returns a comma-separated list of the first X users" do
       user = build_stubbed(:user, name: 'Joe')
diff --git a/spec/javascripts/api_spec.js b/spec/javascripts/api_spec.js
index 8c68ceff914..2aa4fb1f6c6 100644
--- a/spec/javascripts/api_spec.js
+++ b/spec/javascripts/api_spec.js
@@ -101,12 +101,13 @@ describe('Api', () => {
     it('fetches projects with membership when logged in', (done) => {
       const query = 'dummy query';
       const options = { unused: 'option' };
-      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects.json?simple=true`;
+      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects.json`;
       window.gon.current_user_id = 1;
       const expectedData = Object.assign({
         search: query,
         per_page: 20,
         membership: true,
+        simple: true,
       }, options);
       spyOn(jQuery, 'ajax').and.callFake((request) => {
         expect(request.url).toEqual(expectedUrl);
@@ -124,10 +125,11 @@ describe('Api', () => {
     it('fetches projects without membership when not logged in', (done) => {
       const query = 'dummy query';
       const options = { unused: 'option' };
-      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects.json?simple=true`;
+      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects.json`;
       const expectedData = Object.assign({
         search: query,
         per_page: 20,
+        simple: true,
       }, options);
       spyOn(jQuery, 'ajax').and.callFake((request) => {
         expect(request.url).toEqual(expectedUrl);
diff --git a/spec/javascripts/awards_handler_spec.js b/spec/javascripts/awards_handler_spec.js
index 8e056882108..a22b71fd1dc 100644
--- a/spec/javascripts/awards_handler_spec.js
+++ b/spec/javascripts/awards_handler_spec.js
@@ -25,9 +25,10 @@ import '~/lib/utils/common_utils';
   };
 
   describe('AwardsHandler', function() {
-    preloadFixtures('issues/issue_with_comment.html.raw');
+    preloadFixtures('merge_requests/diff_comment.html.raw');
     beforeEach(function(done) {
-      loadFixtures('issues/issue_with_comment.html.raw');
+      loadFixtures('merge_requests/diff_comment.html.raw');
+      $('body').data('page', 'projects:merge_requests:show');
       loadAwardsHandler(true).then((obj) => {
         awardsHandler = obj;
         spyOn(awardsHandler, 'postEmoji').and.callFake((button, url, emoji, cb) => cb());
@@ -139,7 +140,7 @@ import '~/lib/utils/common_utils';
     });
     describe('::getAwardUrl', function() {
       return it('returns the url for request', function() {
-        return expect(awardsHandler.getAwardUrl()).toBe('http://test.host/frontend-fixtures/issues-project/issues/1/toggle_award_emoji');
+        return expect(awardsHandler.getAwardUrl()).toBe('http://test.host/frontend-fixtures/merge-requests-project/merge_requests/1/toggle_award_emoji');
       });
     });
     describe('::addAward and ::checkMutuality', function() {
diff --git a/spec/javascripts/behaviors/quick_submit_spec.js b/spec/javascripts/behaviors/quick_submit_spec.js
index 6dc48f9a293..f62bf43adb9 100644
--- a/spec/javascripts/behaviors/quick_submit_spec.js
+++ b/spec/javascripts/behaviors/quick_submit_spec.js
@@ -1,119 +1,111 @@
-/* eslint-disable space-before-function-paren, no-var, no-return-assign, comma-dangle, jasmine/no-spec-dupes, new-cap, max-len */
-
 import '~/behaviors/quick_submit';
 
-(function() {
-  describe('Quick Submit behavior', function() {
-    var keydownEvent;
-    preloadFixtures('issues/open-issue.html.raw');
-    beforeEach(function() {
-      loadFixtures('issues/open-issue.html.raw');
-      $('form').submit(function(e) {
-        // Prevent a form submit from moving us off the testing page
-        return e.preventDefault();
-      });
-      this.spies = {
-        submit: spyOnEvent('form', 'submit')
-      };
+describe('Quick Submit behavior', () => {
+  const keydownEvent = (options = { keyCode: 13, metaKey: true }) => $.Event('keydown', options);
 
-      this.textarea = $('.js-quick-submit textarea').first();
-    });
-    it('does not respond to other keyCodes', function() {
-      this.textarea.trigger(keydownEvent({
-        keyCode: 32
-      }));
-      return expect(this.spies.submit).not.toHaveBeenTriggered();
-    });
-    it('does not respond to Enter alone', function() {
-      this.textarea.trigger(keydownEvent({
-        ctrlKey: false,
-        metaKey: false
-      }));
-      return expect(this.spies.submit).not.toHaveBeenTriggered();
-    });
-    it('does not respond to repeated events', function() {
-      this.textarea.trigger(keydownEvent({
-        repeat: true
-      }));
-      return expect(this.spies.submit).not.toHaveBeenTriggered();
-    });
-    it('disables input of type submit', function() {
-      const submitButton = $('.js-quick-submit input[type=submit]');
-      this.textarea.trigger(keydownEvent());
+  preloadFixtures('merge_requests/merge_request_with_task_list.html.raw');
 
-      expect(submitButton).toBeDisabled();
+  beforeEach(() => {
+    loadFixtures('merge_requests/merge_request_with_task_list.html.raw');
+    $('body').attr('data-page', 'projects:merge_requests:show');
+    $('form').submit((e) => {
+      // Prevent a form submit from moving us off the testing page
+      e.preventDefault();
     });
-    it('disables button of type submit', function() {
-      const submitButton = $('.js-quick-submit input[type=submit]');
-      this.textarea.trigger(keydownEvent());
+    this.spies = {
+      submit: spyOnEvent('form', 'submit'),
+    };
 
-      expect(submitButton).toBeDisabled();
-    });
-    it('only clicks one submit', function() {
-      const existingSubmit = $('.js-quick-submit input[type=submit]');
-      // Add an extra submit button
-      const newSubmit = $('<button type="submit">Submit it</button>');
-      newSubmit.insertAfter(this.textarea);
+    this.textarea = $('.js-quick-submit textarea').first();
+  });
 
-      const oldClick = spyOnEvent(existingSubmit, 'click');
-      const newClick = spyOnEvent(newSubmit, 'click');
+  it('does not respond to other keyCodes', () => {
+    this.textarea.trigger(keydownEvent({
+      keyCode: 32,
+    }));
+    expect(this.spies.submit).not.toHaveBeenTriggered();
+  });
 
-      this.textarea.trigger(keydownEvent());
+  it('does not respond to Enter alone', () => {
+    this.textarea.trigger(keydownEvent({
+      ctrlKey: false,
+      metaKey: false,
+    }));
+    expect(this.spies.submit).not.toHaveBeenTriggered();
+  });
 
-      expect(oldClick).not.toHaveBeenTriggered();
-      expect(newClick).toHaveBeenTriggered();
-    });
-    // We cannot stub `navigator.userAgent` for CI's `rake karma` task, so we'll
-    // only run the tests that apply to the current platform
-    if (navigator.userAgent.match(/Macintosh/)) {
-      it('responds to Meta+Enter', function() {
-        this.textarea.trigger(keydownEvent());
-        return expect(this.spies.submit).toHaveBeenTriggered();
-      });
-      it('excludes other modifier keys', function() {
-        this.textarea.trigger(keydownEvent({
-          altKey: true
-        }));
-        this.textarea.trigger(keydownEvent({
-          ctrlKey: true
-        }));
-        this.textarea.trigger(keydownEvent({
-          shiftKey: true
-        }));
-        return expect(this.spies.submit).not.toHaveBeenTriggered();
-      });
-    } else {
-      it('responds to Ctrl+Enter', function() {
+  it('does not respond to repeated events', () => {
+    this.textarea.trigger(keydownEvent({
+      repeat: true,
+    }));
+    expect(this.spies.submit).not.toHaveBeenTriggered();
+  });
+
+  it('disables input of type submit', () => {
+    const submitButton = $('.js-quick-submit input[type=submit]');
+    this.textarea.trigger(keydownEvent());
+
+    expect(submitButton).toBeDisabled();
+  });
+  it('disables button of type submit', () => {
+    const submitButton = $('.js-quick-submit input[type=submit]');
+    this.textarea.trigger(keydownEvent());
+
+    expect(submitButton).toBeDisabled();
+  });
+  it('only clicks one submit', () => {
+    const existingSubmit = $('.js-quick-submit input[type=submit]');
+    // Add an extra submit button
+    const newSubmit = $('<button type="submit">Submit it</button>');
+    newSubmit.insertAfter(this.textarea);
+
+    const oldClick = spyOnEvent(existingSubmit, 'click');
+    const newClick = spyOnEvent(newSubmit, 'click');
+
+    this.textarea.trigger(keydownEvent());
+
+    expect(oldClick).not.toHaveBeenTriggered();
+    expect(newClick).toHaveBeenTriggered();
+  });
+  // We cannot stub `navigator.userAgent` for CI's `rake karma` task, so we'll
+  // only run the tests that apply to the current platform
+  if (navigator.userAgent.match(/Macintosh/)) {
+    describe('In Macintosh', () => {
+      it('responds to Meta+Enter', () => {
         this.textarea.trigger(keydownEvent());
         return expect(this.spies.submit).toHaveBeenTriggered();
       });
-      it('excludes other modifier keys', function() {
+
+      it('excludes other modifier keys', () => {
         this.textarea.trigger(keydownEvent({
-          altKey: true
+          altKey: true,
         }));
         this.textarea.trigger(keydownEvent({
-          metaKey: true
+          ctrlKey: true,
         }));
         this.textarea.trigger(keydownEvent({
-          shiftKey: true
+          shiftKey: true,
         }));
         return expect(this.spies.submit).not.toHaveBeenTriggered();
       });
-    }
-    return keydownEvent = function(options) {
-      var defaults;
-      if (navigator.userAgent.match(/Macintosh/)) {
-        defaults = {
-          keyCode: 13,
-          metaKey: true
-        };
-      } else {
-        defaults = {
-          keyCode: 13,
-          ctrlKey: true
-        };
-      }
-      return $.Event('keydown', $.extend({}, defaults, options));
-    };
-  });
-}).call(window);
+    });
+  } else {
+    it('responds to Ctrl+Enter', () => {
+      this.textarea.trigger(keydownEvent());
+      return expect(this.spies.submit).toHaveBeenTriggered();
+    });
+
+    it('excludes other modifier keys', () => {
+      this.textarea.trigger(keydownEvent({
+        altKey: true,
+      }));
+      this.textarea.trigger(keydownEvent({
+        metaKey: true,
+      }));
+      this.textarea.trigger(keydownEvent({
+        shiftKey: true,
+      }));
+      return expect(this.spies.submit).not.toHaveBeenTriggered();
+    });
+  }
+});
diff --git a/spec/javascripts/feature_highlight/feature_highlight_helper_spec.js b/spec/javascripts/feature_highlight/feature_highlight_helper_spec.js
new file mode 100644
index 00000000000..114d282e48a
--- /dev/null
+++ b/spec/javascripts/feature_highlight/feature_highlight_helper_spec.js
@@ -0,0 +1,219 @@
+import Cookies from 'js-cookie';
+import {
+  getCookieName,
+  getSelector,
+  showPopover,
+  hidePopover,
+  dismiss,
+  mouseleave,
+  mouseenter,
+  setupDismissButton,
+} from '~/feature_highlight/feature_highlight_helper';
+
+describe('feature highlight helper', () => {
+  describe('getCookieName', () => {
+    it('returns `feature-highlighted-` prefix', () => {
+      const cookieId = 'cookieId';
+      expect(getCookieName(cookieId)).toEqual(`feature-highlighted-${cookieId}`);
+    });
+  });
+
+  describe('getSelector', () => {
+    it('returns js-feature-highlight selector', () => {
+      const highlightId = 'highlightId';
+      expect(getSelector(highlightId)).toEqual(`.js-feature-highlight[data-highlight=${highlightId}]`);
+    });
+  });
+
+  describe('showPopover', () => {
+    it('returns true when popover is shown', () => {
+      const context = {
+        hasClass: () => false,
+        popover: () => {},
+        addClass: () => {},
+      };
+
+      expect(showPopover.call(context)).toEqual(true);
+    });
+
+    it('returns false when popover is already shown', () => {
+      const context = {
+        hasClass: () => true,
+      };
+
+      expect(showPopover.call(context)).toEqual(false);
+    });
+
+    it('shows popover', (done) => {
+      const context = {
+        hasClass: () => false,
+        popover: () => {},
+        addClass: () => {},
+      };
+
+      spyOn(context, 'popover').and.callFake((method) => {
+        expect(method).toEqual('show');
+        done();
+      });
+
+      showPopover.call(context);
+    });
+
+    it('adds disable-animation and js-popover-show class', (done) => {
+      const context = {
+        hasClass: () => false,
+        popover: () => {},
+        addClass: () => {},
+      };
+
+      spyOn(context, 'addClass').and.callFake((classNames) => {
+        expect(classNames).toEqual('disable-animation js-popover-show');
+        done();
+      });
+
+      showPopover.call(context);
+    });
+  });
+
+  describe('hidePopover', () => {
+    it('returns true when popover is hidden', () => {
+      const context = {
+        hasClass: () => true,
+        popover: () => {},
+        removeClass: () => {},
+      };
+
+      expect(hidePopover.call(context)).toEqual(true);
+    });
+
+    it('returns false when popover is already hidden', () => {
+      const context = {
+        hasClass: () => false,
+      };
+
+      expect(hidePopover.call(context)).toEqual(false);
+    });
+
+    it('hides popover', (done) => {
+      const context = {
+        hasClass: () => true,
+        popover: () => {},
+        removeClass: () => {},
+      };
+
+      spyOn(context, 'popover').and.callFake((method) => {
+        expect(method).toEqual('hide');
+        done();
+      });
+
+      hidePopover.call(context);
+    });
+
+    it('removes disable-animation and js-popover-show class', (done) => {
+      const context = {
+        hasClass: () => true,
+        popover: () => {},
+        removeClass: () => {},
+      };
+
+      spyOn(context, 'removeClass').and.callFake((classNames) => {
+        expect(classNames).toEqual('disable-animation js-popover-show');
+        done();
+      });
+
+      hidePopover.call(context);
+    });
+  });
+
+  describe('dismiss', () => {
+    const context = {
+      hide: () => {},
+    };
+
+    beforeEach(() => {
+      spyOn(Cookies, 'set').and.callFake(() => {});
+      spyOn(hidePopover, 'call').and.callFake(() => {});
+      spyOn(context, 'hide').and.callFake(() => {});
+      dismiss.call(context);
+    });
+
+    it('sets cookie to true', () => {
+      expect(Cookies.set).toHaveBeenCalled();
+    });
+
+    it('calls hide popover', () => {
+      expect(hidePopover.call).toHaveBeenCalled();
+    });
+
+    it('calls hide', () => {
+      expect(context.hide).toHaveBeenCalled();
+    });
+  });
+
+  describe('mouseleave', () => {
+    it('calls hide popover if .popover:hover is false', () => {
+      const fakeJquery = {
+        length: 0,
+      };
+
+      spyOn($.fn, 'init').and.callFake(selector => (selector === '.popover:hover' ? fakeJquery : $.fn));
+      spyOn(hidePopover, 'call');
+      mouseleave();
+      expect(hidePopover.call).toHaveBeenCalled();
+    });
+
+    it('does not call hide popover if .popover:hover is true', () => {
+      const fakeJquery = {
+        length: 1,
+      };
+
+      spyOn($.fn, 'init').and.callFake(selector => (selector === '.popover:hover' ? fakeJquery : $.fn));
+      spyOn(hidePopover, 'call');
+      mouseleave();
+      expect(hidePopover.call).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('mouseenter', () => {
+    const context = {};
+
+    it('shows popover', () => {
+      spyOn(showPopover, 'call').and.returnValue(false);
+      mouseenter.call(context);
+      expect(showPopover.call).toHaveBeenCalled();
+    });
+
+    it('registers mouseleave event if popover is showed', (done) => {
+      spyOn(showPopover, 'call').and.returnValue(true);
+      spyOn($.fn, 'on').and.callFake((eventName) => {
+        expect(eventName).toEqual('mouseleave');
+        done();
+      });
+      mouseenter.call(context);
+    });
+
+    it('does not register mouseleave event if popover is not showed', () => {
+      spyOn(showPopover, 'call').and.returnValue(false);
+      const spy = spyOn($.fn, 'on').and.callFake(() => {});
+      mouseenter.call(context);
+      expect(spy).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('setupDismissButton', () => {
+    it('registers click event callback', (done) => {
+      const context = {
+        getAttribute: () => 'popoverId',
+        dataset: {
+          highlight: 'cookieId',
+        },
+      };
+
+      spyOn($.fn, 'on').and.callFake((event) => {
+        expect(event).toEqual('click');
+        done();
+      });
+      setupDismissButton.call(context);
+    });
+  });
+});
diff --git a/spec/javascripts/feature_highlight/feature_highlight_options_spec.js b/spec/javascripts/feature_highlight/feature_highlight_options_spec.js
new file mode 100644
index 00000000000..7feb361edec
--- /dev/null
+++ b/spec/javascripts/feature_highlight/feature_highlight_options_spec.js
@@ -0,0 +1,45 @@
+import domContentLoaded from '~/feature_highlight/feature_highlight_options';
+import bp from '~/breakpoints';
+
+describe('feature highlight options', () => {
+  describe('domContentLoaded', () => {
+    const highlightOrder = [];
+
+    beforeEach(() => {
+      // Check for when highlightFeatures is called
+      spyOn(highlightOrder, 'find').and.callFake(() => {});
+    });
+
+    it('should not call highlightFeatures when breakpoint is xs', () => {
+      spyOn(bp, 'getBreakpointSize').and.returnValue('xs');
+
+      domContentLoaded(highlightOrder);
+      expect(bp.getBreakpointSize).toHaveBeenCalled();
+      expect(highlightOrder.find).not.toHaveBeenCalled();
+    });
+
+    it('should not call highlightFeatures when breakpoint is sm', () => {
+      spyOn(bp, 'getBreakpointSize').and.returnValue('sm');
+
+      domContentLoaded(highlightOrder);
+      expect(bp.getBreakpointSize).toHaveBeenCalled();
+      expect(highlightOrder.find).not.toHaveBeenCalled();
+    });
+
+    it('should not call highlightFeatures when breakpoint is md', () => {
+      spyOn(bp, 'getBreakpointSize').and.returnValue('md');
+
+      domContentLoaded(highlightOrder);
+      expect(bp.getBreakpointSize).toHaveBeenCalled();
+      expect(highlightOrder.find).not.toHaveBeenCalled();
+    });
+
+    it('should call highlightFeatures when breakpoint is lg', () => {
+      spyOn(bp, 'getBreakpointSize').and.returnValue('lg');
+
+      domContentLoaded(highlightOrder);
+      expect(bp.getBreakpointSize).toHaveBeenCalled();
+      expect(highlightOrder.find).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/spec/javascripts/feature_highlight/feature_highlight_spec.js b/spec/javascripts/feature_highlight/feature_highlight_spec.js
new file mode 100644
index 00000000000..6abe8425ee7
--- /dev/null
+++ b/spec/javascripts/feature_highlight/feature_highlight_spec.js
@@ -0,0 +1,122 @@
+import Cookies from 'js-cookie';
+import * as featureHighlightHelper from '~/feature_highlight/feature_highlight_helper';
+import * as featureHighlight from '~/feature_highlight/feature_highlight';
+
+describe('feature highlight', () => {
+  describe('setupFeatureHighlightPopover', () => {
+    const selector = '.js-feature-highlight[data-highlight=test]';
+    beforeEach(() => {
+      setFixtures(`
+        <div>
+          <div class="js-feature-highlight" data-highlight="test" disabled>
+            Trigger
+          </div>
+        </div>
+        <div class="feature-highlight-popover-content">
+          Content
+          <div class="dismiss-feature-highlight">
+            Dismiss
+          </div>
+        </div>
+      `);
+      spyOn(window, 'addEventListener');
+      spyOn(window, 'removeEventListener');
+      featureHighlight.setupFeatureHighlightPopover('test', 0);
+    });
+
+    it('setups popover content', () => {
+      const $popoverContent = $('.feature-highlight-popover-content');
+      const outerHTML = $popoverContent.prop('outerHTML');
+
+      expect($(selector).data('content')).toEqual(outerHTML);
+    });
+
+    it('setups mouseenter', () => {
+      const showSpy = spyOn(featureHighlightHelper.showPopover, 'call');
+      $(selector).trigger('mouseenter');
+
+      expect(showSpy).toHaveBeenCalled();
+    });
+
+    it('setups debounced mouseleave', (done) => {
+      const hideSpy = spyOn(featureHighlightHelper.hidePopover, 'call');
+      $(selector).trigger('mouseleave');
+
+      // Even though we've set the debounce to 0ms, setTimeout is needed for the debounce
+      setTimeout(() => {
+        expect(hideSpy).toHaveBeenCalled();
+        done();
+      }, 0);
+    });
+
+    it('setups inserted.bs.popover', () => {
+      $(selector).trigger('mouseenter');
+      const popoverId = $(selector).attr('aria-describedby');
+      const spyEvent = spyOnEvent(`#${popoverId} .dismiss-feature-highlight`, 'click');
+
+      $(`#${popoverId} .dismiss-feature-highlight`).click();
+      expect(spyEvent).toHaveBeenTriggered();
+    });
+
+    it('setups show.bs.popover', () => {
+      $(selector).trigger('show.bs.popover');
+      expect(window.addEventListener).toHaveBeenCalledWith('scroll', jasmine.any(Function));
+    });
+
+    it('setups hide.bs.popover', () => {
+      $(selector).trigger('hide.bs.popover');
+      expect(window.removeEventListener).toHaveBeenCalledWith('scroll', jasmine.any(Function));
+    });
+
+    it('removes disabled attribute', () => {
+      expect($('.js-feature-highlight').is(':disabled')).toEqual(false);
+    });
+
+    it('displays popover', () => {
+      expect($(selector).attr('aria-describedby')).toBeFalsy();
+      $(selector).trigger('mouseenter');
+      expect($(selector).attr('aria-describedby')).toBeTruthy();
+    });
+  });
+
+  describe('shouldHighlightFeature', () => {
+    it('should return false if element is not found', () => {
+      spyOn(document, 'querySelector').and.returnValue(null);
+      spyOn(Cookies, 'get').and.returnValue(null);
+
+      expect(featureHighlight.shouldHighlightFeature()).toBeFalsy();
+    });
+
+    it('should return false if previouslyDismissed', () => {
+      spyOn(document, 'querySelector').and.returnValue(document.createElement('div'));
+      spyOn(Cookies, 'get').and.returnValue('true');
+
+      expect(featureHighlight.shouldHighlightFeature()).toBeFalsy();
+    });
+
+    it('should return true if element is found and not previouslyDismissed', () => {
+      spyOn(document, 'querySelector').and.returnValue(document.createElement('div'));
+      spyOn(Cookies, 'get').and.returnValue(null);
+
+      expect(featureHighlight.shouldHighlightFeature()).toBeTruthy();
+    });
+  });
+
+  describe('highlightFeatures', () => {
+    it('calls setupFeatureHighlightPopover if shouldHighlightFeature returns true', () => {
+      // Mimic shouldHighlightFeature set to true
+      const highlightOrder = ['issue-boards'];
+      spyOn(highlightOrder, 'find').and.returnValue(highlightOrder[0]);
+
+      expect(featureHighlight.highlightFeatures(highlightOrder)).toEqual(true);
+    });
+
+    it('does not call setupFeatureHighlightPopover if shouldHighlightFeature returns false', () => {
+      // Mimic shouldHighlightFeature set to false
+      const highlightOrder = ['issue-boards'];
+      spyOn(highlightOrder, 'find').and.returnValue(null);
+
+      expect(featureHighlight.highlightFeatures(highlightOrder)).toEqual(false);
+    });
+  });
+});
diff --git a/spec/javascripts/fixtures/blob.rb b/spec/javascripts/fixtures/blob.rb
index 2dffc42b0ef..81e8a51a902 100644
--- a/spec/javascripts/fixtures/blob.rb
+++ b/spec/javascripts/fixtures/blob.rb
@@ -17,6 +17,10 @@ describe Projects::BlobController, '(JavaScript fixtures)', type: :controller do
     sign_in(admin)
   end
 
+  after do
+    remove_repository(project)
+  end
+
   it 'blob/show.html.raw' do |example|
     get(:show,
         namespace_id: project.namespace,
diff --git a/spec/javascripts/fixtures/branches.rb b/spec/javascripts/fixtures/branches.rb
index bb3bdf7c215..4fc072d2585 100644
--- a/spec/javascripts/fixtures/branches.rb
+++ b/spec/javascripts/fixtures/branches.rb
@@ -17,6 +17,10 @@ describe Projects::BranchesController, '(JavaScript fixtures)', type: :controlle
     sign_in(admin)
   end
 
+  after do
+    remove_repository(project)
+  end
+
   it 'branches/new_branch.html.raw' do |example|
     get :new,
       namespace_id: project.namespace.to_param,
diff --git a/spec/javascripts/fixtures/dashboard.rb b/spec/javascripts/fixtures/dashboard.rb
index 793ffa7c220..7fa351680c9 100644
--- a/spec/javascripts/fixtures/dashboard.rb
+++ b/spec/javascripts/fixtures/dashboard.rb
@@ -17,6 +17,10 @@ describe Dashboard::ProjectsController, '(JavaScript fixtures)', type: :controll
     sign_in(admin)
   end
 
+  after do
+    remove_repository(project)
+  end
+
   it 'dashboard/user-callout.html.raw' do |example|
     rendered = render_template('shared/_user_callout')
     store_frontend_fixture(rendered, example.description)
diff --git a/spec/javascripts/fixtures/deploy_keys.rb b/spec/javascripts/fixtures/deploy_keys.rb
index bea161c514f..580894ceaf9 100644
--- a/spec/javascripts/fixtures/deploy_keys.rb
+++ b/spec/javascripts/fixtures/deploy_keys.rb
@@ -16,6 +16,10 @@ describe Projects::DeployKeysController, '(JavaScript fixtures)', type: :control
     sign_in(admin)
   end
 
+  after do
+    remove_repository(project)
+  end
+
   render_views
 
   it 'deploy_keys/keys.json' do |example|
diff --git a/spec/javascripts/fixtures/issues.rb b/spec/javascripts/fixtures/issues.rb
index d3ad50af1b9..0ee2f82dfd6 100644
--- a/spec/javascripts/fixtures/issues.rb
+++ b/spec/javascripts/fixtures/issues.rb
@@ -17,6 +17,10 @@ describe Projects::IssuesController, '(JavaScript fixtures)', type: :controller
     sign_in(admin)
   end
 
+  after do
+    remove_repository(project)
+  end
+
   it 'issues/open-issue.html.raw' do |example|
     render_issue(example.description, create(:issue, project: project))
   end
diff --git a/spec/javascripts/fixtures/jobs.rb b/spec/javascripts/fixtures/jobs.rb
index 83a96797506..87d131dfe28 100644
--- a/spec/javascripts/fixtures/jobs.rb
+++ b/spec/javascripts/fixtures/jobs.rb
@@ -21,6 +21,10 @@ describe Projects::JobsController, '(JavaScript fixtures)', type: :controller do
     sign_in(admin)
   end
 
+  after do
+    remove_repository(project)
+  end
+
   it 'builds/build-with-artifacts.html.raw' do |example|
     get :show,
       namespace_id: project.namespace.to_param,
diff --git a/spec/javascripts/fixtures/labels.rb b/spec/javascripts/fixtures/labels.rb
index 814f065f3a4..b730d557e21 100644
--- a/spec/javascripts/fixtures/labels.rb
+++ b/spec/javascripts/fixtures/labels.rb
@@ -19,6 +19,10 @@ describe 'Labels (JavaScript fixtures)' do
     clean_frontend_fixtures('labels/')
   end
 
+  after do
+    remove_repository(project)
+  end
+
   describe Groups::LabelsController, '(JavaScript fixtures)', type: :controller do
     render_views
 
diff --git a/spec/javascripts/fixtures/merge_requests.rb b/spec/javascripts/fixtures/merge_requests.rb
index f97a5d2b5de..4bc2205e642 100644
--- a/spec/javascripts/fixtures/merge_requests.rb
+++ b/spec/javascripts/fixtures/merge_requests.rb
@@ -37,6 +37,10 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
     sign_in(admin)
   end
 
+  after do
+    remove_repository(project)
+  end
+
   it 'merge_requests/merge_request_with_task_list.html.raw' do |example|
     create(:ci_build, :pending, pipeline: pipeline)
 
@@ -55,6 +59,11 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
     render_merge_request(example.description, merge_request)
   end
 
+  it 'merge_requests/merge_request_with_comment.html.raw' do |example|
+    create(:note_on_merge_request, author: admin, project: project, noteable: merge_request, note: '- [ ] Task List Item')
+    render_merge_request(example.description, merge_request)
+  end
+
   private
 
   def render_merge_request(fixture_file_name, merge_request)
diff --git a/spec/javascripts/fixtures/merge_requests_diffs.rb b/spec/javascripts/fixtures/merge_requests_diffs.rb
index 6e0a97d2e3f..ddce00bc0fe 100644
--- a/spec/javascripts/fixtures/merge_requests_diffs.rb
+++ b/spec/javascripts/fixtures/merge_requests_diffs.rb
@@ -29,6 +29,10 @@ describe Projects::MergeRequests::DiffsController, '(JavaScript fixtures)', type
     sign_in(admin)
   end
 
+  after do
+    remove_repository(project)
+  end
+
   it 'merge_request_diffs/inline_changes_tab_with_comments.json' do |example|
     create(:diff_note_on_merge_request, project: project, author: admin, position: position, noteable: merge_request)
     create(:note_on_merge_request, author: admin, project: project, noteable: merge_request)
diff --git a/spec/javascripts/fixtures/projects.rb b/spec/javascripts/fixtures/projects.rb
index f09d44a49d1..2a100e7fab5 100644
--- a/spec/javascripts/fixtures/projects.rb
+++ b/spec/javascripts/fixtures/projects.rb
@@ -17,6 +17,10 @@ describe ProjectsController, '(JavaScript fixtures)', type: :controller do
     sign_in(admin)
   end
 
+  after do
+    remove_repository(project)
+  end
+
   it 'projects/dashboard.html.raw' do |example|
     get :show,
       namespace_id: project.namespace.to_param,
diff --git a/spec/javascripts/fixtures/prometheus_service.rb b/spec/javascripts/fixtures/prometheus_service.rb
index 7968c9425f2..f95f8038ffb 100644
--- a/spec/javascripts/fixtures/prometheus_service.rb
+++ b/spec/javascripts/fixtures/prometheus_service.rb
@@ -18,6 +18,10 @@ describe Projects::ServicesController, '(JavaScript fixtures)', type: :controlle
     sign_in(admin)
   end
 
+  after do
+    remove_repository(project)
+  end
+
   it 'services/prometheus/prometheus_service.html.raw' do |example|
     get :edit,
       namespace_id: namespace,
diff --git a/spec/javascripts/fixtures/raw.rb b/spec/javascripts/fixtures/raw.rb
index 25f5a3b0bb3..82770beb39b 100644
--- a/spec/javascripts/fixtures/raw.rb
+++ b/spec/javascripts/fixtures/raw.rb
@@ -10,6 +10,10 @@ describe 'Raw files', '(JavaScript fixtures)', type: :controller do
     clean_frontend_fixtures('blob/notebook/')
   end
 
+  after do
+    remove_repository(project)
+  end
+
   it 'blob/notebook/basic.json' do |example|
     blob = project.repository.blob_at('6d85bb69', 'files/ipython/basic.ipynb')
 
diff --git a/spec/javascripts/fixtures/services.rb b/spec/javascripts/fixtures/services.rb
index 80915c32a74..9280ed5a7f1 100644
--- a/spec/javascripts/fixtures/services.rb
+++ b/spec/javascripts/fixtures/services.rb
@@ -18,6 +18,10 @@ describe Projects::ServicesController, '(JavaScript fixtures)', type: :controlle
     sign_in(admin)
   end
 
+  after do
+    remove_repository(project)
+  end
+
   it 'services/edit_service.html.raw' do |example|
     get :edit,
       namespace_id: namespace,
diff --git a/spec/javascripts/fixtures/snippet.rb b/spec/javascripts/fixtures/snippet.rb
index 01bfb87b0c1..fa97f352e31 100644
--- a/spec/javascripts/fixtures/snippet.rb
+++ b/spec/javascripts/fixtures/snippet.rb
@@ -18,6 +18,10 @@ describe SnippetsController, '(JavaScript fixtures)', type: :controller do
     sign_in(admin)
   end
 
+  after do
+    remove_repository(project)
+  end
+
   it 'snippets/show.html.raw' do |example|
     get(:show, id: snippet.to_param)
 
diff --git a/spec/javascripts/fixtures/todos.rb b/spec/javascripts/fixtures/todos.rb
index ba630365c18..426b854fe8b 100644
--- a/spec/javascripts/fixtures/todos.rb
+++ b/spec/javascripts/fixtures/todos.rb
@@ -15,6 +15,10 @@ describe 'Todos (JavaScript fixtures)' do
     clean_frontend_fixtures('todos/')
   end
 
+  after do
+    remove_repository(project)
+  end
+
   describe Dashboard::TodosController, '(JavaScript fixtures)', type: :controller do
     render_views
 
diff --git a/spec/javascripts/fly_out_nav_spec.js b/spec/javascripts/fly_out_nav_spec.js
index 0847e463577..4588bf3d971 100644
--- a/spec/javascripts/fly_out_nav_spec.js
+++ b/spec/javascripts/fly_out_nav_spec.js
@@ -5,12 +5,14 @@ import {
   canShowActiveSubItems,
   mouseEnterTopItems,
   mouseLeaveTopItem,
+  getOpenMenu,
   setOpenMenu,
   mousePos,
   getHideSubItemsInterval,
   documentMouseMove,
   getHeaderHeight,
   setSidebar,
+  subItemsMouseLeave,
 } from '~/fly_out_nav';
 import bp from '~/breakpoints';
 
@@ -314,4 +316,29 @@ describe('Fly out sidebar navigation', () => {
       ).toBeTruthy();
     });
   });
+
+  describe('subItemsMouseLeave', () => {
+    beforeEach(() => {
+      el.innerHTML = '<div class="sidebar-sub-level-items" style="position: absolute;"></div>';
+
+      setOpenMenu(el.querySelector('.sidebar-sub-level-items'));
+    });
+
+    it('hides subMenu if element is not hovered', () => {
+      subItemsMouseLeave(el);
+
+      expect(
+        getOpenMenu(),
+      ).toBeNull();
+    });
+
+    it('does not hide subMenu if element is hovered', () => {
+      el.classList.add('is-over');
+      subItemsMouseLeave(el);
+
+      expect(
+        getOpenMenu(),
+      ).not.toBeNull();
+    });
+  });
 });
diff --git a/spec/javascripts/issue_show/components/app_spec.js b/spec/javascripts/issue_show/components/app_spec.js
index 81ce18bf2fb..39065814bc2 100644
--- a/spec/javascripts/issue_show/components/app_spec.js
+++ b/spec/javascripts/issue_show/components/app_spec.js
@@ -34,16 +34,14 @@ describe('Issuable output', () => {
       propsData: {
         canUpdate: true,
         canDestroy: true,
-        canMove: true,
         endpoint: '/gitlab-org/gitlab-shell/issues/9/realtime_changes',
         issuableRef: '#1',
         initialTitleHtml: '',
         initialTitleText: '',
         initialDescriptionHtml: '',
         initialDescriptionText: '',
-        markdownPreviewUrl: '/',
-        markdownDocs: '/',
-        projectsAutocompleteUrl: '/',
+        markdownPreviewPath: '/',
+        markdownDocsPath: '/',
         isConfidential: false,
         projectNamespace: '/',
         projectPath: '/',
@@ -226,7 +224,7 @@ describe('Issuable output', () => {
       });
     });
 
-    it('redirects if issue is moved', (done) => {
+    it('redirects if returned web_url has changed', (done) => {
       spyOn(gl.utils, 'visitUrl');
       spyOn(vm.service, 'updateIssuable').and.callFake(() => new Promise((resolve) => {
         resolve({
@@ -250,23 +248,6 @@ describe('Issuable output', () => {
       });
     });
 
-    it('does not update issuable if project move confirm is false', (done) => {
-      spyOn(window, 'confirm').and.returnValue(false);
-      spyOn(vm.service, 'updateIssuable');
-
-      vm.store.formState.move_to_project_id = 1;
-
-      vm.updateIssuable();
-
-      setTimeout(() => {
-        expect(
-          vm.service.updateIssuable,
-        ).not.toHaveBeenCalled();
-
-        done();
-      });
-    });
-
     it('closes form on error', (done) => {
       spyOn(window, 'Flash').and.callThrough();
       spyOn(vm.service, 'updateIssuable').and.callFake(() => new Promise((resolve, reject) => {
diff --git a/spec/javascripts/issue_show/components/fields/description_spec.js b/spec/javascripts/issue_show/components/fields/description_spec.js
index df8189d9290..299f88e7778 100644
--- a/spec/javascripts/issue_show/components/fields/description_spec.js
+++ b/spec/javascripts/issue_show/components/fields/description_spec.js
@@ -25,8 +25,8 @@ describe('Description field component', () => {
     vm = new Component({
       el,
       propsData: {
-        markdownPreviewUrl: '/',
-        markdownDocs: '/',
+        markdownPreviewPath: '/',
+        markdownDocsPath: '/',
         formState: store.formState,
       },
     }).$mount();
diff --git a/spec/javascripts/issue_show/components/fields/project_move_spec.js b/spec/javascripts/issue_show/components/fields/project_move_spec.js
deleted file mode 100644
index 86d35c33ff4..00000000000
--- a/spec/javascripts/issue_show/components/fields/project_move_spec.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import Vue from 'vue';
-import projectMove from '~/issue_show/components/fields/project_move.vue';
-
-describe('Project move field component', () => {
-  let vm;
-  let formState;
-
-  beforeEach((done) => {
-    const Component = Vue.extend(projectMove);
-
-    formState = {
-      move_to_project_id: 0,
-    };
-
-    vm = new Component({
-      propsData: {
-        formState,
-        projectsAutocompleteUrl: '/autocomplete',
-      },
-    }).$mount();
-
-    Vue.nextTick(done);
-  });
-
-  it('mounts select2 element', () => {
-    expect(
-      vm.$el.querySelector('.select2-container'),
-    ).not.toBeNull();
-  });
-
-  it('updates formState on change', () => {
-    $(vm.$refs['move-dropdown']).val(2).trigger('change');
-
-    expect(
-      formState.move_to_project_id,
-    ).toBe(2);
-  });
-});
diff --git a/spec/javascripts/issue_show/components/form_spec.js b/spec/javascripts/issue_show/components/form_spec.js
index 9a85223208c..6e89528a3ea 100644
--- a/spec/javascripts/issue_show/components/form_spec.js
+++ b/spec/javascripts/issue_show/components/form_spec.js
@@ -12,15 +12,13 @@ describe('Inline edit form component', () => {
     vm = new Component({
       propsData: {
         canDestroy: true,
-        canMove: true,
         formState: {
           title: 'b',
           description: 'a',
           lockedWarningVisible: false,
         },
-        markdownPreviewUrl: '/',
-        markdownDocs: '/',
-        projectsAutocompleteUrl: '/',
+        markdownPreviewPath: '/',
+        markdownDocsPath: '/',
         projectPath: '/',
         projectNamespace: '/',
       },
diff --git a/spec/javascripts/monitoring/graph/flag_spec.js b/spec/javascripts/monitoring/graph/flag_spec.js
index 731076a7d2a..14794cbfd50 100644
--- a/spec/javascripts/monitoring/graph/flag_spec.js
+++ b/spec/javascripts/monitoring/graph/flag_spec.js
@@ -32,10 +32,6 @@ describe('GraphFlag', () => {
       .toEqual(component.currentXCoordinate);
     expect(getCoordinate(component, '.selected-metric-line', 'x2'))
       .toEqual(component.currentXCoordinate);
-    expect(getCoordinate(component, '.circle-metric', 'cx'))
-      .toEqual(component.currentXCoordinate);
-    expect(getCoordinate(component, '.circle-metric', 'cy'))
-      .toEqual(component.currentYCoordinate);
   });
 
   it('has a SVG with the class rect-text-metric at the currentFlagPosition', () => {
diff --git a/spec/javascripts/monitoring/graph/legend_spec.js b/spec/javascripts/monitoring/graph/legend_spec.js
index e877832dffd..da2fbd26e23 100644
--- a/spec/javascripts/monitoring/graph/legend_spec.js
+++ b/spec/javascripts/monitoring/graph/legend_spec.js
@@ -1,6 +1,8 @@
 import Vue from 'vue';
 import GraphLegend from '~/monitoring/components/graph/legend.vue';
 import measurements from '~/monitoring/utils/measurements';
+import createTimeSeries from '~/monitoring/utils/multiple_time_series';
+import { singleRowMetricsMultipleSeries, convertDatesMultipleSeries } from '../mock_data';
 
 const createComponent = (propsData) => {
   const Component = Vue.extend(GraphLegend);
@@ -10,6 +12,28 @@ const createComponent = (propsData) => {
   }).$mount();
 };
 
+const convertedMetrics = convertDatesMultipleSeries(singleRowMetricsMultipleSeries);
+
+const defaultValuesComponent = {
+  graphWidth: 500,
+  graphHeight: 300,
+  graphHeightOffset: 120,
+  margin: measurements.large.margin,
+  measurements: measurements.large,
+  areaColorRgb: '#f0f0f0',
+  legendTitle: 'Title',
+  yAxisLabel: 'Values',
+  metricUsage: 'Value',
+  unitOfDisplay: 'Req/Sec',
+  currentDataIndex: 0,
+};
+
+const timeSeries = createTimeSeries(convertedMetrics[0].queries[0].result,
+  defaultValuesComponent.graphWidth, defaultValuesComponent.graphHeight,
+  defaultValuesComponent.graphHeightOffset);
+
+defaultValuesComponent.timeSeries = timeSeries;
+
 function getTextFromNode(component, selector) {
   return component.$el.querySelector(selector).firstChild.nodeValue.trim();
 }
@@ -17,95 +41,67 @@ function getTextFromNode(component, selector) {
 describe('GraphLegend', () => {
   describe('Computed props', () => {
     it('textTransform', () => {
-      const component = createComponent({
-        graphWidth: 500,
-        graphHeight: 300,
-        margin: measurements.large.margin,
-        measurements: measurements.large,
-        areaColorRgb: '#f0f0f0',
-        legendTitle: 'Title',
-        yAxisLabel: 'Values',
-        metricUsage: 'Value',
-      });
+      const component = createComponent(defaultValuesComponent);
 
       expect(component.textTransform).toContain('translate(15, 120) rotate(-90)');
     });
 
     it('xPosition', () => {
-      const component = createComponent({
-        graphWidth: 500,
-        graphHeight: 300,
-        margin: measurements.large.margin,
-        measurements: measurements.large,
-        areaColorRgb: '#f0f0f0',
-        legendTitle: 'Title',
-        yAxisLabel: 'Values',
-        metricUsage: 'Value',
-      });
+      const component = createComponent(defaultValuesComponent);
 
       expect(component.xPosition).toEqual(180);
     });
 
     it('yPosition', () => {
-      const component = createComponent({
-        graphWidth: 500,
-        graphHeight: 300,
-        margin: measurements.large.margin,
-        measurements: measurements.large,
-        areaColorRgb: '#f0f0f0',
-        legendTitle: 'Title',
-        yAxisLabel: 'Values',
-        metricUsage: 'Value',
-      });
+      const component = createComponent(defaultValuesComponent);
 
       expect(component.yPosition).toEqual(240);
     });
 
     it('rectTransform', () => {
-      const component = createComponent({
-        graphWidth: 500,
-        graphHeight: 300,
-        margin: measurements.large.margin,
-        measurements: measurements.large,
-        areaColorRgb: '#f0f0f0',
-        legendTitle: 'Title',
-        yAxisLabel: 'Values',
-        metricUsage: 'Value',
-      });
+      const component = createComponent(defaultValuesComponent);
 
       expect(component.rectTransform).toContain('translate(0, 120) rotate(-90)');
     });
   });
 
-  it('has 2 rect-axis-text rect svg elements', () => {
-    const component = createComponent({
-      graphWidth: 500,
-      graphHeight: 300,
-      margin: measurements.large.margin,
-      measurements: measurements.large,
-      areaColorRgb: '#f0f0f0',
-      legendTitle: 'Title',
-      yAxisLabel: 'Values',
-      metricUsage: 'Value',
+  describe('methods', () => {
+    it('translateLegendGroup should only change Y direction', () => {
+      const component = createComponent(defaultValuesComponent);
+
+      const translatedCoordinate = component.translateLegendGroup(1);
+      expect(translatedCoordinate.indexOf('translate(0, ')).not.toEqual(-1);
     });
 
+    it('formatMetricUsage should contain the unit of display and the current value selected via "currentDataIndex"', () => {
+      const component = createComponent(defaultValuesComponent);
+
+      const formattedMetricUsage = component.formatMetricUsage(timeSeries[0]);
+      const valueFromSeries = timeSeries[0].values[component.currentDataIndex].value;
+      expect(formattedMetricUsage.indexOf(component.unitOfDisplay)).not.toEqual(-1);
+      expect(formattedMetricUsage.indexOf(valueFromSeries)).not.toEqual(-1);
+    });
+  });
+
+  it('has 2 rect-axis-text rect svg elements', () => {
+    const component = createComponent(defaultValuesComponent);
+
     expect(component.$el.querySelectorAll('.rect-axis-text').length).toEqual(2);
   });
 
   it('contains text to signal the usage, title and time', () => {
-    const component = createComponent({
-      graphWidth: 500,
-      graphHeight: 300,
-      margin: measurements.large.margin,
-      measurements: measurements.large,
-      areaColorRgb: '#f0f0f0',
-      legendTitle: 'Title',
-      yAxisLabel: 'Values',
-      metricUsage: 'Value',
-    });
+    const component = createComponent(defaultValuesComponent);
+    const titles = component.$el.querySelectorAll('.legend-metric-title');
+
+    expect(getTextFromNode(component, '.legend-metric-title').indexOf(component.legendTitle)).not.toEqual(-1);
+    expect(titles[0].textContent.indexOf('Title')).not.toEqual(-1);
+    expect(titles[1].textContent.indexOf('Series')).not.toEqual(-1);
+    expect(getTextFromNode(component, '.y-label-text')).toEqual(component.yAxisLabel);
+  });
+
+  it('should contain the same number of legend groups as the timeSeries length', () => {
+    const component = createComponent(defaultValuesComponent);
 
-    expect(getTextFromNode(component, '.text-metric-title')).toEqual(component.legendTitle);
-    expect(getTextFromNode(component, '.text-metric-usage')).toEqual(component.metricUsage);
-    expect(getTextFromNode(component, '.label-axis-text')).toEqual(component.yAxisLabel);
+    expect(component.$el.querySelectorAll('.legend-group').length).toEqual(component.timeSeries.length);
   });
 });
diff --git a/spec/javascripts/monitoring/graph_row_spec.js b/spec/javascripts/monitoring/graph_row_spec.js
index dd485473ccf..6a79d7c8f82 100644
--- a/spec/javascripts/monitoring/graph_row_spec.js
+++ b/spec/javascripts/monitoring/graph_row_spec.js
@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import GraphRow from '~/monitoring/components/graph_row.vue';
 import MonitoringMixins from '~/monitoring/mixins/monitoring_mixins';
-import { deploymentData, singleRowMetrics } from './mock_data';
+import { deploymentData, convertDatesMultipleSeries, singleRowMetricsMultipleSeries } from './mock_data';
 
 const createComponent = (propsData) => {
   const Component = Vue.extend(GraphRow);
@@ -11,15 +11,15 @@ const createComponent = (propsData) => {
   }).$mount();
 };
 
+const convertedMetrics = convertDatesMultipleSeries(singleRowMetricsMultipleSeries);
 describe('GraphRow', () => {
   beforeEach(() => {
     spyOn(MonitoringMixins.methods, 'formatDeployments').and.returnValue({});
   });
-
   describe('Computed props', () => {
     it('bootstrapClass is set to col-md-6 when rowData is higher/equal to 2', () => {
       const component = createComponent({
-        rowData: singleRowMetrics,
+        rowData: convertedMetrics,
         updateAspectRatio: false,
         deploymentData,
       });
@@ -29,7 +29,7 @@ describe('GraphRow', () => {
 
     it('bootstrapClass is set to col-md-12 when rowData is lower than 2', () => {
       const component = createComponent({
-        rowData: [singleRowMetrics[0]],
+        rowData: [convertedMetrics[0]],
         updateAspectRatio: false,
         deploymentData,
       });
@@ -40,7 +40,7 @@ describe('GraphRow', () => {
 
   it('has one column', () => {
     const component = createComponent({
-      rowData: singleRowMetrics,
+      rowData: convertedMetrics,
       updateAspectRatio: false,
       deploymentData,
     });
@@ -51,7 +51,7 @@ describe('GraphRow', () => {
 
   it('has two columns', () => {
     const component = createComponent({
-      rowData: singleRowMetrics,
+      rowData: convertedMetrics,
       updateAspectRatio: false,
       deploymentData,
     });
diff --git a/spec/javascripts/monitoring/graph_spec.js b/spec/javascripts/monitoring/graph_spec.js
index 6d6fe410113..7d8b0744af1 100644
--- a/spec/javascripts/monitoring/graph_spec.js
+++ b/spec/javascripts/monitoring/graph_spec.js
@@ -1,9 +1,8 @@
 import Vue from 'vue';
-import _ from 'underscore';
 import Graph from '~/monitoring/components/graph.vue';
 import MonitoringMixins from '~/monitoring/mixins/monitoring_mixins';
 import eventHub from '~/monitoring/event_hub';
-import { deploymentData, singleRowMetrics } from './mock_data';
+import { deploymentData, convertDatesMultipleSeries, singleRowMetricsMultipleSeries } from './mock_data';
 
 const createComponent = (propsData) => {
   const Component = Vue.extend(Graph);
@@ -13,6 +12,8 @@ const createComponent = (propsData) => {
   }).$mount();
 };
 
+const convertedMetrics = convertDatesMultipleSeries(singleRowMetricsMultipleSeries);
+
 describe('Graph', () => {
   beforeEach(() => {
     spyOn(MonitoringMixins.methods, 'formatDeployments').and.returnValue({});
@@ -20,7 +21,7 @@ describe('Graph', () => {
 
   it('has a title', () => {
     const component = createComponent({
-      graphData: singleRowMetrics[0],
+      graphData: convertedMetrics[1],
       classType: 'col-md-6',
       updateAspectRatio: false,
       deploymentData,
@@ -29,29 +30,10 @@ describe('Graph', () => {
     expect(component.$el.querySelector('.text-center').innerText.trim()).toBe(component.graphData.title);
   });
 
-  it('creates a path for the line and area of the graph', (done) => {
-    const component = createComponent({
-      graphData: singleRowMetrics[0],
-      classType: 'col-md-6',
-      updateAspectRatio: false,
-      deploymentData,
-    });
-
-    Vue.nextTick(() => {
-      expect(component.area).toBeDefined();
-      expect(component.line).toBeDefined();
-      expect(typeof component.area).toEqual('string');
-      expect(typeof component.line).toEqual('string');
-      expect(_.isFunction(component.xScale)).toBe(true);
-      expect(_.isFunction(component.yScale)).toBe(true);
-      done();
-    });
-  });
-
   describe('Computed props', () => {
     it('axisTransform translates an element Y position depending of its height', () => {
       const component = createComponent({
-        graphData: singleRowMetrics[0],
+        graphData: convertedMetrics[1],
         classType: 'col-md-6',
         updateAspectRatio: false,
         deploymentData,
@@ -64,7 +46,7 @@ describe('Graph', () => {
 
     it('outterViewBox gets a width and height property based on the DOM size of the element', () => {
       const component = createComponent({
-        graphData: singleRowMetrics[0],
+        graphData: convertedMetrics[1],
         classType: 'col-md-6',
         updateAspectRatio: false,
         deploymentData,
@@ -79,7 +61,7 @@ describe('Graph', () => {
 
   it('sends an event to the eventhub when it has finished resizing', (done) => {
     const component = createComponent({
-      graphData: singleRowMetrics[0],
+      graphData: convertedMetrics[1],
       classType: 'col-md-6',
       updateAspectRatio: false,
       deploymentData,
@@ -95,7 +77,7 @@ describe('Graph', () => {
 
   it('has a title for the y-axis and the chart legend that comes from the backend', () => {
     const component = createComponent({
-      graphData: singleRowMetrics[0],
+      graphData: convertedMetrics[1],
       classType: 'col-md-6',
       updateAspectRatio: false,
       deploymentData,
diff --git a/spec/javascripts/monitoring/mock_data.js b/spec/javascripts/monitoring/mock_data.js
index b69f4eddffc..3d399f2bb95 100644
--- a/spec/javascripts/monitoring/mock_data.js
+++ b/spec/javascripts/monitoring/mock_data.js
@@ -2473,1754 +2473,5848 @@ export const statePaths = {
   documentationPath: '/help/administration/monitoring/prometheus/index.md',
 };
 
-export const singleRowMetrics = [
-  {
-    'title': 'CPU usage',
-    'weight': 1,
-    'y_label': 'Memory',
-    'queries': [
-      {
-        'query_range': 'avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) * 100',
-        'label': 'Container CPU',
-        'result': [
-          {
-            'metric': {
-
-            },
-            'values': [
-              {
-                'time': '2017-06-04T21:22:59.508Z',
-                'value': '0.06335544298150002'
-              },
-              {
-                'time': '2017-06-04T21:23:59.508Z',
-                'value': '0.0420347312480917'
-              },
-              {
-                'time': '2017-06-04T21:24:59.508Z',
-                'value': '0.0023175131665412706'
-              },
-              {
-                'time': '2017-06-04T21:25:59.508Z',
-                'value': '0.002315870476190476'
-              },
-              {
-                'time': '2017-06-04T21:26:59.508Z',
-                'value': '0.0025005961904761894'
-              },
-              {
-                'time': '2017-06-04T21:27:59.508Z',
-                'value': '0.0024612605834341264'
-              },
-              {
-                'time': '2017-06-04T21:28:59.508Z',
-                'value': '0.002313129398767631'
-              },
-              {
-                'time': '2017-06-04T21:29:59.508Z',
-                'value': '0.002411067353663882'
-              },
-              {
-                'time': '2017-06-04T21:30:59.508Z',
-                'value': '0.002577309263721303'
-              },
-              {
-                'time': '2017-06-04T21:31:59.508Z',
-                'value': '0.00242688307730403'
-              },
-              {
-                'time': '2017-06-04T21:32:59.508Z',
-                'value': '0.0024168360301330457'
-              },
-              {
-                'time': '2017-06-04T21:33:59.508Z',
-                'value': '0.0020449528090743714'
-              },
-              {
-                'time': '2017-06-04T21:34:59.508Z',
-                'value': '0.0019149619047619036'
-              },
-              {
-                'time': '2017-06-04T21:35:59.508Z',
-                'value': '0.0024491714364625094'
-              },
-              {
-                'time': '2017-06-04T21:36:59.508Z',
-                'value': '0.002728773131172677'
-              },
-              {
-                'time': '2017-06-04T21:37:59.508Z',
-                'value': '0.0028439119047618997'
-              },
-              {
-                'time': '2017-06-04T21:38:59.508Z',
-                'value': '0.0026307480952380917'
-              },
-              {
-                'time': '2017-06-04T21:39:59.508Z',
-                'value': '0.0025024842620546446'
-              },
-              {
-                'time': '2017-06-04T21:40:59.508Z',
-                'value': '0.002300662387260825'
-              },
-              {
-                'time': '2017-06-04T21:41:59.508Z',
-                'value': '0.002052890924848337'
-              },
-              {
-                'time': '2017-06-04T21:42:59.508Z',
-                'value': '0.0023711195238095275'
-              },
-              {
-                'time': '2017-06-04T21:43:59.508Z',
-                'value': '0.002513477619047618'
-              },
-              {
-                'time': '2017-06-04T21:44:59.508Z',
-                'value': '0.0023489776287844897'
-              },
-              {
-                'time': '2017-06-04T21:45:59.508Z',
-                'value': '0.002542572310212481'
-              },
-              {
-                'time': '2017-06-04T21:46:59.508Z',
-                'value': '0.0024579470671707952'
-              },
-              {
-                'time': '2017-06-04T21:47:59.508Z',
-                'value': '0.0028725150236664403'
-              },
-              {
-                'time': '2017-06-04T21:48:59.508Z',
-                'value': '0.0024356089105610525'
-              },
-              {
-                'time': '2017-06-04T21:49:59.508Z',
-                'value': '0.002544015828269929'
-              },
-              {
-                'time': '2017-06-04T21:50:59.508Z',
-                'value': '0.0029595013380824906'
-              },
-              {
-                'time': '2017-06-04T21:51:59.508Z',
-                'value': '0.0023084015085858'
-              },
-              {
-                'time': '2017-06-04T21:52:59.508Z',
-                'value': '0.0021070500000000083'
-              },
-              {
-                'time': '2017-06-04T21:53:59.508Z',
-                'value': '0.0022950066191106617'
-              },
-              {
-                'time': '2017-06-04T21:54:59.508Z',
-                'value': '0.002492719454470995'
-              },
-              {
-                'time': '2017-06-04T21:55:59.508Z',
-                'value': '0.00244312761904762'
-              },
-              {
-                'time': '2017-06-04T21:56:59.508Z',
-                'value': '0.0023495500000000028'
-              },
-              {
-                'time': '2017-06-04T21:57:59.508Z',
-                'value': '0.0020597072353070005'
-              },
-              {
-                'time': '2017-06-04T21:58:59.508Z',
-                'value': '0.0021482352044800866'
-              },
-              {
-                'time': '2017-06-04T21:59:59.508Z',
-                'value': '0.002333490000000004'
-              },
-              {
-                'time': '2017-06-04T22:00:59.508Z',
-                'value': '0.0025899442857142815'
-              },
-              {
-                'time': '2017-06-04T22:01:59.508Z',
-                'value': '0.002430299999999999'
-              },
-              {
-                'time': '2017-06-04T22:02:59.508Z',
-                'value': '0.0023550328092113476'
-              },
-              {
-                'time': '2017-06-04T22:03:59.508Z',
-                'value': '0.0026521871636872793'
-              },
-              {
-                'time': '2017-06-04T22:04:59.508Z',
-                'value': '0.0023080671428571398'
-              },
-              {
-                'time': '2017-06-04T22:05:59.508Z',
-                'value': '0.0024108401032390896'
-              },
-              {
-                'time': '2017-06-04T22:06:59.508Z',
-                'value': '0.002433249366678738'
-              },
-              {
-                'time': '2017-06-04T22:07:59.508Z',
-                'value': '0.0023242202306688682'
-              },
-              {
-                'time': '2017-06-04T22:08:59.508Z',
-                'value': '0.002388222857142859'
-              },
-              {
-                'time': '2017-06-04T22:09:59.508Z',
-                'value': '0.002115974914046794'
-              },
-              {
-                'time': '2017-06-04T22:10:59.508Z',
-                'value': '0.0025090043331269917'
-              },
-              {
-                'time': '2017-06-04T22:11:59.508Z',
-                'value': '0.002445507057277277'
-              },
-              {
-                'time': '2017-06-04T22:12:59.508Z',
-                'value': '0.0026348773751130976'
-              },
-              {
-                'time': '2017-06-04T22:13:59.508Z',
-                'value': '0.0025616258583088104'
-              },
-              {
-                'time': '2017-06-04T22:14:59.508Z',
-                'value': '0.0021544093415751505'
-              },
-              {
-                'time': '2017-06-04T22:15:59.508Z',
-                'value': '0.002649394767668881'
-              },
-              {
-                'time': '2017-06-04T22:16:59.508Z',
-                'value': '0.0024023332666685705'
-              },
-              {
-                'time': '2017-06-04T22:17:59.508Z',
-                'value': '0.0025444105294235306'
-              },
-              {
-                'time': '2017-06-04T22:18:59.508Z',
-                'value': '0.0027298872305772806'
-              },
-              {
-                'time': '2017-06-04T22:19:59.508Z',
-                'value': '0.0022880104956379287'
-              },
-              {
-                'time': '2017-06-04T22:20:59.508Z',
-                'value': '0.002473246666666661'
-              },
-              {
-                'time': '2017-06-04T22:21:59.508Z',
-                'value': '0.002259948381935587'
-              },
-              {
-                'time': '2017-06-04T22:22:59.508Z',
-                'value': '0.0025778470886268835'
-              },
-              {
-                'time': '2017-06-04T22:23:59.508Z',
-                'value': '0.002246127910852894'
-              },
-              {
-                'time': '2017-06-04T22:24:59.508Z',
-                'value': '0.0020697466666666758'
-              },
-              {
-                'time': '2017-06-04T22:25:59.508Z',
-                'value': '0.00225859722473547'
-              },
-              {
-                'time': '2017-06-04T22:26:59.508Z',
-                'value': '0.0026466728254554814'
-              },
-              {
-                'time': '2017-06-04T22:27:59.508Z',
-                'value': '0.002151247619047619'
-              },
-              {
-                'time': '2017-06-04T22:28:59.508Z',
-                'value': '0.002324161444543914'
-              },
-              {
-                'time': '2017-06-04T22:29:59.508Z',
-                'value': '0.002476474313796452'
-              },
-              {
-                'time': '2017-06-04T22:30:59.508Z',
-                'value': '0.0023922184232080517'
-              },
-              {
-                'time': '2017-06-04T22:31:59.508Z',
-                'value': '0.0025094934237468933'
-              },
-              {
-                'time': '2017-06-04T22:32:59.508Z',
-                'value': '0.0025665311098200883'
-              },
-              {
-                'time': '2017-06-04T22:33:59.508Z',
-                'value': '0.0024154900681661374'
-              },
-              {
-                'time': '2017-06-04T22:34:59.508Z',
-                'value': '0.0023267450166192037'
-              },
-              {
-                'time': '2017-06-04T22:35:59.508Z',
-                'value': '0.002156521904761904'
-              },
-              {
-                'time': '2017-06-04T22:36:59.508Z',
-                'value': '0.0025474356898637007'
-              },
-              {
-                'time': '2017-06-04T22:37:59.508Z',
-                'value': '0.0025989409624670233'
-              },
-              {
-                'time': '2017-06-04T22:38:59.508Z',
-                'value': '0.002348336664762987'
-              },
-              {
-                'time': '2017-06-04T22:39:59.508Z',
-                'value': '0.002665888246554726'
-              },
-              {
-                'time': '2017-06-04T22:40:59.508Z',
-                'value': '0.002652684787474174'
-              },
-              {
-                'time': '2017-06-04T22:41:59.508Z',
-                'value': '0.002472620430865355'
-              },
-              {
-                'time': '2017-06-04T22:42:59.508Z',
-                'value': '0.0020616469210110247'
-              },
-              {
-                'time': '2017-06-04T22:43:59.508Z',
-                'value': '0.0022434546372311934'
-              },
-              {
-                'time': '2017-06-04T22:44:59.508Z',
-                'value': '0.0024469386784827982'
-              },
-              {
-                'time': '2017-06-04T22:45:59.508Z',
-                'value': '0.0026192823809523787'
-              },
-              {
-                'time': '2017-06-04T22:46:59.508Z',
-                'value': '0.003451999542852798'
-              },
-              {
-                'time': '2017-06-04T22:47:59.508Z',
-                'value': '0.0031780314285714288'
-              },
-              {
-                'time': '2017-06-04T22:48:59.508Z',
-                'value': '0.0024403352380952415'
-              },
-              {
-                'time': '2017-06-04T22:49:59.508Z',
-                'value': '0.001998824761904764'
-              },
-              {
-                'time': '2017-06-04T22:50:59.508Z',
-                'value': '0.0023792404761904806'
-              },
-              {
-                'time': '2017-06-04T22:51:59.508Z',
-                'value': '0.002725906190476185'
-              },
-              {
-                'time': '2017-06-04T22:52:59.508Z',
-                'value': '0.0020989528671155624'
-              },
-              {
-                'time': '2017-06-04T22:53:59.508Z',
-                'value': '0.00228808226745016'
-              },
-              {
-                'time': '2017-06-04T22:54:59.508Z',
-                'value': '0.0019860807413192147'
-              },
-              {
-                'time': '2017-06-04T22:55:59.508Z',
-                'value': '0.0022698085714285897'
-              },
-              {
-                'time': '2017-06-04T22:56:59.508Z',
-                'value': '0.0022839098467604415'
-              },
-              {
-                'time': '2017-06-04T22:57:59.508Z',
-                'value': '0.002531114761904749'
-              },
-              {
-                'time': '2017-06-04T22:58:59.508Z',
-                'value': '0.0028941072550999016'
-              },
-              {
-                'time': '2017-06-04T22:59:59.508Z',
-                'value': '0.002547169523809506'
-              },
-              {
-                'time': '2017-06-04T23:00:59.508Z',
-                'value': '0.0024062999999999958'
-              },
-              {
-                'time': '2017-06-04T23:01:59.508Z',
-                'value': '0.0026939518471604386'
-              },
-              {
-                'time': '2017-06-04T23:02:59.508Z',
-                'value': '0.002362901428571429'
-              },
-              {
-                'time': '2017-06-04T23:03:59.508Z',
-                'value': '0.002663927142857154'
-              },
-              {
-                'time': '2017-06-04T23:04:59.508Z',
-                'value': '0.0026173314285714354'
-              },
-              {
-                'time': '2017-06-04T23:05:59.508Z',
-                'value': '0.002326527366406044'
-              },
-              {
-                'time': '2017-06-04T23:06:59.508Z',
-                'value': '0.002035313809523809'
-              },
-              {
-                'time': '2017-06-04T23:07:59.508Z',
-                'value': '0.002421447414786533'
-              },
-              {
-                'time': '2017-06-04T23:08:59.508Z',
-                'value': '0.002898313809523804'
-              },
-              {
-                'time': '2017-06-04T23:09:59.508Z',
-                'value': '0.002544891856112907'
-              },
-              {
-                'time': '2017-06-04T23:10:59.508Z',
-                'value': '0.002290625356938882'
-              },
-              {
-                'time': '2017-06-04T23:11:59.508Z',
-                'value': '0.002483028095238096'
-              },
-              {
-                'time': '2017-06-04T23:12:59.508Z',
-                'value': '0.0023396832350784237'
-              },
-              {
-                'time': '2017-06-04T23:13:59.508Z',
-                'value': '0.002085529248176153'
-              },
-              {
-                'time': '2017-06-04T23:14:59.508Z',
-                'value': '0.0022417815068428012'
-              },
-              {
-                'time': '2017-06-04T23:15:59.508Z',
-                'value': '0.002660293333333341'
-              },
-              {
-                'time': '2017-06-04T23:16:59.508Z',
-                'value': '0.0029845149093818226'
-              },
-              {
-                'time': '2017-06-04T23:17:59.508Z',
-                'value': '0.0027716655079475464'
-              },
-              {
-                'time': '2017-06-04T23:18:59.508Z',
-                'value': '0.0025217708908741128'
-              },
-              {
-                'time': '2017-06-04T23:19:59.508Z',
-                'value': '0.0025811235131094055'
-              },
-              {
-                'time': '2017-06-04T23:20:59.508Z',
-                'value': '0.002209904761904762'
-              },
-              {
-                'time': '2017-06-04T23:21:59.508Z',
-                'value': '0.0025053322926383344'
-              },
-              {
-                'time': '2017-06-04T23:22:59.508Z',
-                'value': '0.002350917636526411'
-              },
-              {
-                'time': '2017-06-04T23:23:59.508Z',
-                'value': '0.0018477500000000078'
-              },
-              {
-                'time': '2017-06-04T23:24:59.508Z',
-                'value': '0.002427629523809527'
-              },
-              {
-                'time': '2017-06-04T23:25:59.508Z',
-                'value': '0.0019305498147601655'
-              },
-              {
-                'time': '2017-06-04T23:26:59.508Z',
-                'value': '0.002097250000000006'
-              },
-              {
-                'time': '2017-06-04T23:27:59.508Z',
-                'value': '0.002675020952780041'
-              },
-              {
-                'time': '2017-06-04T23:28:59.508Z',
-                'value': '0.0023142214285714374'
-              },
-              {
-                'time': '2017-06-04T23:29:59.508Z',
-                'value': '0.0023644723809523737'
-              },
-              {
-                'time': '2017-06-04T23:30:59.508Z',
-                'value': '0.002108696190476198'
-              },
-              {
-                'time': '2017-06-04T23:31:59.508Z',
-                'value': '0.0019918289697997194'
-              },
-              {
-                'time': '2017-06-04T23:32:59.508Z',
-                'value': '0.001583584285714283'
-              },
-              {
-                'time': '2017-06-04T23:33:59.508Z',
-                'value': '0.002073770226383112'
-              },
-              {
-                'time': '2017-06-04T23:34:59.508Z',
-                'value': '0.0025877664234966818'
-              },
-              {
-                'time': '2017-06-04T23:35:59.508Z',
-                'value': '0.0021138238095238147'
-              },
-              {
-                'time': '2017-06-04T23:36:59.508Z',
-                'value': '0.0022140838095238303'
-              },
-              {
-                'time': '2017-06-04T23:37:59.508Z',
-                'value': '0.0018592674425248847'
-              },
-              {
-                'time': '2017-06-04T23:38:59.508Z',
-                'value': '0.0020461969533657016'
-              },
-              {
-                'time': '2017-06-04T23:39:59.508Z',
-                'value': '0.0021593628571428543'
-              },
-              {
-                'time': '2017-06-04T23:40:59.508Z',
-                'value': '0.0024330682564928188'
-              },
-              {
-                'time': '2017-06-04T23:41:59.508Z',
-                'value': '0.0021501804779093174'
-              },
-              {
-                'time': '2017-06-04T23:42:59.508Z',
-                'value': '0.0025787493928397945'
-              },
-              {
-                'time': '2017-06-04T23:43:59.508Z',
-                'value': '0.002593657082448396'
-              },
-              {
-                'time': '2017-06-04T23:44:59.508Z',
-                'value': '0.0021316752380952306'
-              },
-              {
-                'time': '2017-06-04T23:45:59.508Z',
-                'value': '0.0026972905019952086'
-              },
-              {
-                'time': '2017-06-04T23:46:59.508Z',
-                'value': '0.002580250764292983'
-              },
-              {
-                'time': '2017-06-04T23:47:59.508Z',
-                'value': '0.00227103000000001'
-              },
-              {
-                'time': '2017-06-04T23:48:59.508Z',
-                'value': '0.0023678515647321146'
-              },
-              {
-                'time': '2017-06-04T23:49:59.508Z',
-                'value': '0.002371472857142866'
-              },
-              {
-                'time': '2017-06-04T23:50:59.508Z',
-                'value': '0.0026181353688500978'
-              },
-              {
-                'time': '2017-06-04T23:51:59.508Z',
-                'value': '0.0025609667711121217'
-              },
-              {
-                'time': '2017-06-04T23:52:59.508Z',
-                'value': '0.0027145308139922557'
-              },
-              {
-                'time': '2017-06-04T23:53:59.508Z',
-                'value': '0.0024249397613310512'
-              },
-              {
-                'time': '2017-06-04T23:54:59.508Z',
-                'value': '0.002399907142857147'
-              },
-              {
-                'time': '2017-06-04T23:55:59.508Z',
-                'value': '0.0024753357142857195'
-              },
-              {
-                'time': '2017-06-04T23:56:59.508Z',
-                'value': '0.0026179149325231575'
-              },
-              {
-                'time': '2017-06-04T23:57:59.508Z',
-                'value': '0.0024261340368186956'
-              },
-              {
-                'time': '2017-06-04T23:58:59.508Z',
-                'value': '0.0021061071428571517'
-              },
-              {
-                'time': '2017-06-04T23:59:59.508Z',
-                'value': '0.0024033971105037015'
-              },
-              {
-                'time': '2017-06-05T00:00:59.508Z',
-                'value': '0.0028287676190475956'
-              },
-              {
-                'time': '2017-06-05T00:01:59.508Z',
-                'value': '0.002499719050294778'
-              },
-              {
-                'time': '2017-06-05T00:02:59.508Z',
-                'value': '0.0026726102153353856'
-              },
-              {
-                'time': '2017-06-05T00:03:59.508Z',
-                'value': '0.00262582619047618'
-              },
-              {
-                'time': '2017-06-05T00:04:59.508Z',
-                'value': '0.002280473147363316'
-              },
-              {
-                'time': '2017-06-05T00:05:59.508Z',
-                'value': '0.002095581470652675'
-              },
-              {
-                'time': '2017-06-05T00:06:59.508Z',
-                'value': '0.002270768490828408'
-              },
-              {
-                'time': '2017-06-05T00:07:59.508Z',
-                'value': '0.002728577415023017'
-              },
-              {
-                'time': '2017-06-05T00:08:59.508Z',
-                'value': '0.002652512857142863'
-              },
-              {
-                'time': '2017-06-05T00:09:59.508Z',
-                'value': '0.0022781033924455674'
-              },
-              {
-                'time': '2017-06-05T00:10:59.508Z',
-                'value': '0.0025345038095238234'
-              },
-              {
-                'time': '2017-06-05T00:11:59.508Z',
-                'value': '0.002376050020000397'
-              },
-              {
-                'time': '2017-06-05T00:12:59.508Z',
-                'value': '0.002455068143506122'
-              },
-              {
-                'time': '2017-06-05T00:13:59.508Z',
-                'value': '0.002826705714285719'
-              },
-              {
-                'time': '2017-06-05T00:14:59.508Z',
-                'value': '0.002343833692070314'
-              },
-              {
-                'time': '2017-06-05T00:15:59.508Z',
-                'value': '0.00264853297122164'
-              },
-              {
-                'time': '2017-06-05T00:16:59.508Z',
-                'value': '0.0027656335117426257'
-              },
-              {
-                'time': '2017-06-05T00:17:59.508Z',
-                'value': '0.0025896543842439564'
-              },
-              {
-                'time': '2017-06-05T00:18:59.508Z',
-                'value': '0.002180053237081201'
-              },
-              {
-                'time': '2017-06-05T00:19:59.508Z',
-                'value': '0.002475245002333342'
-              },
-              {
-                'time': '2017-06-05T00:20:59.508Z',
-                'value': '0.0027559767805101065'
-              },
-              {
-                'time': '2017-06-05T00:21:59.508Z',
-                'value': '0.0022294836141296607'
-              },
-              {
-                'time': '2017-06-05T00:22:59.508Z',
-                'value': '0.0021383590476190643'
-              },
-              {
-                'time': '2017-06-05T00:23:59.508Z',
-                'value': '0.002085417956361494'
-              },
-              {
-                'time': '2017-06-05T00:24:59.508Z',
-                'value': '0.0024140319047619013'
-              },
-              {
-                'time': '2017-06-05T00:25:59.508Z',
-                'value': '0.0024513114285714304'
-              },
-              {
-                'time': '2017-06-05T00:26:59.508Z',
-                'value': '0.0026932152380952446'
-              },
-              {
-                'time': '2017-06-05T00:27:59.508Z',
-                'value': '0.0022656844350898517'
-              },
-              {
-                'time': '2017-06-05T00:28:59.508Z',
-                'value': '0.0024483785714285704'
-              },
-              {
-                'time': '2017-06-05T00:29:59.508Z',
-                'value': '0.002559505804817207'
-              },
-              {
-                'time': '2017-06-05T00:30:59.508Z',
-                'value': '0.0019485681088751649'
-              },
-              {
-                'time': '2017-06-05T00:31:59.508Z',
-                'value': '0.00228367984456996'
-              },
-              {
-                'time': '2017-06-05T00:32:59.508Z',
-                'value': '0.002522149047619049'
-              },
-              {
-                'time': '2017-06-05T00:33:59.508Z',
-                'value': '0.0026860117715406737'
-              },
-              {
-                'time': '2017-06-05T00:34:59.508Z',
-                'value': '0.002679669523809523'
-              },
-              {
-                'time': '2017-06-05T00:35:59.508Z',
-                'value': '0.0022201920970675937'
-              },
-              {
-                'time': '2017-06-05T00:36:59.508Z',
-                'value': '0.0022917647619047615'
-              },
-              {
-                'time': '2017-06-05T00:37:59.508Z',
-                'value': '0.0021774059294673576'
-              },
-              {
-                'time': '2017-06-05T00:38:59.508Z',
-                'value': '0.0024637766666666763'
-              },
-              {
-                'time': '2017-06-05T00:39:59.508Z',
-                'value': '0.002470468290174195'
-              },
-              {
-                'time': '2017-06-05T00:40:59.508Z',
-                'value': '0.0022188616082057812'
-              },
-              {
-                'time': '2017-06-05T00:41:59.508Z',
-                'value': '0.002421840744373875'
-              },
-              {
-                'time': '2017-06-05T00:42:59.508Z',
-                'value': '0.0023918266666666547'
-              },
-              {
-                'time': '2017-06-05T00:43:59.508Z',
-                'value': '0.002195743809523809'
-              },
-              {
-                'time': '2017-06-05T00:44:59.508Z',
-                'value': '0.0025514828571428687'
-              },
-              {
-                'time': '2017-06-05T00:45:59.508Z',
-                'value': '0.0027981709349612694'
-              },
-              {
-                'time': '2017-06-05T00:46:59.508Z',
-                'value': '0.002557977142857146'
-              },
-              {
-                'time': '2017-06-05T00:47:59.508Z',
-                'value': '0.002213244285714286'
-              },
-              {
-                'time': '2017-06-05T00:48:59.508Z',
-                'value': '0.0025706738095238046'
-              },
-              {
-                'time': '2017-06-05T00:49:59.508Z',
-                'value': '0.002210976666666671'
-              },
-              {
-                'time': '2017-06-05T00:50:59.508Z',
-                'value': '0.002055377091646749'
-              },
-              {
-                'time': '2017-06-05T00:51:59.508Z',
-                'value': '0.002308368095238119'
-              },
-              {
-                'time': '2017-06-05T00:52:59.508Z',
-                'value': '0.0024687939885141615'
-              },
-              {
-                'time': '2017-06-05T00:53:59.508Z',
-                'value': '0.002563018571428578'
-              },
-              {
-                'time': '2017-06-05T00:54:59.508Z',
-                'value': '0.00240563291078959'
-              }
-            ]
-          }
+export const singleRowMetricsMultipleSeries = [
+    {
+        'title': 'Multiple Time Series',
+        'weight': 1,
+        'y_label': 'Request Rates',
+        'queries': [
+            {
+                'query_range': 'sum(rate(nginx_responses_total{environment="production"}[2m])) by (status_code)',
+                'label': 'Requests',
+                'unit': 'Req/sec',
+                'result': [
+                    {
+                        'metric': {
+                            'status_code': '1xx'
+                        },
+                        'values': [
+                            {
+                                'time': '2017-08-27T11:01:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:02:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:03:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:04:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:05:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:06:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:07:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:08:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:09:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:10:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:11:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:12:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:13:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:14:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:15:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:16:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:17:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:18:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:19:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:20:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:21:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:22:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:23:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:24:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:25:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:26:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:27:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:28:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:29:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:30:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:31:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:32:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:33:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:34:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:35:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:36:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:37:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:38:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:39:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:40:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:41:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:42:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:43:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:44:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:45:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:46:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:47:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:48:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:49:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:50:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:51:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:52:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:53:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:54:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:55:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:56:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:57:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:58:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T11:59:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:00:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:01:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:02:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:03:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:04:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:05:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:06:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:07:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:08:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:09:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:10:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:11:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:12:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:13:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:14:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:15:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:16:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:17:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:18:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:19:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:20:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:21:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:22:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:23:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:24:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:25:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:26:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:27:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:28:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:29:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:30:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:31:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:32:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:33:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:34:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:35:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:36:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:37:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:38:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:39:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:40:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:41:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:42:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:43:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:44:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:45:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:46:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:47:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:48:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:49:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:50:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:51:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:52:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:53:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:54:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:55:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:56:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:57:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:58:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T12:59:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:00:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:01:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:02:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:03:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:04:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:05:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:06:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:07:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:08:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:09:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:10:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:11:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:12:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:13:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:14:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:15:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:16:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:17:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:18:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:19:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:20:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:21:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:22:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:23:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:24:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:25:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:26:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:27:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:28:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:29:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:30:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:31:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:32:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:33:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:34:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:35:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:36:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:37:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:38:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:39:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:40:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:41:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:42:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:43:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:44:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:45:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:46:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:47:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:48:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:49:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:50:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:51:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:52:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:53:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:54:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:55:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:56:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:57:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:58:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T13:59:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:00:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:01:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:02:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:03:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:04:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:05:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:06:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:07:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:08:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:09:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:10:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:11:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:12:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:13:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:14:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:15:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:16:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:17:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:18:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:19:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:20:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:21:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:22:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:23:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:24:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:25:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:26:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:27:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:28:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:29:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:30:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:31:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:32:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:33:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:34:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:35:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:36:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:37:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:38:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:39:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:40:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:41:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:42:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:43:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:44:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:45:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:46:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:47:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:48:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:49:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:50:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:51:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:52:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:53:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:54:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:55:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:56:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:57:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:58:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T14:59:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:00:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:01:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:02:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:03:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:04:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:05:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:06:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:07:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:08:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:09:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:10:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:11:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:12:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:13:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:14:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:15:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:16:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:17:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:18:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:19:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:20:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:21:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:22:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:23:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:24:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:25:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:26:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:27:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:28:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:29:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:30:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:31:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:32:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:33:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:34:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:35:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:36:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:37:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:38:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:39:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:40:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:41:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:42:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:43:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:44:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:45:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:46:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:47:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:48:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:49:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:50:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:51:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:52:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:53:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:54:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:55:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:56:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:57:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:58:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T15:59:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:00:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:01:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:02:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:03:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:04:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:05:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:06:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:07:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:08:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:09:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:10:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:11:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:12:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:13:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:14:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:15:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:16:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:17:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:18:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:19:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:20:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:21:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:22:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:23:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:24:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:25:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:26:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:27:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:28:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:29:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:30:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:31:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:32:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:33:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:34:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:35:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:36:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:37:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:38:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:39:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:40:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:41:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:42:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:43:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:44:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:45:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:46:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:47:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:48:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:49:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:50:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:51:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:52:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:53:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:54:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:55:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:56:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:57:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:58:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T16:59:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:00:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:01:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:02:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:03:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:04:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:05:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:06:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:07:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:08:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:09:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:10:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:11:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:12:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:13:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:14:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:15:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:16:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:17:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:18:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:19:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:20:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:21:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:22:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:23:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:24:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:25:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:26:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:27:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:28:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:29:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:30:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:31:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:32:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:33:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:34:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:35:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:36:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:37:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:38:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:39:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:40:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:41:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:42:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:43:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:44:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:45:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:46:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:47:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:48:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:49:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:50:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:51:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:52:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:53:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:54:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:55:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:56:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:57:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:58:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T17:59:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:00:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:01:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:02:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:03:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:04:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:05:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:06:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:07:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:08:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:09:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:10:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:11:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:12:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:13:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:14:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:15:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:16:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:17:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:18:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:19:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:20:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:21:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:22:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:23:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:24:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:25:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:26:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:27:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:28:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:29:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:30:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:31:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:32:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:33:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:34:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:35:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:36:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:37:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:38:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:39:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:40:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:41:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:42:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:43:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:44:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:45:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:46:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:47:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:48:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:49:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:50:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:51:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:52:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:53:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:54:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:55:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:56:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:57:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:58:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T18:59:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T19:00:51.462Z',
+                                'value': '0'
+                            },
+                            {
+                                'time': '2017-08-27T19:01:51.462Z',
+                                'value': '0'
+                            }
+                        ]
+                    },
+                    {
+                        'metric': {
+                            'status_code': '2xx'
+                        },
+                        'values': [
+                            {
+                                'time': '2017-08-27T11:01:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:02:51.462Z',
+                                'value': '1.2571428571428571'
+                            },
+                            {
+                                'time': '2017-08-27T11:03:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T11:04:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:05:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T11:06:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:07:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T11:08:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:09:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T11:10:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T11:11:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:12:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T11:13:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:14:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T11:15:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:16:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T11:17:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:18:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T11:19:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T11:20:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T11:21:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T11:22:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:23:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:24:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:25:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T11:26:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T11:27:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T11:28:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:29:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T11:30:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:31:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T11:32:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T11:33:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:34:51.462Z',
+                                'value': '1.333320635041571'
+                            },
+                            {
+                                'time': '2017-08-27T11:35:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:36:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:37:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:38:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:39:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T11:40:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:41:51.462Z',
+                                'value': '1.3333587306424883'
+                            },
+                            {
+                                'time': '2017-08-27T11:42:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:43:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T11:44:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:45:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T11:46:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T11:47:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T11:48:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T11:49:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T11:50:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T11:51:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T11:52:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:53:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T11:54:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:55:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T11:56:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:57:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T11:58:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T11:59:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:00:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:01:51.462Z',
+                                'value': '1.3333460318669703'
+                            },
+                            {
+                                'time': '2017-08-27T12:02:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:03:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T12:04:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:05:51.462Z',
+                                'value': '1.31427319739812'
+                            },
+                            {
+                                'time': '2017-08-27T12:06:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:07:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:08:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T12:09:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:10:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:11:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:12:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T12:13:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:14:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T12:15:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:16:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:17:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:18:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:19:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:20:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:21:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T12:22:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:23:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:24:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:25:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T12:26:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:27:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T12:28:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:29:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T12:30:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:31:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T12:32:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:33:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:34:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:35:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:36:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T12:37:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:38:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T12:39:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:40:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T12:41:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:42:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:43:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:44:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:45:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T12:46:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:47:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:48:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:49:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T12:50:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:51:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T12:52:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:53:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:54:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T12:55:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T12:56:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:57:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T12:58:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T12:59:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T13:00:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T13:01:51.462Z',
+                                'value': '1.295225759754669'
+                            },
+                            {
+                                'time': '2017-08-27T13:02:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:03:51.462Z',
+                                'value': '1.2952627669098458'
+                            },
+                            {
+                                'time': '2017-08-27T13:04:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:05:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:06:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:07:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:08:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:09:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:10:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:11:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:12:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:13:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:14:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:15:51.462Z',
+                                'value': '1.2571428571428571'
+                            },
+                            {
+                                'time': '2017-08-27T13:16:51.462Z',
+                                'value': '1.3333587306424883'
+                            },
+                            {
+                                'time': '2017-08-27T13:17:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:18:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:19:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:20:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T13:21:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:22:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:23:51.462Z',
+                                'value': '1.276190476190476'
+                            },
+                            {
+                                'time': '2017-08-27T13:24:51.462Z',
+                                'value': '1.2571428571428571'
+                            },
+                            {
+                                'time': '2017-08-27T13:25:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T13:26:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:27:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T13:28:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:29:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:30:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:31:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:32:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T13:33:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:34:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:35:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T13:36:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:37:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:38:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:39:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:40:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:41:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:42:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:43:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:44:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:45:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:46:51.462Z',
+                                'value': '1.2571428571428571'
+                            },
+                            {
+                                'time': '2017-08-27T13:47:51.462Z',
+                                'value': '1.276190476190476'
+                            },
+                            {
+                                'time': '2017-08-27T13:48:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T13:49:51.462Z',
+                                'value': '1.295225759754669'
+                            },
+                            {
+                                'time': '2017-08-27T13:50:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:51:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:52:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:53:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:54:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:55:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:56:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T13:57:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T13:58:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T13:59:51.462Z',
+                                'value': '1.295225759754669'
+                            },
+                            {
+                                'time': '2017-08-27T14:00:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T14:01:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T14:02:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:03:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T14:04:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:05:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T14:06:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:07:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T14:08:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:09:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T14:10:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T14:11:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:12:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T14:13:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:14:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T14:15:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:16:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:17:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T14:18:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:19:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T14:20:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:21:51.462Z',
+                                'value': '1.3333079369916765'
+                            },
+                            {
+                                'time': '2017-08-27T14:22:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:23:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T14:24:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:25:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T14:26:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:27:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T14:28:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:29:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:30:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T14:31:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:32:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:33:51.462Z',
+                                'value': '1.2571428571428571'
+                            },
+                            {
+                                'time': '2017-08-27T14:34:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T14:35:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:36:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T14:37:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T14:38:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T14:39:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T14:40:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:41:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T14:42:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:43:51.462Z',
+                                'value': '1.276190476190476'
+                            },
+                            {
+                                'time': '2017-08-27T14:44:51.462Z',
+                                'value': '1.2571428571428571'
+                            },
+                            {
+                                'time': '2017-08-27T14:45:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T14:46:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:47:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T14:48:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:49:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T14:50:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:51:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T14:52:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:53:51.462Z',
+                                'value': '1.333320635041571'
+                            },
+                            {
+                                'time': '2017-08-27T14:54:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:55:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T14:56:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:57:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T14:58:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T14:59:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T15:00:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:01:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:02:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:03:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:04:51.462Z',
+                                'value': '1.2571428571428571'
+                            },
+                            {
+                                'time': '2017-08-27T15:05:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:06:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:07:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:08:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:09:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:10:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:11:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:12:51.462Z',
+                                'value': '1.31427319739812'
+                            },
+                            {
+                                'time': '2017-08-27T15:13:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:14:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:15:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:16:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T15:17:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:18:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:19:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:20:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T15:21:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:22:51.462Z',
+                                'value': '1.3333460318669703'
+                            },
+                            {
+                                'time': '2017-08-27T15:23:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:24:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:25:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:26:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:27:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:28:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:29:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:30:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:31:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T15:32:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:33:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T15:34:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:35:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T15:36:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:37:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:38:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T15:39:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:40:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:41:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:42:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:43:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:44:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:45:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:46:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:47:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:48:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:49:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T15:50:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:51:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:52:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:53:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:54:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:55:51.462Z',
+                                'value': '1.3333587306424883'
+                            },
+                            {
+                                'time': '2017-08-27T15:56:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T15:57:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:58:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T15:59:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:00:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T16:01:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T16:02:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:03:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:04:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:05:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T16:06:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:07:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T16:08:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T16:09:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T16:10:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T16:11:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:12:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T16:13:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:14:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T16:15:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T16:16:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T16:17:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T16:18:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:19:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T16:20:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:21:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T16:22:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:23:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T16:24:51.462Z',
+                                'value': '1.295225759754669'
+                            },
+                            {
+                                'time': '2017-08-27T16:25:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T16:26:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T16:27:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T16:28:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T16:29:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:30:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T16:31:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:32:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T16:33:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:34:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T16:35:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:36:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T16:37:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:38:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T16:39:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:40:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T16:41:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:42:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T16:43:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:44:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T16:45:51.462Z',
+                                'value': '1.3142982314117277'
+                            },
+                            {
+                                'time': '2017-08-27T16:46:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T16:47:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:48:51.462Z',
+                                'value': '1.333320635041571'
+                            },
+                            {
+                                'time': '2017-08-27T16:49:51.462Z',
+                                'value': '1.31427319739812'
+                            },
+                            {
+                                'time': '2017-08-27T16:50:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:51:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T16:52:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:53:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T16:54:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:55:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T16:56:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:57:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T16:58:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T16:59:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:00:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:01:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:02:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:03:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:04:51.462Z',
+                                'value': '1.2952504309564854'
+                            },
+                            {
+                                'time': '2017-08-27T17:05:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T17:06:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:07:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T17:08:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T17:09:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:10:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:11:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:12:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:13:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:14:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:15:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:16:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:17:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:18:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:19:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:20:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:21:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:22:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:23:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:24:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T17:25:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:26:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:27:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:28:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:29:51.462Z',
+                                'value': '1.295225759754669'
+                            },
+                            {
+                                'time': '2017-08-27T17:30:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:31:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:32:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:33:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:34:51.462Z',
+                                'value': '1.295225759754669'
+                            },
+                            {
+                                'time': '2017-08-27T17:35:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:36:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T17:37:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:38:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:39:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:40:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:41:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:42:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:43:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:44:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T17:45:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:46:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:47:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:48:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T17:49:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:50:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T17:51:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:52:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:53:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:54:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:55:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T17:56:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:57:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T17:58:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T17:59:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T18:00:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:01:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:02:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:03:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:04:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:05:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:06:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:07:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:08:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:09:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:10:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:11:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:12:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T18:13:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:14:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:15:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:16:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:17:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:18:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:19:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:20:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:21:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:22:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:23:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:24:51.462Z',
+                                'value': '1.2571428571428571'
+                            },
+                            {
+                                'time': '2017-08-27T18:25:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:26:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:27:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:28:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:29:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:30:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:31:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:32:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:33:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:34:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:35:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:36:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:37:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T18:38:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:39:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:40:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:41:51.462Z',
+                                'value': '1.580952380952381'
+                            },
+                            {
+                                'time': '2017-08-27T18:42:51.462Z',
+                                'value': '1.7333333333333334'
+                            },
+                            {
+                                'time': '2017-08-27T18:43:51.462Z',
+                                'value': '2.057142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T18:44:51.462Z',
+                                'value': '2.1904761904761902'
+                            },
+                            {
+                                'time': '2017-08-27T18:45:51.462Z',
+                                'value': '1.8285714285714287'
+                            },
+                            {
+                                'time': '2017-08-27T18:46:51.462Z',
+                                'value': '2.1142857142857143'
+                            },
+                            {
+                                'time': '2017-08-27T18:47:51.462Z',
+                                'value': '1.619047619047619'
+                            },
+                            {
+                                'time': '2017-08-27T18:48:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:49:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:50:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T18:51:51.462Z',
+                                'value': '1.2952504309564854'
+                            },
+                            {
+                                'time': '2017-08-27T18:52:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:53:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:54:51.462Z',
+                                'value': '1.3333333333333333'
+                            },
+                            {
+                                'time': '2017-08-27T18:55:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:56:51.462Z',
+                                'value': '1.314285714285714'
+                            },
+                            {
+                                'time': '2017-08-27T18:57:51.462Z',
+                                'value': '1.295238095238095'
+                            },
+                            {
+                                'time': '2017-08-27T18:58:51.462Z',
+                                'value': '1.7142857142857142'
+                            },
+                            {
+                                'time': '2017-08-27T18:59:51.462Z',
+                                'value': '1.7333333333333334'
+                            },
+                            {
+                                'time': '2017-08-27T19:00:51.462Z',
+                                'value': '1.3904761904761904'
+                            },
+                            {
+                                'time': '2017-08-27T19:01:51.462Z',
+                                'value': '1.5047619047619047'
+                            }
+                        ]
+                    },
+                ]
+            }
         ]
-      }
-    ]
-  },
-  {
-    'title': 'Memory usage',
-    'weight': 1,
-    'y_label': 'Values',
-    'queries': [
-      {
-        'query_range': 'avg(container_memory_usage_bytes{%{environment_filter}}) / 2^20',
-        'label': 'Container memory',
-        'unit': 'MiB',
-        'result': [
-          {
-            'metric': {
+    },
+    {
+        'title': 'Throughput',
+        'weight': 1,
+        'y_label': 'Requests / Sec',
+        'queries': [
+            {
+                'query_range': 'sum(rate(nginx_requests_total{server_zone!=\'*\', server_zone!=\'_\', container_name!=\'POD\',environment=\'production\'}[2m]))',
+                'label': 'Total',
+                'unit': 'req / sec',
+                'result': [
+                    {
+                        'metric': {
 
-            },
-            'values': [
-              {
-                'time': '2017-06-04T21:22:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:23:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:24:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:25:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:26:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:27:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:28:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:29:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:30:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:31:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:32:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:33:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:34:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:35:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:36:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:37:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:38:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:39:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:40:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:41:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:42:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:43:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:44:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:45:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:46:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:47:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:48:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:49:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:50:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:51:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:52:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:53:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:54:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:55:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:56:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:57:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:58:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T21:59:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:00:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:01:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:02:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:03:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:04:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:05:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:06:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:07:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:08:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:09:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:10:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:11:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:12:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:13:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:14:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:15:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:16:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:17:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:18:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:19:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:20:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:21:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:22:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:23:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:24:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:25:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:26:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:27:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:28:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:29:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:30:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:31:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:32:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:33:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:34:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:35:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:36:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:37:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:38:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:39:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:40:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:41:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:42:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:43:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:44:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:45:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:46:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:47:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:48:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:49:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:50:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:51:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:52:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:53:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:54:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:55:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:56:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:57:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:58:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T22:59:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:00:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:01:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:02:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:03:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:04:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:05:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:06:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:07:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:08:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:09:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:10:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:11:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:12:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:13:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:14:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:15:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:16:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:17:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:18:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:19:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:20:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:21:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:22:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:23:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:24:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:25:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:26:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:27:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:28:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:29:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:30:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:31:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:32:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:33:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:34:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:35:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:36:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:37:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:38:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:39:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:40:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:41:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:42:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:43:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:44:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:45:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:46:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:47:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:48:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:49:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:50:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:51:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:52:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:53:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:54:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:55:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:56:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:57:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:58:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-04T23:59:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:00:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:01:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:02:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:03:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:04:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:05:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:06:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:07:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:08:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:09:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:10:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:11:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:12:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:13:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:14:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:15:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:16:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:17:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:18:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:19:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:20:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:21:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:22:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:23:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:24:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:25:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:26:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:27:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:28:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:29:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:30:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:31:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:32:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:33:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:34:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:35:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:36:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:37:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:38:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:39:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:40:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:41:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:42:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:43:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:44:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:45:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:46:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:47:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:48:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:49:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:50:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:51:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:52:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:53:59.508Z',
-                'value': '15.0859375'
-              },
-              {
-                'time': '2017-06-05T00:54:59.508Z',
-                'value': '15.0859375'
-              }
-            ]
-          }
+                        },
+                        'values': [
+                            {
+                                'time': '2017-08-27T11:01:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:02:51.462Z',
+                                'value': '0.45714285714285713'
+                            },
+                            {
+                                'time': '2017-08-27T11:03:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T11:04:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:05:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T11:06:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:07:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T11:08:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:09:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T11:10:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T11:11:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:12:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T11:13:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:14:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T11:15:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:16:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T11:17:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:18:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T11:19:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T11:20:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T11:21:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T11:22:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:23:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:24:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:25:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T11:26:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T11:27:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T11:28:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:29:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T11:30:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:31:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T11:32:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T11:33:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:34:51.462Z',
+                                'value': '0.4952333787297264'
+                            },
+                            {
+                                'time': '2017-08-27T11:35:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:36:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:37:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:38:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:39:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T11:40:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:41:51.462Z',
+                                'value': '0.49524752852435283'
+                            },
+                            {
+                                'time': '2017-08-27T11:42:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:43:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T11:44:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:45:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T11:46:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T11:47:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T11:48:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T11:49:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T11:50:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T11:51:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T11:52:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:53:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T11:54:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:55:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T11:56:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:57:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T11:58:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T11:59:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:00:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:01:51.462Z',
+                                'value': '0.49524281183630325'
+                            },
+                            {
+                                'time': '2017-08-27T12:02:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:03:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T12:04:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:05:51.462Z',
+                                'value': '0.4857096599080009'
+                            },
+                            {
+                                'time': '2017-08-27T12:06:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:07:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:08:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T12:09:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:10:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:11:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:12:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T12:13:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:14:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T12:15:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:16:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:17:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:18:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:19:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:20:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:21:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T12:22:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:23:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:24:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:25:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T12:26:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:27:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T12:28:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:29:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T12:30:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:31:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T12:32:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:33:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:34:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:35:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:36:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T12:37:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:38:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T12:39:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:40:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T12:41:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:42:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:43:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:44:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:45:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T12:46:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:47:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:48:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:49:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T12:50:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:51:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T12:52:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:53:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:54:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T12:55:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T12:56:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:57:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T12:58:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T12:59:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T13:00:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T13:01:51.462Z',
+                                'value': '0.4761859410862754'
+                            },
+                            {
+                                'time': '2017-08-27T13:02:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:03:51.462Z',
+                                'value': '0.4761995466580315'
+                            },
+                            {
+                                'time': '2017-08-27T13:04:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:05:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:06:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:07:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:08:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:09:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:10:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:11:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:12:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:13:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:14:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:15:51.462Z',
+                                'value': '0.45714285714285713'
+                            },
+                            {
+                                'time': '2017-08-27T13:16:51.462Z',
+                                'value': '0.49524752852435283'
+                            },
+                            {
+                                'time': '2017-08-27T13:17:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:18:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:19:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:20:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T13:21:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:22:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:23:51.462Z',
+                                'value': '0.4666666666666667'
+                            },
+                            {
+                                'time': '2017-08-27T13:24:51.462Z',
+                                'value': '0.45714285714285713'
+                            },
+                            {
+                                'time': '2017-08-27T13:25:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T13:26:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:27:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T13:28:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:29:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:30:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:31:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:32:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T13:33:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:34:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:35:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T13:36:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:37:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:38:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:39:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:40:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:41:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:42:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:43:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:44:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:45:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:46:51.462Z',
+                                'value': '0.45714285714285713'
+                            },
+                            {
+                                'time': '2017-08-27T13:47:51.462Z',
+                                'value': '0.4666666666666667'
+                            },
+                            {
+                                'time': '2017-08-27T13:48:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T13:49:51.462Z',
+                                'value': '0.4761859410862754'
+                            },
+                            {
+                                'time': '2017-08-27T13:50:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:51:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:52:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:53:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:54:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:55:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:56:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T13:57:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T13:58:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T13:59:51.462Z',
+                                'value': '0.4761859410862754'
+                            },
+                            {
+                                'time': '2017-08-27T14:00:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T14:01:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T14:02:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:03:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T14:04:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:05:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T14:06:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:07:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T14:08:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:09:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T14:10:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T14:11:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:12:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T14:13:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:14:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T14:15:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:16:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:17:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T14:18:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:19:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T14:20:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:21:51.462Z',
+                                'value': '0.4952286623111941'
+                            },
+                            {
+                                'time': '2017-08-27T14:22:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:23:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T14:24:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:25:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T14:26:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:27:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T14:28:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:29:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:30:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T14:31:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:32:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:33:51.462Z',
+                                'value': '0.45714285714285713'
+                            },
+                            {
+                                'time': '2017-08-27T14:34:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T14:35:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:36:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T14:37:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T14:38:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T14:39:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T14:40:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:41:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T14:42:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:43:51.462Z',
+                                'value': '0.4666666666666667'
+                            },
+                            {
+                                'time': '2017-08-27T14:44:51.462Z',
+                                'value': '0.45714285714285713'
+                            },
+                            {
+                                'time': '2017-08-27T14:45:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T14:46:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:47:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T14:48:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:49:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T14:50:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:51:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T14:52:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:53:51.462Z',
+                                'value': '0.4952333787297264'
+                            },
+                            {
+                                'time': '2017-08-27T14:54:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:55:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T14:56:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:57:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T14:58:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T14:59:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T15:00:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:01:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:02:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:03:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:04:51.462Z',
+                                'value': '0.45714285714285713'
+                            },
+                            {
+                                'time': '2017-08-27T15:05:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:06:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:07:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:08:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:09:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:10:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:11:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:12:51.462Z',
+                                'value': '0.4857096599080009'
+                            },
+                            {
+                                'time': '2017-08-27T15:13:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:14:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:15:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:16:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T15:17:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:18:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:19:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:20:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T15:21:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:22:51.462Z',
+                                'value': '0.49524281183630325'
+                            },
+                            {
+                                'time': '2017-08-27T15:23:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:24:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:25:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:26:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:27:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:28:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:29:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:30:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:31:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T15:32:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:33:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T15:34:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:35:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T15:36:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:37:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:38:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T15:39:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:40:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:41:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:42:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:43:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:44:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:45:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:46:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:47:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:48:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:49:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T15:50:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:51:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:52:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:53:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:54:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:55:51.462Z',
+                                'value': '0.49524752852435283'
+                            },
+                            {
+                                'time': '2017-08-27T15:56:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T15:57:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:58:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T15:59:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:00:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T16:01:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T16:02:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:03:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:04:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:05:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T16:06:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:07:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T16:08:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T16:09:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T16:10:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T16:11:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:12:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T16:13:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:14:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T16:15:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T16:16:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T16:17:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T16:18:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:19:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T16:20:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:21:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T16:22:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:23:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T16:24:51.462Z',
+                                'value': '0.4761859410862754'
+                            },
+                            {
+                                'time': '2017-08-27T16:25:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T16:26:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T16:27:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T16:28:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T16:29:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:30:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T16:31:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:32:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T16:33:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:34:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T16:35:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:36:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T16:37:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:38:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T16:39:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:40:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T16:41:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:42:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T16:43:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:44:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T16:45:51.462Z',
+                                'value': '0.485718911608682'
+                            },
+                            {
+                                'time': '2017-08-27T16:46:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T16:47:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:48:51.462Z',
+                                'value': '0.4952333787297264'
+                            },
+                            {
+                                'time': '2017-08-27T16:49:51.462Z',
+                                'value': '0.4857096599080009'
+                            },
+                            {
+                                'time': '2017-08-27T16:50:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:51:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T16:52:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:53:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T16:54:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:55:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T16:56:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:57:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T16:58:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T16:59:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:00:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:01:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:02:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:03:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:04:51.462Z',
+                                'value': '0.47619501138106085'
+                            },
+                            {
+                                'time': '2017-08-27T17:05:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T17:06:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:07:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T17:08:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T17:09:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:10:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:11:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:12:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:13:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:14:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:15:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:16:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:17:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:18:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:19:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:20:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:21:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:22:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:23:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:24:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T17:25:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:26:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:27:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:28:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:29:51.462Z',
+                                'value': '0.4761859410862754'
+                            },
+                            {
+                                'time': '2017-08-27T17:30:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:31:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:32:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:33:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:34:51.462Z',
+                                'value': '0.4761859410862754'
+                            },
+                            {
+                                'time': '2017-08-27T17:35:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:36:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T17:37:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:38:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:39:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:40:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:41:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:42:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:43:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:44:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T17:45:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:46:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:47:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:48:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T17:49:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:50:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T17:51:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:52:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:53:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:54:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:55:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T17:56:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:57:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T17:58:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T17:59:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T18:00:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:01:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:02:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:03:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:04:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:05:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:06:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:07:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:08:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:09:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:10:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:11:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:12:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T18:13:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:14:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:15:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:16:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:17:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:18:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:19:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:20:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:21:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:22:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:23:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:24:51.462Z',
+                                'value': '0.45714285714285713'
+                            },
+                            {
+                                'time': '2017-08-27T18:25:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:26:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:27:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:28:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:29:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:30:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:31:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:32:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:33:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:34:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:35:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:36:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:37:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T18:38:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:39:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:40:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:41:51.462Z',
+                                'value': '0.6190476190476191'
+                            },
+                            {
+                                'time': '2017-08-27T18:42:51.462Z',
+                                'value': '0.6952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:43:51.462Z',
+                                'value': '0.857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T18:44:51.462Z',
+                                'value': '0.9238095238095239'
+                            },
+                            {
+                                'time': '2017-08-27T18:45:51.462Z',
+                                'value': '0.7428571428571429'
+                            },
+                            {
+                                'time': '2017-08-27T18:46:51.462Z',
+                                'value': '0.8857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T18:47:51.462Z',
+                                'value': '0.638095238095238'
+                            },
+                            {
+                                'time': '2017-08-27T18:48:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:49:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:50:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T18:51:51.462Z',
+                                'value': '0.47619501138106085'
+                            },
+                            {
+                                'time': '2017-08-27T18:52:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:53:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:54:51.462Z',
+                                'value': '0.4952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T18:55:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:56:51.462Z',
+                                'value': '0.4857142857142857'
+                            },
+                            {
+                                'time': '2017-08-27T18:57:51.462Z',
+                                'value': '0.47619047619047616'
+                            },
+                            {
+                                'time': '2017-08-27T18:58:51.462Z',
+                                'value': '0.6857142857142856'
+                            },
+                            {
+                                'time': '2017-08-27T18:59:51.462Z',
+                                'value': '0.6952380952380952'
+                            },
+                            {
+                                'time': '2017-08-27T19:00:51.462Z',
+                                'value': '0.5238095238095237'
+                            },
+                            {
+                                'time': '2017-08-27T19:01:51.462Z',
+                                'value': '0.5904761904761905'
+                            }
+                        ]
+                    }
+                ]
+            }
         ]
-      }
-    ]
-  }
+    }
 ];
 
+export function convertDatesMultipleSeries(multipleSeries) {
+  const convertedMultiple = multipleSeries;
+  multipleSeries.forEach((column, index) => {
+    let convertedResult = [];
+    convertedResult = column.queries[0].result.map((resultObj) => {
+      const convertedMetrics = {};
+      convertedMetrics.values = resultObj.values.map(val => ({
+          time: new Date(val.time),
+          value: val.value,
+      }));
+      convertedMetrics.metric = resultObj.metric;
+      return convertedMetrics;
+    });
+    convertedMultiple[index].queries[0].result = convertedResult;
+  });
+  return convertedMultiple;
+}
+
 export function MonitorMockInterceptor(request, next) {
   const body = responseMockData[request.method.toUpperCase()][request.url];
 
diff --git a/spec/javascripts/monitoring/monitoring_paths_spec.js b/spec/javascripts/monitoring/monitoring_paths_spec.js
new file mode 100644
index 00000000000..d39db945e17
--- /dev/null
+++ b/spec/javascripts/monitoring/monitoring_paths_spec.js
@@ -0,0 +1,34 @@
+import Vue from 'vue';
+import MonitoringPaths from '~/monitoring/components/monitoring_paths.vue';
+import createTimeSeries from '~/monitoring/utils/multiple_time_series';
+import { singleRowMetricsMultipleSeries, convertDatesMultipleSeries } from './mock_data';
+
+const createComponent = (propsData) => {
+  const Component = Vue.extend(MonitoringPaths);
+
+  return new Component({
+    propsData,
+  }).$mount();
+};
+
+const convertedMetrics = convertDatesMultipleSeries(singleRowMetricsMultipleSeries);
+
+const timeSeries = createTimeSeries(convertedMetrics[0].queries[0].result, 428, 272, 120);
+
+describe('Monitoring Paths', () => {
+  it('renders two paths to represent a line and the area underneath it', () => {
+    const component = createComponent({
+      generatedLinePath: timeSeries[0].linePath,
+      generatedAreaPath: timeSeries[0].areaPath,
+      lineColor: '#ccc',
+      areaColor: '#fff',
+    });
+    const metricArea = component.$el.querySelector('.metric-area');
+    const metricLine = component.$el.querySelector('.metric-line');
+
+    expect(metricArea.getAttribute('fill')).toBe('#fff');
+    expect(metricArea.getAttribute('d')).toBe(timeSeries[0].areaPath);
+    expect(metricLine.getAttribute('stroke')).toBe('#ccc');
+    expect(metricLine.getAttribute('d')).toBe(timeSeries[0].linePath);
+  });
+});
diff --git a/spec/javascripts/monitoring/utils/multiple_time_series_spec.js b/spec/javascripts/monitoring/utils/multiple_time_series_spec.js
new file mode 100644
index 00000000000..3daf6bf82df
--- /dev/null
+++ b/spec/javascripts/monitoring/utils/multiple_time_series_spec.js
@@ -0,0 +1,21 @@
+import createTimeSeries from '~/monitoring/utils/multiple_time_series';
+import { convertDatesMultipleSeries, singleRowMetricsMultipleSeries } from '../mock_data';
+
+const convertedMetrics = convertDatesMultipleSeries(singleRowMetricsMultipleSeries);
+const timeSeries = createTimeSeries(convertedMetrics[0].queries[0].result, 428, 272, 120);
+
+describe('Multiple time series', () => {
+  it('createTimeSeries returned array contains an object for each element', () => {
+    expect(typeof timeSeries[0].linePath).toEqual('string');
+    expect(typeof timeSeries[0].areaPath).toEqual('string');
+    expect(typeof timeSeries[0].timeSeriesScaleX).toEqual('function');
+    expect(typeof timeSeries[0].areaColor).toEqual('string');
+    expect(typeof timeSeries[0].lineColor).toEqual('string');
+    expect(timeSeries[0].values instanceof Array).toEqual(true);
+  });
+
+  it('createTimeSeries returns an array', () => {
+    expect(timeSeries instanceof Array).toEqual(true);
+    expect(timeSeries.length).toEqual(2);
+  });
+});
diff --git a/spec/javascripts/notes/components/issue_comment_form_spec.js b/spec/javascripts/notes/components/issue_comment_form_spec.js
new file mode 100644
index 00000000000..cca5ec887a3
--- /dev/null
+++ b/spec/javascripts/notes/components/issue_comment_form_spec.js
@@ -0,0 +1,134 @@
+import Vue from 'vue';
+import store from '~/notes/stores';
+import issueCommentForm from '~/notes/components/issue_comment_form.vue';
+import { loggedOutIssueData, notesDataMock, userDataMock, issueDataMock } from '../mock_data';
+import { keyboardDownEvent } from '../../issue_show/helpers';
+
+describe('issue_comment_form component', () => {
+  let vm;
+  const Component = Vue.extend(issueCommentForm);
+  let mountComponent;
+
+  beforeEach(() => {
+    mountComponent = () => new Component({
+      store,
+    }).$mount();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('user is logged in', () => {
+    beforeEach(() => {
+      store.dispatch('setUserData', userDataMock);
+      store.dispatch('setIssueData', issueDataMock);
+      store.dispatch('setNotesData', notesDataMock);
+
+      vm = mountComponent();
+    });
+
+    it('should render user avatar with link', () => {
+      expect(vm.$el.querySelector('.timeline-icon .user-avatar-link').getAttribute('href')).toEqual(userDataMock.path);
+    });
+
+    describe('textarea', () => {
+      it('should render textarea with placeholder', () => {
+        expect(
+          vm.$el.querySelector('.js-main-target-form textarea').getAttribute('placeholder'),
+        ).toEqual('Write a comment or drag your files here...');
+      });
+
+      it('should support quick actions', () => {
+        expect(
+          vm.$el.querySelector('.js-main-target-form textarea').getAttribute('data-supports-quick-actions'),
+        ).toEqual('true');
+      });
+
+      it('should link to markdown docs', () => {
+        const { markdownDocsPath } = notesDataMock;
+        expect(vm.$el.querySelector(`a[href="${markdownDocsPath}"]`).textContent.trim()).toEqual('Markdown');
+      });
+
+      it('should link to quick actions docs', () => {
+        const { quickActionsDocsPath } = notesDataMock;
+        expect(vm.$el.querySelector(`a[href="${quickActionsDocsPath}"]`).textContent.trim()).toEqual('quick actions');
+      });
+
+      describe('edit mode', () => {
+        it('should enter edit mode when arrow up is pressed', () => {
+          spyOn(vm, 'editCurrentUserLastNote').and.callThrough();
+          vm.$el.querySelector('.js-main-target-form textarea').value = 'Foo';
+          vm.$el.querySelector('.js-main-target-form textarea').dispatchEvent(keyboardDownEvent(38, true));
+
+          expect(vm.editCurrentUserLastNote).toHaveBeenCalled();
+        });
+      });
+
+      describe('event enter', () => {
+        it('should save note when cmd/ctrl+enter is pressed', () => {
+          spyOn(vm, 'handleSave').and.callThrough();
+          vm.$el.querySelector('.js-main-target-form textarea').value = 'Foo';
+          vm.$el.querySelector('.js-main-target-form textarea').dispatchEvent(keyboardDownEvent(13, true));
+
+          expect(vm.handleSave).toHaveBeenCalled();
+        });
+      });
+    });
+
+    describe('actions', () => {
+      it('should be possible to close the issue', () => {
+        expect(vm.$el.querySelector('.btn-comment-and-close').textContent.trim()).toEqual('Close issue');
+      });
+
+      it('should render comment button as disabled', () => {
+        expect(vm.$el.querySelector('.js-comment-submit-button').getAttribute('disabled')).toEqual('disabled');
+      });
+
+      it('should enable comment button if it has note', (done) => {
+        vm.note = 'Foo';
+        Vue.nextTick(() => {
+          expect(vm.$el.querySelector('.js-comment-submit-button').getAttribute('disabled')).toEqual(null);
+          done();
+        });
+      });
+
+      it('should update buttons texts when it has note', (done) => {
+        vm.note = 'Foo';
+        Vue.nextTick(() => {
+          expect(vm.$el.querySelector('.btn-comment-and-close').textContent.trim()).toEqual('Comment & close issue');
+          expect(vm.$el.querySelector('.js-note-discard')).toBeDefined();
+          done();
+        });
+      });
+    });
+
+    describe('issue is confidential', () => {
+      it('shows information warning', (done) => {
+        store.dispatch('setIssueData', Object.assign(issueDataMock, { confidential: true }));
+        Vue.nextTick(() => {
+          expect(vm.$el.querySelector('.confidential-issue-warning')).toBeDefined();
+          done();
+        });
+      });
+    });
+  });
+
+  describe('user is not logged in', () => {
+    beforeEach(() => {
+      store.dispatch('setUserData', null);
+      store.dispatch('setIssueData', loggedOutIssueData);
+      store.dispatch('setNotesData', notesDataMock);
+
+      vm = mountComponent();
+    });
+
+    it('should render signed out widget', () => {
+      expect(vm.$el.textContent.replace(/\s+/g, ' ').trim()).toEqual('Please register or sign in to reply');
+    });
+
+    it('should not render submission form', () => {
+      expect(vm.$el.querySelector('textarea')).toEqual(null);
+    });
+  });
+});
diff --git a/spec/javascripts/notes/components/issue_discussion_spec.js b/spec/javascripts/notes/components/issue_discussion_spec.js
new file mode 100644
index 00000000000..05c6b57f93e
--- /dev/null
+++ b/spec/javascripts/notes/components/issue_discussion_spec.js
@@ -0,0 +1,50 @@
+import Vue from 'vue';
+import store from '~/notes/stores';
+import issueDiscussion from '~/notes/components/issue_discussion.vue';
+import { issueDataMock, discussionMock, notesDataMock } from '../mock_data';
+
+describe('issue_discussion component', () => {
+  let vm;
+
+  beforeEach(() => {
+    const Component = Vue.extend(issueDiscussion);
+
+    store.dispatch('setIssueData', issueDataMock);
+    store.dispatch('setNotesData', notesDataMock);
+
+    vm = new Component({
+      store,
+      propsData: {
+        note: discussionMock,
+      },
+    }).$mount();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  it('should render user avatar', () => {
+    expect(vm.$el.querySelector('.user-avatar-link')).toBeDefined();
+  });
+
+  it('should render discussion header', () => {
+    expect(vm.$el.querySelector('.discussion-header')).toBeDefined();
+    expect(vm.$el.querySelectorAll('.notes li').length).toEqual(discussionMock.notes.length);
+  });
+
+  describe('actions', () => {
+    it('should render reply button', () => {
+      expect(vm.$el.querySelector('.js-vue-discussion-reply').textContent.trim()).toEqual('Reply...');
+    });
+
+    it('should toggle reply form', (done) => {
+      vm.$el.querySelector('.js-vue-discussion-reply').click();
+      Vue.nextTick(() => {
+        expect(vm.$refs.noteForm).toBeDefined();
+        expect(vm.isReplying).toEqual(true);
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/javascripts/notes/components/issue_note_actions_spec.js b/spec/javascripts/notes/components/issue_note_actions_spec.js
new file mode 100644
index 00000000000..7bcc061f167
--- /dev/null
+++ b/spec/javascripts/notes/components/issue_note_actions_spec.js
@@ -0,0 +1,91 @@
+import Vue from 'vue';
+import store from '~/notes/stores';
+import issueActions from '~/notes/components/issue_note_actions.vue';
+import { userDataMock } from '../mock_data';
+
+describe('issse_note_actions component', () => {
+  let vm;
+  let Component;
+
+  beforeEach(() => {
+    Component = Vue.extend(issueActions);
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('user is logged in', () => {
+    let props;
+
+    beforeEach(() => {
+      props = {
+        accessLevel: 'Master',
+        authorId: 26,
+        canDelete: true,
+        canEdit: true,
+        canReportAsAbuse: true,
+        noteId: 539,
+        reportAbusePath: '/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F7%23note_539&user_id=26',
+      };
+
+      store.dispatch('setUserData', userDataMock);
+
+      vm = new Component({
+        store,
+        propsData: props,
+      }).$mount();
+    });
+
+    it('should render access level badge', () => {
+      expect(vm.$el.querySelector('.note-role').textContent.trim()).toEqual(props.accessLevel);
+    });
+
+    it('should render emoji link', () => {
+      expect(vm.$el.querySelector('.js-add-award')).toBeDefined();
+    });
+
+    describe('actions dropdown', () => {
+      it('should be possible to edit the comment', () => {
+        expect(vm.$el.querySelector('.js-note-edit')).toBeDefined();
+      });
+
+      it('should be possible to report as abuse', () => {
+        expect(vm.$el.querySelector(`a[href="${props.reportAbusePath}"]`)).toBeDefined();
+      });
+
+      it('should be possible to delete comment', () => {
+        expect(vm.$el.querySelector('.js-note-delete')).toBeDefined();
+      });
+    });
+  });
+
+  describe('user is not logged in', () => {
+    let props;
+
+    beforeEach(() => {
+      store.dispatch('setUserData', {});
+      props = {
+        accessLevel: 'Master',
+        authorId: 26,
+        canDelete: false,
+        canEdit: false,
+        canReportAsAbuse: false,
+        noteId: 539,
+        reportAbusePath: '/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F7%23note_539&user_id=26',
+      };
+      vm = new Component({
+        store,
+        propsData: props,
+      }).$mount();
+    });
+
+    it('should not render emoji link', () => {
+      expect(vm.$el.querySelector('.js-add-award')).toEqual(null);
+    });
+
+    it('should not render actions dropdown', () => {
+      expect(vm.$el.querySelector('.more-actions')).toEqual(null);
+    });
+  });
+});
diff --git a/spec/javascripts/notes/components/issue_note_app_spec.js b/spec/javascripts/notes/components/issue_note_app_spec.js
new file mode 100644
index 00000000000..22e91c4c40f
--- /dev/null
+++ b/spec/javascripts/notes/components/issue_note_app_spec.js
@@ -0,0 +1,255 @@
+import Vue from 'vue';
+import issueNotesApp from '~/notes/components/issue_notes_app.vue';
+import service from '~/notes/services/issue_notes_service';
+import * as mockData from '../mock_data';
+
+describe('issue_note_app', () => {
+  let mountComponent;
+  let vm;
+
+  const individualNoteInterceptor = (request, next) => {
+    next(request.respondWith(JSON.stringify(mockData.individualNoteServerResponse), {
+      status: 200,
+    }));
+  };
+
+  const discussionNoteInterceptor = (request, next) => {
+    next(request.respondWith(JSON.stringify(mockData.discussionNoteServerResponse), {
+      status: 200,
+    }));
+  };
+
+  beforeEach(() => {
+    const IssueNotesApp = Vue.extend(issueNotesApp);
+
+    mountComponent = (data) => {
+      const props = data || {
+        issueData: mockData.issueDataMock,
+        notesData: mockData.notesDataMock,
+        userData: mockData.userDataMock,
+      };
+
+      return new IssueNotesApp({
+        propsData: props,
+      }).$mount();
+    };
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('set data', () => {
+    const responseInterceptor = (request, next) => {
+      next(request.respondWith(JSON.stringify([]), {
+        status: 200,
+      }));
+    };
+
+    beforeEach(() => {
+      Vue.http.interceptors.push(responseInterceptor);
+      vm = mountComponent();
+    });
+
+    afterEach(() => {
+      Vue.http.interceptors = _.without(Vue.http.interceptors, responseInterceptor);
+    });
+
+    it('should set notes data', () => {
+      expect(vm.$store.state.notesData).toEqual(mockData.notesDataMock);
+    });
+
+    it('should set issue data', () => {
+      expect(vm.$store.state.issueData).toEqual(mockData.issueDataMock);
+    });
+
+    it('should set user data', () => {
+      expect(vm.$store.state.userData).toEqual(mockData.userDataMock);
+    });
+
+    it('should fetch notes', () => {
+      expect(vm.$store.state.notes).toEqual([]);
+    });
+  });
+
+  describe('render', () => {
+    beforeEach(() => {
+      Vue.http.interceptors.push(individualNoteInterceptor);
+      vm = mountComponent();
+    });
+
+    afterEach(() => {
+      Vue.http.interceptors = _.without(Vue.http.interceptors, individualNoteInterceptor);
+    });
+
+    it('should render list of notes', (done) => {
+      const note = mockData.individualNoteServerResponse[0].notes[0];
+
+      setTimeout(() => {
+        expect(
+          vm.$el.querySelector('.main-notes-list .note-header-author-name').textContent.trim(),
+        ).toEqual(note.author.name);
+
+        expect(vm.$el.querySelector('.main-notes-list .note-text').innerHTML).toEqual(note.note_html);
+        done();
+      }, 0);
+    });
+
+    it('should render form', () => {
+      expect(vm.$el.querySelector('.js-main-target-form').tagName).toEqual('FORM');
+      expect(
+        vm.$el.querySelector('.js-main-target-form textarea').getAttribute('placeholder'),
+      ).toEqual('Write a comment or drag your files here...');
+    });
+
+    it('should render form comment button as disabled', () => {
+      expect(
+        vm.$el.querySelector('.js-note-new-discussion').getAttribute('disabled'),
+      ).toEqual('disabled');
+    });
+  });
+
+  describe('while fetching data', () => {
+    beforeEach(() => {
+      vm = mountComponent();
+    });
+
+    it('should render loading icon', () => {
+      expect(vm.$el.querySelector('.js-loading')).toBeDefined();
+    });
+
+    it('should render form', () => {
+      expect(vm.$el.querySelector('.js-main-target-form').tagName).toEqual('FORM');
+      expect(
+        vm.$el.querySelector('.js-main-target-form textarea').getAttribute('placeholder'),
+      ).toEqual('Write a comment or drag your files here...');
+    });
+  });
+
+  describe('update note', () => {
+    describe('individual note', () => {
+      beforeEach(() => {
+        Vue.http.interceptors.push(individualNoteInterceptor);
+        spyOn(service, 'updateNote').and.callFake(() => Promise.resolve());
+        vm = mountComponent();
+      });
+
+      afterEach(() => {
+        Vue.http.interceptors = _.without(Vue.http.interceptors, individualNoteInterceptor);
+      });
+
+      it('renders edit form', (done) => {
+        setTimeout(() => {
+          vm.$el.querySelector('.js-note-edit').click();
+          Vue.nextTick(() => {
+            expect(vm.$el.querySelector('.js-vue-issue-note-form')).toBeDefined();
+            done();
+          });
+        }, 0);
+      });
+
+      it('calls the service to update the note', (done) => {
+        setTimeout(() => {
+          vm.$el.querySelector('.js-note-edit').click();
+          Vue.nextTick(() => {
+            vm.$el.querySelector('.js-vue-issue-note-form').value = 'this is a note';
+            vm.$el.querySelector('.js-vue-issue-save').click();
+
+            expect(service.updateNote).toHaveBeenCalled();
+            done();
+          });
+        }, 0);
+      });
+    });
+
+    describe('dicussion note', () => {
+      beforeEach(() => {
+        Vue.http.interceptors.push(discussionNoteInterceptor);
+        spyOn(service, 'updateNote').and.callFake(() => Promise.resolve());
+        vm = mountComponent();
+      });
+
+      afterEach(() => {
+        Vue.http.interceptors = _.without(Vue.http.interceptors, discussionNoteInterceptor);
+      });
+
+      it('renders edit form', (done) => {
+        setTimeout(() => {
+          vm.$el.querySelector('.js-note-edit').click();
+          Vue.nextTick(() => {
+            expect(vm.$el.querySelector('.js-vue-issue-note-form')).toBeDefined();
+            done();
+          });
+        }, 0);
+      });
+
+      it('updates the note and resets the edit form', (done) => {
+        setTimeout(() => {
+          vm.$el.querySelector('.js-note-edit').click();
+          Vue.nextTick(() => {
+            vm.$el.querySelector('.js-vue-issue-note-form').value = 'this is a note';
+            vm.$el.querySelector('.js-vue-issue-save').click();
+
+            expect(service.updateNote).toHaveBeenCalled();
+            done();
+          });
+        }, 0);
+      });
+    });
+  });
+
+  describe('new note form', () => {
+    beforeEach(() => {
+      vm = mountComponent();
+    });
+
+    it('should render markdown docs url', () => {
+      const { markdownDocsPath } = mockData.notesDataMock;
+      expect(vm.$el.querySelector(`a[href="${markdownDocsPath}"]`).textContent.trim()).toEqual('Markdown');
+    });
+
+    it('should render quick action docs url', () => {
+      const { quickActionsDocsPath } = mockData.notesDataMock;
+      expect(vm.$el.querySelector(`a[href="${quickActionsDocsPath}"]`).textContent.trim()).toEqual('quick actions');
+    });
+  });
+
+  describe('edit form', () => {
+    beforeEach(() => {
+      Vue.http.interceptors.push(individualNoteInterceptor);
+      vm = mountComponent();
+    });
+
+    afterEach(() => {
+      Vue.http.interceptors = _.without(Vue.http.interceptors, individualNoteInterceptor);
+    });
+
+    it('should render markdown docs url', (done) => {
+      setTimeout(() => {
+        vm.$el.querySelector('.js-note-edit').click();
+        const { markdownDocsPath } = mockData.notesDataMock;
+
+        Vue.nextTick(() => {
+          expect(
+            vm.$el.querySelector(`.edit-note a[href="${markdownDocsPath}"]`).textContent.trim(),
+          ).toEqual('Markdown is supported');
+          done();
+        });
+      }, 0);
+    });
+
+    it('should not render quick actions docs url', (done) => {
+      setTimeout(() => {
+        vm.$el.querySelector('.js-note-edit').click();
+        const { quickActionsDocsPath } = mockData.notesDataMock;
+
+        Vue.nextTick(() => {
+          expect(
+            vm.$el.querySelector(`.edit-note a[href="${quickActionsDocsPath}"]`),
+          ).toEqual(null);
+          done();
+        });
+      }, 0);
+    });
+  });
+});
diff --git a/spec/javascripts/notes/components/issue_note_attachment_spec.js b/spec/javascripts/notes/components/issue_note_attachment_spec.js
new file mode 100644
index 00000000000..8f33b874ad6
--- /dev/null
+++ b/spec/javascripts/notes/components/issue_note_attachment_spec.js
@@ -0,0 +1,23 @@
+import Vue from 'vue';
+import issueNoteAttachment from '~/notes/components/issue_note_attachment.vue';
+
+describe('issue note attachment', () => {
+  it('should render properly', () => {
+    const props = {
+      attachment: {
+        filename: 'dk.png',
+        image: true,
+        url: '/dk.png',
+      },
+    };
+
+    const Component = Vue.extend(issueNoteAttachment);
+    const vm = new Component({
+      propsData: props,
+    }).$mount();
+
+    expect(vm.$el.classList.contains('note-attachment')).toBeTruthy();
+    expect(vm.$el.querySelector('img').src).toContain(props.attachment.url);
+    expect(vm.$el.querySelector('a').href).toContain(props.attachment.url);
+  });
+});
diff --git a/spec/javascripts/notes/components/issue_note_awards_list_spec.js b/spec/javascripts/notes/components/issue_note_awards_list_spec.js
new file mode 100644
index 00000000000..3b6c34f1494
--- /dev/null
+++ b/spec/javascripts/notes/components/issue_note_awards_list_spec.js
@@ -0,0 +1,56 @@
+import Vue from 'vue';
+import store from '~/notes/stores';
+import awardsNote from '~/notes/components/issue_note_awards_list.vue';
+import { issueDataMock, notesDataMock } from '../mock_data';
+
+describe('issue_note_awards_list component', () => {
+  let vm;
+  let awardsMock;
+
+  beforeEach(() => {
+    const Component = Vue.extend(awardsNote);
+
+    store.dispatch('setIssueData', issueDataMock);
+    store.dispatch('setNotesData', notesDataMock);
+    awardsMock = [
+      {
+        name: 'flag_tz',
+        user: { id: 1, name: 'Administrator', username: 'root' },
+      },
+      {
+        name: 'cartwheel_tone3',
+        user: { id: 12, name: 'Bobbie Stehr', username: 'erin' },
+      },
+    ];
+
+    vm = new Component({
+      store,
+      propsData: {
+        awards: awardsMock,
+        noteAuthorId: 2,
+        noteId: 545,
+        toggleAwardPath: '/gitlab-org/gitlab-ce/notes/545/toggle_award_emoji',
+      },
+    }).$mount();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  it('should render awarded emojis', () => {
+    expect(vm.$el.querySelector('.js-awards-block button [data-name="flag_tz"]')).toBeDefined();
+    expect(vm.$el.querySelector('.js-awards-block button [data-name="cartwheel_tone3"]')).toBeDefined();
+  });
+
+  it('should be possible to remove awareded emoji', () => {
+    spyOn(vm, 'handleAward').and.callThrough();
+    vm.$el.querySelector('.js-awards-block button').click();
+
+    expect(vm.handleAward).toHaveBeenCalledWith('flag_tz');
+  });
+
+  it('should be possible to add new emoji', () => {
+    expect(vm.$el.querySelector('.js-add-award')).toBeDefined();
+  });
+});
diff --git a/spec/javascripts/notes/components/issue_note_body_spec.js b/spec/javascripts/notes/components/issue_note_body_spec.js
new file mode 100644
index 00000000000..81f07ed47cc
--- /dev/null
+++ b/spec/javascripts/notes/components/issue_note_body_spec.js
@@ -0,0 +1,46 @@
+
+import Vue from 'vue';
+import store from '~/notes/stores';
+import noteBody from '~/notes/components/issue_note_body.vue';
+import { issueDataMock, notesDataMock, note } from '../mock_data';
+
+describe('issue_note_body component', () => {
+  let vm;
+
+  beforeEach(() => {
+    const Component = Vue.extend(noteBody);
+
+    store.dispatch('setIssueData', issueDataMock);
+    store.dispatch('setNotesData', notesDataMock);
+
+    vm = new Component({
+      store,
+      propsData: {
+        note,
+        canEdit: true,
+      },
+    }).$mount();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  it('should render the note', () => {
+    expect(vm.$el.querySelector('.note-text').innerHTML).toEqual(note.note_html);
+  });
+
+  it('should be render form if user is editing', (done) => {
+    vm.isEditing = true;
+
+    Vue.nextTick(() => {
+      expect(vm.$el.querySelector('textarea.js-task-list-field')).toBeDefined();
+      done();
+    });
+  });
+
+  it('should render awards list', () => {
+    expect(vm.$el.querySelector('.js-awards-block button [data-name="baseball"]')).toBeDefined();
+    expect(vm.$el.querySelector('.js-awards-block button [data-name="bath_tone3"]')).toBeDefined();
+  });
+});
diff --git a/spec/javascripts/notes/components/issue_note_edited_text_spec.js b/spec/javascripts/notes/components/issue_note_edited_text_spec.js
new file mode 100644
index 00000000000..6603241eb64
--- /dev/null
+++ b/spec/javascripts/notes/components/issue_note_edited_text_spec.js
@@ -0,0 +1,47 @@
+import Vue from 'vue';
+import issueNoteEditedText from '~/notes/components/issue_note_edited_text.vue';
+
+describe('issue_note_edited_text', () => {
+  let vm;
+  let props;
+
+  beforeEach(() => {
+    const Component = Vue.extend(issueNoteEditedText);
+    props = {
+      actionText: 'Edited',
+      className: 'foo-bar',
+      editedAt: '2017-08-04T09:52:31.062Z',
+      editedBy: {
+        avatar_url: 'path',
+        id: 1,
+        name: 'Root',
+        path: '/root',
+        state: 'active',
+        username: 'root',
+      },
+    };
+
+    vm = new Component({
+      propsData: props,
+    }).$mount();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  it('should render block with provided className', () => {
+    expect(vm.$el.className).toEqual(props.className);
+  });
+
+  it('should render provided actionText', () => {
+    expect(vm.$el.textContent).toContain(props.actionText);
+  });
+
+  it('should render provided user information', () => {
+    const authorLink = vm.$el.querySelector('.js-vue-author');
+
+    expect(authorLink.getAttribute('href')).toEqual(props.editedBy.path);
+    expect(authorLink.textContent.trim()).toEqual(props.editedBy.name);
+  });
+});
diff --git a/spec/javascripts/notes/components/issue_note_form_spec.js b/spec/javascripts/notes/components/issue_note_form_spec.js
new file mode 100644
index 00000000000..a90dbcb72b5
--- /dev/null
+++ b/spec/javascripts/notes/components/issue_note_form_spec.js
@@ -0,0 +1,112 @@
+import Vue from 'vue';
+import store from '~/notes/stores';
+import issueNoteForm from '~/notes/components/issue_note_form.vue';
+import { issueDataMock, notesDataMock } from '../mock_data';
+import { keyboardDownEvent } from '../../issue_show/helpers';
+
+describe('issue_note_form component', () => {
+  let vm;
+  let props;
+
+  beforeEach(() => {
+    const Component = Vue.extend(issueNoteForm);
+
+    store.dispatch('setIssueData', issueDataMock);
+    store.dispatch('setNotesData', notesDataMock);
+
+    props = {
+      isEditing: false,
+      noteBody: 'Magni suscipit eius consectetur enim et ex et commodi.',
+      noteId: 545,
+    };
+
+    vm = new Component({
+      store,
+      propsData: props,
+    }).$mount();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('conflicts editing', () => {
+    it('should show conflict message if note changes outside the component', (done) => {
+      vm.isEditing = true;
+      vm.noteBody = 'Foo';
+      const message = 'This comment has changed since you started editing, please review the updated comment to ensure information is not lost.';
+
+      Vue.nextTick(() => {
+        expect(
+          vm.$el.querySelector('.js-conflict-edit-warning').textContent.replace(/\s+/g, ' ').trim(),
+        ).toEqual(message);
+        done();
+      });
+    });
+  });
+
+  describe('form', () => {
+    it('should render text area with placeholder', () => {
+      expect(
+        vm.$el.querySelector('textarea').getAttribute('placeholder'),
+      ).toEqual('Write a comment or drag your files here...');
+    });
+
+    it('should link to markdown docs', () => {
+      const { markdownDocsPath } = notesDataMock;
+      expect(vm.$el.querySelector(`a[href="${markdownDocsPath}"]`).textContent.trim()).toEqual('Markdown');
+    });
+
+    describe('keyboard events', () => {
+      describe('up', () => {
+        it('should ender edit mode', () => {
+          spyOn(vm, 'editMyLastNote').and.callThrough();
+          vm.$el.querySelector('textarea').value = 'Foo';
+          vm.$el.querySelector('textarea').dispatchEvent(keyboardDownEvent(38, true));
+
+          expect(vm.editMyLastNote).toHaveBeenCalled();
+        });
+      });
+
+      describe('enter', () => {
+        it('should submit note', () => {
+          spyOn(vm, 'handleUpdate').and.callThrough();
+          vm.$el.querySelector('textarea').value = 'Foo';
+          vm.$el.querySelector('textarea').dispatchEvent(keyboardDownEvent(13, true));
+
+          expect(vm.handleUpdate).toHaveBeenCalled();
+        });
+      });
+    });
+
+    describe('actions', () => {
+      it('should be possible to cancel', (done) => {
+        spyOn(vm, 'cancelHandler').and.callThrough();
+        vm.isEditing = true;
+
+        Vue.nextTick(() => {
+          vm.$el.querySelector('.note-edit-cancel').click();
+
+          Vue.nextTick(() => {
+            expect(vm.cancelHandler).toHaveBeenCalled();
+            done();
+          });
+        });
+      });
+
+      it('should be possible to update the note', (done) => {
+        vm.isEditing = true;
+
+        Vue.nextTick(() => {
+          vm.$el.querySelector('textarea').value = 'Foo';
+          vm.$el.querySelector('.js-vue-issue-save').click();
+
+          Vue.nextTick(() => {
+            expect(vm.isSubmitting).toEqual(true);
+            done();
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/spec/javascripts/notes/components/issue_note_header_spec.js b/spec/javascripts/notes/components/issue_note_header_spec.js
new file mode 100644
index 00000000000..83ea18508ae
--- /dev/null
+++ b/spec/javascripts/notes/components/issue_note_header_spec.js
@@ -0,0 +1,94 @@
+import Vue from 'vue';
+import issueNoteHeader from '~/notes/components/issue_note_header.vue';
+import store from '~/notes/stores';
+
+describe('issue_note_header component', () => {
+  let vm;
+  let Component;
+
+  beforeEach(() => {
+    Component = Vue.extend(issueNoteHeader);
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('individual note', () => {
+    beforeEach(() => {
+      vm = new Component({
+        store,
+        propsData: {
+          actionText: 'commented',
+          actionTextHtml: '',
+          author: {
+            avatar_url: null,
+            id: 1,
+            name: 'Root',
+            path: '/root',
+            state: 'active',
+            username: 'root',
+          },
+          createdAt: '2017-08-02T10:51:58.559Z',
+          includeToggle: false,
+          noteId: 1394,
+        },
+      }).$mount();
+    });
+
+    it('should render user information', () => {
+      expect(
+        vm.$el.querySelector('.note-header-author-name').textContent.trim(),
+      ).toEqual('Root');
+      expect(
+        vm.$el.querySelector('.note-header-info a').getAttribute('href'),
+      ).toEqual('/root');
+    });
+
+    it('should render timestamp link', () => {
+      expect(vm.$el.querySelector('a[href="#note_1394"]')).toBeDefined();
+    });
+  });
+
+  describe('discussion', () => {
+    beforeEach(() => {
+      vm = new Component({
+        store,
+        propsData: {
+          actionText: 'started a discussion',
+          actionTextHtml: '',
+          author: {
+            avatar_url: null,
+            id: 1,
+            name: 'Root',
+            path: '/root',
+            state: 'active',
+            username: 'root',
+          },
+          createdAt: '2017-08-02T10:51:58.559Z',
+          includeToggle: true,
+          noteId: 1395,
+        },
+      }).$mount();
+    });
+
+    it('should render toggle button', () => {
+      expect(vm.$el.querySelector('.js-vue-toggle-button')).toBeDefined();
+    });
+
+    it('should toggle the disucssion icon', (done) => {
+      expect(
+        vm.$el.querySelector('.js-vue-toggle-button i').classList.contains('fa-chevron-up'),
+      ).toEqual(true);
+
+      vm.$el.querySelector('.js-vue-toggle-button').click();
+
+      Vue.nextTick(() => {
+        expect(
+          vm.$el.querySelector('.js-vue-toggle-button i').classList.contains('fa-chevron-down'),
+        ).toEqual(true);
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/javascripts/notes/components/issue_note_signed_out_widget_spec.js b/spec/javascripts/notes/components/issue_note_signed_out_widget_spec.js
new file mode 100644
index 00000000000..f20d9ce9268
--- /dev/null
+++ b/spec/javascripts/notes/components/issue_note_signed_out_widget_spec.js
@@ -0,0 +1,37 @@
+import Vue from 'vue';
+import issueNoteSignedOut from '~/notes/components/issue_note_signed_out_widget.vue';
+import store from '~/notes/stores';
+import { notesDataMock } from '../mock_data';
+
+describe('issue_note_signed_out_widget component', () => {
+  let vm;
+
+  beforeEach(() => {
+    const Component = Vue.extend(issueNoteSignedOut);
+    store.dispatch('setNotesData', notesDataMock);
+
+    vm = new Component({
+      store,
+    }).$mount();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  it('should render sign in link provided in the store', () => {
+    expect(
+      vm.$el.querySelector(`a[href="${notesDataMock.newSessionPath}"]`).textContent,
+    ).toEqual('sign in');
+  });
+
+  it('should render register link provided in the store', () => {
+    expect(
+      vm.$el.querySelector(`a[href="${notesDataMock.registerPath}"]`).textContent,
+    ).toEqual('register');
+  });
+
+  it('should render information text', () => {
+    expect(vm.$el.textContent.replace(/\s+/g, ' ').trim()).toEqual('Please register or sign in to reply');
+  });
+});
diff --git a/spec/javascripts/notes/components/issue_note_spec.js b/spec/javascripts/notes/components/issue_note_spec.js
new file mode 100644
index 00000000000..7ef85d5b4f0
--- /dev/null
+++ b/spec/javascripts/notes/components/issue_note_spec.js
@@ -0,0 +1,44 @@
+
+import Vue from 'vue';
+import store from '~/notes/stores';
+import issueNote from '~/notes/components/issue_note.vue';
+import { issueDataMock, notesDataMock, note } from '../mock_data';
+
+describe('issue_note', () => {
+  let vm;
+
+  beforeEach(() => {
+    const Component = Vue.extend(issueNote);
+
+    store.dispatch('setIssueData', issueDataMock);
+    store.dispatch('setNotesData', notesDataMock);
+
+    vm = new Component({
+      store,
+      propsData: {
+        note,
+      },
+    }).$mount();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  it('should render user information', () => {
+    expect(vm.$el.querySelector('.user-avatar-link img').getAttribute('src')).toEqual(note.author.avatar_url);
+  });
+
+  it('should render note header content', () => {
+    expect(vm.$el.querySelector('.note-header .note-header-author-name').textContent.trim()).toEqual(note.author.name);
+    expect(vm.$el.querySelector('.note-header .note-headline-meta').textContent.trim()).toContain('commented');
+  });
+
+  it('should render note actions', () => {
+    expect(vm.$el.querySelector('.note-actions')).toBeDefined();
+  });
+
+  it('should render issue body', () => {
+    expect(vm.$el.querySelector('.note-text').innerHTML).toEqual(note.note_html);
+  });
+});
diff --git a/spec/javascripts/notes/components/issue_placeholder_note_spec.js b/spec/javascripts/notes/components/issue_placeholder_note_spec.js
new file mode 100644
index 00000000000..6e5275087f3
--- /dev/null
+++ b/spec/javascripts/notes/components/issue_placeholder_note_spec.js
@@ -0,0 +1,39 @@
+import Vue from 'vue';
+import issuePlaceholderNote from '~/notes/components/issue_placeholder_note.vue';
+import store from '~/notes/stores';
+import { userDataMock } from '../mock_data';
+
+describe('issue placeholder system note component', () => {
+  let vm;
+
+  beforeEach(() => {
+    const Component = Vue.extend(issuePlaceholderNote);
+    store.dispatch('setUserData', userDataMock);
+    vm = new Component({
+      store,
+      propsData: { note: { body: 'Foo' } },
+    }).$mount();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('user information', () => {
+    it('should render user avatar with link', () => {
+      expect(vm.$el.querySelector('.user-avatar-link').getAttribute('href')).toEqual(userDataMock.path);
+      expect(vm.$el.querySelector('.user-avatar-link img').getAttribute('src')).toEqual(userDataMock.avatar_url);
+    });
+  });
+
+  describe('note content', () => {
+    it('should render note header information', () => {
+      expect(vm.$el.querySelector('.note-header-info a').getAttribute('href')).toEqual(userDataMock.path);
+      expect(vm.$el.querySelector('.note-header-info .note-headline-light').textContent.trim()).toEqual(`@${userDataMock.username}`);
+    });
+
+    it('should render note body', () => {
+      expect(vm.$el.querySelector('.note-text p').textContent.trim()).toEqual('Foo');
+    });
+  });
+});
diff --git a/spec/javascripts/notes/components/issue_placeholder_system_note_spec.js b/spec/javascripts/notes/components/issue_placeholder_system_note_spec.js
new file mode 100644
index 00000000000..d508a49f710
--- /dev/null
+++ b/spec/javascripts/notes/components/issue_placeholder_system_note_spec.js
@@ -0,0 +1,24 @@
+import Vue from 'vue';
+import placeholderSystemNote from '~/notes/components/issue_placeholder_system_note.vue';
+
+describe('issue placeholder system note component', () => {
+  let mountComponent;
+  beforeEach(() => {
+    const PlaceholderSystemNote = Vue.extend(placeholderSystemNote);
+
+    mountComponent = props => new PlaceholderSystemNote({
+      propsData: {
+        note: {
+          body: props,
+        },
+      },
+    }).$mount();
+  });
+
+  it('should render system note placeholder with plain text', () => {
+    const vm = mountComponent('This is a placeholder');
+
+    expect(vm.$el.tagName).toEqual('LI');
+    expect(vm.$el.querySelector('.timeline-content em').textContent.trim()).toEqual('This is a placeholder');
+  });
+});
diff --git a/spec/javascripts/notes/components/issue_system_note_spec.js b/spec/javascripts/notes/components/issue_system_note_spec.js
new file mode 100644
index 00000000000..c317ce32716
--- /dev/null
+++ b/spec/javascripts/notes/components/issue_system_note_spec.js
@@ -0,0 +1,53 @@
+import Vue from 'vue';
+import issueSystemNote from '~/notes/components/issue_system_note.vue';
+import store from '~/notes/stores';
+
+describe('issue system note', () => {
+  let vm;
+  let props;
+
+  beforeEach(() => {
+    props = {
+      note: {
+        id: 1424,
+        author: {
+          id: 1,
+          name: 'Root',
+          username: 'root',
+          state: 'active',
+          avatar_url: 'path',
+          path: '/root',
+        },
+        note_html: '<p dir="auto">closed</p>',
+        system_note_icon_name: 'icon_status_closed',
+        created_at: '2017-08-02T10:51:58.559Z',
+      },
+    };
+
+    store.dispatch('setTargetNoteHash', `note_${props.note.id}`);
+
+    const Component = Vue.extend(issueSystemNote);
+    vm = new Component({
+      store,
+      propsData: props,
+    }).$mount();
+  });
+
+  it('should render a list item with correct id', () => {
+    expect(vm.$el.getAttribute('id')).toEqual(`note_${props.note.id}`);
+  });
+
+  it('should render target class is note is target note', () => {
+    expect(vm.$el.classList).toContain('target');
+  });
+
+  it('should render svg icon', () => {
+    expect(vm.$el.querySelector('.timeline-icon svg')).toBeDefined();
+  });
+
+  it('should render note header component', () => {
+    expect(
+      vm.$el.querySelector('.system-note-message').innerHTML,
+    ).toEqual(props.note.note_html);
+  });
+});
diff --git a/spec/javascripts/notes/mock_data.js b/spec/javascripts/notes/mock_data.js
new file mode 100644
index 00000000000..89ba3a002b7
--- /dev/null
+++ b/spec/javascripts/notes/mock_data.js
@@ -0,0 +1,449 @@
+/* eslint-disable */
+export const notesDataMock = {
+  discussionsPath: '/gitlab-org/gitlab-ce/issues/26/discussions.json',
+  lastFetchedAt: '1501862675',
+  markdownDocsPath: '/help/user/markdown',
+  newSessionPath: '/users/sign_in?redirect_to_referer=yes',
+  notesPath: '/gitlab-org/gitlab-ce/noteable/issue/98/notes',
+  quickActionsDocsPath: '/help/user/project/quick_actions',
+  registerPath: '/users/sign_in?redirect_to_referer=yes#register-pane',
+};
+
+export const userDataMock = {
+  avatar_url: 'mock_path',
+  id: 1,
+  name: 'Root',
+  path: '/root',
+  state: 'active',
+  username: 'root',
+};
+
+export const issueDataMock = {
+  assignees: [],
+  author_id: 1,
+  branch_name: null,
+  confidential: false,
+  create_note_path: '/gitlab-org/gitlab-ce/notes?target_id=98&target_type=issue',
+  created_at: '2017-02-07T10:11:18.395Z',
+  current_user: {
+    can_create_note: true,
+    can_update: true,
+  },
+  deleted_at: null,
+  description: '',
+  due_date: null,
+  human_time_estimate: null,
+  human_total_time_spent: null,
+  id: 98,
+  iid: 26,
+  labels: [],
+  lock_version: null,
+  milestone: null,
+  milestone_id: null,
+  moved_to_id: null,
+  preview_note_path: '/gitlab-org/gitlab-ce/preview_markdown?quick_actions_target_id=98&quick_actions_target_type=Issue',
+  project_id: 2,
+  state: 'opened',
+  time_estimate: 0,
+  title: '14',
+  total_time_spent: 0,
+  updated_at: '2017-08-04T09:53:01.226Z',
+  updated_by_id: 1,
+  web_url: '/gitlab-org/gitlab-ce/issues/26',
+};
+
+export const lastFetchedAt = '1501862675';
+
+export const individualNote = {
+  expanded: true,
+  id: '0fb4e0e3f9276e55ff32eb4195add694aece4edd',
+  individual_note: true,
+  notes: [{
+    id: 1390,
+    attachment: {
+      url: null,
+      filename: null,
+      image: false,
+    },
+    author: {
+      id: 1,
+      name: 'Root',
+      username: 'root',
+      state: 'active',
+      avatar_url: 'test',
+      path: '/root',
+    },
+    created_at: '2017-08-01T17: 09: 33.762Z',
+    updated_at: '2017-08-01T17: 09: 33.762Z',
+    system: false,
+    noteable_id: 98,
+    noteable_type: 'Issue',
+    type: null,
+    human_access: 'Owner',
+    note: 'sdfdsaf',
+    note_html: '<p dir=\'auto\'>sdfdsaf</p>',
+    current_user: { can_edit: true },
+    discussion_id: '0fb4e0e3f9276e55ff32eb4195add694aece4edd',
+    emoji_awardable: true,
+    award_emoji: [
+      { name: 'baseball', user: { id: 1, name: 'Root', username: 'root' } },
+      { name: 'art', user: { id: 1, name: 'Root', username: 'root' } },
+    ],
+    toggle_award_path: '/gitlab-org/gitlab-ce/notes/1390/toggle_award_emoji',
+    report_abuse_path: '/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F26%23note_1390&user_id=1',
+    path: '/gitlab-org/gitlab-ce/notes/1390',
+  }],
+  reply_id: '0fb4e0e3f9276e55ff32eb4195add694aece4edd',
+};
+
+export const note = {
+  "id": 546,
+  "attachment": {
+    "url": null,
+    "filename": null,
+    "image": false
+  },
+  "author": {
+    "id": 1,
+    "name": "Administrator",
+    "username": "root",
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+    "path": "/root"
+  },
+  "created_at": "2017-08-10T15:24:03.087Z",
+  "updated_at": "2017-08-10T15:24:03.087Z",
+  "system": false,
+  "noteable_id": 67,
+  "noteable_type": "Issue",
+  "noteable_iid": 7,
+  "type": null,
+  "human_access": "Owner",
+  "note": "Vel id placeat reprehenderit sit numquam.",
+  "note_html": "<p dir=\"auto\">Vel id placeat reprehenderit sit numquam.</p>",
+  "current_user": {
+    "can_edit": true
+  },
+  "discussion_id": "d3842a451b7f3d9a5dfce329515127b2d29a4cd0",
+  "emoji_awardable": true,
+  "award_emoji": [{
+    "name": "baseball",
+    "user": {
+      "id": 1,
+      "name": "Administrator",
+      "username": "root"
+    }
+  }, {
+    "name": "bath_tone3",
+    "user": {
+      "id": 1,
+      "name": "Administrator",
+      "username": "root"
+    }
+  }],
+  "toggle_award_path": "/gitlab-org/gitlab-ce/notes/546/toggle_award_emoji",
+  "report_abuse_path": "/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F7%23note_546&user_id=1",
+  "path": "/gitlab-org/gitlab-ce/notes/546"
+  }
+
+export const discussionMock = {
+  id: '9e3bd2f71a01de45fd166e6719eb380ad9f270b1',
+  reply_id: '9e3bd2f71a01de45fd166e6719eb380ad9f270b1',
+  expanded: true,
+  notes: [{
+    id: 1395,
+    attachment: {
+      url: null,
+      filename: null,
+      image: false,
+    },
+    author: {
+      id: 1,
+      name: 'Root',
+      username: 'root',
+      state: 'active',
+      avatar_url: null,
+      path: '/root',
+    },
+    created_at: '2017-08-02T10:51:58.559Z',
+    updated_at: '2017-08-02T10:51:58.559Z',
+    system: false,
+    noteable_id: 98,
+    noteable_type: 'Issue',
+    type: 'DiscussionNote',
+    human_access: 'Owner',
+    note: 'THIS IS A DICUSSSION!',
+    note_html: '<p dir=\'auto\'>THIS IS A DICUSSSION!</p>',
+    current_user: {
+      can_edit: true,
+    },
+    discussion_id: '9e3bd2f71a01de45fd166e6719eb380ad9f270b1',
+    emoji_awardable: true,
+    award_emoji: [],
+    toggle_award_path: '/gitlab-org/gitlab-ce/notes/1395/toggle_award_emoji',
+    report_abuse_path: '/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F26%23note_1395&user_id=1',
+    path: '/gitlab-org/gitlab-ce/notes/1395',
+  }, {
+    id: 1396,
+    attachment: {
+      url: null,
+      filename: null,
+      image: false,
+    },
+    author: {
+      id: 1,
+      name: 'Root',
+      username: 'root',
+      state: 'active',
+      avatar_url: null,
+      path: '/root',
+    },
+    created_at: '2017-08-02T10:56:50.980Z',
+    updated_at: '2017-08-03T14:19:35.691Z',
+    system: false,
+    noteable_id: 98,
+    noteable_type: 'Issue',
+    type: 'DiscussionNote',
+    human_access: 'Owner',
+    note: 'sadfasdsdgdsf',
+    note_html: '<p dir=\'auto\'>sadfasdsdgdsf</p>',
+    last_edited_at: '2017-08-03T14:19:35.691Z',
+    last_edited_by: {
+      id: 1,
+      name: 'Root',
+      username: 'root',
+      state: 'active',
+      avatar_url: null,
+      path: '/root',
+    },
+    current_user: {
+      can_edit: true,
+    },
+    discussion_id: '9e3bd2f71a01de45fd166e6719eb380ad9f270b1',
+    emoji_awardable: true,
+    award_emoji: [],
+    toggle_award_path: '/gitlab-org/gitlab-ce/notes/1396/toggle_award_emoji',
+    report_abuse_path: '/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F26%23note_1396&user_id=1',
+    path: '/gitlab-org/gitlab-ce/notes/1396',
+  }, {
+    id: 1437,
+    attachment: {
+      url: null,
+      filename: null,
+      image: false,
+    },
+    author: {
+      id: 1,
+      name: 'Root',
+      username: 'root',
+      state: 'active',
+      avatar_url: null,
+      path: '/root',
+    },
+    created_at: '2017-08-03T18:11:18.780Z',
+    updated_at: '2017-08-04T09:52:31.062Z',
+    system: false,
+    noteable_id: 98,
+    noteable_type: 'Issue',
+    type: 'DiscussionNote',
+    human_access: 'Owner',
+    note: 'adsfasf Should disappear',
+    note_html: '<p dir=\'auto\'>adsfasf Should disappear</p>',
+    last_edited_at: '2017-08-04T09:52:31.062Z',
+    last_edited_by: {
+      id: 1,
+      name: 'Root',
+      username: 'root',
+      state: 'active',
+      avatar_url: null,
+      path: '/root',
+    },
+    current_user: {
+      can_edit: true,
+    },
+    discussion_id: '9e3bd2f71a01de45fd166e6719eb380ad9f270b1',
+    emoji_awardable: true,
+    award_emoji: [],
+    toggle_award_path: '/gitlab-org/gitlab-ce/notes/1437/toggle_award_emoji',
+    report_abuse_path: '/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F26%23note_1437&user_id=1',
+    path: '/gitlab-org/gitlab-ce/notes/1437',
+  }],
+  individual_note: false,
+};
+
+export const loggedOutIssueData = {
+  "id": 98,
+  "iid": 26,
+  "author_id": 1,
+  "description": "",
+  "lock_version": 1,
+  "milestone_id": null,
+  "state": "opened",
+  "title": "asdsa",
+  "updated_by_id": 1,
+  "created_at": "2017-02-07T10:11:18.395Z",
+  "updated_at": "2017-08-08T10:22:51.564Z",
+  "deleted_at": null,
+  "time_estimate": 0,
+  "total_time_spent": 0,
+  "human_time_estimate": null,
+  "human_total_time_spent": null,
+  "milestone": null,
+  "labels": [],
+  "branch_name": null,
+  "confidential": false,
+  "assignees": [{
+    "id": 1,
+    "name": "Root",
+    "username": "root",
+    "state": "active",
+    "avatar_url": null,
+    "web_url": "http://localhost:3000/root"
+  }],
+  "due_date": null,
+  "moved_to_id": null,
+  "project_id": 2,
+  "web_url": "/gitlab-org/gitlab-ce/issues/26",
+  "current_user": {
+    "can_create_note": false,
+    "can_update": false
+  },
+  "create_note_path": "/gitlab-org/gitlab-ce/notes?target_id=98&target_type=issue",
+  "preview_note_path": "/gitlab-org/gitlab-ce/preview_markdown?quick_actions_target_id=98&quick_actions_target_type=Issue"
+}
+
+export const individualNoteServerResponse = [{
+  "id": "0fb4e0e3f9276e55ff32eb4195add694aece4edd",
+  "reply_id": "0fb4e0e3f9276e55ff32eb4195add694aece4edd",
+  "expanded": true,
+  "notes": [{
+    "id": 1390,
+    "attachment": {
+      "url": null,
+      "filename": null,
+      "image": false
+    },
+    "author": {
+      "id": 1,
+      "name": "Root",
+      "username": "root",
+      "state": "active",
+      "avatar_url": null,
+      "path": "/root"
+    },
+    "created_at": "2017-08-01T17:09:33.762Z",
+    "updated_at": "2017-08-01T17:09:33.762Z",
+    "system": false,
+    "noteable_id": 98,
+    "noteable_type": "Issue",
+    "type": null,
+    "human_access": "Owner",
+    "note": "sdfdsaf",
+    "note_html": "\u003cp dir=\"auto\"\u003esdfdsaf\u003c/p\u003e",
+    "current_user": {
+      "can_edit": true
+    },
+    "discussion_id": "0fb4e0e3f9276e55ff32eb4195add694aece4edd",
+    "emoji_awardable": true,
+    "award_emoji": [{
+      "name": "baseball",
+      "user": {
+        "id": 1,
+        "name": "Root",
+        "username": "root"
+      }
+    }, {
+      "name": "art",
+      "user": {
+        "id": 1,
+        "name": "Root",
+        "username": "root"
+      }
+    }],
+    "toggle_award_path": "/gitlab-org/gitlab-ce/notes/1390/toggle_award_emoji",
+    "report_abuse_path": "/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F26%23note_1390\u0026user_id=1",
+    "path": "/gitlab-org/gitlab-ce/notes/1390"
+  }],
+  "individual_note": true
+  }, {
+  "id": "70d5c92a4039a36c70100c6691c18c27e4b0a790",
+  "reply_id": "70d5c92a4039a36c70100c6691c18c27e4b0a790",
+  "expanded": true,
+  "notes": [{
+    "id": 1391,
+    "attachment": {
+      "url": null,
+      "filename": null,
+      "image": false
+    },
+    "author": {
+      "id": 1,
+      "name": "Root",
+      "username": "root",
+      "state": "active",
+      "avatar_url": null,
+      "path": "/root"
+    },
+    "created_at": "2017-08-02T10:51:38.685Z",
+    "updated_at": "2017-08-02T10:51:38.685Z",
+    "system": false,
+    "noteable_id": 98,
+    "noteable_type": "Issue",
+    "type": null,
+    "human_access": "Owner",
+    "note": "New note!",
+    "note_html": "\u003cp dir=\"auto\"\u003eNew note!\u003c/p\u003e",
+    "current_user": {
+      "can_edit": true
+    },
+    "discussion_id": "70d5c92a4039a36c70100c6691c18c27e4b0a790",
+    "emoji_awardable": true,
+    "award_emoji": [],
+    "toggle_award_path": "/gitlab-org/gitlab-ce/notes/1391/toggle_award_emoji",
+    "report_abuse_path": "/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F26%23note_1391\u0026user_id=1",
+    "path": "/gitlab-org/gitlab-ce/notes/1391"
+  }],
+  "individual_note": true
+}];
+
+export const discussionNoteServerResponse = [{
+  "id": "a3ed36e29b1957efb3b68c53e2d7a2b24b1df052",
+  "reply_id": "a3ed36e29b1957efb3b68c53e2d7a2b24b1df052",
+  "expanded": true,
+  "notes": [{
+    "id": 1471,
+    "attachment": {
+      "url": null,
+      "filename": null,
+      "image": false
+    },
+    "author": {
+      "id": 1,
+      "name": "Root",
+      "username": "root",
+      "state": "active",
+      "avatar_url": null,
+      "path": "/root"
+    },
+    "created_at": "2017-08-08T16:53:00.666Z",
+    "updated_at": "2017-08-08T16:53:00.666Z",
+    "system": false,
+    "noteable_id": 124,
+    "noteable_type": "Issue",
+    "noteable_iid": 29,
+    "type": "DiscussionNote",
+    "human_access": "Owner",
+    "note": "Adding a comment",
+    "note_html": "\u003cp dir=\"auto\"\u003eAdding a comment\u003c/p\u003e",
+    "current_user": {
+      "can_edit": true
+    },
+    "discussion_id": "a3ed36e29b1957efb3b68c53e2d7a2b24b1df052",
+    "emoji_awardable": true,
+    "award_emoji": [],
+    "toggle_award_path": "/gitlab-org/gitlab-ce/notes/1471/toggle_award_emoji",
+    "report_abuse_path": "/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F29%23note_1471\u0026user_id=1",
+    "path": "/gitlab-org/gitlab-ce/notes/1471"
+  }],
+  "individual_note": false
+}];
diff --git a/spec/javascripts/notes/stores/actions_spec.js b/spec/javascripts/notes/stores/actions_spec.js
new file mode 100644
index 00000000000..72d362acb2f
--- /dev/null
+++ b/spec/javascripts/notes/stores/actions_spec.js
@@ -0,0 +1,62 @@
+
+import * as actions from '~/notes/stores/actions';
+import testAction from './helpers';
+import { discussionMock, notesDataMock, userDataMock, issueDataMock, individualNote } from '../mock_data';
+
+describe('Actions Notes Store', () => {
+  describe('setNotesData', () => {
+    it('should set received notes data', (done) => {
+      testAction(actions.setNotesData, null, { notesData: {} }, [
+        { type: 'SET_NOTES_DATA', payload: notesDataMock },
+      ], done);
+    });
+  });
+
+  describe('setIssueData', () => {
+    it('should set received issue data', (done) => {
+      testAction(actions.setIssueData, null, { issueData: {} }, [
+        { type: 'SET_ISSUE_DATA', payload: issueDataMock },
+      ], done);
+    });
+  });
+
+  describe('setUserData', () => {
+    it('should set received user data', (done) => {
+      testAction(actions.setUserData, null, { userData: {} }, [
+        { type: 'SET_USER_DATA', payload: userDataMock },
+      ], done);
+    });
+  });
+
+  describe('setLastFetchedAt', () => {
+    it('should set received timestamp', (done) => {
+      testAction(actions.setLastFetchedAt, null, { lastFetchedAt: {} }, [
+        { type: 'SET_LAST_FETCHED_AT', payload: 'timestamp' },
+      ], done);
+    });
+  });
+
+  describe('setInitialNotes', () => {
+    it('should set initial notes', (done) => {
+      testAction(actions.setInitialNotes, null, { notes: [] }, [
+        { type: 'SET_INITIAL_NOTES', payload: [individualNote] },
+      ], done);
+    });
+  });
+
+  describe('setTargetNoteHash', () => {
+    it('should set target note hash', (done) => {
+      testAction(actions.setTargetNoteHash, null, { notes: [] }, [
+        { type: 'SET_TARGET_NOTE_HASH', payload: 'hash' },
+      ], done);
+    });
+  });
+
+  describe('toggleDiscussion', () => {
+    it('should toggle discussion', (done) => {
+      testAction(actions.toggleDiscussion, null, { notes: [discussionMock] }, [
+        { type: 'TOGGLE_DISCUSSION', payload: { discussionId: discussionMock.id } },
+      ], done);
+    });
+  });
+});
diff --git a/spec/javascripts/notes/stores/getters_spec.js b/spec/javascripts/notes/stores/getters_spec.js
new file mode 100644
index 00000000000..48ee1bf9a52
--- /dev/null
+++ b/spec/javascripts/notes/stores/getters_spec.js
@@ -0,0 +1,58 @@
+import * as getters from '~/notes/stores/getters';
+import { notesDataMock, userDataMock, issueDataMock, individualNote } from '../mock_data';
+
+describe('Getters Notes Store', () => {
+  let state;
+  beforeEach(() => {
+    state = {
+      notes: [individualNote],
+      targetNoteHash: 'hash',
+      lastFetchedAt: 'timestamp',
+
+      notesData: notesDataMock,
+      userData: userDataMock,
+      issueData: issueDataMock,
+    };
+  });
+  describe('notes', () => {
+    it('should return all notes in the store', () => {
+      expect(getters.notes(state)).toEqual([individualNote]);
+    });
+  });
+
+  describe('targetNoteHash', () => {
+    it('should return `targetNoteHash`', () => {
+      expect(getters.targetNoteHash(state)).toEqual('hash');
+    });
+  });
+
+  describe('getNotesData', () => {
+    it('should return all data in `notesData`', () => {
+      expect(getters.getNotesData(state)).toEqual(notesDataMock);
+    });
+  });
+
+  describe('getIssueData', () => {
+    it('should return all data in `issueData`', () => {
+      expect(getters.getIssueData(state)).toEqual(issueDataMock);
+    });
+  });
+
+  describe('getUserData', () => {
+    it('should return all data in `userData`', () => {
+      expect(getters.getUserData(state)).toEqual(userDataMock);
+    });
+  });
+
+  describe('notesById', () => {
+    it('should return the note for the given id', () => {
+      expect(getters.notesById(state)).toEqual({ 1390: individualNote.notes[0] });
+    });
+  });
+
+  describe('getCurrentUserLastNote', () => {
+    it('should return the last note of the current user', () => {
+      expect(getters.getCurrentUserLastNote(state)).toEqual(individualNote.notes[0]);
+    });
+  });
+});
diff --git a/spec/javascripts/notes/stores/helpers.js b/spec/javascripts/notes/stores/helpers.js
new file mode 100644
index 00000000000..2d386fe1da5
--- /dev/null
+++ b/spec/javascripts/notes/stores/helpers.js
@@ -0,0 +1,37 @@
+/* eslint-disable */
+
+/**
+ * helper for testing action with expected mutations
+ * https://vuex.vuejs.org/en/testing.html
+ */
+export default (action, payload, state, expectedMutations, done) => {
+  let count = 0;
+
+  // mock commit
+  const commit = (type, payload) => {
+    const mutation = expectedMutations[count];
+
+    try {
+      expect(mutation.type).to.equal(type);
+      if (payload) {
+        expect(mutation.payload).to.deep.equal(payload);
+      }
+    } catch (error) {
+      done(error);
+    }
+
+    count++;
+    if (count >= expectedMutations.length) {
+      done();
+    }
+  };
+
+  // call the action with mocked store and arguments
+  action({ commit, state }, payload);
+
+  // check if no mutations should have been dispatched
+  if (expectedMutations.length === 0) {
+    expect(count).to.equal(0);
+    done();
+  }
+};
diff --git a/spec/javascripts/notes/stores/mutation_spec.js b/spec/javascripts/notes/stores/mutation_spec.js
new file mode 100644
index 00000000000..a38f29c1e39
--- /dev/null
+++ b/spec/javascripts/notes/stores/mutation_spec.js
@@ -0,0 +1,207 @@
+import mutations from '~/notes/stores/mutations';
+import { note, discussionMock, notesDataMock, userDataMock, issueDataMock, individualNote } from '../mock_data';
+
+describe('Mutation Notes Store', () => {
+  describe('ADD_NEW_NOTE', () => {
+    it('should add a new note to an array of notes', () => {
+      const state = { notes: [] };
+      mutations.ADD_NEW_NOTE(state, note);
+
+      expect(state).toEqual({
+        notes: [{
+          expanded: true,
+          id: note.discussion_id,
+          individual_note: true,
+          notes: [note],
+          reply_id: note.discussion_id,
+        }],
+      });
+    });
+  });
+
+  describe('ADD_NEW_REPLY_TO_DISCUSSION', () => {
+    it('should add a reply to a specific discussion', () => {
+      const state = { notes: [discussionMock] };
+      const newReply = Object.assign({}, note, { discussion_id: discussionMock.id });
+      mutations.ADD_NEW_REPLY_TO_DISCUSSION(state, newReply);
+
+      expect(state.notes[0].notes.length).toEqual(4);
+    });
+  });
+
+  describe('DELETE_NOTE', () => {
+    it('should delete a note ', () => {
+      const state = { notes: [discussionMock] };
+      const toDelete = discussionMock.notes[0];
+      const lengthBefore = discussionMock.notes.length;
+
+      mutations.DELETE_NOTE(state, toDelete);
+
+      expect(state.notes[0].notes.length).toEqual(lengthBefore - 1);
+    });
+  });
+
+  describe('REMOVE_PLACEHOLDER_NOTES', () => {
+    it('should remove all placeholder notes in indivudal notes and discussion', () => {
+      const placeholderNote = Object.assign({}, individualNote, { isPlaceholderNote: true });
+      const state = { notes: [placeholderNote] };
+      mutations.REMOVE_PLACEHOLDER_NOTES(state);
+
+      expect(state.notes).toEqual([]);
+    });
+  });
+
+  describe('SET_NOTES_DATA', () => {
+    it('should set an object with notesData', () => {
+      const state = {
+        notesData: {},
+      };
+
+      mutations.SET_NOTES_DATA(state, notesDataMock);
+      expect(state.notesData).toEqual(notesDataMock);
+    });
+  });
+
+  describe('SET_ISSUE_DATA', () => {
+    it('should set the issue data', () => {
+      const state = {
+        issueData: {},
+      };
+
+      mutations.SET_ISSUE_DATA(state, issueDataMock);
+      expect(state.issueData).toEqual(issueDataMock);
+    });
+  });
+
+  describe('SET_USER_DATA', () => {
+    it('should set the user data', () => {
+      const state = {
+        userData: {},
+      };
+
+      mutations.SET_USER_DATA(state, userDataMock);
+      expect(state.userData).toEqual(userDataMock);
+    });
+  });
+
+  describe('SET_INITIAL_NOTES', () => {
+    it('should set the initial notes received', () => {
+      const state = {
+        notes: [],
+      };
+
+      mutations.SET_INITIAL_NOTES(state, [note]);
+      expect(state.notes).toEqual([note]);
+    });
+  });
+
+  describe('SET_LAST_FETCHED_AT', () => {
+    it('should set timestamp', () => {
+      const state = {
+        lastFetchedAt: [],
+      };
+
+      mutations.SET_LAST_FETCHED_AT(state, 'timestamp');
+      expect(state.lastFetchedAt).toEqual('timestamp');
+    });
+  });
+
+  describe('SET_TARGET_NOTE_HASH', () => {
+    it('should set the note hash', () => {
+      const state = {
+        targetNoteHash: [],
+      };
+
+      mutations.SET_TARGET_NOTE_HASH(state, 'hash');
+      expect(state.targetNoteHash).toEqual('hash');
+    });
+  });
+
+  describe('SHOW_PLACEHOLDER_NOTE', () => {
+    it('should set a placeholder note', () => {
+      const state = {
+        notes: [],
+      };
+      mutations.SHOW_PLACEHOLDER_NOTE(state, note);
+      expect(state.notes[0].isPlaceholderNote).toEqual(true);
+    });
+  });
+
+  describe('TOGGLE_AWARD', () => {
+    it('should add award if user has not reacted yet', () => {
+      const state = {
+        notes: [note],
+        userData: userDataMock,
+      };
+
+      const data = {
+        note,
+        awardName: 'cartwheel',
+      };
+
+      mutations.TOGGLE_AWARD(state, data);
+      const lastIndex = state.notes[0].award_emoji.length - 1;
+
+      expect(state.notes[0].award_emoji[lastIndex]).toEqual({
+        name: 'cartwheel',
+        user: { id: userDataMock.id, name: userDataMock.name, username: userDataMock.username },
+      });
+    });
+
+    it('should remove award if user already reacted', () => {
+      const state = {
+        notes: [note],
+        userData: {
+          id: 1,
+          name: 'Administrator',
+          username: 'root',
+        },
+      };
+
+      const data = {
+        note,
+        awardName: 'bath_tone3',
+      };
+      mutations.TOGGLE_AWARD(state, data);
+      expect(state.notes[0].award_emoji.length).toEqual(2);
+    });
+  });
+
+  describe('TOGGLE_DISCUSSION', () => {
+    it('should open a closed discussion', () => {
+      const discussion = Object.assign({}, discussionMock, { expanded: false });
+
+      const state = {
+        notes: [discussion],
+      };
+
+      mutations.TOGGLE_DISCUSSION(state, { discussionId: discussion.id });
+
+      expect(state.notes[0].expanded).toEqual(true);
+    });
+
+    it('should close a opened discussion', () => {
+      const state = {
+        notes: [discussionMock],
+      };
+
+      mutations.TOGGLE_DISCUSSION(state, { discussionId: discussionMock.id });
+
+      expect(state.notes[0].expanded).toEqual(false);
+    });
+  });
+
+  describe('UPDATE_NOTE', () => {
+    it('should update a note', () => {
+      const state = {
+        notes: [individualNote],
+      };
+
+      const updated = Object.assign({}, individualNote.notes[0], { note: 'Foo' });
+
+      mutations.UPDATE_NOTE(state, updated);
+
+      expect(state.notes[0].notes[0].note).toEqual('Foo');
+    });
+  });
+});
diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js
index 2c096ed08a8..8c5ad8914b0 100644
--- a/spec/javascripts/notes_spec.js
+++ b/spec/javascripts/notes_spec.js
@@ -32,14 +32,14 @@ import '~/notes';
 
   describe('Notes', function() {
     const FLASH_TYPE_ALERT = 'alert';
-    var commentsTemplate = 'issues/issue_with_comment.html.raw';
+    var commentsTemplate = 'merge_requests/merge_request_with_comment.html.raw';
     preloadFixtures(commentsTemplate);
 
     beforeEach(function () {
       loadFixtures(commentsTemplate);
       gl.utils.disableButtonIfEmptyField = _.noop;
       window.project_uploads_path = 'http://test.host/uploads';
-      $('body').data('page', 'projects:issues:show');
+      $('body').data('page', 'projects:merge_requets:show');
     });
 
     describe('task lists', function() {
@@ -53,17 +53,19 @@ import '~/notes';
       it('modifies the Markdown field', function() {
         const changeEvent = document.createEvent('HTMLEvents');
         changeEvent.initEvent('change', true, true);
-        $('input[type=checkbox]').attr('checked', true)[0].dispatchEvent(changeEvent);
-        expect($('.js-task-list-field').val()).toBe('- [x] Task List Item');
+        $('input[type=checkbox]').attr('checked', true)[1].dispatchEvent(changeEvent);
+
+        expect($('.js-task-list-field.original-task-list').val()).toBe('- [x] Task List Item');
       });
 
       it('submits an ajax request on tasklist:changed', function() {
         spyOn(jQuery, 'ajax').and.callFake(function(req) {
           expect(req.type).toBe('PATCH');
-          expect(req.url).toBe('http://test.host/frontend-fixtures/issues-project/notes/1');
+          expect(req.url).toBe('http://test.host/frontend-fixtures/merge-requests-project/merge_requests/1.json');
           return expect(req.data.note).not.toBe(null);
         });
-        $('.js-task-list-field').trigger('tasklist:changed');
+
+        $('.js-task-list-field.js-note-text').trigger('tasklist:changed');
       });
     });
 
diff --git a/spec/javascripts/project_title_spec.js b/spec/javascripts/project_title_spec.js
deleted file mode 100644
index 3d36bb3e4d4..00000000000
--- a/spec/javascripts/project_title_spec.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* global Project */
-
-import 'select2/select2';
-import '~/gl_dropdown';
-import '~/api';
-import '~/project_select';
-import '~/project';
-
-describe('Project Title', () => {
-  const dummyApiVersion = 'v3000';
-  preloadFixtures('issues/open-issue.html.raw');
-  loadJSONFixtures('projects.json');
-
-  beforeEach(() => {
-    loadFixtures('issues/open-issue.html.raw');
-
-    window.gon = {};
-    window.gon.api_version = dummyApiVersion;
-
-    // eslint-disable-next-line no-new
-    new Project();
-  });
-
-  describe('project list', () => {
-    let reqUrl;
-    let reqData;
-
-    beforeEach(() => {
-      const fakeResponseData = getJSONFixture('projects.json');
-      spyOn(jQuery, 'ajax').and.callFake((req) => {
-        const def = $.Deferred();
-        reqUrl = req.url;
-        reqData = req.data;
-        def.resolve(fakeResponseData);
-        return def.promise();
-      });
-    });
-
-    it('toggles dropdown', () => {
-      const $menu = $('.js-dropdown-menu-projects');
-      window.gon.current_user_id = 1;
-      $('.js-projects-dropdown-toggle').click();
-      expect($menu).toHaveClass('open');
-      expect(reqUrl).toBe(`/api/${dummyApiVersion}/projects.json?simple=true`);
-      expect(reqData).toEqual({
-        search: '',
-        order_by: 'last_activity_at',
-        per_page: 20,
-        membership: true,
-      });
-      $menu.find('.dropdown-menu-close-icon').click();
-      expect($menu).not.toHaveClass('open');
-    });
-  });
-
-  afterEach(() => {
-    window.gon = {};
-  });
-});
diff --git a/spec/javascripts/projects_dropdown/components/app_spec.js b/spec/javascripts/projects_dropdown/components/app_spec.js
new file mode 100644
index 00000000000..42f0f6fc1af
--- /dev/null
+++ b/spec/javascripts/projects_dropdown/components/app_spec.js
@@ -0,0 +1,348 @@
+import Vue from 'vue';
+
+import bp from '~/breakpoints';
+import appComponent from '~/projects_dropdown/components/app.vue';
+import eventHub from '~/projects_dropdown/event_hub';
+import ProjectsStore from '~/projects_dropdown/store/projects_store';
+import ProjectsService from '~/projects_dropdown/service/projects_service';
+
+import mountComponent from '../../helpers/vue_mount_component_helper';
+import { currentSession, mockProject, mockRawProject } from '../mock_data';
+
+const createComponent = () => {
+  gon.api_version = currentSession.apiVersion;
+  const Component = Vue.extend(appComponent);
+  const store = new ProjectsStore();
+  const service = new ProjectsService(currentSession.username);
+
+  return mountComponent(Component, {
+    store,
+    service,
+    currentUserName: currentSession.username,
+    currentProject: currentSession.project,
+  });
+};
+
+const returnServicePromise = (data, failed) => new Promise((resolve, reject) => {
+  if (failed) {
+    reject(data);
+  } else {
+    resolve({
+      json() {
+        return data;
+      },
+    });
+  }
+});
+
+describe('AppComponent', () => {
+  describe('computed', () => {
+    let vm;
+
+    beforeEach(() => {
+      vm = createComponent();
+    });
+
+    afterEach(() => {
+      vm.$destroy();
+    });
+
+    describe('frequentProjects', () => {
+      it('should return list of frequently accessed projects from store', () => {
+        expect(vm.frequentProjects).toBeDefined();
+        expect(vm.frequentProjects.length).toBe(0);
+
+        vm.store.setFrequentProjects([mockProject]);
+        expect(vm.frequentProjects).toBeDefined();
+        expect(vm.frequentProjects.length).toBe(1);
+      });
+    });
+
+    describe('searchProjects', () => {
+      it('should return list of frequently accessed projects from store', () => {
+        expect(vm.searchProjects).toBeDefined();
+        expect(vm.searchProjects.length).toBe(0);
+
+        vm.store.setSearchedProjects([mockRawProject]);
+        expect(vm.searchProjects).toBeDefined();
+        expect(vm.searchProjects.length).toBe(1);
+      });
+    });
+  });
+
+  describe('methods', () => {
+    let vm;
+
+    beforeEach(() => {
+      vm = createComponent();
+    });
+
+    afterEach(() => {
+      vm.$destroy();
+    });
+
+    describe('toggleFrequentProjectsList', () => {
+      it('should toggle props which control visibility of Frequent Projects list from state passed', () => {
+        vm.toggleFrequentProjectsList(true);
+        expect(vm.isLoadingProjects).toBeFalsy();
+        expect(vm.isSearchListVisible).toBeFalsy();
+        expect(vm.isFrequentsListVisible).toBeTruthy();
+
+        vm.toggleFrequentProjectsList(false);
+        expect(vm.isLoadingProjects).toBeTruthy();
+        expect(vm.isSearchListVisible).toBeTruthy();
+        expect(vm.isFrequentsListVisible).toBeFalsy();
+      });
+    });
+
+    describe('toggleSearchProjectsList', () => {
+      it('should toggle props which control visibility of Searched Projects list from state passed', () => {
+        vm.toggleSearchProjectsList(true);
+        expect(vm.isLoadingProjects).toBeFalsy();
+        expect(vm.isFrequentsListVisible).toBeFalsy();
+        expect(vm.isSearchListVisible).toBeTruthy();
+
+        vm.toggleSearchProjectsList(false);
+        expect(vm.isLoadingProjects).toBeTruthy();
+        expect(vm.isFrequentsListVisible).toBeTruthy();
+        expect(vm.isSearchListVisible).toBeFalsy();
+      });
+    });
+
+    describe('toggleLoader', () => {
+      it('should toggle props which control visibility of list loading animation from state passed', () => {
+        vm.toggleLoader(true);
+        expect(vm.isFrequentsListVisible).toBeFalsy();
+        expect(vm.isSearchListVisible).toBeFalsy();
+        expect(vm.isLoadingProjects).toBeTruthy();
+
+        vm.toggleLoader(false);
+        expect(vm.isFrequentsListVisible).toBeTruthy();
+        expect(vm.isSearchListVisible).toBeTruthy();
+        expect(vm.isLoadingProjects).toBeFalsy();
+      });
+    });
+
+    describe('fetchFrequentProjects', () => {
+      it('should set props for loading animation to `true` while frequent projects list is being loaded', () => {
+        spyOn(vm, 'toggleLoader');
+
+        vm.fetchFrequentProjects();
+        expect(vm.isLocalStorageFailed).toBeFalsy();
+        expect(vm.toggleLoader).toHaveBeenCalledWith(true);
+      });
+
+      it('should set props for loading animation to `false` and props for frequent projects list to `true` once data is loaded', () => {
+        const mockData = [mockProject];
+
+        spyOn(vm.service, 'getFrequentProjects').and.returnValue(mockData);
+        spyOn(vm.store, 'setFrequentProjects');
+        spyOn(vm, 'toggleFrequentProjectsList');
+
+        vm.fetchFrequentProjects();
+        expect(vm.service.getFrequentProjects).toHaveBeenCalled();
+        expect(vm.store.setFrequentProjects).toHaveBeenCalledWith(mockData);
+        expect(vm.toggleFrequentProjectsList).toHaveBeenCalledWith(true);
+      });
+
+      it('should set props for failure message to `true` when method fails to fetch frequent projects list', () => {
+        spyOn(vm.service, 'getFrequentProjects').and.returnValue(null);
+        spyOn(vm.store, 'setFrequentProjects');
+        spyOn(vm, 'toggleFrequentProjectsList');
+
+        expect(vm.isLocalStorageFailed).toBeFalsy();
+
+        vm.fetchFrequentProjects();
+        expect(vm.service.getFrequentProjects).toHaveBeenCalled();
+        expect(vm.store.setFrequentProjects).toHaveBeenCalledWith([]);
+        expect(vm.toggleFrequentProjectsList).toHaveBeenCalledWith(true);
+        expect(vm.isLocalStorageFailed).toBeTruthy();
+      });
+
+      it('should set props for search results list to `true` if search query was already made previously', () => {
+        spyOn(bp, 'getBreakpointSize').and.returnValue('md');
+        spyOn(vm.service, 'getFrequentProjects');
+        spyOn(vm, 'toggleSearchProjectsList');
+
+        vm.searchQuery = 'test';
+        vm.fetchFrequentProjects();
+        expect(vm.service.getFrequentProjects).not.toHaveBeenCalled();
+        expect(vm.toggleSearchProjectsList).toHaveBeenCalledWith(true);
+      });
+
+      it('should set props for frequent projects list to `true` if search query was already made but screen size is less than 768px', () => {
+        spyOn(bp, 'getBreakpointSize').and.returnValue('sm');
+        spyOn(vm, 'toggleSearchProjectsList');
+        spyOn(vm.service, 'getFrequentProjects');
+
+        vm.searchQuery = 'test';
+        vm.fetchFrequentProjects();
+        expect(vm.service.getFrequentProjects).toHaveBeenCalled();
+        expect(vm.toggleSearchProjectsList).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('fetchSearchedProjects', () => {
+      const searchQuery = 'test';
+
+      it('should perform search with provided search query', (done) => {
+        const mockData = [mockRawProject];
+        spyOn(vm, 'toggleLoader');
+        spyOn(vm, 'toggleSearchProjectsList');
+        spyOn(vm.service, 'getSearchedProjects').and.returnValue(returnServicePromise(mockData));
+        spyOn(vm.store, 'setSearchedProjects');
+
+        vm.fetchSearchedProjects(searchQuery);
+        setTimeout(() => {
+          expect(vm.searchQuery).toBe(searchQuery);
+          expect(vm.toggleLoader).toHaveBeenCalledWith(true);
+          expect(vm.service.getSearchedProjects).toHaveBeenCalledWith(searchQuery);
+          expect(vm.toggleSearchProjectsList).toHaveBeenCalledWith(true);
+          expect(vm.store.setSearchedProjects).toHaveBeenCalledWith(mockData);
+          done();
+        }, 0);
+      });
+
+      it('should update props for showing search failure', (done) => {
+        spyOn(vm, 'toggleSearchProjectsList');
+        spyOn(vm.service, 'getSearchedProjects').and.returnValue(returnServicePromise({}, true));
+
+        vm.fetchSearchedProjects(searchQuery);
+        setTimeout(() => {
+          expect(vm.searchQuery).toBe(searchQuery);
+          expect(vm.service.getSearchedProjects).toHaveBeenCalledWith(searchQuery);
+          expect(vm.isSearchFailed).toBeTruthy();
+          expect(vm.toggleSearchProjectsList).toHaveBeenCalledWith(true);
+          done();
+        }, 0);
+      });
+    });
+
+    describe('logCurrentProjectAccess', () => {
+      it('should log current project access via service', (done) => {
+        spyOn(vm.service, 'logProjectAccess');
+
+        vm.currentProject = mockProject;
+        vm.logCurrentProjectAccess();
+
+        setTimeout(() => {
+          expect(vm.service.logProjectAccess).toHaveBeenCalledWith(mockProject);
+          done();
+        }, 1);
+      });
+    });
+
+    describe('handleSearchClear', () => {
+      it('should show frequent projects list when search input is cleared', () => {
+        spyOn(vm.store, 'clearSearchedProjects');
+        spyOn(vm, 'toggleFrequentProjectsList');
+
+        vm.handleSearchClear();
+
+        expect(vm.toggleFrequentProjectsList).toHaveBeenCalledWith(true);
+        expect(vm.store.clearSearchedProjects).toHaveBeenCalled();
+        expect(vm.searchQuery).toBe('');
+      });
+    });
+
+    describe('handleSearchFailure', () => {
+      it('should show failure message within dropdown', () => {
+        spyOn(vm, 'toggleSearchProjectsList');
+
+        vm.handleSearchFailure();
+        expect(vm.toggleSearchProjectsList).toHaveBeenCalledWith(true);
+        expect(vm.isSearchFailed).toBeTruthy();
+      });
+    });
+  });
+
+  describe('created', () => {
+    it('should bind event listeners on eventHub', (done) => {
+      spyOn(eventHub, '$on');
+
+      createComponent().$mount();
+
+      Vue.nextTick(() => {
+        expect(eventHub.$on).toHaveBeenCalledWith('dropdownOpen', jasmine.any(Function));
+        expect(eventHub.$on).toHaveBeenCalledWith('searchProjects', jasmine.any(Function));
+        expect(eventHub.$on).toHaveBeenCalledWith('searchCleared', jasmine.any(Function));
+        expect(eventHub.$on).toHaveBeenCalledWith('searchFailed', jasmine.any(Function));
+        done();
+      });
+    });
+  });
+
+  describe('beforeDestroy', () => {
+    it('should unbind event listeners on eventHub', (done) => {
+      const vm = createComponent();
+      spyOn(eventHub, '$off');
+
+      vm.$mount();
+      vm.$destroy();
+
+      Vue.nextTick(() => {
+        expect(eventHub.$off).toHaveBeenCalledWith('dropdownOpen', jasmine.any(Function));
+        expect(eventHub.$off).toHaveBeenCalledWith('searchProjects', jasmine.any(Function));
+        expect(eventHub.$off).toHaveBeenCalledWith('searchCleared', jasmine.any(Function));
+        expect(eventHub.$off).toHaveBeenCalledWith('searchFailed', jasmine.any(Function));
+        done();
+      });
+    });
+  });
+
+  describe('template', () => {
+    let vm;
+
+    beforeEach(() => {
+      vm = createComponent();
+    });
+
+    afterEach(() => {
+      vm.$destroy();
+    });
+
+    it('should render search input', () => {
+      expect(vm.$el.querySelector('.search-input-container')).toBeDefined();
+    });
+
+    it('should render loading animation', (done) => {
+      vm.toggleLoader(true);
+      Vue.nextTick(() => {
+        const loadingEl = vm.$el.querySelector('.loading-animation');
+
+        expect(loadingEl).toBeDefined();
+        expect(loadingEl.classList.contains('prepend-top-20')).toBeTruthy();
+        expect(loadingEl.querySelector('i').getAttribute('aria-label')).toBe('Loading projects');
+        done();
+      });
+    });
+
+    it('should render frequent projects list header', (done) => {
+      vm.toggleFrequentProjectsList(true);
+      Vue.nextTick(() => {
+        const sectionHeaderEl = vm.$el.querySelector('.section-header');
+
+        expect(sectionHeaderEl).toBeDefined();
+        expect(sectionHeaderEl.innerText.trim()).toBe('Frequently visited');
+        done();
+      });
+    });
+
+    it('should render frequent projects list', (done) => {
+      vm.toggleFrequentProjectsList(true);
+      Vue.nextTick(() => {
+        expect(vm.$el.querySelector('.projects-list-frequent-container')).toBeDefined();
+        done();
+      });
+    });
+
+    it('should render searched projects list', (done) => {
+      vm.toggleSearchProjectsList(true);
+      Vue.nextTick(() => {
+        expect(vm.$el.querySelector('.section-header')).toBe(null);
+        expect(vm.$el.querySelector('.projects-list-search-container')).toBeDefined();
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/javascripts/projects_dropdown/components/projects_list_frequent_spec.js b/spec/javascripts/projects_dropdown/components/projects_list_frequent_spec.js
new file mode 100644
index 00000000000..fcd0f6a3630
--- /dev/null
+++ b/spec/javascripts/projects_dropdown/components/projects_list_frequent_spec.js
@@ -0,0 +1,72 @@
+import Vue from 'vue';
+
+import projectsListFrequentComponent from '~/projects_dropdown/components/projects_list_frequent.vue';
+
+import mountComponent from '../../helpers/vue_mount_component_helper';
+import { mockFrequents } from '../mock_data';
+
+const createComponent = () => {
+  const Component = Vue.extend(projectsListFrequentComponent);
+
+  return mountComponent(Component, {
+    projects: mockFrequents,
+    localStorageFailed: false,
+  });
+};
+
+describe('ProjectsListFrequentComponent', () => {
+  let vm;
+
+  beforeEach(() => {
+    vm = createComponent();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('computed', () => {
+    describe('isListEmpty', () => {
+      it('should return `true` or `false` representing whether if `projects` is empty of not', () => {
+        vm.projects = [];
+        expect(vm.isListEmpty).toBeTruthy();
+
+        vm.projects = mockFrequents;
+        expect(vm.isListEmpty).toBeFalsy();
+      });
+    });
+
+    describe('listEmptyMessage', () => {
+      it('should return appropriate empty list message based on value of `localStorageFailed` prop', () => {
+        vm.localStorageFailed = true;
+        expect(vm.listEmptyMessage).toBe('This feature requires browser localStorage support');
+
+        vm.localStorageFailed = false;
+        expect(vm.listEmptyMessage).toBe('Projects you visit often will appear here');
+      });
+    });
+  });
+
+  describe('template', () => {
+    it('should render component element with list of projects', (done) => {
+      vm.projects = mockFrequents;
+
+      Vue.nextTick(() => {
+        expect(vm.$el.classList.contains('projects-list-frequent-container')).toBeTruthy();
+        expect(vm.$el.querySelectorAll('ul.list-unstyled').length).toBe(1);
+        expect(vm.$el.querySelectorAll('li.projects-list-item-container').length).toBe(5);
+        done();
+      });
+    });
+
+    it('should render component element with empty message', (done) => {
+      vm.projects = [];
+
+      Vue.nextTick(() => {
+        expect(vm.$el.querySelectorAll('li.section-empty').length).toBe(1);
+        expect(vm.$el.querySelectorAll('li.projects-list-item-container').length).toBe(0);
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/javascripts/projects_dropdown/components/projects_list_item_spec.js b/spec/javascripts/projects_dropdown/components/projects_list_item_spec.js
new file mode 100644
index 00000000000..171629fcd6b
--- /dev/null
+++ b/spec/javascripts/projects_dropdown/components/projects_list_item_spec.js
@@ -0,0 +1,65 @@
+import Vue from 'vue';
+
+import projectsListItemComponent from '~/projects_dropdown/components/projects_list_item.vue';
+
+import mountComponent from '../../helpers/vue_mount_component_helper';
+import { mockProject } from '../mock_data';
+
+const createComponent = () => {
+  const Component = Vue.extend(projectsListItemComponent);
+
+  return mountComponent(Component, {
+    projectId: mockProject.id,
+    projectName: mockProject.name,
+    namespace: mockProject.namespace,
+    webUrl: mockProject.webUrl,
+    avatarUrl: mockProject.avatarUrl,
+  });
+};
+
+describe('ProjectsListItemComponent', () => {
+  let vm;
+
+  beforeEach(() => {
+    vm = createComponent();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('computed', () => {
+    describe('hasAvatar', () => {
+      it('should return `true` or `false` if whether avatar is present or not', () => {
+        vm.avatarUrl = 'path/to/avatar.png';
+        expect(vm.hasAvatar).toBeTruthy();
+
+        vm.avatarUrl = null;
+        expect(vm.hasAvatar).toBeFalsy();
+      });
+    });
+
+    describe('highlightedProjectName', () => {
+      it('should enclose part of project name in <b> & </b> which matches with `matcher` prop', () => {
+        vm.matcher = 'lab';
+        expect(vm.highlightedProjectName).toContain('<b>Lab</b>');
+      });
+
+      it('should return project name as it is if `matcher` is not available', () => {
+        vm.matcher = null;
+        expect(vm.highlightedProjectName).toBe(mockProject.name);
+      });
+    });
+  });
+
+  describe('template', () => {
+    it('should render component element', () => {
+      expect(vm.$el.classList.contains('projects-list-item-container')).toBeTruthy();
+      expect(vm.$el.querySelectorAll('a').length).toBe(1);
+      expect(vm.$el.querySelectorAll('.project-item-avatar-container').length).toBe(1);
+      expect(vm.$el.querySelectorAll('.project-item-metadata-container').length).toBe(1);
+      expect(vm.$el.querySelectorAll('.project-title').length).toBe(1);
+      expect(vm.$el.querySelectorAll('.project-namespace').length).toBe(1);
+    });
+  });
+});
diff --git a/spec/javascripts/projects_dropdown/components/projects_list_search_spec.js b/spec/javascripts/projects_dropdown/components/projects_list_search_spec.js
new file mode 100644
index 00000000000..59fc2dedba5
--- /dev/null
+++ b/spec/javascripts/projects_dropdown/components/projects_list_search_spec.js
@@ -0,0 +1,84 @@
+import Vue from 'vue';
+
+import projectsListSearchComponent from '~/projects_dropdown/components/projects_list_search.vue';
+
+import mountComponent from '../../helpers/vue_mount_component_helper';
+import { mockProject } from '../mock_data';
+
+const createComponent = () => {
+  const Component = Vue.extend(projectsListSearchComponent);
+
+  return mountComponent(Component, {
+    projects: [mockProject],
+    matcher: 'lab',
+    searchFailed: false,
+  });
+};
+
+describe('ProjectsListSearchComponent', () => {
+  let vm;
+
+  beforeEach(() => {
+    vm = createComponent();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('computed', () => {
+    describe('isListEmpty', () => {
+      it('should return `true` or `false` representing whether if `projects` is empty of not', () => {
+        vm.projects = [];
+        expect(vm.isListEmpty).toBeTruthy();
+
+        vm.projects = [mockProject];
+        expect(vm.isListEmpty).toBeFalsy();
+      });
+    });
+
+    describe('listEmptyMessage', () => {
+      it('should return appropriate empty list message based on value of `searchFailed` prop', () => {
+        vm.searchFailed = true;
+        expect(vm.listEmptyMessage).toBe('Something went wrong on our end.');
+
+        vm.searchFailed = false;
+        expect(vm.listEmptyMessage).toBe('No projects matched your query');
+      });
+    });
+  });
+
+  describe('template', () => {
+    it('should render component element with list of projects', (done) => {
+      vm.projects = [mockProject];
+
+      Vue.nextTick(() => {
+        expect(vm.$el.classList.contains('projects-list-search-container')).toBeTruthy();
+        expect(vm.$el.querySelectorAll('ul.list-unstyled').length).toBe(1);
+        expect(vm.$el.querySelectorAll('li.projects-list-item-container').length).toBe(1);
+        done();
+      });
+    });
+
+    it('should render component element with empty message', (done) => {
+      vm.projects = [];
+
+      Vue.nextTick(() => {
+        expect(vm.$el.querySelectorAll('li.section-empty').length).toBe(1);
+        expect(vm.$el.querySelectorAll('li.projects-list-item-container').length).toBe(0);
+        done();
+      });
+    });
+
+    it('should render component element with failure message', (done) => {
+      vm.searchFailed = true;
+      vm.projects = [];
+
+      Vue.nextTick(() => {
+        expect(vm.$el.querySelectorAll('li.section-empty.section-failure').length).toBe(1);
+        expect(vm.$el.querySelectorAll('li.projects-list-item-container').length).toBe(0);
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/javascripts/projects_dropdown/components/search_spec.js b/spec/javascripts/projects_dropdown/components/search_spec.js
new file mode 100644
index 00000000000..f2a23e33325
--- /dev/null
+++ b/spec/javascripts/projects_dropdown/components/search_spec.js
@@ -0,0 +1,101 @@
+import Vue from 'vue';
+
+import searchComponent from '~/projects_dropdown/components/search.vue';
+import eventHub from '~/projects_dropdown/event_hub';
+
+import mountComponent from '../../helpers/vue_mount_component_helper';
+
+const createComponent = () => {
+  const Component = Vue.extend(searchComponent);
+
+  return mountComponent(Component);
+};
+
+describe('SearchComponent', () => {
+  describe('methods', () => {
+    let vm;
+
+    beforeEach(() => {
+      vm = createComponent();
+    });
+
+    afterEach(() => {
+      vm.$destroy();
+    });
+
+    describe('setFocus', () => {
+      it('should set focus to search input', () => {
+        spyOn(vm.$refs.search, 'focus');
+
+        vm.setFocus();
+        expect(vm.$refs.search.focus).toHaveBeenCalled();
+      });
+    });
+
+    describe('emitSearchEvents', () => {
+      it('should emit `searchProjects` event via eventHub when `searchQuery` present', () => {
+        const searchQuery = 'test';
+        spyOn(eventHub, '$emit');
+        vm.searchQuery = searchQuery;
+        vm.emitSearchEvents();
+        expect(eventHub.$emit).toHaveBeenCalledWith('searchProjects', searchQuery);
+      });
+
+      it('should emit `searchCleared` event via eventHub when `searchQuery` is cleared', () => {
+        spyOn(eventHub, '$emit');
+        vm.searchQuery = '';
+        vm.emitSearchEvents();
+        expect(eventHub.$emit).toHaveBeenCalledWith('searchCleared');
+      });
+    });
+  });
+
+  describe('mounted', () => {
+    it('should listen `dropdownOpen` event', (done) => {
+      spyOn(eventHub, '$on');
+      createComponent();
+
+      Vue.nextTick(() => {
+        expect(eventHub.$on).toHaveBeenCalledWith('dropdownOpen', jasmine.any(Function));
+        done();
+      });
+    });
+  });
+
+  describe('beforeDestroy', () => {
+    it('should unbind event listeners on eventHub', (done) => {
+      const vm = createComponent();
+      spyOn(eventHub, '$off');
+
+      vm.$mount();
+      vm.$destroy();
+
+      Vue.nextTick(() => {
+        expect(eventHub.$off).toHaveBeenCalledWith('dropdownOpen', jasmine.any(Function));
+        done();
+      });
+    });
+  });
+
+  describe('template', () => {
+    let vm;
+
+    beforeEach(() => {
+      vm = createComponent();
+    });
+
+    afterEach(() => {
+      vm.$destroy();
+    });
+
+    it('should render component element', () => {
+      const inputEl = vm.$el.querySelector('input.form-control');
+
+      expect(vm.$el.classList.contains('search-input-container')).toBeTruthy();
+      expect(vm.$el.classList.contains('hidden-xs')).toBeTruthy();
+      expect(inputEl).not.toBe(null);
+      expect(inputEl.getAttribute('placeholder')).toBe('Search projects');
+      expect(vm.$el.querySelector('.search-icon')).toBeDefined();
+    });
+  });
+});
diff --git a/spec/javascripts/projects_dropdown/mock_data.js b/spec/javascripts/projects_dropdown/mock_data.js
new file mode 100644
index 00000000000..d6a79fb8ac1
--- /dev/null
+++ b/spec/javascripts/projects_dropdown/mock_data.js
@@ -0,0 +1,96 @@
+export const currentSession = {
+  username: 'root',
+  storageKey: 'root/frequent-projects',
+  apiVersion: 'v4',
+  project: {
+    id: 1,
+    name: 'dummy-project',
+    namespace: 'SamepleGroup / Dummy-Project',
+    webUrl: 'http://127.0.0.1/samplegroup/dummy-project',
+    avatarUrl: null,
+    lastAccessedOn: Date.now(),
+  },
+};
+
+export const mockProject = {
+  id: 1,
+  name: 'GitLab Community Edition',
+  namespace: 'gitlab-org / gitlab-ce',
+  webUrl: 'http://127.0.0.1:3000/gitlab-org/gitlab-ce',
+  avatarUrl: null,
+};
+
+export const mockRawProject = {
+  id: 1,
+  name: 'GitLab Community Edition',
+  name_with_namespace: 'gitlab-org / gitlab-ce',
+  web_url: 'http://127.0.0.1:3000/gitlab-org/gitlab-ce',
+  avatar_url: null,
+};
+
+export const mockFrequents = [
+  {
+    id: 1,
+    name: 'GitLab Community Edition',
+    namespace: 'gitlab-org / gitlab-ce',
+    webUrl: 'http://127.0.0.1:3000/gitlab-org/gitlab-ce',
+    avatarUrl: null,
+  },
+  {
+    id: 2,
+    name: 'GitLab CI',
+    namespace: 'gitlab-org / gitlab-ci',
+    webUrl: 'http://127.0.0.1:3000/gitlab-org/gitlab-ci',
+    avatarUrl: null,
+  },
+  {
+    id: 3,
+    name: 'Typeahead.Js',
+    namespace: 'twitter / typeahead-js',
+    webUrl: 'http://127.0.0.1:3000/twitter/typeahead-js',
+    avatarUrl: '/uploads/-/system/project/avatar/7/TWBS.png',
+  },
+  {
+    id: 4,
+    name: 'Intel',
+    namespace: 'platform / hardware / bsp / intel',
+    webUrl: 'http://127.0.0.1:3000/platform/hardware/bsp/intel',
+    avatarUrl: null,
+  },
+  {
+    id: 5,
+    name: 'v4.4',
+    namespace: 'platform / hardware / bsp / kernel / common / v4.4',
+    webUrl: 'http://localhost:3000/platform/hardware/bsp/kernel/common/v4.4',
+    avatarUrl: null,
+  },
+];
+
+export const unsortedFrequents = [
+  { id: 1, frequency: 12, lastAccessedOn: 1491400843391 },
+  { id: 2, frequency: 14, lastAccessedOn: 1488240890738 },
+  { id: 3, frequency: 44, lastAccessedOn: 1497675908472 },
+  { id: 4, frequency: 8, lastAccessedOn: 1497979281815 },
+  { id: 5, frequency: 34, lastAccessedOn: 1488089211943 },
+  { id: 6, frequency: 14, lastAccessedOn: 1493517292488 },
+  { id: 7, frequency: 42, lastAccessedOn: 1486815299875 },
+  { id: 8, frequency: 33, lastAccessedOn: 1500762279114 },
+  { id: 10, frequency: 46, lastAccessedOn: 1483251641543 },
+];
+
+/**
+ * This const has a specific order which tests authenticity
+ * of `ProjectsService.getTopFrequentProjects` method so
+ * DO NOT change order of items in this const.
+ */
+export const sortedFrequents = [
+  { id: 10, frequency: 46, lastAccessedOn: 1483251641543 },
+  { id: 3, frequency: 44, lastAccessedOn: 1497675908472 },
+  { id: 7, frequency: 42, lastAccessedOn: 1486815299875 },
+  { id: 5, frequency: 34, lastAccessedOn: 1488089211943 },
+  { id: 8, frequency: 33, lastAccessedOn: 1500762279114 },
+  { id: 6, frequency: 14, lastAccessedOn: 1493517292488 },
+  { id: 2, frequency: 14, lastAccessedOn: 1488240890738 },
+  { id: 1, frequency: 12, lastAccessedOn: 1491400843391 },
+  { id: 4, frequency: 8, lastAccessedOn: 1497979281815 },
+];
diff --git a/spec/javascripts/projects_dropdown/service/projects_service_spec.js b/spec/javascripts/projects_dropdown/service/projects_service_spec.js
new file mode 100644
index 00000000000..d5dd8b3449a
--- /dev/null
+++ b/spec/javascripts/projects_dropdown/service/projects_service_spec.js
@@ -0,0 +1,179 @@
+import Vue from 'vue';
+import VueResource from 'vue-resource';
+
+import bp from '~/breakpoints';
+import ProjectsService from '~/projects_dropdown/service/projects_service';
+import { FREQUENT_PROJECTS } from '~/projects_dropdown/constants';
+import { currentSession, unsortedFrequents, sortedFrequents } from '../mock_data';
+
+Vue.use(VueResource);
+
+FREQUENT_PROJECTS.MAX_COUNT = 3;
+
+describe('ProjectsService', () => {
+  let service;
+
+  beforeEach(() => {
+    gon.api_version = currentSession.apiVersion;
+    gon.current_user_id = 1;
+    service = new ProjectsService(currentSession.username);
+  });
+
+  describe('contructor', () => {
+    it('should initialize default properties of class', () => {
+      expect(service.isLocalStorageAvailable).toBeTruthy();
+      expect(service.currentUserName).toBe(currentSession.username);
+      expect(service.storageKey).toBe(currentSession.storageKey);
+      expect(service.projectsPath).toBeDefined();
+    });
+  });
+
+  describe('getSearchedProjects', () => {
+    it('should return promise from VueResource HTTP GET', () => {
+      spyOn(service.projectsPath, 'get').and.stub();
+
+      const searchQuery = 'lab';
+      const queryParams = {
+        simple: false,
+        per_page: 20,
+        membership: true,
+        order_by: 'last_activity_at',
+        search: searchQuery,
+      };
+
+      service.getSearchedProjects(searchQuery);
+      expect(service.projectsPath.get).toHaveBeenCalledWith(queryParams);
+    });
+  });
+
+  describe('logProjectAccess', () => {
+    let storage;
+
+    beforeEach(() => {
+      storage = {};
+
+      spyOn(window.localStorage, 'setItem').and.callFake((storageKey, value) => {
+        storage[storageKey] = value;
+      });
+
+      spyOn(window.localStorage, 'getItem').and.callFake((storageKey) => {
+        if (storage[storageKey]) {
+          return storage[storageKey];
+        }
+
+        return null;
+      });
+    });
+
+    it('should create a project store if it does not exist and adds a project', () => {
+      service.logProjectAccess(currentSession.project);
+
+      const projects = JSON.parse(storage[currentSession.storageKey]);
+      expect(projects.length).toBe(1);
+      expect(projects[0].frequency).toBe(1);
+      expect(projects[0].lastAccessedOn).toBeDefined();
+    });
+
+    it('should prevent inserting same report multiple times into store', () => {
+      service.logProjectAccess(currentSession.project);
+      service.logProjectAccess(currentSession.project);
+
+      const projects = JSON.parse(storage[currentSession.storageKey]);
+      expect(projects.length).toBe(1);
+    });
+
+    it('should increase frequency of report if it was logged multiple times over the course of an hour', () => {
+      let projects;
+      spyOn(Math, 'abs').and.returnValue(3600001); // this will lead to `diff` > 1;
+      service.logProjectAccess(currentSession.project);
+
+      projects = JSON.parse(storage[currentSession.storageKey]);
+      expect(projects[0].frequency).toBe(1);
+
+      service.logProjectAccess(currentSession.project);
+      projects = JSON.parse(storage[currentSession.storageKey]);
+      expect(projects[0].frequency).toBe(2);
+      expect(projects[0].lastAccessedOn).not.toBe(currentSession.project.lastAccessedOn);
+    });
+
+    it('should always update project metadata', () => {
+      let projects;
+      const oldProject = {
+        ...currentSession.project,
+      };
+
+      const newProject = {
+        ...currentSession.project,
+        name: 'New Name',
+        avatarUrl: 'new/avatar.png',
+        namespace: 'New / Namespace',
+        webUrl: 'http://localhost/new/web/url',
+      };
+
+      service.logProjectAccess(oldProject);
+      projects = JSON.parse(storage[currentSession.storageKey]);
+      expect(projects[0].name).toBe(oldProject.name);
+      expect(projects[0].avatarUrl).toBe(oldProject.avatarUrl);
+      expect(projects[0].namespace).toBe(oldProject.namespace);
+      expect(projects[0].webUrl).toBe(oldProject.webUrl);
+
+      service.logProjectAccess(newProject);
+      projects = JSON.parse(storage[currentSession.storageKey]);
+      expect(projects[0].name).toBe(newProject.name);
+      expect(projects[0].avatarUrl).toBe(newProject.avatarUrl);
+      expect(projects[0].namespace).toBe(newProject.namespace);
+      expect(projects[0].webUrl).toBe(newProject.webUrl);
+    });
+
+    it('should not add more than 20 projects in store', () => {
+      for (let i = 1; i <= 5; i += 1) {
+        const project = Object.assign(currentSession.project, { id: i });
+        service.logProjectAccess(project);
+      }
+
+      const projects = JSON.parse(storage[currentSession.storageKey]);
+      expect(projects.length).toBe(3);
+    });
+  });
+
+  describe('getTopFrequentProjects', () => {
+    let storage = {};
+
+    beforeEach(() => {
+      storage[currentSession.storageKey] = JSON.stringify(unsortedFrequents);
+
+      spyOn(window.localStorage, 'getItem').and.callFake((storageKey) => {
+        if (storage[storageKey]) {
+          return storage[storageKey];
+        }
+
+        return null;
+      });
+    });
+
+    it('should return top 5 frequently accessed projects for desktop screens', () => {
+      spyOn(bp, 'getBreakpointSize').and.returnValue('md');
+      const frequentProjects = service.getTopFrequentProjects();
+
+      expect(frequentProjects.length).toBe(5);
+      frequentProjects.forEach((project, index) => {
+        expect(project.id).toBe(sortedFrequents[index].id);
+      });
+    });
+
+    it('should return top 3 frequently accessed projects for mobile screens', () => {
+      spyOn(bp, 'getBreakpointSize').and.returnValue('sm');
+      const frequentProjects = service.getTopFrequentProjects();
+
+      expect(frequentProjects.length).toBe(3);
+      frequentProjects.forEach((project, index) => {
+        expect(project.id).toBe(sortedFrequents[index].id);
+      });
+    });
+
+    it('should return empty array if there are no projects available in store', () => {
+      storage = {};
+      expect(service.getTopFrequentProjects().length).toBe(0);
+    });
+  });
+});
diff --git a/spec/javascripts/projects_dropdown/store/projects_store_spec.js b/spec/javascripts/projects_dropdown/store/projects_store_spec.js
new file mode 100644
index 00000000000..e57399d37cd
--- /dev/null
+++ b/spec/javascripts/projects_dropdown/store/projects_store_spec.js
@@ -0,0 +1,41 @@
+import ProjectsStore from '~/projects_dropdown/store/projects_store';
+import { mockProject, mockRawProject } from '../mock_data';
+
+describe('ProjectsStore', () => {
+  let store;
+
+  beforeEach(() => {
+    store = new ProjectsStore();
+  });
+
+  describe('setFrequentProjects', () => {
+    it('should set frequent projects list to state', () => {
+      store.setFrequentProjects([mockProject]);
+
+      expect(store.getFrequentProjects().length).toBe(1);
+      expect(store.getFrequentProjects()[0].id).toBe(mockProject.id);
+    });
+  });
+
+  describe('setSearchedProjects', () => {
+    it('should set searched projects list to state', () => {
+      store.setSearchedProjects([mockRawProject]);
+
+      const processedProjects = store.getSearchedProjects();
+      expect(processedProjects.length).toBe(1);
+      expect(processedProjects[0].id).toBe(mockRawProject.id);
+      expect(processedProjects[0].namespace).toBe(mockRawProject.name_with_namespace);
+      expect(processedProjects[0].webUrl).toBe(mockRawProject.web_url);
+      expect(processedProjects[0].avatarUrl).toBe(mockRawProject.avatar_url);
+    });
+  });
+
+  describe('clearSearchedProjects', () => {
+    it('should clear searched projects list from state', () => {
+      store.setSearchedProjects([mockRawProject]);
+      expect(store.getSearchedProjects().length).toBe(1);
+      store.clearSearchedProjects();
+      expect(store.getSearchedProjects().length).toBe(0);
+    });
+  });
+});
diff --git a/spec/javascripts/shortcuts_issuable_spec.js b/spec/javascripts/shortcuts_issuable_spec.js
index 3515dfbc60b..a912e150e9b 100644
--- a/spec/javascripts/shortcuts_issuable_spec.js
+++ b/spec/javascripts/shortcuts_issuable_spec.js
@@ -1,78 +1,74 @@
-/* eslint-disable space-before-function-paren, no-return-assign, no-var, quotes */
 /* global ShortcutsIssuable */
 
 import '~/copy_as_gfm';
 import '~/shortcuts_issuable';
 
-(function() {
-  describe('ShortcutsIssuable', function() {
-    var fixtureName = 'issues/open-issue.html.raw';
-    preloadFixtures(fixtureName);
-    beforeEach(function() {
-      loadFixtures(fixtureName);
-      document.querySelector('.js-new-note-form').classList.add('js-main-target-form');
-      this.shortcut = new ShortcutsIssuable();
-    });
-    describe('replyWithSelectedText', function() {
-      var stubSelection;
-      // Stub window.gl.utils.getSelectedFragment to return a node with the provided HTML.
-      stubSelection = function(html) {
-        window.gl.utils.getSelectedFragment = function() {
-          var node = document.createElement('div');
-          node.innerHTML = html;
-          return node;
-        };
+describe('ShortcutsIssuable', () => {
+  const fixtureName = 'merge_requests/diff_comment.html.raw';
+  preloadFixtures(fixtureName);
+  beforeEach(() => {
+    loadFixtures(fixtureName);
+    document.querySelector('.js-new-note-form').classList.add('js-main-target-form');
+    this.shortcut = new ShortcutsIssuable(true);
+  });
+  describe('replyWithSelectedText', () => {
+    // Stub window.gl.utils.getSelectedFragment to return a node with the provided HTML.
+    const stubSelection = (html) => {
+      window.gl.utils.getSelectedFragment = () => {
+        const node = document.createElement('div');
+        node.innerHTML = html;
+        return node;
       };
-      beforeEach(function() {
-        this.selector = 'form.js-main-target-form textarea#note_note';
+    };
+    beforeEach(() => {
+      this.selector = '.js-main-target-form #note_note';
+    });
+    describe('with empty selection', () => {
+      it('does not return an error', () => {
+        this.shortcut.replyWithSelectedText(true);
+        expect($(this.selector).val()).toBe('');
       });
-      describe('with empty selection', function() {
-        it('does not return an error', function() {
-          this.shortcut.replyWithSelectedText();
-          expect($(this.selector).val()).toBe('');
-        });
-        it('triggers `focus`', function() {
-          this.shortcut.replyWithSelectedText();
-          expect(document.activeElement).toBe(document.querySelector(this.selector));
-        });
+      it('triggers `focus`', () => {
+        this.shortcut.replyWithSelectedText(true);
+        expect(document.activeElement).toBe(document.querySelector(this.selector));
       });
-      describe('with any selection', function() {
-        beforeEach(function() {
-          stubSelection('<p>Selected text.</p>');
-        });
-        it('leaves existing input intact', function() {
-          $(this.selector).val('This text was already here.');
-          expect($(this.selector).val()).toBe('This text was already here.');
-          this.shortcut.replyWithSelectedText();
-          expect($(this.selector).val()).toBe("This text was already here.\n\n> Selected text.\n\n");
-        });
-        it('triggers `input`', function() {
-          var triggered = false;
-          $(this.selector).on('input', function() {
-            triggered = true;
-          });
-          this.shortcut.replyWithSelectedText();
-          expect(triggered).toBe(true);
-        });
-        it('triggers `focus`', function() {
-          this.shortcut.replyWithSelectedText();
-          expect(document.activeElement).toBe(document.querySelector(this.selector));
-        });
+    });
+    describe('with any selection', () => {
+      beforeEach(() => {
+        stubSelection('<p>Selected text.</p>');
       });
-      describe('with a one-line selection', function() {
-        it('quotes the selection', function() {
-          stubSelection('<p>This text has been selected.</p>');
-          this.shortcut.replyWithSelectedText();
-          expect($(this.selector).val()).toBe("> This text has been selected.\n\n");
-        });
+      it('leaves existing input intact', () => {
+        $(this.selector).val('This text was already here.');
+        expect($(this.selector).val()).toBe('This text was already here.');
+        this.shortcut.replyWithSelectedText(true);
+        expect($(this.selector).val()).toBe('This text was already here.\n\n> Selected text.\n\n');
       });
-      describe('with a multi-line selection', function() {
-        it('quotes the selected lines as a group', function() {
-          stubSelection("<p>Selected line one.</p>\n\n<p>Selected line two.</p>\n\n<p>Selected line three.</p>");
-          this.shortcut.replyWithSelectedText();
-          expect($(this.selector).val()).toBe("> Selected line one.\n>\n> Selected line two.\n>\n> Selected line three.\n\n");
+      it('triggers `input`', () => {
+        let triggered = false;
+        $(this.selector).on('input', () => {
+          triggered = true;
         });
+        this.shortcut.replyWithSelectedText(true);
+        expect(triggered).toBe(true);
+      });
+      it('triggers `focus`', () => {
+        this.shortcut.replyWithSelectedText(true);
+        expect(document.activeElement).toBe(document.querySelector(this.selector));
+      });
+    });
+    describe('with a one-line selection', () => {
+      it('quotes the selection', () => {
+        stubSelection('<p>This text has been selected.</p>');
+        this.shortcut.replyWithSelectedText(true);
+        expect($(this.selector).val()).toBe('> This text has been selected.\n\n');
+      });
+    });
+    describe('with a multi-line selection', () => {
+      it('quotes the selected lines as a group', () => {
+        stubSelection('<p>Selected line one.</p>\n\n<p>Selected line two.</p>\n\n<p>Selected line three.</p>');
+        this.shortcut.replyWithSelectedText(true);
+        expect($(this.selector).val()).toBe('> Selected line one.\n>\n> Selected line two.\n>\n> Selected line three.\n\n');
       });
     });
   });
-}).call(window);
+});
diff --git a/spec/javascripts/shortcuts_spec.js b/spec/javascripts/shortcuts_spec.js
index 9b8373df29e..53e4c68beb3 100644
--- a/spec/javascripts/shortcuts_spec.js
+++ b/spec/javascripts/shortcuts_spec.js
@@ -1,6 +1,6 @@
 /* global Shortcuts */
 describe('Shortcuts', () => {
-  const fixtureName = 'issues/issue_with_comment.html.raw';
+  const fixtureName = 'merge_requests/diff_comment.html.raw';
   const createEvent = (type, target) => $.Event(type, {
     target,
   });
diff --git a/spec/javascripts/sidebar/mock_data.js b/spec/javascripts/sidebar/mock_data.js
index 9fc8667ecc9..e2b6bcabc98 100644
--- a/spec/javascripts/sidebar/mock_data.js
+++ b/spec/javascripts/sidebar/mock_data.js
@@ -66,17 +66,57 @@ const sidebarMockData = {
       },
       labels: [],
     },
+    '/autocomplete/projects?project_id=15': [
+      {
+        'id': 0,
+        'name_with_namespace': 'No project',
+      }, {
+        'id': 20,
+        'name_with_namespace': 'foo / bar',
+      },
+    ],
   },
   'PUT': {
     '/gitlab-org/gitlab-shell/issues/5.json': {
       data: {},
     },
   },
+  'POST': {
+    '/gitlab-org/gitlab-shell/issues/5/move': {
+      id: 123,
+      iid: 5,
+      author_id: 1,
+      description: 'some description',
+      lock_version: 5,
+      milestone_id: null,
+      state: 'opened',
+      title: 'some title',
+      updated_by_id: 1,
+      created_at: '2017-06-27T19:54:42.437Z',
+      updated_at: '2017-08-18T03:39:49.222Z',
+      deleted_at: null,
+      time_estimate: 0,
+      total_time_spent: 0,
+      human_time_estimate: null,
+      human_total_time_spent: null,
+      branch_name: null,
+      confidential: false,
+      assignees: [],
+      due_date: null,
+      moved_to_id: null,
+      project_id: 7,
+      milestone: null,
+      labels: [],
+      web_url: '/root/some-project/issues/5',
+    },
+  },
 };
 
 export default {
   mediator: {
     endpoint: '/gitlab-org/gitlab-shell/issues/5.json',
+    moveIssueEndpoint: '/gitlab-org/gitlab-shell/issues/5/move',
+    projectsAutocompleteEndpoint: '/autocomplete/projects?project_id=15',
     editable: true,
     currentUser: {
       id: 1,
@@ -85,6 +125,7 @@ export default {
       avatar_url: 'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon',
     },
     rootPath: '/',
+    fullPath: '/gitlab-org/gitlab-shell',
   },
   time: {
     time_estimate: 3600,
diff --git a/spec/javascripts/sidebar/sidebar_mediator_spec.js b/spec/javascripts/sidebar/sidebar_mediator_spec.js
index e246f41ee82..3aa8ca5db0d 100644
--- a/spec/javascripts/sidebar/sidebar_mediator_spec.js
+++ b/spec/javascripts/sidebar/sidebar_mediator_spec.js
@@ -30,7 +30,7 @@ describe('Sidebar mediator', () => {
         expect(resp.status).toEqual(200);
         done();
       })
-      .catch(() => {});
+      .catch(done.fail);
   });
 
   it('fetches the data', () => {
@@ -38,4 +38,42 @@ describe('Sidebar mediator', () => {
     this.mediator.fetch();
     expect(this.mediator.service.get).toHaveBeenCalled();
   });
+
+  it('sets moveToProjectId', () => {
+    const projectId = 7;
+    spyOn(this.mediator.store, 'setMoveToProjectId').and.callThrough();
+
+    this.mediator.setMoveToProjectId(projectId);
+
+    expect(this.mediator.store.setMoveToProjectId).toHaveBeenCalledWith(projectId);
+  });
+
+  it('fetches autocomplete projects', (done) => {
+    const searchTerm = 'foo';
+    spyOn(this.mediator.service, 'getProjectsAutocomplete').and.callThrough();
+    spyOn(this.mediator.store, 'setAutocompleteProjects').and.callThrough();
+
+    this.mediator.fetchAutocompleteProjects(searchTerm)
+      .then(() => {
+        expect(this.mediator.service.getProjectsAutocomplete).toHaveBeenCalledWith(searchTerm);
+        expect(this.mediator.store.setAutocompleteProjects).toHaveBeenCalled();
+        done();
+      })
+      .catch(done.fail);
+  });
+
+  it('moves issue', (done) => {
+    const moveToProjectId = 7;
+    this.mediator.store.setMoveToProjectId(moveToProjectId);
+    spyOn(this.mediator.service, 'moveIssue').and.callThrough();
+    spyOn(gl.utils, 'visitUrl');
+
+    this.mediator.moveIssue()
+      .then(() => {
+        expect(this.mediator.service.moveIssue).toHaveBeenCalledWith(moveToProjectId);
+        expect(gl.utils.visitUrl).toHaveBeenCalledWith('/root/some-project/issues/5');
+        done();
+      })
+      .catch(done.fail);
+  });
 });
diff --git a/spec/javascripts/sidebar/sidebar_move_issue_spec.js b/spec/javascripts/sidebar/sidebar_move_issue_spec.js
new file mode 100644
index 00000000000..8b0d51bbcc8
--- /dev/null
+++ b/spec/javascripts/sidebar/sidebar_move_issue_spec.js
@@ -0,0 +1,142 @@
+import Vue from 'vue';
+import SidebarMediator from '~/sidebar/sidebar_mediator';
+import SidebarStore from '~/sidebar/stores/sidebar_store';
+import SidebarService from '~/sidebar/services/sidebar_service';
+import SidebarMoveIssue from '~/sidebar/lib/sidebar_move_issue';
+import Mock from './mock_data';
+
+describe('SidebarMoveIssue', () => {
+  beforeEach(() => {
+    Vue.http.interceptors.push(Mock.sidebarMockInterceptor);
+    this.mediator = new SidebarMediator(Mock.mediator);
+    this.$content = $(`
+      <div class="dropdown">
+        <div class="js-toggle"></div>
+        <div class="dropdown-content"></div>
+        <div class="js-confirm-button"></div>
+      </div>
+    `);
+    this.$toggleButton = this.$content.find('.js-toggle');
+    this.$confirmButton = this.$content.find('.js-confirm-button');
+
+    this.sidebarMoveIssue = new SidebarMoveIssue(
+      this.mediator,
+      this.$toggleButton,
+      this.$confirmButton,
+    );
+    this.sidebarMoveIssue.init();
+  });
+
+  afterEach(() => {
+    SidebarService.singleton = null;
+    SidebarStore.singleton = null;
+    SidebarMediator.singleton = null;
+
+    this.sidebarMoveIssue.destroy();
+
+    Vue.http.interceptors = _.without(Vue.http.interceptors, Mock.sidebarMockInterceptor);
+  });
+
+  describe('init', () => {
+    it('should initialize the dropdown and listeners', () => {
+      spyOn(this.sidebarMoveIssue, 'initDropdown');
+      spyOn(this.sidebarMoveIssue, 'addEventListeners');
+
+      this.sidebarMoveIssue.init();
+
+      expect(this.sidebarMoveIssue.initDropdown).toHaveBeenCalled();
+      expect(this.sidebarMoveIssue.addEventListeners).toHaveBeenCalled();
+    });
+  });
+
+  describe('destroy', () => {
+    it('should remove the listeners', () => {
+      spyOn(this.sidebarMoveIssue, 'removeEventListeners');
+
+      this.sidebarMoveIssue.destroy();
+
+      expect(this.sidebarMoveIssue.removeEventListeners).toHaveBeenCalled();
+    });
+  });
+
+  describe('initDropdown', () => {
+    it('should initialize the gl_dropdown', () => {
+      spyOn($.fn, 'glDropdown');
+
+      this.sidebarMoveIssue.initDropdown();
+
+      expect($.fn.glDropdown).toHaveBeenCalled();
+    });
+  });
+
+  describe('onConfirmClicked', () => {
+    it('should move the issue with valid project ID', () => {
+      spyOn(this.mediator, 'moveIssue').and.returnValue(Promise.resolve());
+      this.mediator.setMoveToProjectId(7);
+
+      this.sidebarMoveIssue.onConfirmClicked();
+
+      expect(this.mediator.moveIssue).toHaveBeenCalled();
+      expect(this.$confirmButton.attr('disabled')).toBe('disabled');
+      expect(this.$confirmButton.hasClass('is-loading')).toBe(true);
+    });
+
+    it('should remove loading state from confirm button on failure', (done) => {
+      spyOn(window, 'Flash');
+      spyOn(this.mediator, 'moveIssue').and.returnValue(Promise.reject());
+      this.mediator.setMoveToProjectId(7);
+
+      this.sidebarMoveIssue.onConfirmClicked();
+
+      expect(this.mediator.moveIssue).toHaveBeenCalled();
+      // Wait for the move issue request to fail
+      setTimeout(() => {
+        expect(window.Flash).toHaveBeenCalled();
+        expect(this.$confirmButton.attr('disabled')).toBe(undefined);
+        expect(this.$confirmButton.hasClass('is-loading')).toBe(false);
+        done();
+      });
+    });
+
+    it('should not move the issue with id=0', () => {
+      spyOn(this.mediator, 'moveIssue');
+      this.mediator.setMoveToProjectId(0);
+
+      this.sidebarMoveIssue.onConfirmClicked();
+
+      expect(this.mediator.moveIssue).not.toHaveBeenCalled();
+    });
+  });
+
+  it('should set moveToProjectId on dropdown item "No project" click', (done) => {
+    spyOn(this.mediator, 'setMoveToProjectId');
+
+    // Open the dropdown
+    this.$toggleButton.dropdown('toggle');
+
+    // Wait for the autocomplete request to finish
+    setTimeout(() => {
+      this.$content.find('.js-move-issue-dropdown-item').eq(0).trigger('click');
+
+      expect(this.mediator.setMoveToProjectId).toHaveBeenCalledWith(0);
+      expect(this.$confirmButton.attr('disabled')).toBe('disabled');
+      done();
+    }, 0);
+  });
+
+  it('should set moveToProjectId on dropdown item click', (done) => {
+    spyOn(this.mediator, 'setMoveToProjectId');
+
+    // Open the dropdown
+    this.$toggleButton.dropdown('toggle');
+
+    // Wait for the autocomplete request to finish
+    setTimeout(() => {
+      this.$content.find('.js-move-issue-dropdown-item').eq(1).trigger('click');
+
+      expect(this.mediator.setMoveToProjectId).toHaveBeenCalledWith(20);
+      expect(this.$confirmButton.attr('disabled')).toBe(undefined);
+      done();
+    }, 0);
+  });
+});
diff --git a/spec/javascripts/sidebar/sidebar_service_spec.js b/spec/javascripts/sidebar/sidebar_service_spec.js
index 91a4dd669a7..a4bd8ba8d88 100644
--- a/spec/javascripts/sidebar/sidebar_service_spec.js
+++ b/spec/javascripts/sidebar/sidebar_service_spec.js
@@ -5,7 +5,11 @@ import Mock from './mock_data';
 describe('Sidebar service', () => {
   beforeEach(() => {
     Vue.http.interceptors.push(Mock.sidebarMockInterceptor);
-    this.service = new SidebarService('/gitlab-org/gitlab-shell/issues/5.json');
+    this.service = new SidebarService({
+      endpoint: '/gitlab-org/gitlab-shell/issues/5.json',
+      moveIssueEndpoint: '/gitlab-org/gitlab-shell/issues/5/move',
+      projectsAutocompleteEndpoint: '/autocomplete/projects?project_id=15',
+    });
   });
 
   afterEach(() => {
@@ -19,7 +23,7 @@ describe('Sidebar service', () => {
         expect(resp).toBeDefined();
         done();
       })
-      .catch(() => {});
+      .catch(done.fail);
   });
 
   it('updates the data', (done) => {
@@ -28,6 +32,24 @@ describe('Sidebar service', () => {
         expect(resp).toBeDefined();
         done();
       })
-      .catch(() => {});
+      .catch(done.fail);
+  });
+
+  it('gets projects for autocomplete', (done) => {
+    this.service.getProjectsAutocomplete()
+      .then((resp) => {
+        expect(resp).toBeDefined();
+        done();
+      })
+      .catch(done.fail);
+  });
+
+  it('moves the issue to another project', (done) => {
+    this.service.moveIssue(123)
+      .then((resp) => {
+        expect(resp).toBeDefined();
+        done();
+      })
+      .catch(done.fail);
   });
 });
diff --git a/spec/javascripts/sidebar/sidebar_store_spec.js b/spec/javascripts/sidebar/sidebar_store_spec.js
index b3fa156eb64..69eb3839d67 100644
--- a/spec/javascripts/sidebar/sidebar_store_spec.js
+++ b/spec/javascripts/sidebar/sidebar_store_spec.js
@@ -82,4 +82,18 @@ describe('Sidebar store', () => {
     expect(this.store.humanTimeEstimate).toEqual(Mock.time.human_time_estimate);
     expect(this.store.humanTotalTimeSpent).toEqual(Mock.time.human_total_time_spent);
   });
+
+  it('set autocomplete projects', () => {
+    const projects = [{ id: 0 }];
+    this.store.setAutocompleteProjects(projects);
+
+    expect(this.store.autocompleteProjects).toEqual(projects);
+  });
+
+  it('set move to project ID', () => {
+    const projectId = 7;
+    this.store.setMoveToProjectId(projectId);
+
+    expect(this.store.moveToProjectId).toEqual(projectId);
+  });
 });
diff --git a/spec/javascripts/vue_shared/components/identicon_spec.js b/spec/javascripts/vue_shared/components/identicon_spec.js
index 4f194e5a64e..647680f00f7 100644
--- a/spec/javascripts/vue_shared/components/identicon_spec.js
+++ b/spec/javascripts/vue_shared/components/identicon_spec.js
@@ -1,25 +1,30 @@
 import Vue from 'vue';
 import identiconComponent from '~/vue_shared/components/identicon.vue';
 
-const createComponent = () => {
+const createComponent = (sizeClass) => {
   const Component = Vue.extend(identiconComponent);
 
   return new Component({
     propsData: {
       entityId: 1,
       entityName: 'entity-name',
+      sizeClass,
     },
   }).$mount();
 };
 
 describe('IdenticonComponent', () => {
-  let vm;
+  describe('computed', () => {
+    let vm;
 
-  beforeEach(() => {
-    vm = createComponent();
-  });
+    beforeEach(() => {
+      vm = createComponent();
+    });
+
+    afterEach(() => {
+      vm.$destroy();
+    });
 
-  describe('computed', () => {
     describe('identiconStyles', () => {
       it('should return styles attribute value with `background-color` property', () => {
         vm.entityId = 4;
@@ -48,9 +53,20 @@ describe('IdenticonComponent', () => {
 
   describe('template', () => {
     it('should render identicon', () => {
+      const vm = createComponent();
+
       expect(vm.$el.nodeName).toBe('DIV');
       expect(vm.$el.classList.contains('identicon')).toBeTruthy();
+      expect(vm.$el.classList.contains('s40')).toBeTruthy();
       expect(vm.$el.getAttribute('style').indexOf('background-color') > -1).toBeTruthy();
+      vm.$destroy();
+    });
+
+    it('should render identicon with provided sizing class', () => {
+      const vm = createComponent('s32');
+
+      expect(vm.$el.classList.contains('s32')).toBeTruthy();
+      vm.$destroy();
     });
   });
 });
diff --git a/spec/javascripts/vue_shared/components/issue/confidential_issue_warning_spec.js b/spec/javascripts/vue_shared/components/issue/confidential_issue_warning_spec.js
new file mode 100644
index 00000000000..6df08f3ebe7
--- /dev/null
+++ b/spec/javascripts/vue_shared/components/issue/confidential_issue_warning_spec.js
@@ -0,0 +1,20 @@
+import Vue from 'vue';
+import confidentialIssue from '~/vue_shared/components/issue/confidential_issue_warning.vue';
+
+describe('Confidential Issue Warning Component', () => {
+  let vm;
+
+  beforeEach(() => {
+    const Component = Vue.extend(confidentialIssue);
+    vm = new Component().$mount();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  it('should render confidential issue warning information', () => {
+    expect(vm.$el.querySelector('i').className).toEqual('fa fa-eye-slash');
+    expect(vm.$el.querySelector('span').textContent.trim()).toEqual('This is a confidential issue. Your comment will not be visible to the public.');
+  });
+});
diff --git a/spec/javascripts/vue_shared/components/markdown/field_spec.js b/spec/javascripts/vue_shared/components/markdown/field_spec.js
index 291e19c9f3c..60a5c2ae74e 100644
--- a/spec/javascripts/vue_shared/components/markdown/field_spec.js
+++ b/spec/javascripts/vue_shared/components/markdown/field_spec.js
@@ -16,8 +16,8 @@ describe('Markdown field component', () => {
       },
       template: `
         <field-component
-          marodown-preview-url="/preview"
-          markdown-docs="/docs"
+          markdown-preview-path="/preview"
+          markdown-docs-path="/docs"
         >
           <textarea
             slot="textarea"
@@ -92,6 +92,7 @@ describe('Markdown field component', () => {
 
       it('renders GFM with jQuery', (done) => {
         spyOn($.fn, 'renderGFM');
+
         previewLink.click();
 
         setTimeout(() => {
@@ -100,7 +101,7 @@ describe('Markdown field component', () => {
           ).toHaveBeenCalled();
 
           done();
-        });
+        }, 0);
       });
     });
 
diff --git a/spec/javascripts/zen_mode_spec.js b/spec/javascripts/zen_mode_spec.js
index a225b04c47e..bd18f79cea7 100644
--- a/spec/javascripts/zen_mode_spec.js
+++ b/spec/javascripts/zen_mode_spec.js
@@ -8,7 +8,7 @@ import ZenMode from '~/zen_mode';
   var enterZen, escapeKeydown, exitZen;
 
   describe('ZenMode', function() {
-    var fixtureName = 'issues/open-issue.html.raw';
+    var fixtureName = 'merge_requests/merge_request_with_comment.html.raw';
     preloadFixtures(fixtureName);
     beforeEach(function() {
       loadFixtures(fixtureName);
diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
index c70a4cb55fe..1efd3113a43 100644
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
@@ -164,9 +164,46 @@ module Ci
           expect(seeds.first.builds.dig(0, :name)).to eq 'spinach'
         end
       end
+
+      context 'when kubernetes policy is specified' do
+        let(:pipeline) { create(:ci_empty_pipeline) }
+
+        let(:config) do
+          YAML.dump(
+            spinach: { stage: 'test', script: 'spinach' },
+            production: {
+              stage: 'deploy',
+              script: 'cap',
+              only: { kubernetes: 'active' }
+            }
+          )
+        end
+
+        context 'when kubernetes is active' do
+          let(:project) { create(:kubernetes_project) }
+          let(:pipeline) { create(:ci_empty_pipeline, project: project) }
+
+          it 'returns seeds for kubernetes dependent job' do
+            seeds = subject.stage_seeds(pipeline)
+
+            expect(seeds.size).to eq 2
+            expect(seeds.first.builds.dig(0, :name)).to eq 'spinach'
+            expect(seeds.second.builds.dig(0, :name)).to eq 'production'
+          end
+        end
+
+        context 'when kubernetes is not active' do
+          it 'does not return seeds for kubernetes dependent job' do
+            seeds = subject.stage_seeds(pipeline)
+
+            expect(seeds.size).to eq 1
+            expect(seeds.first.builds.dig(0, :name)).to eq 'spinach'
+          end
+        end
+      end
     end
 
-    describe "#builds_for_ref" do
+    describe "#builds_for_stage_and_ref" do
       let(:type) { 'test' }
 
       it "returns builds if no branch specified" do
diff --git a/spec/lib/container_registry/tag_spec.rb b/spec/lib/container_registry/tag_spec.rb
index e76463b5e7c..cb4ae3be525 100644
--- a/spec/lib/container_registry/tag_spec.rb
+++ b/spec/lib/container_registry/tag_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe ContainerRegistry::Tag do
   let(:group) { create(:group, name: 'group') }
-  let(:project) { create(:project, :repository, path: 'test', group: group) }
+  let(:project) { create(:project, path: 'test', group: group) }
 
   let(:repository) do
     create(:container_repository, name: '', project: project)
diff --git a/spec/lib/gitlab/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb
index 4a498e79c87..f685bb83d0d 100644
--- a/spec/lib/gitlab/auth_spec.rb
+++ b/spec/lib/gitlab/auth_spec.rb
@@ -279,16 +279,6 @@ describe Gitlab::Auth do
         gl_auth.find_with_user_password('ldap_user', 'password')
       end
     end
-
-    context "with sign-in disabled" do
-      before do
-        stub_application_setting(password_authentication_enabled: false)
-      end
-
-      it "does not find user by valid login/password" do
-        expect(gl_auth.find_with_user_password(username, password)).to be_nil
-      end
-    end
   end
 
   private
diff --git a/spec/lib/gitlab/ci/config/entry/policy_spec.rb b/spec/lib/gitlab/ci/config/entry/policy_spec.rb
index 36a84da4a52..5e83abf645b 100644
--- a/spec/lib/gitlab/ci/config/entry/policy_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/policy_spec.rb
@@ -16,8 +16,8 @@ describe Gitlab::Ci::Config::Entry::Policy do
           end
 
           describe '#value' do
-            it 'returns key value' do
-              expect(entry.value).to eq config
+            it 'returns refs hash' do
+              expect(entry.value).to eq(refs: config)
             end
           end
         end
@@ -56,6 +56,50 @@ describe Gitlab::Ci::Config::Entry::Policy do
     end
   end
 
+  context 'when using complex policy' do
+    context 'when specifiying refs policy' do
+      let(:config) { { refs: ['master'] } }
+
+      it 'is a correct configuraton' do
+        expect(entry).to be_valid
+        expect(entry.value).to eq(refs: %w[master])
+      end
+    end
+
+    context 'when specifying kubernetes policy' do
+      let(:config) { { kubernetes: 'active' } }
+
+      it 'is a correct configuraton' do
+        expect(entry).to be_valid
+        expect(entry.value).to eq(kubernetes: 'active')
+      end
+    end
+
+    context 'when specifying invalid kubernetes policy' do
+      let(:config) { { kubernetes: 'something' } }
+
+      it 'reports an error about invalid policy' do
+        expect(entry.errors).to include /unknown value: something/
+      end
+    end
+
+    context 'when specifying unknown policy' do
+      let(:config) { { refs: ['master'], invalid: :something } }
+
+      it 'returns error about invalid key' do
+        expect(entry.errors).to include /unknown keys: invalid/
+      end
+    end
+
+    context 'when policy is empty' do
+      let(:config) { {} }
+
+      it 'is not a valid configuration' do
+        expect(entry.errors).to include /can't be blank/
+      end
+    end
+  end
+
   context 'when policy strategy does not match' do
     let(:config) { 'string strategy' }
 
diff --git a/spec/lib/gitlab/ci/stage/seed_spec.rb b/spec/lib/gitlab/ci/stage/seed_spec.rb
index d7e91a5a62c..9ecd128faca 100644
--- a/spec/lib/gitlab/ci/stage/seed_spec.rb
+++ b/spec/lib/gitlab/ci/stage/seed_spec.rb
@@ -27,6 +27,26 @@ describe Gitlab::Ci::Stage::Seed do
       expect(subject.builds)
         .to all(include(trigger_request: pipeline.trigger_requests.first))
     end
+
+    context 'when a ref is protected' do
+      before do
+        allow_any_instance_of(Project).to receive(:protected_for?).and_return(true)
+      end
+
+      it 'returns protected builds' do
+        expect(subject.builds).to all(include(protected: true))
+      end
+    end
+
+    context 'when a ref is unprotected' do
+      before do
+        allow_any_instance_of(Project).to receive(:protected_for?).and_return(false)
+      end
+
+      it 'returns unprotected builds' do
+        expect(subject.builds).to all(include(protected: false))
+      end
+    end
   end
 
   describe '#user=' do
diff --git a/spec/lib/gitlab/email/handler/create_issue_handler_spec.rb b/spec/lib/gitlab/email/handler/create_issue_handler_spec.rb
index bd36d1d309d..6568a0b1bb0 100644
--- a/spec/lib/gitlab/email/handler/create_issue_handler_spec.rb
+++ b/spec/lib/gitlab/email/handler/create_issue_handler_spec.rb
@@ -13,7 +13,7 @@ describe Gitlab::Email::Handler::CreateIssueHandler do
   let(:email_raw) { fixture_file('emails/valid_new_issue.eml') }
   let(:namespace) { create(:namespace, path: 'gitlabhq') }
 
-  let!(:project)  { create(:project, :public, :repository, namespace: namespace) }
+  let!(:project)  { create(:project, :public, namespace: namespace, path: 'gitlabhq') }
   let!(:user) do
     create(
       :user,
diff --git a/spec/lib/gitlab/email/message/repository_push_spec.rb b/spec/lib/gitlab/email/message/repository_push_spec.rb
index 83c4d177cae..0ec1f931037 100644
--- a/spec/lib/gitlab/email/message/repository_push_spec.rb
+++ b/spec/lib/gitlab/email/message/repository_push_spec.rb
@@ -4,7 +4,7 @@ describe Gitlab::Email::Message::RepositoryPush do
   include RepoHelpers
 
   let!(:group) { create(:group, name: 'my_group') }
-  let!(:project) { create(:project, :repository, name: 'my_project', namespace: group) }
+  let!(:project) { create(:project, :repository, namespace: group) }
   let!(:author) { create(:author, name: 'Author') }
 
   let(:message) do
@@ -38,7 +38,7 @@ describe Gitlab::Email::Message::RepositoryPush do
 
     describe '#project_name_with_namespace' do
       subject { message.project_name_with_namespace }
-      it { is_expected.to eq 'my_group / my_project' }
+      it { is_expected.to eq "#{group.name} / #{project.path}" }
     end
 
     describe '#author' do
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index 4cfb4b7d357..08959e7bc16 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -916,27 +916,37 @@ describe Gitlab::Git::Repository, seed_helper: true do
   end
 
   describe '#find_branch' do
-    it 'should return a Branch for master' do
-      branch = repository.find_branch('master')
+    shared_examples 'finding a branch' do
+      it 'should return a Branch for master' do
+        branch = repository.find_branch('master')
 
-      expect(branch).to be_a_kind_of(Gitlab::Git::Branch)
-      expect(branch.name).to eq('master')
-    end
+        expect(branch).to be_a_kind_of(Gitlab::Git::Branch)
+        expect(branch.name).to eq('master')
+      end
 
-    it 'should handle non-existent branch' do
-      branch = repository.find_branch('this-is-garbage')
+      it 'should handle non-existent branch' do
+        branch = repository.find_branch('this-is-garbage')
 
-      expect(branch).to eq(nil)
+        expect(branch).to eq(nil)
+      end
     end
 
-    it 'should reload Rugged::Repository and return master' do
-      expect(Rugged::Repository).to receive(:new).twice.and_call_original
+    context 'when Gitaly find_branch feature is enabled' do
+      it_behaves_like 'finding a branch'
+    end
 
-      repository.find_branch('master')
-      branch = repository.find_branch('master', force_reload: true)
+    context 'when Gitaly find_branch feature is disabled', skip_gitaly_mock: true do
+      it_behaves_like 'finding a branch'
 
-      expect(branch).to be_a_kind_of(Gitlab::Git::Branch)
-      expect(branch.name).to eq('master')
+      it 'should reload Rugged::Repository and return master' do
+        expect(Rugged::Repository).to receive(:new).twice.and_call_original
+
+        repository.find_branch('master')
+        branch = repository.find_branch('master', force_reload: true)
+
+        expect(branch).to be_a_kind_of(Gitlab::Git::Branch)
+        expect(branch.name).to eq('master')
+      end
     end
   end
 
diff --git a/spec/lib/gitlab/git_access_spec.rb b/spec/lib/gitlab/git_access_spec.rb
index 295a979da76..458627ee4de 100644
--- a/spec/lib/gitlab/git_access_spec.rb
+++ b/spec/lib/gitlab/git_access_spec.rb
@@ -155,6 +155,44 @@ describe Gitlab::GitAccess do
     end
   end
 
+  shared_examples '#check with a key that is not valid' do
+    before do
+      project.add_master(user)
+    end
+
+    context 'key is too small' do
+      before do
+        stub_application_setting(rsa_key_restriction: 4096)
+      end
+
+      it 'does not allow keys which are too small', aggregate_failures: true do
+        expect(actor).not_to be_valid
+        expect { pull_access_check }.to raise_unauthorized('Your SSH key must be at least 4096 bits.')
+        expect { push_access_check }.to raise_unauthorized('Your SSH key must be at least 4096 bits.')
+      end
+    end
+
+    context 'key type is not allowed' do
+      before do
+        stub_application_setting(rsa_key_restriction: ApplicationSetting::FORBIDDEN_KEY_VALUE)
+      end
+
+      it 'does not allow keys which are too small', aggregate_failures: true do
+        expect(actor).not_to be_valid
+        expect { pull_access_check }.to raise_unauthorized(/Your SSH key type is forbidden/)
+        expect { push_access_check }.to raise_unauthorized(/Your SSH key type is forbidden/)
+      end
+    end
+  end
+
+  it_behaves_like '#check with a key that is not valid' do
+    let(:actor) { build(:rsa_key_2048, user: user) }
+  end
+
+  it_behaves_like '#check with a key that is not valid' do
+    let(:actor) { build(:rsa_deploy_key_2048, user: user) }
+  end
+
   describe '#check_project_moved!' do
     before do
       project.add_master(user)
diff --git a/spec/lib/gitlab/gpg/commit_spec.rb b/spec/lib/gitlab/gpg/commit_spec.rb
index e521fcc6dc1..b07462e4978 100644
--- a/spec/lib/gitlab/gpg/commit_spec.rb
+++ b/spec/lib/gitlab/gpg/commit_spec.rb
@@ -2,45 +2,9 @@ require 'rails_helper'
 
 describe Gitlab::Gpg::Commit do
   describe '#signature' do
-    let!(:project) { create :project, :repository, path: 'sample-project' }
-    let!(:commit_sha) { '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'  }
-
-    context 'unsigned commit' do
-      it 'returns nil' do
-        expect(described_class.new(project, commit_sha).signature).to be_nil
-      end
-    end
-
-    context 'known and verified public key' do
-      let!(:gpg_key) do
-        create :gpg_key, key: GpgHelpers::User1.public_key, user: create(:user, email: GpgHelpers::User1.emails.first)
-      end
-
-      before do
-        allow(Rugged::Commit).to receive(:extract_signature)
-          .with(Rugged::Repository, commit_sha)
-          .and_return(
-            [
-              GpgHelpers::User1.signed_commit_signature,
-              GpgHelpers::User1.signed_commit_base_data
-            ]
-          )
-      end
-
-      it 'returns a valid signature' do
-        expect(described_class.new(project, commit_sha).signature).to have_attributes(
-          commit_sha: commit_sha,
-          project: project,
-          gpg_key: gpg_key,
-          gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
-          gpg_key_user_name: GpgHelpers::User1.names.first,
-          gpg_key_user_email: GpgHelpers::User1.emails.first,
-          valid_signature: true
-        )
-      end
-
+    shared_examples 'returns the cached signature on second call' do
       it 'returns the cached signature on second call' do
-        gpg_commit = described_class.new(project, commit_sha)
+        gpg_commit = described_class.new(commit)
 
         expect(gpg_commit).to receive(:using_keychain).and_call_original
         gpg_commit.signature
@@ -51,11 +15,140 @@ describe Gitlab::Gpg::Commit do
       end
     end
 
-    context 'known but unverified public key' do
-      let!(:gpg_key) { create :gpg_key, key: GpgHelpers::User1.public_key }
+    let!(:project) { create :project, :repository, path: 'sample-project' }
+    let!(:commit_sha) { '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33' }
 
-      before do
-        allow(Rugged::Commit).to receive(:extract_signature)
+    context 'unsigned commit' do
+      let!(:commit) { create :commit, project: project, sha: commit_sha }
+
+      it 'returns nil' do
+        expect(described_class.new(commit).signature).to be_nil
+      end
+    end
+
+    context 'known key' do
+      context 'user matches the key uid' do
+        context 'user email matches the email committer' do
+          let!(:commit) { create :commit, project: project, sha: commit_sha, committer_email: GpgHelpers::User1.emails.first }
+
+          let!(:user) { create(:user, email: GpgHelpers::User1.emails.first) }
+
+          let!(:gpg_key) do
+            create :gpg_key, key: GpgHelpers::User1.public_key, user: user
+          end
+
+          before do
+            allow(Rugged::Commit).to receive(:extract_signature)
+            .with(Rugged::Repository, commit_sha)
+            .and_return(
+              [
+                GpgHelpers::User1.signed_commit_signature,
+                GpgHelpers::User1.signed_commit_base_data
+              ]
+            )
+          end
+
+          it 'returns a valid signature' do
+            expect(described_class.new(commit).signature).to have_attributes(
+              commit_sha: commit_sha,
+              project: project,
+              gpg_key: gpg_key,
+              gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
+              gpg_key_user_name: GpgHelpers::User1.names.first,
+              gpg_key_user_email: GpgHelpers::User1.emails.first,
+              verification_status: 'verified'
+            )
+          end
+
+          it_behaves_like 'returns the cached signature on second call'
+        end
+
+        context 'user email does not match the committer email, but is the same user' do
+          let!(:commit) { create :commit, project: project, sha: commit_sha, committer_email: GpgHelpers::User2.emails.first }
+
+          let(:user) do
+            create(:user, email: GpgHelpers::User1.emails.first).tap do |user|
+              create :email, user: user, email: GpgHelpers::User2.emails.first
+            end
+          end
+
+          let!(:gpg_key) do
+            create :gpg_key, key: GpgHelpers::User1.public_key, user: user
+          end
+
+          before do
+            allow(Rugged::Commit).to receive(:extract_signature)
+            .with(Rugged::Repository, commit_sha)
+            .and_return(
+              [
+                GpgHelpers::User1.signed_commit_signature,
+                GpgHelpers::User1.signed_commit_base_data
+              ]
+            )
+          end
+
+          it 'returns an invalid signature' do
+            expect(described_class.new(commit).signature).to have_attributes(
+              commit_sha: commit_sha,
+              project: project,
+              gpg_key: gpg_key,
+              gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
+              gpg_key_user_name: GpgHelpers::User1.names.first,
+              gpg_key_user_email: GpgHelpers::User1.emails.first,
+              verification_status: 'same_user_different_email'
+            )
+          end
+
+          it_behaves_like 'returns the cached signature on second call'
+        end
+
+        context 'user email does not match the committer email' do
+          let!(:commit) { create :commit, project: project, sha: commit_sha, committer_email: GpgHelpers::User2.emails.first }
+
+          let(:user) { create(:user, email: GpgHelpers::User1.emails.first) }
+
+          let!(:gpg_key) do
+            create :gpg_key, key: GpgHelpers::User1.public_key, user: user
+          end
+
+          before do
+            allow(Rugged::Commit).to receive(:extract_signature)
+            .with(Rugged::Repository, commit_sha)
+            .and_return(
+              [
+                GpgHelpers::User1.signed_commit_signature,
+                GpgHelpers::User1.signed_commit_base_data
+              ]
+            )
+          end
+
+          it 'returns an invalid signature' do
+            expect(described_class.new(commit).signature).to have_attributes(
+              commit_sha: commit_sha,
+              project: project,
+              gpg_key: gpg_key,
+              gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
+              gpg_key_user_name: GpgHelpers::User1.names.first,
+              gpg_key_user_email: GpgHelpers::User1.emails.first,
+              verification_status: 'other_user'
+            )
+          end
+
+          it_behaves_like 'returns the cached signature on second call'
+        end
+      end
+
+      context 'user does not match the key uid' do
+        let!(:commit) { create :commit, project: project, sha: commit_sha }
+
+        let(:user) { create(:user, email: GpgHelpers::User2.emails.first) }
+
+        let!(:gpg_key) do
+          create :gpg_key, key: GpgHelpers::User1.public_key, user: user
+        end
+
+        before do
+          allow(Rugged::Commit).to receive(:extract_signature)
           .with(Rugged::Repository, commit_sha)
           .and_return(
             [
@@ -63,33 +156,27 @@ describe Gitlab::Gpg::Commit do
               GpgHelpers::User1.signed_commit_base_data
             ]
           )
-      end
-
-      it 'returns an invalid signature' do
-        expect(described_class.new(project, commit_sha).signature).to have_attributes(
-          commit_sha: commit_sha,
-          project: project,
-          gpg_key: gpg_key,
-          gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
-          gpg_key_user_name: GpgHelpers::User1.names.first,
-          gpg_key_user_email: GpgHelpers::User1.emails.first,
-          valid_signature: false
-        )
-      end
-
-      it 'returns the cached signature on second call' do
-        gpg_commit = described_class.new(project, commit_sha)
-
-        expect(gpg_commit).to receive(:using_keychain).and_call_original
-        gpg_commit.signature
+        end
+
+        it 'returns an invalid signature' do
+          expect(described_class.new(commit).signature).to have_attributes(
+            commit_sha: commit_sha,
+            project: project,
+            gpg_key: gpg_key,
+            gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
+            gpg_key_user_name: GpgHelpers::User1.names.first,
+            gpg_key_user_email: GpgHelpers::User1.emails.first,
+            verification_status: 'unverified_key'
+          )
+        end
 
-        # consecutive call
-        expect(gpg_commit).not_to receive(:using_keychain).and_call_original
-        gpg_commit.signature
+        it_behaves_like 'returns the cached signature on second call'
       end
     end
 
-    context 'unknown public key' do
+    context 'unknown key' do
+      let!(:commit) { create :commit, project: project, sha: commit_sha }
+
       before do
         allow(Rugged::Commit).to receive(:extract_signature)
           .with(Rugged::Repository, commit_sha)
@@ -102,27 +189,18 @@ describe Gitlab::Gpg::Commit do
       end
 
       it 'returns an invalid signature' do
-        expect(described_class.new(project, commit_sha).signature).to have_attributes(
+        expect(described_class.new(commit).signature).to have_attributes(
           commit_sha: commit_sha,
           project: project,
           gpg_key: nil,
           gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
           gpg_key_user_name: nil,
           gpg_key_user_email: nil,
-          valid_signature: false
+          verification_status: 'unknown_key'
         )
       end
 
-      it 'returns the cached signature on second call' do
-        gpg_commit = described_class.new(project, commit_sha)
-
-        expect(gpg_commit).to receive(:using_keychain).and_call_original
-        gpg_commit.signature
-
-        # consecutive call
-        expect(gpg_commit).not_to receive(:using_keychain).and_call_original
-        gpg_commit.signature
-      end
+      it_behaves_like 'returns the cached signature on second call'
     end
   end
 end
diff --git a/spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb b/spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb
index 4de4419de27..b9fd4d02156 100644
--- a/spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb
+++ b/spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb
@@ -4,8 +4,29 @@ RSpec.describe Gitlab::Gpg::InvalidGpgSignatureUpdater do
   describe '#run' do
     let!(:commit_sha) { '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33' }
     let!(:project) { create :project, :repository, path: 'sample-project' }
+    let!(:raw_commit) do
+      raw_commit = double(
+        :raw_commit,
+        signature: [
+          GpgHelpers::User1.signed_commit_signature,
+          GpgHelpers::User1.signed_commit_base_data
+        ],
+        sha: commit_sha,
+        committer_email: GpgHelpers::User1.emails.first
+      )
+
+      allow(raw_commit).to receive :save!
+
+      raw_commit
+    end
+
+    let!(:commit) do
+      create :commit, git_commit: raw_commit, project: project
+    end
 
     before do
+      allow_any_instance_of(Project).to receive(:commit).and_return(commit)
+
       allow(Rugged::Commit).to receive(:extract_signature)
         .with(Rugged::Repository, commit_sha)
         .and_return(
@@ -25,7 +46,7 @@ RSpec.describe Gitlab::Gpg::InvalidGpgSignatureUpdater do
           commit_sha: commit_sha,
           gpg_key: nil,
           gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
-          valid_signature: true
+          verification_status: 'verified'
       end
 
       it 'assigns the gpg key to the signature when the missing gpg key is added' do
@@ -39,7 +60,7 @@ RSpec.describe Gitlab::Gpg::InvalidGpgSignatureUpdater do
           commit_sha: commit_sha,
           gpg_key: gpg_key,
           gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
-          valid_signature: true
+          verification_status: 'verified'
         )
       end
 
@@ -54,7 +75,7 @@ RSpec.describe Gitlab::Gpg::InvalidGpgSignatureUpdater do
           commit_sha: commit_sha,
           gpg_key: nil,
           gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
-          valid_signature: true
+          verification_status: 'verified'
         )
       end
     end
@@ -68,7 +89,7 @@ RSpec.describe Gitlab::Gpg::InvalidGpgSignatureUpdater do
           commit_sha: commit_sha,
           gpg_key: nil,
           gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
-          valid_signature: false
+          verification_status: 'unknown_key'
       end
 
       it 'updates the signature to being valid when the missing gpg key is added' do
@@ -82,7 +103,7 @@ RSpec.describe Gitlab::Gpg::InvalidGpgSignatureUpdater do
           commit_sha: commit_sha,
           gpg_key: gpg_key,
           gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
-          valid_signature: true
+          verification_status: 'verified'
         )
       end
 
@@ -97,7 +118,7 @@ RSpec.describe Gitlab::Gpg::InvalidGpgSignatureUpdater do
           commit_sha: commit_sha,
           gpg_key: nil,
           gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
-          valid_signature: false
+          verification_status: 'unknown_key'
         )
       end
     end
@@ -115,7 +136,7 @@ RSpec.describe Gitlab::Gpg::InvalidGpgSignatureUpdater do
           commit_sha: commit_sha,
           gpg_key: nil,
           gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
-          valid_signature: false
+          verification_status: 'unknown_key'
       end
 
       it 'updates the signature to being valid when the user updates the email address' do
@@ -123,7 +144,7 @@ RSpec.describe Gitlab::Gpg::InvalidGpgSignatureUpdater do
           key: GpgHelpers::User1.public_key,
           user: user
 
-        expect(invalid_gpg_signature.reload.valid_signature).to be_falsey
+        expect(invalid_gpg_signature.reload.verification_status).to eq 'unverified_key'
 
         # InvalidGpgSignatureUpdater is called by the after_update hook
         user.update_attributes!(email: GpgHelpers::User1.emails.first)
@@ -133,7 +154,7 @@ RSpec.describe Gitlab::Gpg::InvalidGpgSignatureUpdater do
           commit_sha: commit_sha,
           gpg_key: gpg_key,
           gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
-          valid_signature: true
+          verification_status: 'verified'
         )
       end
 
@@ -147,7 +168,7 @@ RSpec.describe Gitlab::Gpg::InvalidGpgSignatureUpdater do
           commit_sha: commit_sha,
           gpg_key: gpg_key,
           gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
-          valid_signature: false
+          verification_status: 'unverified_key'
         )
 
         # InvalidGpgSignatureUpdater is called by the after_update hook
@@ -158,7 +179,7 @@ RSpec.describe Gitlab::Gpg::InvalidGpgSignatureUpdater do
           commit_sha: commit_sha,
           gpg_key: gpg_key,
           gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
-          valid_signature: false
+          verification_status: 'unverified_key'
         )
       end
     end
diff --git a/spec/lib/gitlab/gpg_spec.rb b/spec/lib/gitlab/gpg_spec.rb
index 30ad033b204..11a2aea1915 100644
--- a/spec/lib/gitlab/gpg_spec.rb
+++ b/spec/lib/gitlab/gpg_spec.rb
@@ -42,6 +42,21 @@ describe Gitlab::Gpg do
         described_class.user_infos_from_key('bogus')
       ).to eq []
     end
+
+    it 'downcases the email' do
+      public_key = double(:key)
+      fingerprints = double(:fingerprints)
+      uid = double(:uid, name: 'Nannie Bernhard', email: 'NANNIE.BERNHARD@EXAMPLE.COM')
+      raw_key = double(:raw_key, uids: [uid])
+      allow(Gitlab::Gpg::CurrentKeyChain).to receive(:fingerprints_from_key).with(public_key).and_return(fingerprints)
+      allow(GPGME::Key).to receive(:find).with(:public, anything).and_return([raw_key])
+
+      user_infos = described_class.user_infos_from_key(public_key)
+      expect(user_infos).to eq([{
+        name: 'Nannie Bernhard',
+        email: 'nannie.bernhard@example.com'
+      }])
+    end
   end
 
   describe '.current_home_dir' do
diff --git a/spec/lib/gitlab/i18n/metadata_entry_spec.rb b/spec/lib/gitlab/i18n/metadata_entry_spec.rb
new file mode 100644
index 00000000000..ab71d6454a9
--- /dev/null
+++ b/spec/lib/gitlab/i18n/metadata_entry_spec.rb
@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe Gitlab::I18n::MetadataEntry do
+  describe '#expected_plurals' do
+    it 'returns the number of plurals' do
+      data = {
+        msgid: "",
+        msgstr: [
+          "",
+          "Project-Id-Version: gitlab 1.0.0\\n",
+          "Report-Msgid-Bugs-To: \\n",
+          "PO-Revision-Date: 2017-07-13 12:10-0500\\n",
+          "Language-Team: Spanish\\n",
+          "Language: es\\n",
+          "MIME-Version: 1.0\\n",
+          "Content-Type: text/plain; charset=UTF-8\\n",
+          "Content-Transfer-Encoding: 8bit\\n",
+          "Plural-Forms: nplurals=2; plural=n != 1;\\n",
+          "Last-Translator: Bob Van Landuyt <bob@gitlab.com>\\n",
+          "X-Generator: Poedit 2.0.2\\n"
+        ]
+      }
+      entry = described_class.new(data)
+
+      expect(entry.expected_plurals).to eq(2)
+    end
+
+    it 'returns 0 for the POT-metadata' do
+      data = {
+        msgid: "",
+        msgstr: [
+          "",
+          "Project-Id-Version: gitlab 1.0.0\\n",
+          "Report-Msgid-Bugs-To: \\n",
+          "PO-Revision-Date: 2017-07-13 12:10-0500\\n",
+          "Language-Team: Spanish\\n",
+          "Language: es\\n",
+          "MIME-Version: 1.0\\n",
+          "Content-Type: text/plain; charset=UTF-8\\n",
+          "Content-Transfer-Encoding: 8bit\\n",
+          "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n",
+          "Last-Translator: Bob Van Landuyt <bob@gitlab.com>\\n",
+          "X-Generator: Poedit 2.0.2\\n"
+        ]
+      }
+      entry = described_class.new(data)
+
+      expect(entry.expected_plurals).to eq(0)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/i18n/po_linter_spec.rb b/spec/lib/gitlab/i18n/po_linter_spec.rb
new file mode 100644
index 00000000000..3a962ba7f22
--- /dev/null
+++ b/spec/lib/gitlab/i18n/po_linter_spec.rb
@@ -0,0 +1,338 @@
+require 'spec_helper'
+require 'simple_po_parser'
+
+describe Gitlab::I18n::PoLinter do
+  let(:linter) { described_class.new(po_path) }
+  let(:po_path) { 'spec/fixtures/valid.po' }
+
+  describe '#errors' do
+    it 'only calls validation once' do
+      expect(linter).to receive(:validate_po).once.and_call_original
+
+      2.times { linter.errors }
+    end
+  end
+
+  describe '#validate_po' do
+    subject(:errors) { linter.validate_po }
+
+    context 'for a fuzzy message' do
+      let(:po_path) { 'spec/fixtures/fuzzy.po' }
+
+      it 'has an error' do
+        is_expected.to include('PipelineSchedules|Remove variable row' => ['is marked fuzzy'])
+      end
+    end
+
+    context 'for a translations with newlines' do
+      let(:po_path) { 'spec/fixtures/newlines.po' }
+
+      it 'has an error for a normal string' do
+        message_id = "You are going to remove %{group_name}.\\nRemoved groups CANNOT be restored!\\nAre you ABSOLUTELY sure?"
+        expected_message = "is defined over multiple lines, this breaks some tooling."
+
+        expect(errors[message_id]).to include(expected_message)
+      end
+
+      it 'has an error when a translation is defined over multiple lines' do
+        message_id = "You are going to remove %{group_name}.\\nRemoved groups CANNOT be restored!\\nAre you ABSOLUTELY sure?"
+        expected_message = "has translations defined over multiple lines, this breaks some tooling."
+
+        expect(errors[message_id]).to include(expected_message)
+      end
+
+      it 'raises an error when a plural translation is defined over multiple lines' do
+        message_id = 'With plural'
+        expected_message = "has translations defined over multiple lines, this breaks some tooling."
+
+        expect(errors[message_id]).to include(expected_message)
+      end
+
+      it 'raises an error when the plural id is defined over multiple lines' do
+        message_id = 'multiline plural id'
+        expected_message = "plural is defined over multiple lines, this breaks some tooling."
+
+        expect(errors[message_id]).to include(expected_message)
+      end
+    end
+
+    context 'with an invalid po' do
+      let(:po_path) { 'spec/fixtures/invalid.po' }
+
+      it 'returns the error' do
+        is_expected.to include('PO-syntax errors' => a_kind_of(Array))
+      end
+
+      it 'does not validate entries' do
+        expect(linter).not_to receive(:validate_entries)
+
+        linter.validate_po
+      end
+    end
+
+    context 'with missing metadata' do
+      let(:po_path) { 'spec/fixtures/missing_metadata.po' }
+
+      it 'returns the an error' do
+        is_expected.to include('PO-syntax errors' => a_kind_of(Array))
+      end
+    end
+
+    context 'with a valid po' do
+      it 'parses the file' do
+        expect(linter).to receive(:parse_po).and_call_original
+
+        linter.validate_po
+      end
+
+      it 'validates the entries' do
+        expect(linter).to receive(:validate_entries).and_call_original
+
+        linter.validate_po
+      end
+
+      it 'has no errors' do
+        is_expected.to be_empty
+      end
+    end
+
+    context 'with missing plurals' do
+      let(:po_path) { 'spec/fixtures/missing_plurals.po' }
+
+      it 'has errors' do
+        is_expected.not_to be_empty
+      end
+    end
+
+    context 'with multiple plurals' do
+      let(:po_path) { 'spec/fixtures/multiple_plurals.po' }
+
+      it 'has errors' do
+        is_expected.not_to be_empty
+      end
+    end
+
+    context 'with unescaped chars' do
+      let(:po_path) { 'spec/fixtures/unescaped_chars.po' }
+
+      it 'contains an error' do
+        message_id = 'You are going to transfer %{project_name_with_namespace} to another owner. Are you ABSOLUTELY sure?'
+        expected_error = 'translation contains unescaped `%`, escape it using `%%`'
+
+        expect(errors[message_id]).to include(expected_error)
+      end
+    end
+  end
+
+  describe '#parse_po' do
+    context 'with a valid po' do
+      it 'fills in the entries' do
+        linter.parse_po
+
+        expect(linter.translation_entries).not_to be_empty
+        expect(linter.metadata_entry).to be_kind_of(Gitlab::I18n::MetadataEntry)
+      end
+
+      it 'does not have errors' do
+        expect(linter.parse_po).to be_nil
+      end
+    end
+
+    context 'with an invalid po' do
+      let(:po_path) { 'spec/fixtures/invalid.po' }
+
+      it 'contains an error' do
+        expect(linter.parse_po).not_to be_nil
+      end
+
+      it 'sets the entries to an empty array' do
+        linter.parse_po
+
+        expect(linter.translation_entries).to eq([])
+      end
+    end
+  end
+
+  describe '#validate_entries' do
+    it 'keeps track of errors for entries' do
+      fake_invalid_entry = Gitlab::I18n::TranslationEntry.new(
+        { msgid: "Hello %{world}", msgstr: "Bonjour %{monde}" }, 2
+      )
+      allow(linter).to receive(:translation_entries) { [fake_invalid_entry] }
+
+      expect(linter).to receive(:validate_entry)
+                          .with(fake_invalid_entry)
+                          .and_call_original
+
+      expect(linter.validate_entries).to include("Hello %{world}" => an_instance_of(Array))
+    end
+  end
+
+  describe '#validate_entry' do
+    it 'validates the flags, variable usage, newlines, and unescaped chars' do
+      fake_entry = double
+
+      expect(linter).to receive(:validate_flags).with([], fake_entry)
+      expect(linter).to receive(:validate_variables).with([], fake_entry)
+      expect(linter).to receive(:validate_newlines).with([], fake_entry)
+      expect(linter).to receive(:validate_number_of_plurals).with([], fake_entry)
+      expect(linter).to receive(:validate_unescaped_chars).with([], fake_entry)
+
+      linter.validate_entry(fake_entry)
+    end
+  end
+
+  describe '#validate_number_of_plurals' do
+    it 'validates when there are an incorrect number of translations' do
+      fake_metadata = double
+      allow(fake_metadata).to receive(:expected_plurals).and_return(2)
+      allow(linter).to receive(:metadata_entry).and_return(fake_metadata)
+
+      fake_entry = Gitlab::I18n::TranslationEntry.new(
+        { msgid: 'the singular', msgid_plural: 'the plural', 'msgstr[0]' => 'the singular' },
+        2
+      )
+      errors = []
+
+      linter.validate_number_of_plurals(errors, fake_entry)
+
+      expect(errors).to include('should have 2 translations')
+    end
+  end
+
+  describe '#validate_variables' do
+    it 'validates both signular and plural in a pluralized string when the entry has a singular' do
+      pluralized_entry = Gitlab::I18n::TranslationEntry.new(
+        { msgid: 'Hello %{world}',
+          msgid_plural: 'Hello all %{world}',
+          'msgstr[0]' => 'Bonjour %{world}',
+          'msgstr[1]' => 'Bonjour tous %{world}' },
+        2
+      )
+
+      expect(linter).to receive(:validate_variables_in_message)
+                          .with([], 'Hello %{world}', 'Bonjour %{world}')
+                          .and_call_original
+      expect(linter).to receive(:validate_variables_in_message)
+                          .with([], 'Hello all %{world}', 'Bonjour tous %{world}')
+                          .and_call_original
+
+      linter.validate_variables([], pluralized_entry)
+    end
+
+    it 'only validates plural when there is no separate singular' do
+      pluralized_entry = Gitlab::I18n::TranslationEntry.new(
+        { msgid: 'Hello %{world}',
+          msgid_plural: 'Hello all %{world}',
+          'msgstr[0]' => 'Bonjour %{world}' },
+        1
+      )
+
+      expect(linter).to receive(:validate_variables_in_message)
+                          .with([], 'Hello all %{world}', 'Bonjour %{world}')
+
+      linter.validate_variables([], pluralized_entry)
+    end
+
+    it 'validates the message variables' do
+      entry = Gitlab::I18n::TranslationEntry.new(
+        { msgid: 'Hello', msgstr: 'Bonjour' },
+        2
+      )
+
+      expect(linter).to receive(:validate_variables_in_message)
+                          .with([], 'Hello', 'Bonjour')
+
+      linter.validate_variables([], entry)
+    end
+  end
+
+  describe '#validate_variables_in_message' do
+    it 'detects when a variables are used incorrectly' do
+      errors = []
+
+      expected_errors = ['<hello %{world} %d> is missing: [%{hello}]',
+                         '<hello %{world} %d> is using unknown variables: [%{world}]',
+                         'is combining multiple unnamed variables']
+
+      linter.validate_variables_in_message(errors, '%{hello} world %d', 'hello %{world} %d')
+
+      expect(errors).to include(*expected_errors)
+    end
+  end
+
+  describe '#validate_translation' do
+    it 'succeeds with valid variables' do
+      errors = []
+
+      linter.validate_translation(errors, 'Hello %{world}',  ['%{world}'])
+
+      expect(errors).to be_empty
+    end
+
+    it 'adds an error message when translating fails' do
+      errors = []
+
+      expect(FastGettext::Translation).to receive(:_) { raise 'broken' }
+
+      linter.validate_translation(errors, 'Hello', [])
+
+      expect(errors).to include('Failure translating to en with []: broken')
+    end
+
+    it 'adds an error message when translating fails when translating with context' do
+      errors = []
+
+      expect(FastGettext::Translation).to receive(:s_) { raise 'broken' }
+
+      linter.validate_translation(errors, 'Tests|Hello', [])
+
+      expect(errors).to include('Failure translating to en with []: broken')
+    end
+
+    it "adds an error when trying to translate with incorrect variables when using unnamed variables" do
+      errors = []
+
+      linter.validate_translation(errors, 'Hello %d', ['%s'])
+
+      expect(errors.first).to start_with("Failure translating to en with")
+    end
+
+    it "adds an error when trying to translate with named variables when unnamed variables are expected" do
+      errors = []
+
+      linter.validate_translation(errors, 'Hello %d', ['%{world}'])
+
+      expect(errors.first).to start_with("Failure translating to en with")
+    end
+
+    it 'adds an error when translated with incorrect variables using named variables' do
+      errors = []
+
+      linter.validate_translation(errors, 'Hello %{thing}', ['%d'])
+
+      expect(errors.first).to start_with("Failure translating to en with")
+    end
+  end
+
+  describe '#fill_in_variables' do
+    it 'builds an array for %d translations' do
+      result = linter.fill_in_variables(['%d'])
+
+      expect(result).to contain_exactly(a_kind_of(Integer))
+    end
+
+    it 'builds an array for %s translations' do
+      result = linter.fill_in_variables(['%s'])
+
+      expect(result).to contain_exactly(a_kind_of(String))
+    end
+
+    it 'builds a hash for named variables' do
+      result = linter.fill_in_variables(['%{hello}'])
+
+      expect(result).to be_a(Hash)
+      expect(result).to include('hello' => an_instance_of(String))
+    end
+  end
+end
diff --git a/spec/lib/gitlab/i18n/translation_entry_spec.rb b/spec/lib/gitlab/i18n/translation_entry_spec.rb
new file mode 100644
index 00000000000..f68bc8feff9
--- /dev/null
+++ b/spec/lib/gitlab/i18n/translation_entry_spec.rb
@@ -0,0 +1,203 @@
+require 'spec_helper'
+
+describe Gitlab::I18n::TranslationEntry do
+  describe '#singular_translation' do
+    it 'returns the normal `msgstr` for translations without plural' do
+      data = { msgid: 'Hello world', msgstr: 'Bonjour monde' }
+      entry = described_class.new(data, 2)
+
+      expect(entry.singular_translation).to eq('Bonjour monde')
+    end
+
+    it 'returns the first string for entries with plurals' do
+      data = {
+        msgid: 'Hello world',
+        msgid_plural: 'Hello worlds',
+        'msgstr[0]' => 'Bonjour monde',
+        'msgstr[1]' => 'Bonjour mondes'
+      }
+      entry = described_class.new(data, 2)
+
+      expect(entry.singular_translation).to eq('Bonjour monde')
+    end
+  end
+
+  describe '#all_translations' do
+    it 'returns all translations for singular translations' do
+      data = { msgid: 'Hello world', msgstr: 'Bonjour monde' }
+      entry = described_class.new(data, 2)
+
+      expect(entry.all_translations).to eq(['Bonjour monde'])
+    end
+
+    it 'returns all translations when including plural translations' do
+      data = {
+        msgid: 'Hello world',
+        msgid_plural: 'Hello worlds',
+        'msgstr[0]' => 'Bonjour monde',
+        'msgstr[1]' => 'Bonjour mondes'
+      }
+      entry = described_class.new(data, 2)
+
+      expect(entry.all_translations).to eq(['Bonjour monde', 'Bonjour mondes'])
+    end
+  end
+
+  describe '#plural_translations' do
+    it 'returns all translations if there is only one plural' do
+      data = {
+        msgid: 'Hello world',
+        msgid_plural: 'Hello worlds',
+        'msgstr[0]' => 'Bonjour monde'
+      }
+      entry = described_class.new(data, 1)
+
+      expect(entry.plural_translations).to eq(['Bonjour monde'])
+    end
+
+    it 'returns all translations except for the first one if there are multiple' do
+      data = {
+        msgid: 'Hello world',
+        msgid_plural: 'Hello worlds',
+        'msgstr[0]' => 'Bonjour monde',
+        'msgstr[1]' => 'Bonjour mondes',
+        'msgstr[2]' => 'Bonjour tous les mondes'
+      }
+      entry = described_class.new(data, 3)
+
+      expect(entry.plural_translations).to eq(['Bonjour mondes', 'Bonjour tous les mondes'])
+    end
+  end
+
+  describe '#has_singular_translation?' do
+    it 'has a singular when the translation is not pluralized' do
+      data = {
+        msgid: 'hello world',
+        msgstr: 'hello'
+      }
+      entry = described_class.new(data, 2)
+
+      expect(entry).to have_singular_translation
+    end
+
+    it 'has a singular when plural and singular are separately defined' do
+      data = {
+        msgid: 'hello world',
+        msgid_plural: 'hello worlds',
+        "msgstr[0]" => 'hello world',
+        "msgstr[1]" => 'hello worlds'
+      }
+      entry = described_class.new(data, 2)
+
+      expect(entry).to have_singular_translation
+    end
+
+    it 'does not have a separate singular if the plural string only has one translation' do
+      data = {
+        msgid: 'hello world',
+        msgid_plural: 'hello worlds',
+        "msgstr[0]" => 'hello worlds'
+      }
+      entry = described_class.new(data, 1)
+
+      expect(entry).not_to have_singular_translation
+    end
+  end
+
+  describe '#msgid_contains_newlines' do
+    it 'is true when the msgid is an array' do
+      data = { msgid: %w(hello world) }
+      entry = described_class.new(data, 2)
+
+      expect(entry.msgid_contains_newlines?).to be_truthy
+    end
+  end
+
+  describe '#plural_id_contains_newlines' do
+    it 'is true when the msgid is an array' do
+      data = { msgid_plural: %w(hello world) }
+      entry = described_class.new(data, 2)
+
+      expect(entry.plural_id_contains_newlines?).to be_truthy
+    end
+  end
+
+  describe '#translations_contain_newlines' do
+    it 'is true when the msgid is an array' do
+      data = { msgstr: %w(hello world) }
+      entry = described_class.new(data, 2)
+
+      expect(entry.translations_contain_newlines?).to be_truthy
+    end
+  end
+
+  describe '#contains_unescaped_chars' do
+    let(:data) { { msgid: '' } }
+    let(:entry) { described_class.new(data, 2) }
+    it 'is true when the msgid is an array' do
+      string = '「100%確定」'
+
+      expect(entry.contains_unescaped_chars?(string)).to be_truthy
+    end
+
+    it 'is false when the `%` char is escaped' do
+      string = '「100%%確定」'
+
+      expect(entry.contains_unescaped_chars?(string)).to be_falsy
+    end
+
+    it 'is false when using an unnamed variable' do
+      string = '「100%d確定」'
+
+      expect(entry.contains_unescaped_chars?(string)).to be_falsy
+    end
+
+    it 'is false when using a named variable' do
+      string = '「100%{named}確定」'
+
+      expect(entry.contains_unescaped_chars?(string)).to be_falsy
+    end
+
+    it 'is true when an unnamed variable is not closed' do
+      string = '「100%{named確定」'
+
+      expect(entry.contains_unescaped_chars?(string)).to be_truthy
+    end
+
+    it 'is true when the string starts with a `%`' do
+      string = '%10'
+
+      expect(entry.contains_unescaped_chars?(string)).to be_truthy
+    end
+  end
+
+  describe '#msgid_contains_unescaped_chars' do
+    it 'is true when the msgid contains a `%`' do
+      data = { msgid: '「100%確定」' }
+      entry = described_class.new(data, 2)
+
+      expect(entry).to receive(:contains_unescaped_chars?).and_call_original
+      expect(entry.msgid_contains_unescaped_chars?).to be_truthy
+    end
+  end
+
+  describe '#plural_id_contains_unescaped_chars' do
+    it 'is true when the plural msgid contains a `%`' do
+      data = { msgid_plural: '「100%確定」' }
+      entry = described_class.new(data, 2)
+
+      expect(entry).to receive(:contains_unescaped_chars?).and_call_original
+      expect(entry.plural_id_contains_unescaped_chars?).to be_truthy
+    end
+  end
+
+  describe '#translations_contain_unescaped_chars' do
+    it 'is true when the translation contains a `%`' do
+      data = { msgstr: '「100%確定」' }
+      entry = described_class.new(data, 2)
+
+      expect(entry).to receive(:contains_unescaped_chars?).and_call_original
+      expect(entry.translations_contain_unescaped_chars?).to be_truthy
+    end
+  end
+end
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index a5e03e149a7..b852ac570a3 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -224,6 +224,7 @@ Ci::Pipeline:
 - lock_version
 - auto_canceled_by_id
 - pipeline_schedule_id
+- protected
 Ci::Stage:
 - id
 - name
@@ -276,6 +277,8 @@ CommitStatus:
 - coverage_regex
 - auto_canceled_by_id
 - retried
+- protected
+- failure_reason
 Ci::Variable:
 - id
 - project_id
diff --git a/spec/lib/gitlab/issuables_count_for_state_spec.rb b/spec/lib/gitlab/issuables_count_for_state_spec.rb
new file mode 100644
index 00000000000..c262fdfcb61
--- /dev/null
+++ b/spec/lib/gitlab/issuables_count_for_state_spec.rb
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Gitlab::IssuablesCountForState do
+  let(:finder) do
+    double(:finder, count_by_state: { opened: 2, closed: 1 })
+  end
+
+  let(:counter) { described_class.new(finder) }
+
+  describe '#for_state_or_opened' do
+    it 'returns the number of issuables for the given state' do
+      expect(counter.for_state_or_opened(:closed)).to eq(1)
+    end
+
+    it 'returns the number of open issuables when no state is given' do
+      expect(counter.for_state_or_opened).to eq(2)
+    end
+
+    it 'returns the number of open issuables when a nil value is given' do
+      expect(counter.for_state_or_opened(nil)).to eq(2)
+    end
+  end
+
+  describe '#[]' do
+    it 'returns the number of issuables for the given state' do
+      expect(counter[:closed]).to eq(1)
+    end
+
+    it 'casts valid states from Strings to Symbols' do
+      expect(counter['closed']).to eq(1)
+    end
+
+    it 'returns 0 when using an invalid state name as a String' do
+      expect(counter['kittens']).to be_zero
+    end
+  end
+end
diff --git a/spec/lib/gitlab/key_fingerprint_spec.rb b/spec/lib/gitlab/key_fingerprint_spec.rb
deleted file mode 100644
index d643dc5342d..00000000000
--- a/spec/lib/gitlab/key_fingerprint_spec.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::KeyFingerprint, lib: true do
-  KEYS = {
-    rsa:
-      'example.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5z65PwQ1GE6foJgwk' \
-      '9rmQi/glaXbUeVa5uvQpnZ3Z5+forcI7aTngh3aZ/H2UDP2L70TGy7kKNyp0J3a8/OdG' \
-      'Z08y5yi3JlbjFARO1NyoFEjw2H1SJxeJ43L6zmvTlu+hlK1jSAlidl7enS0ufTlzEEj4' \
-      'iJcuTPKdVzKRgZuTRVm9woWNVKqIrdRC0rJiTinERnfSAp/vNYERMuaoN4oJt8p/NEek' \
-      'rmFoDsQOsyDW5RAnCnjWUU+jFBKDpfkJQ1U2n6BjJewC9dl6ODK639l3yN4WOLZEk4tN' \
-      'UysfbGeF3rmMeflaD6O1Jplpv3YhwVGFNKa7fMq6k3Z0tszTJPYh',
-    ecdsa:
-      'example.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAI' \
-      'bmlzdHAyNTYAAABBBKTJy43NZzJSfNxpv/e2E6Zy3qoHoTQbmOsU5FEfpWfWa1MdTeXQ' \
-      'YvKOi+qz/1AaNx6BK421jGu74JCDJtiZWT8=',
-    ed25519:
-      '@revoked example.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjq' \
-      'uxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf',
-    dss:
-      'example.com ssh-dss AAAAB3NzaC1kc3MAAACBAP1/U4EddRIpUt9KnC7s5Of2EbdS' \
-      'PO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f' \
-      '6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iID' \
-      'GZ3RSAHHAAAAFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QAAAIEA9+GghdabPd7LvKtcNrhX' \
-      'uXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwW' \
-      'eotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6A' \
-      'e1UlZAFMO/7PSSoAAACBAJcQ4JODqhuGbXIEpqxetm7PWbdbCcr3y/GzIZ066pRovpL6' \
-      'qm3qCVIym4cyChxWwb8qlyCIi+YRUUWm1z/wiBYT2Vf3S4FXBnyymCkKEaV/EY7+jd4X' \
-      '1bXI58OD2u+bLCB/sInM4fGB8CZUIWT9nJH0Ve9jJUge2ms348/QOJ1+'
-  }.freeze
-
-  MD5_FINGERPRINTS = {
-    rsa: '06:b2:8a:92:df:0e:11:2c:ca:7b:8f:a4:ba:6e:4b:fd',
-    ecdsa: '45:ff:5b:98:9a:b6:8a:41:13:c1:30:8b:09:5e:7b:4e',
-    ed25519: '2e:65:6a:c8:cf:bf:b2:8b:9a:bd:6d:9f:11:5c:12:16',
-    dss: '57:98:86:02:5f:9c:f4:9b:ad:5a:1e:51:92:0e:fd:2b'
-  }.freeze
-
-  BIT_COUNTS = {
-    rsa: 2048,
-    ecdsa: 256,
-    ed25519: 256,
-    dss: 1024
-  }.freeze
-
-  describe '#type' do
-    KEYS.each do |type, key|
-      it "calculates the type of #{type} keys" do
-        calculated_type = described_class.new(key).type
-
-        expect(calculated_type).to eq(type.to_s.upcase)
-      end
-    end
-  end
-
-  describe '#fingerprint' do
-    KEYS.each do |type, key|
-      it "calculates the MD5 fingerprint for #{type} keys" do
-        fp = described_class.new(key).fingerprint
-
-        expect(fp).to eq(MD5_FINGERPRINTS[type])
-      end
-    end
-  end
-
-  describe '#bits' do
-    KEYS.each do |type, key|
-      it "calculates the number of bits in #{type} keys" do
-        bits = described_class.new(key).bits
-
-        expect(bits).to eq(BIT_COUNTS[type])
-      end
-    end
-  end
-
-  describe '#key' do
-    it 'carries the unmodified key data' do
-      key = described_class.new(KEYS[:rsa]).key
-
-      expect(key).to eq(KEYS[:rsa])
-    end
-  end
-end
diff --git a/spec/lib/gitlab/reference_counter_spec.rb b/spec/lib/gitlab/reference_counter_spec.rb
new file mode 100644
index 00000000000..b2344d1870a
--- /dev/null
+++ b/spec/lib/gitlab/reference_counter_spec.rb
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Gitlab::ReferenceCounter do
+  let(:redis) { double('redis') }
+  let(:reference_counter_key) { "git-receive-pack-reference-counter:project-1" }
+  let(:reference_counter) { described_class.new('project-1') }
+
+  before do
+    allow(Gitlab::Redis::SharedState).to receive(:with).and_yield(redis)
+  end
+
+  it 'increases and set the expire time of a reference count for a path' do
+    expect(redis).to receive(:incr).with(reference_counter_key)
+    expect(redis).to receive(:expire).with(reference_counter_key,
+        described_class::REFERENCE_EXPIRE_TIME)
+    expect(reference_counter.increase).to be(true)
+  end
+
+  it 'decreases the reference count for a path' do
+    allow(redis).to receive(:decr).and_return(0)
+    expect(redis).to receive(:decr).with(reference_counter_key)
+    expect(reference_counter.decrease).to be(true)
+  end
+
+  it 'warns if attempting to decrease a counter with a value of one or less, and resets the counter' do
+    expect(redis).to receive(:decr).and_return(-1)
+    expect(redis).to receive(:del)
+    expect(Rails.logger).to receive(:warn).with("Reference counter for project-1" \
+        " decreased when its value was less than 1. Reseting the counter.")
+    expect(reference_counter.decrease).to be(true)
+  end
+
+  it 'get the reference count for a path' do
+    allow(redis).to receive(:get).and_return(1)
+    expect(reference_counter.value).to be(1)
+  end
+end
diff --git a/spec/lib/gitlab/sentry_spec.rb b/spec/lib/gitlab/sentry_spec.rb
new file mode 100644
index 00000000000..8c211d1c63f
--- /dev/null
+++ b/spec/lib/gitlab/sentry_spec.rb
@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Gitlab::Sentry do
+  describe '.context' do
+    it 'adds the locale to the tags' do
+      expect(described_class).to receive(:enabled?).and_return(true)
+
+      described_class.context(nil)
+
+      expect(Raven.tags_context[:locale]).to eq(I18n.locale.to_s)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/sql/pattern_spec.rb b/spec/lib/gitlab/sql/pattern_spec.rb
index 9d7b2136dab..48d56628ed5 100644
--- a/spec/lib/gitlab/sql/pattern_spec.rb
+++ b/spec/lib/gitlab/sql/pattern_spec.rb
@@ -52,4 +52,124 @@ describe Gitlab::SQL::Pattern do
       end
     end
   end
+
+  describe '.select_fuzzy_words' do
+    subject(:select_fuzzy_words) { Issue.select_fuzzy_words(query) }
+
+    context 'with a word equal to 3 chars' do
+      let(:query) { 'foo' }
+
+      it 'returns array cotaining a word' do
+        expect(select_fuzzy_words).to match_array(['foo'])
+      end
+    end
+
+    context 'with a word shorter than 3 chars' do
+      let(:query) { 'fo' }
+
+      it 'returns empty array' do
+        expect(select_fuzzy_words).to match_array([])
+      end
+    end
+
+    context 'with two words both equal to 3 chars' do
+      let(:query) { 'foo baz' }
+
+      it 'returns array containing two words' do
+        expect(select_fuzzy_words).to match_array(%w[foo baz])
+      end
+    end
+
+    context 'with two words divided by two spaces both equal to 3 chars' do
+      let(:query) { 'foo  baz' }
+
+      it 'returns array containing two words' do
+        expect(select_fuzzy_words).to match_array(%w[foo baz])
+      end
+    end
+
+    context 'with two words equal to 3 chars and shorter than 3 chars' do
+      let(:query) { 'foo ba' }
+
+      it 'returns array containing a word' do
+        expect(select_fuzzy_words).to match_array(['foo'])
+      end
+    end
+
+    context 'with a multi-word surrounded by double quote' do
+      let(:query) { '"really bar"' }
+
+      it 'returns array containing a multi-word' do
+        expect(select_fuzzy_words).to match_array(['really bar'])
+      end
+    end
+
+    context 'with a multi-word surrounded by double quote and two words' do
+      let(:query) { 'foo "really bar" baz' }
+
+      it 'returns array containing a multi-word and tow words' do
+        expect(select_fuzzy_words).to match_array(['foo', 'really bar', 'baz'])
+      end
+    end
+
+    context 'with a multi-word surrounded by double quote missing a spece before the first double quote' do
+      let(:query) { 'foo"really bar"' }
+
+      it 'returns array containing two words with double quote' do
+        expect(select_fuzzy_words).to match_array(['foo"really', 'bar"'])
+      end
+    end
+
+    context 'with a multi-word surrounded by double quote missing a spece after the second double quote' do
+      let(:query) { '"really bar"baz' }
+
+      it 'returns array containing two words with double quote' do
+        expect(select_fuzzy_words).to match_array(['"really', 'bar"baz'])
+      end
+    end
+
+    context 'with two multi-word surrounded by double quote and two words' do
+      let(:query) { 'foo "really bar" baz "awesome feature"' }
+
+      it 'returns array containing two multi-words and tow words' do
+        expect(select_fuzzy_words).to match_array(['foo', 'really bar', 'baz', 'awesome feature'])
+      end
+    end
+  end
+
+  describe '.to_fuzzy_arel' do
+    subject(:to_fuzzy_arel) { Issue.to_fuzzy_arel(:title, query) }
+
+    context 'with a word equal to 3 chars' do
+      let(:query) { 'foo' }
+
+      it 'returns a single ILIKE condition' do
+        expect(to_fuzzy_arel.to_sql).to match(/title.*I?LIKE '\%foo\%'/)
+      end
+    end
+
+    context 'with a word shorter than 3 chars' do
+      let(:query) { 'fo' }
+
+      it 'returns nil' do
+        expect(to_fuzzy_arel).to be_nil
+      end
+    end
+
+    context 'with two words both equal to 3 chars' do
+      let(:query) { 'foo baz' }
+
+      it 'returns a joining LIKE condition using a AND' do
+        expect(to_fuzzy_arel.to_sql).to match(/title.+I?LIKE '\%foo\%' AND .*title.*I?LIKE '\%baz\%'/)
+      end
+    end
+
+    context 'with a multi-word surrounded by double quote and two words' do
+      let(:query) { 'foo "really bar" baz' }
+
+      it 'returns a joining LIKE condition using a AND' do
+        expect(to_fuzzy_arel.to_sql).to match(/title.+I?LIKE '\%foo\%' AND .*title.*I?LIKE '\%baz\%' AND .*title.*I?LIKE '\%really bar\%'/)
+      end
+    end
+  end
 end
diff --git a/spec/lib/gitlab/ssh_public_key_spec.rb b/spec/lib/gitlab/ssh_public_key_spec.rb
new file mode 100644
index 00000000000..93d538141ce
--- /dev/null
+++ b/spec/lib/gitlab/ssh_public_key_spec.rb
@@ -0,0 +1,136 @@
+require 'spec_helper'
+
+describe Gitlab::SSHPublicKey, lib: true do
+  let(:key) { attributes_for(:rsa_key_2048)[:key] }
+  let(:public_key) { described_class.new(key) }
+
+  describe '.technology(name)' do
+    it 'returns nil for an unrecognised name' do
+      expect(described_class.technology(:foo)).to be_nil
+    end
+
+    where(:name) do
+      [:rsa, :dsa, :ecdsa, :ed25519]
+    end
+
+    with_them do
+      it { expect(described_class.technology(name).name).to eq(name) }
+      it { expect(described_class.technology(name.to_s).name).to eq(name) }
+    end
+  end
+
+  describe '.supported_sizes(name)' do
+    where(:name, :sizes) do
+      [
+        [:rsa, [1024, 2048, 3072, 4096]],
+        [:dsa, [1024, 2048, 3072]],
+        [:ecdsa, [256, 384, 521]],
+        [:ed25519, [256]]
+      ]
+    end
+
+    subject { described_class.supported_sizes(name) }
+
+    with_them do
+      it { expect(described_class.supported_sizes(name)).to eq(sizes) }
+      it { expect(described_class.supported_sizes(name.to_s)).to eq(sizes) }
+    end
+  end
+
+  describe '#valid?' do
+    subject { public_key }
+
+    context 'with a valid SSH key' do
+      it { is_expected.to be_valid }
+    end
+
+    context 'with an invalid SSH key' do
+      let(:key) { 'this is not a key' }
+
+      it { is_expected.not_to be_valid }
+    end
+  end
+
+  describe '#type' do
+    subject { public_key.type }
+
+    where(:factory, :type) do
+      [
+        [:rsa_key_2048, :rsa],
+        [:dsa_key_2048, :dsa],
+        [:ecdsa_key_256, :ecdsa],
+        [:ed25519_key_256, :ed25519]
+      ]
+    end
+
+    with_them do
+      let(:key) { attributes_for(factory)[:key] }
+
+      it { is_expected.to eq(type) }
+    end
+
+    context 'with an invalid SSH key' do
+      let(:key) { 'this is not a key' }
+
+      it { is_expected.to be_nil }
+    end
+  end
+
+  describe '#bits' do
+    subject { public_key.bits }
+
+    where(:factory, :bits) do
+      [
+        [:rsa_key_2048, 2048],
+        [:dsa_key_2048, 2048],
+        [:ecdsa_key_256, 256],
+        [:ed25519_key_256, 256]
+      ]
+    end
+
+    with_them do
+      let(:key) { attributes_for(factory)[:key] }
+
+      it { is_expected.to eq(bits) }
+    end
+
+    context 'with an invalid SSH key' do
+      let(:key) { 'this is not a key' }
+
+      it { is_expected.to be_nil }
+    end
+  end
+
+  describe '#fingerprint' do
+    subject { public_key.fingerprint }
+
+    where(:factory, :fingerprint) do
+      [
+        [:rsa_key_2048, '2e:ca:dc:e0:37:29:ed:fc:f0:1d:bf:66:d4:cd:51:b1'],
+        [:dsa_key_2048, 'bc:c1:a4:be:7e:8c:84:56:b3:58:93:53:c6:80:78:8c'],
+        [:ecdsa_key_256, '67:a3:a9:7d:b8:e1:15:d4:80:40:21:34:bb:ed:97:38'],
+        [:ed25519_key_256, 'e6:eb:45:8a:3c:59:35:5f:e9:5b:80:12:be:7e:22:73']
+      ]
+    end
+
+    with_them do
+      let(:key) { attributes_for(factory)[:key] }
+
+      it { is_expected.to eq(fingerprint) }
+    end
+
+    context 'with an invalid SSH key' do
+      let(:key) { 'this is not a key' }
+
+      it { is_expected.to be_nil }
+    end
+  end
+
+  describe '#key_text' do
+    let(:key) { 'this is not a key' }
+
+    it 'carries the unmodified key data' do
+      expect(public_key.key_text).to eq(key)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/template/gitlab_ci_yml_template_spec.rb b/spec/lib/gitlab/template/gitlab_ci_yml_template_spec.rb
index 6541326d1de..e2fa76522bc 100644
--- a/spec/lib/gitlab/template/gitlab_ci_yml_template_spec.rb
+++ b/spec/lib/gitlab/template/gitlab_ci_yml_template_spec.rb
@@ -30,6 +30,14 @@ describe Gitlab::Template::GitlabCiYmlTemplate do
     end
   end
 
+  describe '.by_category' do
+    it 'returns sorted results' do
+      result = described_class.by_category('General')
+
+      expect(result).to eq(result.sort)
+    end
+  end
+
   describe '#content' do
     it 'loads the full file' do
       gitignore = subject.new(Rails.root.join('vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml'))
@@ -38,4 +46,14 @@ describe Gitlab::Template::GitlabCiYmlTemplate do
       expect(gitignore.content).to start_with('#')
     end
   end
+
+  describe '#<=>' do
+    it 'sorts lexicographically' do
+      one = described_class.new('a.gitlab-ci.yml')
+      other = described_class.new('z.gitlab-ci.yml')
+
+      expect(one.<=>(other)).to be(-1)
+      expect([other, one].sort).to eq([one, other])
+    end
+  end
 end
diff --git a/spec/lib/gitlab/utils_spec.rb b/spec/lib/gitlab/utils_spec.rb
index 92787bb262e..3137a72fdc4 100644
--- a/spec/lib/gitlab/utils_spec.rb
+++ b/spec/lib/gitlab/utils_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::Utils do
-  delegate :to_boolean, :boolean_to_yes_no, :slugify, to: :described_class
+  delegate :to_boolean, :boolean_to_yes_no, :slugify, :random_string, to: :described_class
 
   describe '.slugify' do
     {
@@ -53,4 +53,10 @@ describe Gitlab::Utils do
       expect(boolean_to_yes_no(false)).to eq('No')
     end
   end
+
+  describe '.random_string' do
+    it 'generates a string' do
+      expect(random_string).to be_kind_of(String)
+    end
+  end
 end
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb
index b66afafa174..699184ad9fe 100644
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -228,21 +228,10 @@ describe Gitlab::Workhorse do
         let(:action) { 'git_upload_pack' }
         let(:feature_flag) { :post_upload_pack }
 
-        context 'when action is enabled by feature flag' do
-          it 'includes Gitaly params in the returned value' do
-            allow(Gitlab::GitalyClient).to receive(:feature_enabled?).with(feature_flag).and_return(true)
+        it 'includes Gitaly params in the returned value' do
+          allow(Gitlab::GitalyClient).to receive(:feature_enabled?).with(feature_flag).and_return(true)
 
-            expect(subject).to include(gitaly_params)
-          end
-        end
-
-        context 'when action is not enabled by feature flag' do
-          it 'does not include Gitaly params in the returned value' do
-            status_opt_out = Gitlab::GitalyClient::MigrationStatus::OPT_OUT
-            allow(Gitlab::GitalyClient).to receive(:feature_enabled?).with(feature_flag, status: status_opt_out).and_return(false)
-
-            expect(subject).not_to include(gitaly_params)
-          end
+          expect(subject).to include(gitaly_params)
         end
       end
 
diff --git a/spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb b/spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb
new file mode 100644
index 00000000000..7125bfcab59
--- /dev/null
+++ b/spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb
@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+describe SystemCheck::App::GitUserDefaultSSHConfigCheck do
+  let(:username) { '_this_user_will_not_exist_unless_it_is_stubbed' }
+  let(:base_dir) { Dir.mktmpdir }
+  let(:home_dir) { File.join(base_dir, "/var/lib/#{username}") }
+  let(:ssh_dir) { File.join(home_dir, '.ssh') }
+  let(:forbidden_file) { 'id_rsa' }
+
+  before do
+    allow(Gitlab.config.gitlab).to receive(:user).and_return(username)
+  end
+
+  after do
+    FileUtils.rm_rf(base_dir)
+  end
+
+  it 'only whitelists safe files' do
+    expect(described_class::WHITELIST).to contain_exactly('authorized_keys', 'authorized_keys2', 'known_hosts')
+  end
+
+  describe '#skip?' do
+    subject { described_class.new.skip? }
+
+    where(user_exists: [true, false], home_dir_exists: [true, false])
+
+    with_them do
+      let(:expected_result) { !user_exists || !home_dir_exists }
+
+      before do
+        stub_user if user_exists
+        stub_home_dir if home_dir_exists
+      end
+
+      it { is_expected.to eq(expected_result) }
+    end
+  end
+
+  describe '#check?' do
+    subject { described_class.new.check? }
+
+    before do
+      stub_user
+    end
+
+    it 'fails if a forbidden file exists' do
+      stub_ssh_file(forbidden_file)
+
+      is_expected.to be_falsy
+    end
+
+    it "succeeds if the SSH directory doesn't exist" do
+      FileUtils.rm_rf(ssh_dir)
+
+      is_expected.to be_truthy
+    end
+
+    it 'succeeds if all the whitelisted files exist' do
+      described_class::WHITELIST.each do |filename|
+        stub_ssh_file(filename)
+      end
+
+      is_expected.to be_truthy
+    end
+  end
+
+  def stub_user
+    allow(File).to receive(:expand_path).with("~#{username}").and_return(home_dir)
+  end
+
+  def stub_home_dir
+    FileUtils.mkdir_p(home_dir)
+  end
+
+  def stub_ssh_file(filename)
+    FileUtils.mkdir_p(ssh_dir)
+    FileUtils.touch(File.join(ssh_dir, filename))
+  end
+end
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 1fa59ebd22b..932e2fd8c95 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -8,6 +8,25 @@ describe Notify do
 
   include_context 'gitlab email notification'
 
+  set(:user) { create(:user) }
+  set(:current_user) { create(:user, email: "current@email.com") }
+  set(:assignee) { create(:user, email: 'assignee@example.com', name: 'John Doe') }
+
+  set(:merge_request) do
+    create(:merge_request, source_project: project,
+                           target_project: project,
+                           author: current_user,
+                           assignee: assignee,
+                           description: 'Awesome description')
+  end
+
+  set(:issue) do
+    create(:issue, author: current_user,
+                   assignees: [assignee],
+                   project: project,
+                   description: 'My awesome description!')
+  end
+
   def have_referable_subject(referable, reply: false)
     prefix = referable.project.name if referable.project
     prefix = "Re: #{prefix}" if reply
@@ -19,8 +38,6 @@ describe Notify do
 
   context 'for a project' do
     describe 'items that are assignable, the email' do
-      let(:current_user) { create(:user, email: "current@email.com") }
-      let(:assignee) { create(:user, email: 'assignee@example.com', name: 'John Doe') }
       let(:previous_assignee) { create(:user, name: 'Previous Assignee') }
 
       shared_examples 'an assignee email' do
@@ -36,9 +53,6 @@ describe Notify do
       end
 
       context 'for issues' do
-        let(:issue) { create(:issue, author: current_user, assignees: [assignee], project: project) }
-        let(:issue_with_description) { create(:issue, author: current_user, assignees: [assignee], project: project, description: 'My awesome description') }
-
         describe 'that are new' do
           subject { described_class.new_issue_email(issue.assignees.first.id, issue.id) }
 
@@ -56,6 +70,10 @@ describe Notify do
             end
           end
 
+          it 'contains the description' do
+            is_expected.to have_html_escaped_body_text issue.description
+          end
+
           context 'when enabled email_author_in_body' do
             before do
               stub_application_setting(email_author_in_body: true)
@@ -68,16 +86,6 @@ describe Notify do
           end
         end
 
-        describe 'that are new with a description' do
-          subject { described_class.new_issue_email(issue_with_description.assignees.first.id, issue_with_description.id) }
-
-          it_behaves_like 'it should show Gmail Actions View Issue link'
-
-          it 'contains the description' do
-            is_expected.to have_html_escaped_body_text issue_with_description.description
-          end
-        end
-
         describe 'that have been reassigned' do
           subject { described_class.reassigned_issue_email(recipient.id, issue.id, [previous_assignee.id], current_user.id) }
 
@@ -197,11 +205,6 @@ describe Notify do
       end
 
       context 'for merge requests' do
-        let(:project) { create(:project, :repository) }
-        let(:merge_author) { create(:user) }
-        let(:merge_request) { create(:merge_request, author: current_user, assignee: assignee, source_project: project, target_project: project) }
-        let(:merge_request_with_description) { create(:merge_request, author: current_user, assignee: assignee, source_project: project, target_project: project, description: 'My awesome description') }
-
         describe 'that are new' do
           subject { described_class.new_merge_request_email(merge_request.assignee_id, merge_request.id) }
 
@@ -221,6 +224,10 @@ describe Notify do
             end
           end
 
+          it 'contains the description' do
+            is_expected.to have_html_escaped_body_text merge_request.description
+          end
+
           context 'when enabled email_author_in_body' do
             before do
               stub_application_setting(email_author_in_body: true)
@@ -233,17 +240,6 @@ describe Notify do
           end
         end
 
-        describe 'that are new with a description' do
-          subject { described_class.new_merge_request_email(merge_request_with_description.assignee_id, merge_request_with_description.id) }
-
-          it_behaves_like 'it should show Gmail Actions View Merge request link'
-          it_behaves_like "an unsubscribeable thread"
-
-          it 'contains the description' do
-            is_expected.to have_html_escaped_body_text merge_request_with_description.description
-          end
-        end
-
         describe 'that are reassigned' do
           subject { described_class.reassigned_merge_request_email(recipient.id, merge_request.id, previous_assignee.id, current_user.id) }
 
@@ -321,6 +317,7 @@ describe Notify do
         end
 
         describe 'that are merged' do
+          let(:merge_author) { create(:user) }
           subject { described_class.merged_merge_request_email(recipient.id, merge_request.id, merge_author.id) }
 
           it_behaves_like 'a multiple recipients email'
@@ -348,8 +345,6 @@ describe Notify do
     end
 
     describe 'project was moved' do
-      let(:project) { create(:project) }
-      let(:user) { create(:user) }
       subject { described_class.project_was_moved_email(project.id, user.id, "gitlab/gitlab") }
 
       it_behaves_like 'an email sent from GitLab'
@@ -371,7 +366,6 @@ describe Notify do
           end
         end
 
-        let(:user) { create(:user) }
         let(:project_member) do
           project.request_access(user)
           project.requesters.find_by(user_id: user.id)
@@ -398,7 +392,6 @@ describe Notify do
         let(:group_owner) { create(:user) }
         let(:group) { create(:group).tap { |g| g.add_owner(group_owner) } }
         let(:project) { create(:project, :public, :access_requestable, namespace: group) }
-        let(:user) { create(:user) }
         let(:project_member) do
           project.request_access(user)
           project.requesters.find_by(user_id: user.id)
@@ -424,7 +417,6 @@ describe Notify do
 
     describe 'project access denied' do
       let(:project) { create(:project, :public, :access_requestable) }
-      let(:user) { create(:user) }
       let(:project_member) do
         project.request_access(user)
         project.requesters.find_by(user_id: user.id)
@@ -445,7 +437,6 @@ describe Notify do
     describe 'project access changed' do
       let(:owner) { create(:user, name: "Chang O'Keefe") }
       let(:project) { create(:project, :public, :access_requestable, namespace: owner.namespace) }
-      let(:user) { create(:user) }
       let(:project_member) { create(:project_member, project: project, user: user) }
       subject { described_class.member_access_granted_email('project', project_member.id) }
 
@@ -474,7 +465,6 @@ describe Notify do
     end
 
     describe 'project invitation' do
-      let(:project) { create(:project) }
       let(:master) { create(:user).tap { |u| project.team << [u, :master] } }
       let(:project_member) { invite_to_project(project, inviter: master) }
 
@@ -494,7 +484,6 @@ describe Notify do
     end
 
     describe 'project invitation accepted' do
-      let(:project) { create(:project) }
       let(:invited_user) { create(:user, name: 'invited user') }
       let(:master) { create(:user).tap { |u| project.team << [u, :master] } }
       let(:project_member) do
@@ -519,7 +508,6 @@ describe Notify do
     end
 
     describe 'project invitation declined' do
-      let(:project) { create(:project) }
       let(:master) { create(:user).tap { |u| project.team << [u, :master] } }
       let(:project_member) do
         invitee = invite_to_project(project, inviter: master)
@@ -582,7 +570,6 @@ describe Notify do
       end
 
       describe 'on a commit' do
-        let(:project) { create(:project, :repository) }
         let(:commit) { project.commit }
 
         before do
@@ -607,7 +594,6 @@ describe Notify do
       end
 
       describe 'on a merge request' do
-        let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
         let(:note_on_merge_request_path) { project_merge_request_path(project, merge_request, anchor: "note_#{note.id}") }
 
         before do
@@ -632,7 +618,6 @@ describe Notify do
       end
 
       describe 'on an issue' do
-        let(:issue) { create(:issue, project: project) }
         let(:note_on_issue_path) { project_issue_path(project, issue, anchor: "note_#{note.id}") }
 
         before do
@@ -658,7 +643,6 @@ describe Notify do
     end
 
     context 'items that are noteable, the email for a discussion note' do
-      let(:project) { create(:project, :repository) }
       let(:note_author) { create(:user, name: 'author_name') }
 
       before do
@@ -722,7 +706,6 @@ describe Notify do
       end
 
       describe 'on a merge request' do
-        let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
         let(:note) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project, author: note_author) }
         let(:note_on_merge_request_path) { project_merge_request_path(project, merge_request, anchor: "note_#{note.id}") }
 
@@ -749,7 +732,6 @@ describe Notify do
       end
 
       describe 'on an issue' do
-        let(:issue) { create(:issue, project: project) }
         let(:note) { create(:discussion_note_on_issue, noteable: issue, project: project, author: note_author) }
         let(:note_on_issue_path) { project_issue_path(project, issue, anchor: "note_#{note.id}") }
 
@@ -835,7 +817,6 @@ describe Notify do
       end
 
       describe 'on a merge request' do
-        let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
         let(:note) { create(:diff_note_on_merge_request) }
 
         subject { described_class.note_merge_request_email(recipient.id, note.id) }
@@ -848,9 +829,10 @@ describe Notify do
   end
 
   context 'for a group' do
+    set(:group) { create(:group) }
+
     describe 'group access requested' do
       let(:group) { create(:group, :public, :access_requestable) }
-      let(:user) { create(:user) }
       let(:group_member) do
         group.request_access(user)
         group.requesters.find_by(user_id: user.id)
@@ -870,8 +852,6 @@ describe Notify do
     end
 
     describe 'group access denied' do
-      let(:group) { create(:group) }
-      let(:user) { create(:user) }
       let(:group_member) do
         group.request_access(user)
         group.requesters.find_by(user_id: user.id)
@@ -890,8 +870,6 @@ describe Notify do
     end
 
     describe 'group access changed' do
-      let(:group) { create(:group) }
-      let(:user) { create(:user) }
       let(:group_member) { create(:group_member, group: group, user: user) }
 
       subject { described_class.member_access_granted_email('group', group_member.id) }
@@ -921,7 +899,6 @@ describe Notify do
     end
 
     describe 'group invitation' do
-      let(:group) { create(:group) }
       let(:owner) { create(:user).tap { |u| group.add_user(u, Gitlab::Access::OWNER) } }
       let(:group_member) { invite_to_group(group, inviter: owner) }
 
@@ -941,7 +918,6 @@ describe Notify do
     end
 
     describe 'group invitation accepted' do
-      let(:group) { create(:group) }
       let(:invited_user) { create(:user, name: 'invited user') }
       let(:owner) { create(:user).tap { |u| group.add_user(u, Gitlab::Access::OWNER) } }
       let(:group_member) do
@@ -966,7 +942,6 @@ describe Notify do
     end
 
     describe 'group invitation declined' do
-      let(:group) { create(:group) }
       let(:owner) { create(:user).tap { |u| group.add_user(u, Gitlab::Access::OWNER) } }
       let(:group_member) do
         invitee = invite_to_group(group, inviter: owner)
@@ -1020,7 +995,6 @@ describe Notify do
 
   describe 'email on push for a created branch' do
     let(:example_site_path) { root_path }
-    let(:user) { create(:user) }
     let(:tree_path) { project_tree_path(project, "empty-branch") }
 
     subject { described_class.repository_push_email(project.id, author_id: user.id, ref: 'refs/heads/empty-branch', action: :create) }
@@ -1046,7 +1020,6 @@ describe Notify do
 
   describe 'email on push for a created tag' do
     let(:example_site_path) { root_path }
-    let(:user) { create(:user) }
     let(:tree_path) { project_tree_path(project, "v1.0") }
 
     subject { described_class.repository_push_email(project.id, author_id: user.id, ref: 'refs/tags/v1.0', action: :create) }
@@ -1072,7 +1045,6 @@ describe Notify do
 
   describe 'email on push for a deleted branch' do
     let(:example_site_path) { root_path }
-    let(:user) { create(:user) }
 
     subject { described_class.repository_push_email(project.id, author_id: user.id, ref: 'refs/heads/master', action: :delete) }
 
@@ -1094,7 +1066,6 @@ describe Notify do
 
   describe 'email on push for a deleted tag' do
     let(:example_site_path) { root_path }
-    let(:user) { create(:user) }
 
     subject { described_class.repository_push_email(project.id, author_id: user.id, ref: 'refs/tags/v1.0', action: :delete) }
 
@@ -1115,9 +1086,7 @@ describe Notify do
   end
 
   describe 'email on push with multiple commits' do
-    let(:project) { create(:project, :repository) }
     let(:example_site_path) { root_path }
-    let(:user) { create(:user) }
     let(:raw_compare) { Gitlab::Git::Compare.new(project.repository.raw_repository, sample_image_commit.id, sample_commit.id) }
     let(:compare) { Compare.decorate(raw_compare, project) }
     let(:commits) { compare.commits }
@@ -1209,9 +1178,7 @@ describe Notify do
   end
 
   describe 'email on push with a single commit' do
-    let(:project) { create(:project, :repository) }
     let(:example_site_path) { root_path }
-    let(:user) { create(:user) }
     let(:raw_compare) { Gitlab::Git::Compare.new(project.repository.raw_repository, sample_commit.parent_id, sample_commit.id) }
     let(:compare) { Compare.decorate(raw_compare, project) }
     let(:commits) { compare.commits }
@@ -1242,8 +1209,6 @@ describe Notify do
   end
 
   describe 'HTML emails setting' do
-    let(:project) { create(:project) }
-    let(:user) { create(:user) }
     let(:multipart_mail) { described_class.project_was_moved_email(project.id, user.id, "gitlab/gitlab") }
 
     context 'when disabled' do
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index 359753b600e..f921545668d 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -72,6 +72,33 @@ describe ApplicationSetting do
         .is_greater_than(0)
     end
 
+    context 'key restrictions' do
+      it 'supports all key types' do
+        expect(described_class::SUPPORTED_KEY_TYPES).to contain_exactly(:rsa, :dsa, :ecdsa, :ed25519)
+      end
+
+      it 'does not allow all key types to be disabled' do
+        described_class::SUPPORTED_KEY_TYPES.each do |type|
+          setting["#{type}_key_restriction"] = described_class::FORBIDDEN_KEY_VALUE
+        end
+
+        expect(setting).not_to be_valid
+        expect(setting.errors.messages).to have_key(:allowed_key_types)
+      end
+
+      where(:type) do
+        described_class::SUPPORTED_KEY_TYPES
+      end
+
+      with_them do
+        let(:field) { :"#{type}_key_restriction" }
+
+        it { is_expected.to validate_presence_of(field) }
+        it { is_expected.to allow_value(*KeyRestrictionValidator.supported_key_restrictions(type)).for(field) }
+        it { is_expected.not_to allow_value(128).for(field) }
+      end
+    end
+
     it_behaves_like 'an object with email-formated attributes', :admin_notification_email do
       subject { setting }
     end
@@ -441,4 +468,36 @@ describe ApplicationSetting do
       end
     end
   end
+
+  describe '#allowed_key_types' do
+    it 'includes all key types by default' do
+      expect(setting.allowed_key_types).to contain_exactly(*described_class::SUPPORTED_KEY_TYPES)
+    end
+
+    it 'excludes disabled key types' do
+      expect(setting.allowed_key_types).to include(:ed25519)
+
+      setting.ed25519_key_restriction = described_class::FORBIDDEN_KEY_VALUE
+
+      expect(setting.allowed_key_types).not_to include(:ed25519)
+    end
+  end
+
+  describe '#key_restriction_for' do
+    it 'returns the restriction value for recognised types' do
+      setting.rsa_key_restriction = 1024
+
+      expect(setting.key_restriction_for(:rsa)).to eq(1024)
+    end
+
+    it 'allows types to be passed as a string' do
+      setting.rsa_key_restriction = 1024
+
+      expect(setting.key_restriction_for('rsa')).to eq(1024)
+    end
+
+    it 'returns forbidden for unrecognised type' do
+      expect(setting.key_restriction_for(:foo)).to eq(described_class::FORBIDDEN_KEY_VALUE)
+    end
+  end
 end
diff --git a/spec/models/award_emoji_spec.rb b/spec/models/award_emoji_spec.rb
index 87e60d9c16b..b909e04dfc3 100644
--- a/spec/models/award_emoji_spec.rb
+++ b/spec/models/award_emoji_spec.rb
@@ -41,4 +41,40 @@ describe AwardEmoji do
       end
     end
   end
+
+  describe 'expiring ETag cache' do
+    context 'on a note' do
+      let(:note) { create(:note_on_issue) }
+      let(:award_emoji) { build(:award_emoji, user: build(:user), awardable: note) }
+
+      it 'calls expire_etag_cache on the note when saved' do
+        expect(note).to receive(:expire_etag_cache)
+
+        award_emoji.save!
+      end
+
+      it 'calls expire_etag_cache on the note when destroyed' do
+        expect(note).to receive(:expire_etag_cache)
+
+        award_emoji.destroy!
+      end
+    end
+
+    context 'on another awardable' do
+      let(:issue) { create(:issue) }
+      let(:award_emoji) { build(:award_emoji, user: build(:user), awardable: issue) }
+
+      it 'does not call expire_etag_cache on the issue when saved' do
+        expect(issue).not_to receive(:expire_etag_cache)
+
+        award_emoji.save!
+      end
+
+      it 'does not call expire_etag_cache on the issue when destroyed' do
+        expect(issue).not_to receive(:expire_etag_cache)
+
+        award_emoji.destroy!
+      end
+    end
+  end
 end
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 0c35ad3c9d8..08d22f166e4 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -43,6 +43,32 @@ describe Ci::Build do
     it { is_expected.not_to include(manual_but_created) }
   end
 
+  describe '.ref_protected' do
+    subject { described_class.ref_protected }
+
+    context 'when protected is true' do
+      let!(:job) { create(:ci_build, :protected) }
+
+      it { is_expected.to include(job) }
+    end
+
+    context 'when protected is false' do
+      let!(:job) { create(:ci_build) }
+
+      it { is_expected.not_to include(job) }
+    end
+
+    context 'when protected is nil' do
+      let!(:job) { create(:ci_build) }
+
+      before do
+        job.update_attribute(:protected, nil)
+      end
+
+      it { is_expected.not_to include(job) }
+    end
+  end
+
   describe '#actionize' do
     context 'when build is a created' do
       before do
@@ -1466,10 +1492,12 @@ describe Ci::Build do
 
     context 'when build is for triggers' do
       let(:trigger) { create(:ci_trigger, project: project) }
-      let(:trigger_request) { create(:ci_trigger_request_with_variables, pipeline: pipeline, trigger: trigger) }
+      let(:trigger_request) { create(:ci_trigger_request, pipeline: pipeline, trigger: trigger) }
+
       let(:user_trigger_variable) do
-        { key: :TRIGGER_KEY_1, value: 'TRIGGER_VALUE_1', public: false }
+        { key: 'TRIGGER_KEY_1', value: 'TRIGGER_VALUE_1', public: false }
       end
+
       let(:predefined_trigger_variable) do
         { key: 'CI_PIPELINE_TRIGGERED', value: 'true', public: true }
       end
@@ -1478,8 +1506,26 @@ describe Ci::Build do
         build.trigger_request = trigger_request
       end
 
-      it { is_expected.to include(user_trigger_variable) }
-      it { is_expected.to include(predefined_trigger_variable) }
+      shared_examples 'returns variables for triggers' do
+        it { is_expected.to include(user_trigger_variable) }
+        it { is_expected.to include(predefined_trigger_variable) }
+      end
+
+      context 'when variables are stored in trigger_request' do
+        before do
+          trigger_request.update_attribute(:variables, { 'TRIGGER_KEY_1' => 'TRIGGER_VALUE_1' } )
+        end
+
+        it_behaves_like 'returns variables for triggers'
+      end
+
+      context 'when variables are stored in pipeline_variables' do
+        before do
+          create(:ci_pipeline_variable, pipeline: pipeline, key: 'TRIGGER_KEY_1', value: 'TRIGGER_VALUE_1')
+        end
+
+        it_behaves_like 'returns variables for triggers'
+      end
     end
 
     context 'when pipeline has a variable' do
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index b84e3ff18e8..84656ffe0b9 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -546,6 +546,22 @@ describe Ci::Pipeline, :mailer do
     end
   end
 
+  describe '#has_kubernetes_active?' do
+    context 'when kubernetes is active' do
+      let(:project) { create(:kubernetes_project) }
+
+      it 'returns true' do
+        expect(pipeline).to have_kubernetes_active
+      end
+    end
+
+    context 'when kubernetes is not active' do
+      it 'returns false' do
+        expect(pipeline).not_to have_kubernetes_active
+      end
+    end
+  end
+
   describe '#has_stage_seeds?' do
     context 'when pipeline has stage seeds' do
       subject { build(:ci_pipeline_with_one_job) }
diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb
index 48f878bbee6..2e686e515c5 100644
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
@@ -2,6 +2,8 @@ require 'spec_helper'
 
 describe Ci::Runner do
   describe 'validation' do
+    it { is_expected.to validate_presence_of(:access_level) }
+
     context 'when runner is not allowed to pick untagged jobs' do
       context 'when runner does not have tags' do
         it 'is not valid' do
@@ -19,6 +21,34 @@ describe Ci::Runner do
     end
   end
 
+  describe '#access_level' do
+    context 'when creating new runner and access_level is nil' do
+      let(:runner) do
+        build(:ci_runner, access_level: nil)
+      end
+
+      it "object is invalid" do
+        expect(runner).not_to be_valid
+      end
+    end
+
+    context 'when creating new runner and access_level is defined in enum' do
+      let(:runner) do
+        build(:ci_runner, access_level: :not_protected)
+      end
+
+      it "object is valid" do
+        expect(runner).to be_valid
+      end
+    end
+
+    context 'when creating new runner and access_level is not defined in enum' do
+      it "raises an error" do
+        expect { build(:ci_runner, access_level: :this_is_not_defined) }.to raise_error(ArgumentError)
+      end
+    end
+  end
+
   describe '#display_name' do
     it 'returns the description if it has a value' do
       runner = FactoryGirl.build(:ci_runner, description: 'Linux/Ruby-1.9.3-p448')
@@ -95,6 +125,8 @@ describe Ci::Runner do
     let(:build) { create(:ci_build, pipeline: pipeline) }
     let(:runner) { create(:ci_runner) }
 
+    subject { runner.can_pick?(build) }
+
     before do
       build.project.runners << runner
     end
@@ -222,6 +254,50 @@ describe Ci::Runner do
         end
       end
     end
+
+    context 'when access_level of runner is not_protected' do
+      before do
+        runner.not_protected!
+      end
+
+      context 'when build is protected' do
+        before do
+          build.protected = true
+        end
+
+        it { is_expected.to be_truthy }
+      end
+
+      context 'when build is unprotected' do
+        before do
+          build.protected = false
+        end
+
+        it { is_expected.to be_truthy }
+      end
+    end
+
+    context 'when access_level of runner is ref_protected' do
+      before do
+        runner.ref_protected!
+      end
+
+      context 'when build is protected' do
+        before do
+          build.protected = true
+        end
+
+        it { is_expected.to be_truthy }
+      end
+
+      context 'when build is unprotected' do
+        before do
+          build.protected = false
+        end
+
+        it { is_expected.to be_falsey }
+      end
+    end
   end
 
   describe '#status' do
diff --git a/spec/models/ci/trigger_request_spec.rb b/spec/models/ci/trigger_request_spec.rb
new file mode 100644
index 00000000000..7dcf3528f73
--- /dev/null
+++ b/spec/models/ci/trigger_request_spec.rb
@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Ci::TriggerRequest do
+  describe 'validation' do
+    it 'be invalid if saving a variable' do
+      trigger = build(:ci_trigger_request, variables: { TRIGGER_KEY_1: 'TRIGGER_VALUE_1' } )
+
+      expect(trigger).not_to be_valid
+    end
+
+    it 'be valid if not saving a variable' do
+      trigger = build(:ci_trigger_request)
+
+      expect(trigger).to be_valid
+    end
+  end
+end
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index c18c635d811..11e64a0f877 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -195,6 +195,67 @@ eos
     it { expect(data[:removed]).to eq([]) }
   end
 
+  describe '#cherry_pick_message' do
+    let(:user) { create(:user) }
+
+    context 'of a regular commit' do
+      let(:commit) { project.commit('video') }
+
+      it { expect(commit.cherry_pick_message(user)).to include("\n\n(cherry picked from commit 88790590ed1337ab189bccaa355f068481c90bec)") }
+    end
+
+    context 'of a merge commit' do
+      let(:repository) { project.repository }
+
+      let(:commit_options) do
+        author = repository.user_to_committer(user)
+        { message: 'Test message', committer: author, author: author }
+      end
+
+      let(:merge_request) do
+        create(:merge_request,
+               source_branch: 'video',
+               target_branch: 'master',
+               source_project: project,
+               author: user)
+      end
+
+      let(:merge_commit) do
+        merge_commit_id = repository.merge(user,
+                                           merge_request.diff_head_sha,
+                                           merge_request,
+                                           commit_options)
+
+        repository.commit(merge_commit_id)
+      end
+
+      context 'that is found' do
+        before do
+          # Artificially mark as completed.
+          merge_request.update(merge_commit_sha: merge_commit.id)
+        end
+
+        it do
+          expected_appended_text = <<~STR.rstrip
+
+            (cherry picked from commit #{merge_commit.sha})
+
+            467dc98f Add new 'videos' directory
+            88790590 Upload new video file
+          STR
+
+          expect(merge_commit.cherry_pick_message(user)).to include(expected_appended_text)
+        end
+      end
+
+      context "that is existing but not found" do
+        it 'does not include details of the merged commits' do
+          expect(merge_commit.cherry_pick_message(user)).to end_with("(cherry picked from commit #{merge_commit.sha})")
+        end
+      end
+    end
+  end
+
   describe '#reverts_commit?' do
     let(:another_commit) { double(:commit, revert_description: "This reverts commit #{commit.sha}") }
     let(:user) { commit.author }
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index f7583645e69..858ec831200 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -443,4 +443,25 @@ describe CommitStatus do
       end
     end
   end
+
+  describe 'set failure_reason when drop' do
+    let(:commit_status) { create(:commit_status, :created) }
+
+    subject do
+      commit_status.drop!(reason)
+      commit_status
+    end
+
+    context 'when failure_reason is nil' do
+      let(:reason) { }
+
+      it { is_expected.to be_unknown_failure }
+    end
+
+    context 'when failure_reason is script_failure' do
+      let(:reason) { :script_failure }
+
+      it { is_expected.to be_script_failure }
+    end
+  end
 end
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index dfbe1a7c192..37f6fd3a25b 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -66,56 +66,76 @@ describe Issuable do
   end
 
   describe ".search" do
-    let!(:searchable_issue) { create(:issue, title: "Searchable issue") }
+    let!(:searchable_issue) { create(:issue, title: "Searchable awesome issue") }
 
-    it 'returns notes with a matching title' do
+    it 'returns issues with a matching title' do
       expect(issuable_class.search(searchable_issue.title))
         .to eq([searchable_issue])
     end
 
-    it 'returns notes with a partially matching title' do
+    it 'returns issues with a partially matching title' do
       expect(issuable_class.search('able')).to eq([searchable_issue])
     end
 
-    it 'returns notes with a matching title regardless of the casing' do
+    it 'returns issues with a matching title regardless of the casing' do
       expect(issuable_class.search(searchable_issue.title.upcase))
         .to eq([searchable_issue])
     end
+
+    it 'returns issues with a fuzzy matching title' do
+      expect(issuable_class.search('searchable issue')).to eq([searchable_issue])
+    end
+
+    it 'returns all issues with a query shorter than 3 chars' do
+      expect(issuable_class.search('zz')).to eq(issuable_class.all)
+    end
   end
 
   describe ".full_search" do
     let!(:searchable_issue) do
-      create(:issue, title: "Searchable issue", description: 'kittens')
+      create(:issue, title: "Searchable awesome issue", description: 'Many cute kittens')
     end
 
-    it 'returns notes with a matching title' do
+    it 'returns issues with a matching title' do
       expect(issuable_class.full_search(searchable_issue.title))
         .to eq([searchable_issue])
     end
 
-    it 'returns notes with a partially matching title' do
+    it 'returns issues with a partially matching title' do
       expect(issuable_class.full_search('able')).to eq([searchable_issue])
     end
 
-    it 'returns notes with a matching title regardless of the casing' do
+    it 'returns issues with a matching title regardless of the casing' do
       expect(issuable_class.full_search(searchable_issue.title.upcase))
         .to eq([searchable_issue])
     end
 
-    it 'returns notes with a matching description' do
+    it 'returns issues with a fuzzy matching title' do
+      expect(issuable_class.full_search('searchable issue')).to eq([searchable_issue])
+    end
+
+    it 'returns issues with a matching description' do
       expect(issuable_class.full_search(searchable_issue.description))
         .to eq([searchable_issue])
     end
 
-    it 'returns notes with a partially matching description' do
+    it 'returns issues with a partially matching description' do
       expect(issuable_class.full_search(searchable_issue.description))
         .to eq([searchable_issue])
     end
 
-    it 'returns notes with a matching description regardless of the casing' do
+    it 'returns issues with a matching description regardless of the casing' do
       expect(issuable_class.full_search(searchable_issue.description.upcase))
         .to eq([searchable_issue])
     end
+
+    it 'returns issues with a fuzzy matching description' do
+      expect(issuable_class.full_search('many kittens')).to eq([searchable_issue])
+    end
+
+    it 'returns all issues with a query shorter than 3 chars' do
+      expect(issuable_class.search('zz')).to eq(issuable_class.all)
+    end
   end
 
   describe '.to_ability_name' do
diff --git a/spec/models/container_repository_spec.rb b/spec/models/container_repository_spec.rb
index bae88cb1d24..e46945e301e 100644
--- a/spec/models/container_repository_spec.rb
+++ b/spec/models/container_repository_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe ContainerRepository do
   let(:group) { create(:group, name: 'group') }
-  let(:project) { create(:project, :repository, path: 'test', group: group) }
+  let(:project) { create(:project, path: 'test', group: group) }
 
   let(:repository) do
     create(:container_repository, name: 'my_image', project: project)
diff --git a/spec/models/gpg_key_spec.rb b/spec/models/gpg_key_spec.rb
index e48f20bf53b..9c99c3e5c08 100644
--- a/spec/models/gpg_key_spec.rb
+++ b/spec/models/gpg_key_spec.rb
@@ -99,14 +99,14 @@ describe GpgKey do
   end
 
   describe '#verified?' do
-    it 'returns true one of the email addresses in the key belongs to the user' do
+    it 'returns true if one of the email addresses in the key belongs to the user' do
       user = create :user, email: 'bette.cartwright@example.com'
       gpg_key = create :gpg_key, key: GpgHelpers::User2.public_key, user: user
 
       expect(gpg_key.verified?).to be_truthy
     end
 
-    it 'returns false if one of the email addresses in the key does not belong to the user' do
+    it 'returns false if none of the email addresses in the key does not belong to the user' do
       user = create :user, email: 'someone.else@example.com'
       gpg_key = create :gpg_key, key: GpgHelpers::User2.public_key, user: user
 
@@ -114,6 +114,32 @@ describe GpgKey do
     end
   end
 
+  describe 'verified_and_belongs_to_email?' do
+    it 'returns false if none of the email addresses in the key does not belong to the user' do
+      user = create :user, email: 'someone.else@example.com'
+      gpg_key = create :gpg_key, key: GpgHelpers::User2.public_key, user: user
+
+      expect(gpg_key.verified?).to be_falsey
+      expect(gpg_key.verified_and_belongs_to_email?('someone.else@example.com')).to be_falsey
+    end
+
+    it 'returns false if one of the email addresses in the key belongs to the user and does not match the provided email' do
+      user = create :user, email: 'bette.cartwright@example.com'
+      gpg_key = create :gpg_key, key: GpgHelpers::User2.public_key, user: user
+
+      expect(gpg_key.verified?).to be_truthy
+      expect(gpg_key.verified_and_belongs_to_email?('bette.cartwright@example.net')).to be_falsey
+    end
+
+    it 'returns true if one of the email addresses in the key belongs to the user and matches the provided email' do
+      user = create :user, email: 'bette.cartwright@example.com'
+      gpg_key = create :gpg_key, key: GpgHelpers::User2.public_key, user: user
+
+      expect(gpg_key.verified?).to be_truthy
+      expect(gpg_key.verified_and_belongs_to_email?('bette.cartwright@example.com')).to be_truthy
+    end
+  end
+
   describe 'notification', :mailer do
     let(:user) { create(:user) }
 
@@ -129,15 +155,15 @@ describe GpgKey do
   describe '#revoke' do
     it 'invalidates all associated gpg signatures and destroys the key' do
       gpg_key = create :gpg_key
-      gpg_signature = create :gpg_signature, valid_signature: true, gpg_key: gpg_key
+      gpg_signature = create :gpg_signature, verification_status: :verified, gpg_key: gpg_key
 
       unrelated_gpg_key = create :gpg_key, key: GpgHelpers::User2.public_key
-      unrelated_gpg_signature = create :gpg_signature, valid_signature: true, gpg_key: unrelated_gpg_key
+      unrelated_gpg_signature = create :gpg_signature, verification_status: :verified, gpg_key: unrelated_gpg_key
 
       gpg_key.revoke
 
       expect(gpg_signature.reload).to have_attributes(
-        valid_signature: false,
+        verification_status: 'unknown_key',
         gpg_key: nil
       )
 
@@ -145,7 +171,7 @@ describe GpgKey do
 
       # unrelated signature is left untouched
       expect(unrelated_gpg_signature.reload).to have_attributes(
-        valid_signature: true,
+        verification_status: 'verified',
         gpg_key: unrelated_gpg_key
       )
 
diff --git a/spec/models/key_spec.rb b/spec/models/key_spec.rb
index 3508391c721..96baeaff0a4 100644
--- a/spec/models/key_spec.rb
+++ b/spec/models/key_spec.rb
@@ -1,6 +1,13 @@
 require 'spec_helper'
 
 describe Key, :mailer do
+  include Gitlab::CurrentSettings
+
+  describe 'modules' do
+    subject { described_class }
+    it { is_expected.to include_module(Gitlab::CurrentSettings) }
+  end
+
   describe "Associations" do
     it { is_expected.to belong_to(:user) }
   end
@@ -11,8 +18,10 @@ describe Key, :mailer do
 
     it { is_expected.to validate_presence_of(:key) }
     it { is_expected.to validate_length_of(:key).is_at_most(5000) }
-    it { is_expected.to allow_value('ssh-foo').for(:key) }
-    it { is_expected.to allow_value('ecdsa-foo').for(:key) }
+    it { is_expected.to allow_value(attributes_for(:rsa_key_2048)[:key]).for(:key) }
+    it { is_expected.to allow_value(attributes_for(:dsa_key_2048)[:key]).for(:key) }
+    it { is_expected.to allow_value(attributes_for(:ecdsa_key_256)[:key]).for(:key) }
+    it { is_expected.to allow_value(attributes_for(:ed25519_key_256)[:key]).for(:key) }
     it { is_expected.not_to allow_value('foo-bar').for(:key) }
   end
 
@@ -95,6 +104,48 @@ describe Key, :mailer do
     end
   end
 
+  context 'validate it meets key restrictions' do
+    where(:factory, :minimum, :result) do
+      forbidden = ApplicationSetting::FORBIDDEN_KEY_VALUE
+
+      [
+        [:rsa_key_2048,    0, true],
+        [:dsa_key_2048,    0, true],
+        [:ecdsa_key_256,   0, true],
+        [:ed25519_key_256, 0, true],
+
+        [:rsa_key_2048, 1024, true],
+        [:rsa_key_2048, 2048, true],
+        [:rsa_key_2048, 4096, false],
+
+        [:dsa_key_2048, 1024, true],
+        [:dsa_key_2048, 2048, true],
+        [:dsa_key_2048, 4096, false],
+
+        [:ecdsa_key_256, 256, true],
+        [:ecdsa_key_256, 384, false],
+
+        [:ed25519_key_256, 256, true],
+        [:ed25519_key_256, 384, false],
+
+        [:rsa_key_2048,    forbidden, false],
+        [:dsa_key_2048,    forbidden, false],
+        [:ecdsa_key_256,   forbidden, false],
+        [:ed25519_key_256, forbidden, false]
+      ]
+    end
+
+    with_them do
+      subject(:key) { build(factory) }
+
+      before do
+        stub_application_setting("#{key.public_key.type}_key_restriction" => minimum)
+      end
+
+      it { expect(key.valid?).to eq(result) }
+    end
+  end
+
   context 'callbacks' do
     it 'adds new key to authorized_file' do
       key = build(:personal_key, id: 7)
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 09f3b97ec58..f5d079c27c4 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -159,6 +159,7 @@ describe MergeRequest do
       before do
         subject.project.has_external_issue_tracker = true
         subject.project.save!
+        create(:jira_service, project: subject.project)
       end
 
       it 'does not cache issues from external trackers' do
@@ -166,6 +167,7 @@ describe MergeRequest do
         commit = double('commit1', safe_message: "Fixes #{issue.to_reference}")
         allow(subject).to receive(:commits).and_return([commit])
 
+        expect { subject.cache_merge_request_closes_issues!(subject.author) }.not_to raise_error
         expect { subject.cache_merge_request_closes_issues!(subject.author) }.not_to change(subject.merge_requests_closing_issues, :count)
       end
 
diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb
index b1743cd608e..537cdadd528 100644
--- a/spec/models/project_services/kubernetes_service_spec.rb
+++ b/spec/models/project_services/kubernetes_service_spec.rb
@@ -203,18 +203,13 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
 
   describe '#predefined_variables' do
     let(:kubeconfig) do
-      config =
-        YAML.load(File.read(expand_fixture_path('config/kubeconfig.yml')))
-
-      config.dig('users', 0, 'user')['token'] =
-        'token'
-
+      config_file = expand_fixture_path('config/kubeconfig.yml')
+      config = YAML.load(File.read(config_file))
+      config.dig('users', 0, 'user')['token'] = 'token'
+      config.dig('contexts', 0, 'context')['namespace'] = namespace
       config.dig('clusters', 0, 'cluster')['certificate-authority-data'] =
         Base64.encode64('CA PEM DATA')
 
-      config.dig('contexts', 0, 'context')['namespace'] =
-        namespace
-
       YAML.dump(config)
     end
 
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 3621023f4ca..be1ae295f75 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -181,7 +181,7 @@ describe Project do
       end
     end
 
-    context 'repository storages inclussion' do
+    context 'repository storages inclusion' do
       let(:project2) { build(:project, repository_storage: 'missing') }
 
       before do
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 34e1a955309..7065d467ec0 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -886,7 +886,7 @@ describe Repository, models: true do
     context 'when pre hooks were successful' do
       it 'runs without errors' do
         expect_any_instance_of(Gitlab::Git::HooksService).to receive(:execute)
-          .with(committer, repository, old_rev, blank_sha, 'refs/heads/feature')
+          .with(committer, repository.raw_repository, old_rev, blank_sha, 'refs/heads/feature')
 
         expect { repository.rm_branch(user, 'feature') }.not_to raise_error
       end
@@ -932,20 +932,20 @@ describe Repository, models: true do
         service = Gitlab::Git::HooksService.new
         expect(Gitlab::Git::HooksService).to receive(:new).and_return(service)
         expect(service).to receive(:execute)
-          .with(committer, target_repository, old_rev, new_rev, updating_ref)
+          .with(committer, target_repository.raw_repository, old_rev, new_rev, updating_ref)
           .and_yield(service).and_return(true)
       end
 
       it 'runs without errors' do
         expect do
-          GitOperationService.new(committer, repository).with_branch('feature') do
+          Gitlab::Git::OperationService.new(committer, repository.raw_repository).with_branch('feature') do
             new_rev
           end
         end.not_to raise_error
       end
 
       it 'ensures the autocrlf Git option is set to :input' do
-        service = GitOperationService.new(committer, repository)
+        service = Gitlab::Git::OperationService.new(committer, repository.raw_repository)
 
         expect(service).to receive(:update_autocrlf_option)
 
@@ -956,7 +956,7 @@ describe Repository, models: true do
         it 'updates the head' do
           expect(repository.find_branch('feature').dereferenced_target.id).to eq(old_rev)
 
-          GitOperationService.new(committer, repository).with_branch('feature') do
+          Gitlab::Git::OperationService.new(committer, repository.raw_repository).with_branch('feature') do
             new_rev
           end
 
@@ -971,13 +971,13 @@ describe Repository, models: true do
         let(:updating_ref) { 'refs/heads/master' }
 
         it 'fetch_ref and create the branch' do
-          expect(target_project.repository).to receive(:fetch_ref)
+          expect(target_project.repository.raw_repository).to receive(:fetch_ref)
             .and_call_original
 
-          GitOperationService.new(committer, target_repository)
+          Gitlab::Git::OperationService.new(committer, target_repository.raw_repository)
             .with_branch(
               'master',
-              start_project: project,
+              start_repository: project.repository.raw_repository,
               start_branch_name: 'feature') { new_rev }
 
           expect(target_repository.branch_names).to contain_exactly('master')
@@ -990,8 +990,8 @@ describe Repository, models: true do
         it 'does not fetch_ref and just pass the commit' do
           expect(target_repository).not_to receive(:fetch_ref)
 
-          GitOperationService.new(committer, target_repository)
-            .with_branch('feature', start_project: project) { new_rev }
+          Gitlab::Git::OperationService.new(committer, target_repository.raw_repository)
+            .with_branch('feature', start_repository: project.repository.raw_repository) { new_rev }
         end
       end
     end
@@ -1000,7 +1000,7 @@ describe Repository, models: true do
       let(:target_project) { create(:project, :empty_repo) }
 
       before do
-        expect(target_project.repository).to receive(:run_git)
+        expect(target_project.repository.raw_repository).to receive(:run_git)
       end
 
       it 'raises Rugged::ReferenceError' do
@@ -1009,9 +1009,9 @@ describe Repository, models: true do
         end
 
         expect do
-          GitOperationService.new(committer, target_project.repository)
+          Gitlab::Git::OperationService.new(committer, target_project.repository.raw_repository)
             .with_branch('feature',
-                         start_project: project,
+                         start_repository: project.repository.raw_repository,
                          &:itself)
         end.to raise_reference_error
       end
@@ -1031,7 +1031,7 @@ describe Repository, models: true do
         repository.add_branch(user, branch, old_rev)
 
         expect do
-          GitOperationService.new(committer, repository).with_branch(branch) do
+          Gitlab::Git::OperationService.new(committer, repository.raw_repository).with_branch(branch) do
             new_rev
           end
         end.not_to raise_error
@@ -1049,10 +1049,10 @@ describe Repository, models: true do
         # Updating 'master' to new_rev would lose the commits on 'master' that
         # are not contained in new_rev. This should not be allowed.
         expect do
-          GitOperationService.new(committer, repository).with_branch(branch) do
+          Gitlab::Git::OperationService.new(committer, repository.raw_repository).with_branch(branch) do
             new_rev
           end
-        end.to raise_error(Repository::CommitError)
+        end.to raise_error(Gitlab::Git::CommitError)
       end
     end
 
@@ -1061,7 +1061,7 @@ describe Repository, models: true do
         allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return([false, ''])
 
         expect do
-          GitOperationService.new(committer, repository).with_branch('feature') do
+          Gitlab::Git::OperationService.new(committer, repository.raw_repository).with_branch('feature') do
             new_rev
           end
         end.to raise_error(Gitlab::Git::HooksService::PreReceiveError)
@@ -1079,10 +1079,9 @@ describe Repository, models: true do
         expect(repository).not_to receive(:expire_emptiness_caches)
         expect(repository).to     receive(:expire_branches_cache)
 
-        GitOperationService.new(committer, repository)
-          .with_branch('new-feature') do
-            new_rev
-          end
+        repository.with_branch(user, 'new-feature') do
+          new_rev
+        end
       end
     end
 
@@ -1139,7 +1138,7 @@ describe Repository, models: true do
 
     describe 'when there are no branches' do
       before do
-        allow(repository).to receive(:branch_count).and_return(0)
+        allow(repository.raw_repository).to receive(:branch_count).and_return(0)
       end
 
       it { is_expected.to eq(false) }
@@ -1147,7 +1146,7 @@ describe Repository, models: true do
 
     describe 'when there are branches' do
       it 'returns true' do
-        expect(repository).to receive(:branch_count).and_return(3)
+        expect(repository.raw_repository).to receive(:branch_count).and_return(3)
 
         expect(subject).to eq(true)
       end
@@ -1161,7 +1160,7 @@ describe Repository, models: true do
       end
 
       it 'sets autocrlf to :input' do
-        GitOperationService.new(nil, repository).send(:update_autocrlf_option)
+        Gitlab::Git::OperationService.new(nil, repository.raw_repository).send(:update_autocrlf_option)
 
         expect(repository.raw_repository.autocrlf).to eq(:input)
       end
@@ -1176,7 +1175,7 @@ describe Repository, models: true do
         expect(repository.raw_repository).not_to receive(:autocrlf=)
           .with(:input)
 
-        GitOperationService.new(nil, repository).send(:update_autocrlf_option)
+        Gitlab::Git::OperationService.new(nil, repository.raw_repository).send(:update_autocrlf_option)
       end
     end
   end
@@ -1379,8 +1378,11 @@ describe Repository, models: true do
       it 'cherry-picks the changes' do
         expect(repository.blob_at_branch('improve/awesome', 'foo/bar/.gitkeep')).to be_nil
 
-        repository.cherry_pick(user, pickable_merge, 'improve/awesome')
+        cherry_pick_commit_sha = repository.cherry_pick(user, pickable_merge, 'improve/awesome')
+        cherry_pick_commit_message = project.commit(cherry_pick_commit_sha).message
+
         expect(repository.blob_at_branch('improve/awesome', 'foo/bar/.gitkeep')).not_to be_nil
+        expect(cherry_pick_commit_message).to include('cherry picked from')
       end
     end
   end
@@ -1759,15 +1761,15 @@ describe Repository, models: true do
 
   describe '#update_ref' do
     it 'can create a ref' do
-      GitOperationService.new(nil, repository).send(:update_ref, 'refs/heads/foobar', 'refs/heads/master', Gitlab::Git::BLANK_SHA)
+      Gitlab::Git::OperationService.new(nil, repository.raw_repository).send(:update_ref, 'refs/heads/foobar', 'refs/heads/master', Gitlab::Git::BLANK_SHA)
 
       expect(repository.find_branch('foobar')).not_to be_nil
     end
 
     it 'raises CommitError when the ref update fails' do
       expect do
-        GitOperationService.new(nil, repository).send(:update_ref, 'refs/heads/master', 'refs/heads/master', Gitlab::Git::BLANK_SHA)
-      end.to raise_error(Repository::CommitError)
+        Gitlab::Git::OperationService.new(nil, repository.raw_repository).send(:update_ref, 'refs/heads/master', 'refs/heads/master', Gitlab::Git::BLANK_SHA)
+      end.to raise_error(Gitlab::Git::CommitError)
     end
   end
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index b70ab5581ac..fd83a58ed9f 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2102,4 +2102,18 @@ describe User do
       end
     end
   end
+
+  describe '#verified_email?' do
+    it 'returns true when the email is the primary email' do
+      user = build :user, email: 'email@example.com'
+
+      expect(user.verified_email?('email@example.com')).to be true
+    end
+
+    it 'returns false when the email is not the primary email' do
+      user = build :user, email: 'email@example.com'
+
+      expect(user.verified_email?('other_email@example.com')).to be false
+    end
+  end
 end
diff --git a/spec/models/wiki_page_spec.rb b/spec/models/wiki_page_spec.rb
index 40a222be24d..9ef8d117123 100644
--- a/spec/models/wiki_page_spec.rb
+++ b/spec/models/wiki_page_spec.rb
@@ -281,6 +281,12 @@ describe WikiPage do
       @page.title = "Import-existing-repositories-into-GitLab"
       expect(@page.title).to eq("Import existing repositories into GitLab")
     end
+
+    it 'unescapes html' do
+      @page.title = 'foo &amp; bar'
+
+      expect(@page.title).to eq('foo & bar')
+    end
   end
 
   describe '#directory' do
diff --git a/spec/presenters/ci/build_presenter_spec.rb b/spec/presenters/ci/build_presenter_spec.rb
index a7a34ecac72..1a8001be6ab 100644
--- a/spec/presenters/ci/build_presenter_spec.rb
+++ b/spec/presenters/ci/build_presenter_spec.rb
@@ -100,4 +100,38 @@ describe Ci::BuildPresenter do
       end
     end
   end
+
+  describe '#trigger_variables' do
+    let(:build) { create(:ci_build, pipeline: pipeline, trigger_request: trigger_request) }
+    let(:trigger) { create(:ci_trigger, project: project) }
+    let(:trigger_request) { create(:ci_trigger_request, pipeline: pipeline, trigger: trigger) }
+
+    context 'when variable is stored in ci_pipeline_variables' do
+      let!(:pipeline_variable) { create(:ci_pipeline_variable, pipeline: pipeline) }
+
+      context 'when pipeline is triggered by trigger API' do
+        it 'returns variables' do
+          expect(presenter.trigger_variables).to eq([pipeline_variable.to_runner_variable])
+        end
+      end
+
+      context 'when pipeline is not triggered by trigger API' do
+        let(:build) { create(:ci_build, pipeline: pipeline) }
+
+        it 'does not return variables' do
+          expect(presenter.trigger_variables).to eq([])
+        end
+      end
+    end
+
+    context 'when variable is stored in ci_trigger_requests.variables' do
+      before do
+        trigger_request.update_attribute(:variables, { 'TRIGGER_KEY_1' => 'TRIGGER_VALUE_1' } )
+      end
+
+      it 'returns variables' do
+        expect(presenter.trigger_variables).to eq(trigger_request.user_variables)
+      end
+    end
+  end
 end
diff --git a/spec/requests/api/branches_spec.rb b/spec/requests/api/branches_spec.rb
index b1e011de604..cc794fad3a7 100644
--- a/spec/requests/api/branches_spec.rb
+++ b/spec/requests/api/branches_spec.rb
@@ -75,6 +75,22 @@ describe API::Branches do
     let(:route) { "/projects/#{project_id}/repository/branches/#{branch_name}" }
 
     shared_examples_for 'repository branch' do
+      context 'HEAD request' do
+        it 'returns 204 No Content' do
+          head api(route, user)
+
+          expect(response).to have_gitlab_http_status(204)
+          expect(response.body).to be_empty
+        end
+
+        it 'returns 404 Not Found' do
+          head api("/projects/#{project_id}/repository/branches/unknown", user)
+
+          expect(response).to have_gitlab_http_status(404)
+          expect(response.body).to be_empty
+        end
+      end
+
       it 'returns the repository branch' do
         get api(route, current_user)
 
diff --git a/spec/requests/api/commit_statuses_spec.rb b/spec/requests/api/commit_statuses_spec.rb
index 3c02e6302b4..e4c73583545 100644
--- a/spec/requests/api/commit_statuses_spec.rb
+++ b/spec/requests/api/commit_statuses_spec.rb
@@ -16,8 +16,8 @@ describe API::CommitStatuses do
     let(:get_url) { "/projects/#{project.id}/repository/commits/#{sha}/statuses" }
 
     context 'ci commit exists' do
-      let!(:master) { project.pipelines.create(source: :push, sha: commit.id, ref: 'master') }
-      let!(:develop) { project.pipelines.create(source: :push, sha: commit.id, ref: 'develop') }
+      let!(:master) { project.pipelines.create(source: :push, sha: commit.id, ref: 'master', protected: false) }
+      let!(:develop) { project.pipelines.create(source: :push, sha: commit.id, ref: 'develop', protected: false) }
 
       context "reporter user" do
         let(:statuses_id) { json_response.map { |status| status['id'] } }
@@ -142,6 +142,9 @@ describe API::CommitStatuses do
               expect(json_response['ref']).not_to be_empty
               expect(json_response['target_url']).to be_nil
               expect(json_response['description']).to be_nil
+              if status == 'failed'
+                expect(CommitStatus.find(json_response['id'])).to be_api_failure
+              end
             end
           end
         end
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index dafe3f466a2..edbfaf510c5 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -565,7 +565,7 @@ describe API::Commits do
       end
 
       context 'when the ref has a pipeline' do
-        let!(:pipeline) { project.pipelines.create(source: :push, ref: 'master', sha: commit.sha) }
+        let!(:pipeline) { project.pipelines.create(source: :push, ref: 'master', sha: commit.sha, protected: false) }
 
         it 'includes a "created" status' do
           get api(route, current_user)
@@ -804,7 +804,7 @@ describe API::Commits do
           expect(response).to have_gitlab_http_status(201)
           expect(response).to match_response_schema('public_api/v4/commit/basic')
           expect(json_response['title']).to eq(commit.title)
-          expect(json_response['message']).to eq(commit.message)
+          expect(json_response['message']).to eq(commit.cherry_pick_message(user))
           expect(json_response['author_name']).to eq(commit.author_name)
           expect(json_response['committer_name']).to eq(user.name)
         end
diff --git a/spec/requests/api/files_spec.rb b/spec/requests/api/files_spec.rb
index 971eaf837cb..114019441a3 100644
--- a/spec/requests/api/files_spec.rb
+++ b/spec/requests/api/files_spec.rb
@@ -224,7 +224,7 @@ describe API::Files do
 
     it "returns a 400 if editor fails to create file" do
       allow_any_instance_of(Repository).to receive(:create_file)
-        .and_raise(Repository::CommitError, 'Cannot create file')
+        .and_raise(Gitlab::Git::CommitError, 'Cannot create file')
 
       post api(route("any%2Etxt"), user), valid_params
 
@@ -339,7 +339,7 @@ describe API::Files do
     end
 
     it "returns a 400 if fails to delete file" do
-      allow_any_instance_of(Repository).to receive(:delete_file).and_raise(Repository::CommitError, 'Cannot delete file')
+      allow_any_instance_of(Repository).to receive(:delete_file).and_raise(Gitlab::Git::CommitError, 'Cannot delete file')
 
       delete api(route(file_path), user), valid_params
 
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb
index e9c30dba8d4..a6c804fb2b3 100644
--- a/spec/requests/api/internal_spec.rb
+++ b/spec/requests/api/internal_spec.rb
@@ -660,6 +660,95 @@ describe API::Internal do
   #   end
   # end
 
+  describe 'POST /internal/post_receive' do
+    let(:gl_repository) { "project-#{project.id}" }
+    let(:identifier) { 'key-123' }
+    let(:reference_counter) { double('ReferenceCounter') }
+
+    let(:valid_params) do
+      {
+        gl_repository: gl_repository,
+        secret_token: secret_token,
+        identifier: identifier,
+        changes: changes
+      }
+    end
+
+    let(:changes) do
+      "#{Gitlab::Git::BLANK_SHA} 570e7b2abdd848b95f2f578043fc23bd6f6fd24d refs/heads/new_branch"
+    end
+
+    before do
+      project.team << [user, :developer]
+    end
+
+    it 'enqueues a PostReceive worker job' do
+      expect(PostReceive).to receive(:perform_async)
+        .with(gl_repository, identifier, changes)
+
+      post api("/internal/post_receive"), valid_params
+    end
+
+    it 'decreases the reference counter and returns the result' do
+      expect(Gitlab::ReferenceCounter).to receive(:new).with(gl_repository)
+        .and_return(reference_counter)
+      expect(reference_counter).to receive(:decrease).and_return(true)
+
+      post api("/internal/post_receive"), valid_params
+
+      expect(json_response['reference_counter_decreased']).to be(true)
+    end
+
+    it 'returns link to create new merge request' do
+      post api("/internal/post_receive"), valid_params
+
+      expect(json_response['merge_request_urls']).to match [{
+        "branch_name" => "new_branch",
+        "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch",
+        "new_merge_request" => true
+      }]
+    end
+
+    it 'returns empty array if printing_merge_request_link_enabled is false' do
+      project.update!(printing_merge_request_link_enabled: false)
+
+      post api("/internal/post_receive"), valid_params
+
+      expect(json_response['merge_request_urls']).to eq([])
+    end
+
+    context 'broadcast message exists' do
+      let!(:broadcast_message) { create(:broadcast_message, starts_at: 1.day.ago, ends_at: 1.day.from_now ) }
+
+      it 'returns one broadcast message'  do
+        post api("/internal/post_receive"), valid_params
+
+        expect(response).to have_http_status(200)
+        expect(json_response['broadcast_message']).to eq(broadcast_message.message)
+      end
+    end
+
+    context 'broadcast message does not exist' do
+      it 'returns empty string'  do
+        post api("/internal/post_receive"), valid_params
+
+        expect(response).to have_http_status(200)
+        expect(json_response['broadcast_message']).to eq(nil)
+      end
+    end
+
+    context 'nil broadcast message' do
+      it 'returns empty string' do
+        allow(BroadcastMessage).to receive(:current).and_return(nil)
+
+        post api("/internal/post_receive"), valid_params
+
+        expect(response).to have_http_status(200)
+        expect(json_response['broadcast_message']).to eq(nil)
+      end
+    end
+  end
+
   def project_with_repo_path(path)
     double().tap do |fake_project|
       allow(fake_project).to receive_message_chain('repository.path_to_repo' => path)
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index dee75c96b86..1583d1c2435 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -138,6 +138,16 @@ describe API::Issues, :mailer do
         expect(first_issue['id']).to eq(issue2.id)
       end
 
+      it 'returns issues reacted by the authenticated user by the given emoji' do
+        issue2 = create(:issue, project: project, author: user, assignees: [user])
+        award_emoji = create(:award_emoji, awardable: issue2, user: user2, name: 'star')
+
+        get api('/issues', user2), my_reaction_emoji: award_emoji.name, scope: 'all'
+
+        expect_paginated_array_response(size: 1)
+        expect(first_issue['id']).to eq(issue2.id)
+      end
+
       it 'returns issues matching given search string for title' do
         get api("/issues", user), search: issue.title
 
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 9027090aabd..21d2c9644fb 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -117,6 +117,18 @@ describe API::MergeRequests do
         expect(json_response.length).to eq(1)
         expect(json_response.first['id']).to eq(merge_request3.id)
       end
+
+      it 'returns merge requests reacted by the authenticated user by the given emoji' do
+        merge_request3 = create(:merge_request, :simple, author: user, assignee: user, source_project: project2, target_project: project2, source_branch: 'other-branch')
+        award_emoji = create(:award_emoji, awardable: merge_request3, user: user2, name: 'star')
+
+        get api('/merge_requests', user2), my_reaction_emoji: award_emoji.name, scope: 'all'
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(json_response).to be_an Array
+        expect(json_response.length).to eq(1)
+        expect(json_response.first['id']).to eq(merge_request3.id)
+      end
     end
   end
 
diff --git a/spec/requests/api/pipeline_schedules_spec.rb b/spec/requests/api/pipeline_schedules_spec.rb
index b6a5a7ffbb5..f650df57383 100644
--- a/spec/requests/api/pipeline_schedules_spec.rb
+++ b/spec/requests/api/pipeline_schedules_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe API::PipelineSchedules do
   set(:developer) { create(:user) }
   set(:user) { create(:user) }
-  set(:project) { create(:project, :repository) }
+  set(:project) { create(:project, :repository, public_builds: false) }
 
   before do
     project.add_developer(developer)
@@ -110,6 +110,18 @@ describe API::PipelineSchedules do
       end
     end
 
+    context 'authenticated user with insufficient permissions' do
+      before do
+        project.add_guest(user)
+      end
+
+      it 'does not return pipeline_schedules list' do
+        get api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}", user)
+
+        expect(response).to have_http_status(:not_found)
+      end
+    end
+
     context 'unauthenticated user' do
       it 'does not return pipeline_schedules list' do
         get api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}")
@@ -299,4 +311,150 @@ describe API::PipelineSchedules do
       end
     end
   end
+
+  describe 'POST /projects/:id/pipeline_schedules/:pipeline_schedule_id/variables' do
+    let(:params) { attributes_for(:ci_pipeline_schedule_variable) }
+
+    set(:pipeline_schedule) do
+      create(:ci_pipeline_schedule, project: project, owner: developer)
+    end
+
+    context 'authenticated user with valid permissions' do
+      context 'with required parameters' do
+        it 'creates pipeline_schedule_variable' do
+          expect do
+            post api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables", developer),
+              params
+          end.to change { pipeline_schedule.variables.count }.by(1)
+
+          expect(response).to have_http_status(:created)
+          expect(response).to match_response_schema('pipeline_schedule_variable')
+          expect(json_response['key']).to eq(params[:key])
+          expect(json_response['value']).to eq(params[:value])
+        end
+      end
+
+      context 'without required parameters' do
+        it 'does not create pipeline_schedule_variable' do
+          post api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables", developer)
+
+          expect(response).to have_http_status(:bad_request)
+        end
+      end
+
+      context 'when key has validation error' do
+        it 'does not create pipeline_schedule_variable' do
+          post api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables", developer),
+            params.merge('key' => '!?!?')
+
+          expect(response).to have_http_status(:bad_request)
+          expect(json_response['message']).to have_key('key')
+        end
+      end
+    end
+
+    context 'authenticated user with invalid permissions' do
+      it 'does not create pipeline_schedule_variable' do
+        post api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables", user), params
+
+        expect(response).to have_http_status(:not_found)
+      end
+    end
+
+    context 'unauthenticated user' do
+      it 'does not create pipeline_schedule_variable' do
+        post api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables"), params
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+  end
+
+  describe 'PUT /projects/:id/pipeline_schedules/:pipeline_schedule_id/variables/:key' do
+    set(:pipeline_schedule) do
+      create(:ci_pipeline_schedule, project: project, owner: developer)
+    end
+
+    let(:pipeline_schedule_variable) do
+      create(:ci_pipeline_schedule_variable, pipeline_schedule: pipeline_schedule)
+    end
+
+    context 'authenticated user with valid permissions' do
+      it 'updates pipeline_schedule_variable' do
+        put api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables/#{pipeline_schedule_variable.key}", developer),
+          value: 'updated_value'
+
+        expect(response).to have_http_status(:ok)
+        expect(response).to match_response_schema('pipeline_schedule_variable')
+        expect(json_response['value']).to eq('updated_value')
+      end
+    end
+
+    context 'authenticated user with invalid permissions' do
+      it 'does not update pipeline_schedule_variable' do
+        put api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables/#{pipeline_schedule_variable.key}", user)
+
+        expect(response).to have_http_status(:not_found)
+      end
+    end
+
+    context 'unauthenticated user' do
+      it 'does not update pipeline_schedule_variable' do
+        put api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables/#{pipeline_schedule_variable.key}")
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+  end
+
+  describe 'DELETE /projects/:id/pipeline_schedules/:pipeline_schedule_id/variables/:key' do
+    let(:master) { create(:user) }
+
+    set(:pipeline_schedule) do
+      create(:ci_pipeline_schedule, project: project, owner: developer)
+    end
+
+    let!(:pipeline_schedule_variable) do
+      create(:ci_pipeline_schedule_variable, pipeline_schedule: pipeline_schedule)
+    end
+
+    before do
+      project.add_master(master)
+    end
+
+    context 'authenticated user with valid permissions' do
+      it 'deletes pipeline_schedule_variable' do
+        expect do
+          delete api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables/#{pipeline_schedule_variable.key}", master)
+        end.to change { Ci::PipelineScheduleVariable.count }.by(-1)
+
+        expect(response).to have_http_status(:accepted)
+        expect(response).to match_response_schema('pipeline_schedule_variable')
+      end
+
+      it 'responds with 404 Not Found if requesting non-existing pipeline_schedule_variable' do
+        delete api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables/____", master)
+
+        expect(response).to have_http_status(:not_found)
+      end
+    end
+
+    context 'authenticated user with invalid permissions' do
+      let!(:pipeline_schedule) { create(:ci_pipeline_schedule, project: project, owner: master) }
+
+      it 'does not delete pipeline_schedule_variable' do
+        delete api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables/#{pipeline_schedule_variable.key}", developer)
+
+        expect(response).to have_http_status(:forbidden)
+      end
+    end
+
+    context 'unauthenticated user' do
+      it 'does not delete pipeline_schedule_variable' do
+        delete api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables/#{pipeline_schedule_variable.key}")
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+  end
 end
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb
index 993164aa8fe..12720355a6d 100644
--- a/spec/requests/api/runner_spec.rb
+++ b/spec/requests/api/runner_spec.rb
@@ -557,17 +557,36 @@ describe API::Runner do
                { 'key' => 'TRIGGER_KEY_1', 'value' => 'TRIGGER_VALUE_1', 'public' => false }]
             end
 
+            let(:trigger) { create(:ci_trigger, project: project) }
+            let!(:trigger_request) { create(:ci_trigger_request, pipeline: pipeline, builds: [job], trigger: trigger) }
+
             before do
-              trigger = create(:ci_trigger, project: project)
-              create(:ci_trigger_request_with_variables, pipeline: pipeline, builds: [job], trigger: trigger)
               project.variables << Ci::Variable.new(key: 'SECRET_KEY', value: 'secret_value')
             end
 
-            it 'returns variables for triggers' do
-              request_job
+            shared_examples 'expected variables behavior' do
+              it 'returns variables for triggers' do
+                request_job
 
-              expect(response).to have_http_status(201)
-              expect(json_response['variables']).to include(*expected_variables)
+                expect(response).to have_http_status(201)
+                expect(json_response['variables']).to include(*expected_variables)
+              end
+            end
+
+            context 'when variables are stored in trigger_request' do
+              before do
+                trigger_request.update_attribute(:variables, { TRIGGER_KEY_1: 'TRIGGER_VALUE_1' } )
+              end
+
+              it_behaves_like 'expected variables behavior'
+            end
+
+            context 'when variables are stored in pipeline_variables' do
+              before do
+                create(:ci_pipeline_variable, pipeline: pipeline, key: :TRIGGER_KEY_1, value: 'TRIGGER_VALUE_1')
+              end
+
+              it_behaves_like 'expected variables behavior'
             end
           end
 
@@ -626,13 +645,34 @@ describe API::Runner do
         it 'mark job as succeeded' do
           update_job(state: 'success')
 
-          expect(job.reload.status).to eq 'success'
+          job.reload
+          expect(job).to be_success
         end
 
         it 'mark job as failed' do
           update_job(state: 'failed')
 
-          expect(job.reload.status).to eq 'failed'
+          job.reload
+          expect(job).to be_failed
+          expect(job).to be_unknown_failure
+        end
+
+        context 'when failure_reason is script_failure' do
+          before do
+            update_job(state: 'failed', failure_reason: 'script_failure')
+            job.reload
+          end
+
+          it { expect(job).to be_script_failure }
+        end
+
+        context 'when failure_reason is runner_system_failure' do
+          before do
+            update_job(state: 'failed', failure_reason: 'runner_system_failure')
+            job.reload
+          end
+
+          it { expect(job).to be_runner_system_failure }
         end
       end
 
diff --git a/spec/requests/api/runners_spec.rb b/spec/requests/api/runners_spec.rb
index 244895a417e..67907579225 100644
--- a/spec/requests/api/runners_spec.rb
+++ b/spec/requests/api/runners_spec.rb
@@ -191,7 +191,8 @@ describe API::Runners do
                                                  active: !active,
                                                  tag_list: ['ruby2.1', 'pgsql', 'mysql'],
                                                  run_untagged: 'false',
-                                                 locked: 'true')
+                                                 locked: 'true',
+                                                 access_level: 'ref_protected')
           shared_runner.reload
 
           expect(response).to have_http_status(200)
@@ -200,6 +201,7 @@ describe API::Runners do
           expect(shared_runner.tag_list).to include('ruby2.1', 'pgsql', 'mysql')
           expect(shared_runner.run_untagged?).to be(false)
           expect(shared_runner.locked?).to be(true)
+          expect(shared_runner.ref_protected?).to be_truthy
           expect(shared_runner.ensure_runner_queue_value)
             .not_to eq(runner_queue_value)
         end
diff --git a/spec/requests/api/settings_spec.rb b/spec/requests/api/settings_spec.rb
index 737c028ad53..0b9a4b5c3db 100644
--- a/spec/requests/api/settings_spec.rb
+++ b/spec/requests/api/settings_spec.rb
@@ -19,6 +19,10 @@ describe API::Settings, 'Settings' do
       expect(json_response['default_project_visibility']).to be_a String
       expect(json_response['default_snippet_visibility']).to be_a String
       expect(json_response['default_group_visibility']).to be_a String
+      expect(json_response['rsa_key_restriction']).to eq(0)
+      expect(json_response['dsa_key_restriction']).to eq(0)
+      expect(json_response['ecdsa_key_restriction']).to eq(0)
+      expect(json_response['ed25519_key_restriction']).to eq(0)
     end
   end
 
@@ -44,7 +48,11 @@ describe API::Settings, 'Settings' do
           help_page_text: 'custom help text',
           help_page_hide_commercial_content: true,
           help_page_support_url: 'http://example.com/help',
-          project_export_enabled: false
+          project_export_enabled: false,
+          rsa_key_restriction: ApplicationSetting::FORBIDDEN_KEY_VALUE,
+          dsa_key_restriction: 2048,
+          ecdsa_key_restriction: 384,
+          ed25519_key_restriction: 256
 
         expect(response).to have_http_status(200)
         expect(json_response['default_projects_limit']).to eq(3)
@@ -61,6 +69,10 @@ describe API::Settings, 'Settings' do
         expect(json_response['help_page_hide_commercial_content']).to be_truthy
         expect(json_response['help_page_support_url']).to eq('http://example.com/help')
         expect(json_response['project_export_enabled']).to be_falsey
+        expect(json_response['rsa_key_restriction']).to eq(ApplicationSetting::FORBIDDEN_KEY_VALUE)
+        expect(json_response['dsa_key_restriction']).to eq(2048)
+        expect(json_response['ecdsa_key_restriction']).to eq(384)
+        expect(json_response['ed25519_key_restriction']).to eq(256)
       end
     end
 
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index 5fef4437997..37cb95a16e3 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -4,6 +4,7 @@ describe API::Users do
   let(:user)  { create(:user) }
   let(:admin) { create(:admin) }
   let(:key) { create(:key, user: user) }
+  let(:gpg_key) { create(:gpg_key, user: user) }
   let(:email) { create(:email, user: user) }
   let(:omniauth_user) { create(:omniauth_user) }
   let(:ldap_user) { create(:omniauth_user, provider: 'ldapmain') }
@@ -753,6 +754,164 @@ describe API::Users do
     end
   end
 
+  describe 'POST /users/:id/keys' do
+    before do
+      admin
+    end
+
+    it 'does not create invalid GPG key' do
+      post api("/users/#{user.id}/gpg_keys", admin)
+
+      expect(response).to have_http_status(400)
+      expect(json_response['error']).to eq('key is missing')
+    end
+
+    it 'creates GPG key' do
+      key_attrs = attributes_for :gpg_key
+      expect do
+        post api("/users/#{user.id}/gpg_keys", admin), key_attrs
+
+        expect(response).to have_http_status(201)
+      end.to change { user.gpg_keys.count }.by(1)
+    end
+
+    it 'returns 400 for invalid ID' do
+      post api('/users/999999/gpg_keys', admin)
+
+      expect(response).to have_http_status(400)
+    end
+  end
+
+  describe 'GET /user/:id/gpg_keys' do
+    before do
+      admin
+    end
+
+    context 'when unauthenticated' do
+      it 'returns authentication error' do
+        get api("/users/#{user.id}/gpg_keys")
+
+        expect(response).to have_http_status(401)
+      end
+    end
+
+    context 'when authenticated' do
+      it 'returns 404 for non-existing user' do
+        get api('/users/999999/gpg_keys', admin)
+
+        expect(response).to have_http_status(404)
+        expect(json_response['message']).to eq('404 User Not Found')
+      end
+
+      it 'returns 404 error if key not foud' do
+        delete api("/users/#{user.id}/gpg_keys/42", admin)
+
+        expect(response).to have_http_status(404)
+        expect(json_response['message']).to eq('404 GPG Key Not Found')
+      end
+
+      it 'returns array of GPG keys' do
+        user.gpg_keys << gpg_key
+        user.save
+
+        get api("/users/#{user.id}/gpg_keys", admin)
+
+        expect(response).to have_http_status(200)
+        expect(response).to include_pagination_headers
+        expect(json_response).to be_an Array
+        expect(json_response.first['key']).to eq(gpg_key.key)
+      end
+    end
+  end
+
+  describe 'DELETE /user/:id/gpg_keys/:key_id' do
+    before do
+      admin
+    end
+
+    context 'when unauthenticated' do
+      it 'returns authentication error' do
+        delete api("/users/#{user.id}/keys/42")
+
+        expect(response).to have_http_status(401)
+      end
+    end
+
+    context 'when authenticated' do
+      it 'deletes existing key' do
+        user.gpg_keys << gpg_key
+        user.save
+
+        expect do
+          delete api("/users/#{user.id}/gpg_keys/#{gpg_key.id}", admin)
+
+          expect(response).to have_http_status(204)
+        end.to change { user.gpg_keys.count }.by(-1)
+      end
+
+      it 'returns 404 error if user not found' do
+        user.keys << key
+        user.save
+
+        delete api("/users/999999/gpg_keys/#{gpg_key.id}", admin)
+
+        expect(response).to have_http_status(404)
+        expect(json_response['message']).to eq('404 User Not Found')
+      end
+
+      it 'returns 404 error if key not foud' do
+        delete api("/users/#{user.id}/gpg_keys/42", admin)
+
+        expect(response).to have_http_status(404)
+        expect(json_response['message']).to eq('404 GPG Key Not Found')
+      end
+    end
+  end
+
+  describe 'POST /user/:id/gpg_keys/:key_id/revoke' do
+    before do
+      admin
+    end
+
+    context 'when unauthenticated' do
+      it 'returns authentication error' do
+        post api("/users/#{user.id}/gpg_keys/42/revoke")
+
+        expect(response).to have_http_status(401)
+      end
+    end
+
+    context 'when authenticated' do
+      it 'revokes existing key' do
+        user.gpg_keys << gpg_key
+        user.save
+
+        expect do
+          post api("/users/#{user.id}/gpg_keys/#{gpg_key.id}/revoke", admin)
+
+          expect(response).to have_http_status(:accepted)
+        end.to change { user.gpg_keys.count }.by(-1)
+      end
+
+      it 'returns 404 error if user not found' do
+        user.gpg_keys << gpg_key
+        user.save
+
+        post api("/users/999999/gpg_keys/#{gpg_key.id}/revoke", admin)
+
+        expect(response).to have_http_status(404)
+        expect(json_response['message']).to eq('404 User Not Found')
+      end
+
+      it 'returns 404 error if key not foud' do
+        post api("/users/#{user.id}/gpg_keys/42/revoke", admin)
+
+        expect(response).to have_http_status(404)
+        expect(json_response['message']).to eq('404 GPG Key Not Found')
+      end
+    end
+  end
+
   describe "POST /users/:id/emails" do
     before do
       admin
@@ -1153,6 +1312,173 @@ describe API::Users do
     end
   end
 
+  describe 'GET /user/gpg_keys' do
+    context 'when unauthenticated' do
+      it 'returns authentication error' do
+        get api('/user/gpg_keys')
+
+        expect(response).to have_http_status(401)
+      end
+    end
+
+    context 'when authenticated' do
+      it 'returns array of GPG keys' do
+        user.gpg_keys << gpg_key
+        user.save
+
+        get api('/user/gpg_keys', user)
+
+        expect(response).to have_http_status(200)
+        expect(response).to include_pagination_headers
+        expect(json_response).to be_an Array
+        expect(json_response.first['key']).to eq(gpg_key.key)
+      end
+
+      context 'scopes' do
+        let(:path) { '/user/gpg_keys' }
+        let(:api_call) { method(:api) }
+
+        include_examples 'allows the "read_user" scope'
+      end
+    end
+  end
+
+  describe 'GET /user/gpg_keys/:key_id' do
+    it 'returns a single key' do
+      user.gpg_keys << gpg_key
+      user.save
+
+      get api("/user/gpg_keys/#{gpg_key.id}", user)
+
+      expect(response).to have_http_status(200)
+      expect(json_response['key']).to eq(gpg_key.key)
+    end
+
+    it 'returns 404 Not Found within invalid ID' do
+      get api('/user/gpg_keys/42', user)
+
+      expect(response).to have_http_status(404)
+      expect(json_response['message']).to eq('404 GPG Key Not Found')
+    end
+
+    it "returns 404 error if admin accesses user's GPG key" do
+      user.gpg_keys << gpg_key
+      user.save
+
+      get api("/user/gpg_keys/#{gpg_key.id}", admin)
+
+      expect(response).to have_http_status(404)
+      expect(json_response['message']).to eq('404 GPG Key Not Found')
+    end
+
+    it 'returns 404 for invalid ID' do
+      get api('/users/gpg_keys/ASDF', admin)
+
+      expect(response).to have_http_status(404)
+    end
+
+    context 'scopes' do
+      let(:path) { "/user/gpg_keys/#{gpg_key.id}" }
+      let(:api_call) { method(:api) }
+
+      include_examples 'allows the "read_user" scope'
+    end
+  end
+
+  describe 'POST /user/gpg_keys' do
+    it 'creates a GPG key' do
+      key_attrs = attributes_for :gpg_key
+      expect do
+        post api('/user/gpg_keys', user), key_attrs
+
+        expect(response).to have_http_status(201)
+      end.to change { user.gpg_keys.count }.by(1)
+    end
+
+    it 'returns a 401 error if unauthorized' do
+      post api('/user/gpg_keys'), key: 'some key'
+
+      expect(response).to have_http_status(401)
+    end
+
+    it 'does not create GPG key without key' do
+      post api('/user/gpg_keys', user)
+
+      expect(response).to have_http_status(400)
+      expect(json_response['error']).to eq('key is missing')
+    end
+  end
+
+  describe 'POST /user/gpg_keys/:key_id/revoke' do
+    it 'revokes existing GPG key' do
+      user.gpg_keys << gpg_key
+      user.save
+
+      expect do
+        post api("/user/gpg_keys/#{gpg_key.id}/revoke", user)
+
+        expect(response).to have_http_status(:accepted)
+      end.to change { user.gpg_keys.count}.by(-1)
+    end
+
+    it 'returns 404 if key ID not found' do
+      post api('/user/gpg_keys/42/revoke', user)
+
+      expect(response).to have_http_status(404)
+      expect(json_response['message']).to eq('404 GPG Key Not Found')
+    end
+
+    it 'returns 401 error if unauthorized' do
+      user.gpg_keys << gpg_key
+      user.save
+
+      post api("/user/gpg_keys/#{gpg_key.id}/revoke")
+
+      expect(response).to have_http_status(401)
+    end
+
+    it 'returns a 404 for invalid ID' do
+      post api('/users/gpg_keys/ASDF/revoke', admin)
+
+      expect(response).to have_http_status(404)
+    end
+  end
+
+  describe 'DELETE /user/gpg_keys/:key_id' do
+    it 'deletes existing GPG key' do
+      user.gpg_keys << gpg_key
+      user.save
+
+      expect do
+        delete api("/user/gpg_keys/#{gpg_key.id}", user)
+
+        expect(response).to have_http_status(204)
+      end.to change { user.gpg_keys.count}.by(-1)
+    end
+
+    it 'returns 404 if key ID not found' do
+      delete api('/user/gpg_keys/42', user)
+
+      expect(response).to have_http_status(404)
+      expect(json_response['message']).to eq('404 GPG Key Not Found')
+    end
+
+    it 'returns 401 error if unauthorized' do
+      user.gpg_keys << gpg_key
+      user.save
+
+      delete api("/user/gpg_keys/#{gpg_key.id}")
+
+      expect(response).to have_http_status(401)
+    end
+
+    it 'returns a 404 for invalid ID' do
+      delete api('/users/gpg_keys/ASDF', admin)
+
+      expect(response).to have_http_status(404)
+    end
+  end
+
   describe "GET /user/emails" do
     context "when unauthenticated" do
       it "returns authentication error" do
diff --git a/spec/requests/api/v3/commits_spec.rb b/spec/requests/api/v3/commits_spec.rb
index 4a4a5dc5c7c..6d0ca33a6fa 100644
--- a/spec/requests/api/v3/commits_spec.rb
+++ b/spec/requests/api/v3/commits_spec.rb
@@ -386,7 +386,7 @@ describe API::V3::Commits do
       end
 
       it "returns status for CI" do
-        pipeline = project.pipelines.create(source: :push, ref: 'master', sha: project.repository.commit.sha)
+        pipeline = project.pipelines.create(source: :push, ref: 'master', sha: project.repository.commit.sha, protected: false)
         pipeline.update(status: 'success')
 
         get v3_api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
@@ -396,7 +396,7 @@ describe API::V3::Commits do
       end
 
       it "returns status for CI when pipeline is created" do
-        project.pipelines.create(source: :push, ref: 'master', sha: project.repository.commit.sha)
+        project.pipelines.create(source: :push, ref: 'master', sha: project.repository.commit.sha, protected: false)
 
         get v3_api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
 
@@ -474,7 +474,7 @@ describe API::V3::Commits do
 
         expect(response).to have_http_status(201)
         expect(json_response['title']).to eq(master_pickable_commit.title)
-        expect(json_response['message']).to eq(master_pickable_commit.message)
+        expect(json_response['message']).to eq(master_pickable_commit.cherry_pick_message(user))
         expect(json_response['author_name']).to eq(master_pickable_commit.author_name)
         expect(json_response['committer_name']).to eq(user.name)
       end
diff --git a/spec/requests/api/v3/files_spec.rb b/spec/requests/api/v3/files_spec.rb
index 4ffa5d1784e..dc7f0eefd16 100644
--- a/spec/requests/api/v3/files_spec.rb
+++ b/spec/requests/api/v3/files_spec.rb
@@ -127,7 +127,7 @@ describe API::V3::Files do
 
     it "returns a 400 if editor fails to create file" do
       allow_any_instance_of(Repository).to receive(:create_file)
-        .and_raise(Repository::CommitError, 'Cannot create file')
+        .and_raise(Gitlab::Git::CommitError, 'Cannot create file')
 
       post v3_api("/projects/#{project.id}/repository/files", user), valid_params
 
@@ -228,7 +228,7 @@ describe API::V3::Files do
     end
 
     it "returns a 400 if fails to delete file" do
-      allow_any_instance_of(Repository).to receive(:delete_file).and_raise(Repository::CommitError, 'Cannot delete file')
+      allow_any_instance_of(Repository).to receive(:delete_file).and_raise(Gitlab::Git::CommitError, 'Cannot delete file')
 
       delete v3_api("/projects/#{project.id}/repository/files", user), valid_params
 
diff --git a/spec/requests/api/v3/triggers_spec.rb b/spec/requests/api/v3/triggers_spec.rb
index d4648136841..7ccf387f2dc 100644
--- a/spec/requests/api/v3/triggers_spec.rb
+++ b/spec/requests/api/v3/triggers_spec.rb
@@ -37,7 +37,7 @@ describe API::V3::Triggers do
 
       it 'returns unauthorized if token is for different project' do
         post v3_api("/projects/#{project2.id}/trigger/builds"), options.merge(ref: 'master')
-        expect(response).to have_http_status(401)
+        expect(response).to have_http_status(404)
       end
     end
 
@@ -80,7 +80,8 @@ describe API::V3::Triggers do
           post v3_api("/projects/#{project.id}/trigger/builds"), options.merge(variables: variables, ref: 'master')
           expect(response).to have_http_status(201)
           pipeline.builds.reload
-          expect(pipeline.builds.first.trigger_request.variables).to eq(variables)
+          expect(pipeline.variables.map { |v| { v.key => v.value } }.first).to eq(variables)
+          expect(json_response['variables']).to eq(variables)
         end
       end
     end
diff --git a/spec/serializers/note_entity_spec.rb b/spec/serializers/note_entity_spec.rb
new file mode 100644
index 00000000000..3459cc72063
--- /dev/null
+++ b/spec/serializers/note_entity_spec.rb
@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe NoteEntity do
+  include Gitlab::Routing
+
+  let(:request) { double('request', current_user: user, noteable: note.noteable) }
+
+  let(:entity) { described_class.new(note, request: request) }
+  let(:note) { create(:note) }
+  let(:user) { create(:user) }
+  subject { entity.as_json }
+
+  context 'basic note' do
+    it 'exposes correct elements' do
+      expect(subject).to include(:type, :author, :human_access, :note, :note_html, :current_user,
+        :discussion_id, :emoji_awardable, :award_emoji, :toggle_award_path, :report_abuse_path, :path, :attachment)
+    end
+
+    it 'does not expose elements for specific notes cases' do
+      expect(subject).not_to include(:last_edited_by, :last_edited_at, :system_note_icon_name)
+    end
+
+    it 'exposes author correctly' do
+      expect(subject[:author]).to include(:id, :name, :username, :state, :avatar_url, :path)
+    end
+
+    it 'does not expose web_url for author' do
+      expect(subject[:author]).not_to include(:web_url)
+    end
+  end
+
+  context 'when note was edited' do
+    before do
+      note.update(updated_at: 1.minute.from_now, updated_by: user)
+    end
+
+    it 'exposes last_edited_at and last_edited_by elements' do
+      expect(subject).to include(:last_edited_at, :last_edited_by)
+    end
+  end
+
+  context 'when note is a system note' do
+    before do
+      note.update(system: true)
+    end
+
+    it 'exposes system_note_icon_name element' do
+      expect(subject).to include(:system_note_icon_name)
+    end
+  end
+end
diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb
index 4ba3dada37c..49d7c663128 100644
--- a/spec/services/ci/create_pipeline_service_spec.rb
+++ b/spec/services/ci/create_pipeline_service_spec.rb
@@ -391,12 +391,15 @@ describe Ci::CreatePipelineService do
       end
 
       context 'when user is master' do
+        let(:pipeline) { execute_service }
+
         before do
           project.add_master(user)
         end
 
-        it 'creates a pipeline' do
-          expect(execute_service).to be_persisted
+        it 'creates a protected pipeline' do
+          expect(pipeline).to be_persisted
+          expect(pipeline).to be_protected
           expect(Ci::Pipeline.count).to eq(1)
         end
       end
@@ -468,10 +471,11 @@ describe Ci::CreatePipelineService do
         let(:user) {}
         let(:trigger) { create(:ci_trigger, owner: nil) }
         let(:trigger_request) { create(:ci_trigger_request, trigger: trigger) }
+        let(:pipeline) { execute_service(trigger_request: trigger_request) }
 
-        it 'creates a pipeline' do
-          expect(execute_service(trigger_request: trigger_request))
-            .to be_persisted
+        it 'creates an unprotected pipeline' do
+          expect(pipeline).to be_persisted
+          expect(pipeline).not_to be_protected
           expect(Ci::Pipeline.count).to eq(1)
         end
       end
diff --git a/spec/services/ci/create_trigger_request_service_spec.rb b/spec/services/ci/create_trigger_request_service_spec.rb
deleted file mode 100644
index 8295813a1ca..00000000000
--- a/spec/services/ci/create_trigger_request_service_spec.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require 'spec_helper'
-
-describe Ci::CreateTriggerRequestService do
-  let(:service) { described_class }
-  let(:project) { create(:project, :repository) }
-  let(:trigger) { create(:ci_trigger, project: project, owner: owner) }
-  let(:owner) { create(:user) }
-
-  before do
-    stub_ci_pipeline_to_return_yaml_file
-
-    project.add_developer(owner)
-  end
-
-  describe '#execute' do
-    context 'valid params' do
-      subject { service.execute(project, trigger, 'master') }
-
-      context 'without owner' do
-        it { expect(subject.trigger_request).to be_kind_of(Ci::TriggerRequest) }
-        it { expect(subject.trigger_request.builds.first).to be_kind_of(Ci::Build) }
-        it { expect(subject.pipeline).to be_kind_of(Ci::Pipeline) }
-        it { expect(subject.pipeline).to be_trigger }
-      end
-
-      context 'with owner' do
-        it { expect(subject.trigger_request).to be_kind_of(Ci::TriggerRequest) }
-        it { expect(subject.trigger_request.builds.first).to be_kind_of(Ci::Build) }
-        it { expect(subject.trigger_request.builds.first.user).to eq(owner) }
-        it { expect(subject.pipeline).to be_kind_of(Ci::Pipeline) }
-        it { expect(subject.pipeline).to be_trigger }
-        it { expect(subject.pipeline.user).to eq(owner) }
-      end
-    end
-
-    context 'no commit for ref' do
-      subject { service.execute(project, trigger, 'other-branch') }
-
-      it { expect(subject.pipeline).not_to be_persisted }
-    end
-
-    context 'no builds created' do
-      subject { service.execute(project, trigger, 'master') }
-
-      before do
-        stub_ci_pipeline_yaml_file('script: { only: [develop], script: hello World }')
-      end
-
-      it { expect(subject.pipeline).not_to be_persisted }
-    end
-  end
-end
diff --git a/spec/services/ci/register_job_service_spec.rb b/spec/services/ci/register_job_service_spec.rb
index 8eb0d2d10a4..5ac30111ec9 100644
--- a/spec/services/ci/register_job_service_spec.rb
+++ b/spec/services/ci/register_job_service_spec.rb
@@ -4,7 +4,7 @@ module Ci
   describe RegisterJobService do
     let!(:project) { FactoryGirl.create :project, shared_runners_enabled: false }
     let!(:pipeline) { FactoryGirl.create :ci_pipeline, project: project }
-    let!(:pending_build) { FactoryGirl.create :ci_build, pipeline: pipeline }
+    let!(:pending_job) { FactoryGirl.create :ci_build, pipeline: pipeline }
     let!(:shared_runner) { FactoryGirl.create(:ci_runner, is_shared: true) }
     let!(:specific_runner) { FactoryGirl.create(:ci_runner, is_shared: false) }
 
@@ -15,32 +15,32 @@ module Ci
     describe '#execute' do
       context 'runner follow tag list' do
         it "picks build with the same tag" do
-          pending_build.tag_list = ["linux"]
-          pending_build.save
+          pending_job.tag_list = ["linux"]
+          pending_job.save
           specific_runner.tag_list = ["linux"]
-          expect(execute(specific_runner)).to eq(pending_build)
+          expect(execute(specific_runner)).to eq(pending_job)
         end
 
         it "does not pick build with different tag" do
-          pending_build.tag_list = ["linux"]
-          pending_build.save
+          pending_job.tag_list = ["linux"]
+          pending_job.save
           specific_runner.tag_list = ["win32"]
           expect(execute(specific_runner)).to be_falsey
         end
 
         it "picks build without tag" do
-          expect(execute(specific_runner)).to eq(pending_build)
+          expect(execute(specific_runner)).to eq(pending_job)
         end
 
         it "does not pick build with tag" do
-          pending_build.tag_list = ["linux"]
-          pending_build.save
+          pending_job.tag_list = ["linux"]
+          pending_job.save
           expect(execute(specific_runner)).to be_falsey
         end
 
         it "pick build without tag" do
           specific_runner.tag_list = ["win32"]
-          expect(execute(specific_runner)).to eq(pending_build)
+          expect(execute(specific_runner)).to eq(pending_job)
         end
       end
 
@@ -76,7 +76,7 @@ module Ci
           let!(:pipeline2) { create :ci_pipeline, project: project2 }
           let!(:project3) { create :project, shared_runners_enabled: true }
           let!(:pipeline3) { create :ci_pipeline, project: project3 }
-          let!(:build1_project1) { pending_build }
+          let!(:build1_project1) { pending_job }
           let!(:build2_project1) { FactoryGirl.create :ci_build, pipeline: pipeline }
           let!(:build3_project1) { FactoryGirl.create :ci_build, pipeline: pipeline }
           let!(:build1_project2) { FactoryGirl.create :ci_build, pipeline: pipeline2 }
@@ -172,7 +172,7 @@ module Ci
 
       context 'when first build is stalled' do
         before do
-          pending_build.lock_version = 10
+          pending_job.lock_version = 10
         end
 
         subject { described_class.new(specific_runner).execute }
@@ -182,7 +182,7 @@ module Ci
 
           before do
             allow_any_instance_of(Ci::RegisterJobService).to receive(:builds_for_specific_runner)
-              .and_return([pending_build, other_build])
+              .and_return([pending_job, other_build])
           end
 
           it "receives second build from the queue" do
@@ -194,7 +194,7 @@ module Ci
         context 'when single build is in queue' do
           before do
             allow_any_instance_of(Ci::RegisterJobService).to receive(:builds_for_specific_runner)
-              .and_return([pending_build])
+              .and_return([pending_job])
           end
 
           it "does not receive any valid result" do
@@ -215,6 +215,70 @@ module Ci
         end
       end
 
+      context 'when access_level of runner is not_protected' do
+        let!(:specific_runner) { create(:ci_runner, :specific) }
+
+        context 'when a job is protected' do
+          let!(:pending_job) { create(:ci_build, :protected, pipeline: pipeline) }
+
+          it 'picks the job' do
+            expect(execute(specific_runner)).to eq(pending_job)
+          end
+        end
+
+        context 'when a job is unprotected' do
+          let!(:pending_job) { create(:ci_build, pipeline: pipeline) }
+
+          it 'picks the job' do
+            expect(execute(specific_runner)).to eq(pending_job)
+          end
+        end
+
+        context 'when protected attribute of a job is nil' do
+          let!(:pending_job) { create(:ci_build, pipeline: pipeline) }
+
+          before do
+            pending_job.update_attribute(:protected, nil)
+          end
+
+          it 'picks the job' do
+            expect(execute(specific_runner)).to eq(pending_job)
+          end
+        end
+      end
+
+      context 'when access_level of runner is ref_protected' do
+        let!(:specific_runner) { create(:ci_runner, :ref_protected, :specific) }
+
+        context 'when a job is protected' do
+          let!(:pending_job) { create(:ci_build, :protected, pipeline: pipeline) }
+
+          it 'picks the job' do
+            expect(execute(specific_runner)).to eq(pending_job)
+          end
+        end
+
+        context 'when a job is unprotected' do
+          let!(:pending_job) { create(:ci_build, pipeline: pipeline) }
+
+          it 'does not pick the job' do
+            expect(execute(specific_runner)).to be_nil
+          end
+        end
+
+        context 'when protected attribute of a job is nil' do
+          let!(:pending_job) { create(:ci_build, pipeline: pipeline) }
+
+          before do
+            pending_job.update_attribute(:protected, nil)
+          end
+
+          it 'does not pick the job' do
+            expect(execute(specific_runner)).to be_nil
+          end
+        end
+      end
+
       def execute(runner)
         described_class.new(runner).execute.build
       end
diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb
index cec667071cc..f5ed9ff608f 100644
--- a/spec/services/ci/retry_build_service_spec.rb
+++ b/spec/services/ci/retry_build_service_spec.rb
@@ -22,7 +22,7 @@ describe Ci::RetryBuildService do
     %i[type lock_version target_url base_tags
        commit_id deployments erased_by_id last_deployment project_id
        runner_id tag_taggings taggings tags trigger_request_id
-       user_id auto_canceled_by_id retried].freeze
+       user_id auto_canceled_by_id retried failure_reason].freeze
 
   shared_examples 'build duplication' do
     let(:stage) do
@@ -48,7 +48,7 @@ describe Ci::RetryBuildService do
     describe 'clone accessors' do
       CLONE_ACCESSORS.each do |attribute|
         it "clones #{attribute} build attribute" do
-          expect(new_build.send(attribute)).to be_present
+          expect(new_build.send(attribute)).not_to be_nil
           expect(new_build.send(attribute)).to eq build.send(attribute)
         end
       end
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 34fb16edc84..85f46838351 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -510,6 +510,26 @@ describe Issues::UpdateService, :mailer do
       end
     end
 
+    context 'move issue to another project' do
+      let(:target_project) { create(:project) }
+
+      context 'valid project' do
+        before do
+          target_project.team << [user, :master]
+        end
+
+        it 'calls the move service with the proper issue and project' do
+          move_stub = instance_double(Issues::MoveService)
+          allow(Issues::MoveService).to receive(:new).and_return(move_stub)
+          allow(move_stub).to receive(:execute).with(issue, target_project).and_return(issue)
+
+          expect(move_stub).to receive(:execute).with(issue, target_project)
+
+          update_issue(target_project: target_project)
+        end
+      end
+    end
+
     include_examples 'issuable update service' do
       let(:open_issuable) { issue }
       let(:closed_issuable) { create(:closed_issue, project: project) }
diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb
index 088b7b4fc04..5da634e2fb1 100644
--- a/spec/services/projects/create_service_spec.rb
+++ b/spec/services/projects/create_service_spec.rb
@@ -1,11 +1,12 @@
 require 'spec_helper'
 
 describe Projects::CreateService, '#execute' do
+  let(:gitlab_shell) { Gitlab::Shell.new }
   let(:user) { create :user }
   let(:opts) do
     {
-      name: "GitLab",
-      namespace: user.namespace
+      name: 'GitLab',
+      namespace_id: user.namespace.id
     }
   end
 
@@ -146,6 +147,41 @@ describe Projects::CreateService, '#execute' do
       expect(project.owner).to eq(user)
       expect(project.namespace).to eq(user.namespace)
     end
+
+    context 'when another repository already exists on disk' do
+      let(:opts) do
+        {
+          name: 'Existing',
+          namespace_id: user.namespace.id
+        }
+      end
+
+      let(:repository_storage_path) { Gitlab.config.repositories.storages['default']['path'] }
+
+      before do
+        gitlab_shell.add_repository(repository_storage_path, "#{user.namespace.full_path}/existing")
+      end
+
+      after do
+        gitlab_shell.remove_repository(repository_storage_path, "#{user.namespace.full_path}/existing")
+      end
+
+      it 'does not allow to create project with same path' do
+        project = create_project(user, opts)
+
+        expect(project).to respond_to(:errors)
+        expect(project.errors.messages).to have_key(:base)
+        expect(project.errors.messages[:base].first).to match('There is already a repository with that name on disk')
+      end
+
+      it 'does not allow to import a project with the same path' do
+        project = create_project(user, opts.merge({ import_url: 'https://gitlab.com/gitlab-org/gitlab-test.git' }))
+
+        expect(project).to respond_to(:errors)
+        expect(project.errors.messages).to have_key(:base)
+        expect(project.errors.messages[:base].first).to match('There is already a repository with that name on disk')
+      end
+    end
   end
 
   context 'when there is an active service template' do
diff --git a/spec/services/projects/fork_service_spec.rb b/spec/services/projects/fork_service_spec.rb
index 21c4b30734c..a6e0364d44c 100644
--- a/spec/services/projects/fork_service_spec.rb
+++ b/spec/services/projects/fork_service_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Projects::ForkService do
+  let(:gitlab_shell) { Gitlab::Shell.new }
+
   describe 'fork by user' do
     before do
       @from_user = create(:user)
@@ -73,6 +75,26 @@ describe Projects::ForkService do
       end
     end
 
+    context 'repository already exists' do
+      let(:repository_storage_path) { Gitlab.config.repositories.storages['default']['path'] }
+
+      before do
+        gitlab_shell.add_repository(repository_storage_path, "#{@to_user.namespace.full_path}/#{@from_project.path}")
+      end
+
+      after do
+        gitlab_shell.remove_repository(repository_storage_path, "#{@to_user.namespace.full_path}/#{@from_project.path}")
+      end
+
+      it 'does not allow creation' do
+        to_project = fork_project(@from_project, @to_user)
+
+        expect(to_project).not_to be_persisted
+        expect(to_project.errors.messages).to have_key(:base)
+        expect(to_project.errors.messages[:base].first).to match('There is already a repository with that name on disk')
+      end
+    end
+
     context 'GitLab CI is enabled' do
       it "forks and enables CI for fork" do
         @from_project.enable_ci
diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb
index 2cb60cbcfc4..a14ed526f68 100644
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Projects::TransferService do
+  let(:gitlab_shell) { Gitlab::Shell.new }
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let(:project) { create(:project, :repository, namespace: user.namespace) }
@@ -119,6 +120,25 @@ describe Projects::TransferService do
     it { expect(project.namespace).to eq(user.namespace) }
   end
 
+  context 'namespace which contains orphan repository with same projects path name' do
+    let(:repository_storage_path) { Gitlab.config.repositories.storages['default']['path'] }
+
+    before do
+      group.add_owner(user)
+      gitlab_shell.add_repository(repository_storage_path, "#{group.full_path}/#{project.path}")
+
+      @result = transfer_project(project, user, group)
+    end
+
+    after do
+      gitlab_shell.remove_repository(repository_storage_path, "#{group.full_path}/#{project.path}")
+    end
+
+    it { expect(@result).to eq false }
+    it { expect(project.namespace).to eq(user.namespace) }
+    it { expect(project.errors[:new_namespace]).to include('Cannot move project') }
+  end
+
   def transfer_project(project, user, new_namespace)
     service = Projects::TransferService.new(project, user)
 
diff --git a/spec/services/projects/update_pages_service_spec.rb b/spec/services/projects/update_pages_service_spec.rb
index aa6ad6340f5..031366d1825 100644
--- a/spec/services/projects/update_pages_service_spec.rb
+++ b/spec/services/projects/update_pages_service_spec.rb
@@ -116,6 +116,7 @@ describe Projects::UpdatePagesService do
 
         expect(deploy_status.description)
           .to match(/artifacts for pages are too large/)
+        expect(deploy_status).to be_script_failure
       end
     end
 
diff --git a/spec/services/projects/update_service_spec.rb b/spec/services/projects/update_service_spec.rb
index 1b282e82187..92cc9a37795 100644
--- a/spec/services/projects/update_service_spec.rb
+++ b/spec/services/projects/update_service_spec.rb
@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Projects::UpdateService, '#execute' do
+  let(:gitlab_shell) { Gitlab::Shell.new }
   let(:user) { create(:user) }
   let(:admin) { create(:admin) }
 
@@ -132,6 +133,28 @@ describe Projects::UpdateService, '#execute' do
     end
   end
 
+  context 'when renaming a project' do
+    let(:repository_storage_path) { Gitlab.config.repositories.storages['default']['path'] }
+
+    before do
+      gitlab_shell.add_repository(repository_storage_path, "#{user.namespace.full_path}/existing")
+    end
+
+    after do
+      gitlab_shell.remove_repository(repository_storage_path, "#{user.namespace.full_path}/existing")
+    end
+
+    it 'does not allow renaming when new path matches existing repository on disk' do
+      result = update_project(project, admin, path: 'existing')
+
+      expect(result).to include(status: :error)
+      expect(result[:message]).to match('Project could not be updated!')
+      expect(project).not_to be_valid
+      expect(project.errors.messages).to have_key(:base)
+      expect(project.errors.messages[:base]).to include('There is already a repository with that name on disk')
+    end
+  end
+
   context 'when passing invalid parameters' do
     it 'returns an error result when record cannot be updated' do
       result = update_project(project, admin, { name: 'foo&bar' })
diff --git a/spec/services/quick_actions/interpret_service_spec.rb b/spec/services/quick_actions/interpret_service_spec.rb
index 30fa0ee6873..6926ac85de3 100644
--- a/spec/services/quick_actions/interpret_service_spec.rb
+++ b/spec/services/quick_actions/interpret_service_spec.rb
@@ -1147,5 +1147,15 @@ describe QuickActions::InterpretService do
         expect(explanations).to eq(["Moves issue to ~#{bug.id} column in the board."])
       end
     end
+
+    describe 'move issue to another project command' do
+      let(:content) { '/move test/project' }
+
+      it 'includes the project name' do
+        _, explanations = service.explain(content, issue)
+
+        expect(explanations).to eq(["Moves this issue to test/project."])
+      end
+    end
   end
 end
diff --git a/spec/support/cycle_analytics_helpers.rb b/spec/support/cycle_analytics_helpers.rb
index 39586d37e93..934b4557ba2 100644
--- a/spec/support/cycle_analytics_helpers.rb
+++ b/spec/support/cycle_analytics_helpers.rb
@@ -80,7 +80,8 @@ module CycleAnalyticsHelpers
         sha: project.repository.commit('master').sha,
         ref: 'master',
         source: :push,
-        project: project)
+        project: project,
+        protected: false)
   end
 
   def new_dummy_job(environment)
@@ -93,7 +94,8 @@ module CycleAnalyticsHelpers
       ref: 'master',
       tag: false,
       name: 'dummy',
-      pipeline: dummy_pipeline)
+      pipeline: dummy_pipeline,
+      protected: false)
   end
 end
 
diff --git a/spec/support/features/discussion_comments_shared_example.rb b/spec/support/features/discussion_comments_shared_example.rb
index da1074e5932..b65b1300769 100644
--- a/spec/support/features/discussion_comments_shared_example.rb
+++ b/spec/support/features/discussion_comments_shared_example.rb
@@ -14,6 +14,8 @@ shared_examples 'discussion comments' do |resource_name|
 
     find(submit_selector).click
 
+    wait_for_requests
+
     find(comments_selector, match: :first)
     new_comment = all(comments_selector).last
 
@@ -26,6 +28,7 @@ shared_examples 'discussion comments' do |resource_name|
       find("#{form_selector} .note-textarea").send_keys('a')
 
       find(close_selector).click
+      wait_for_requests
 
       find(comments_selector, match: :first)
       find("#{comments_selector}.system-note")
@@ -76,12 +79,22 @@ shared_examples 'discussion comments' do |resource_name|
     it 'clicking the ul padding or divider should not change the text' do
       find(menu_selector).click
 
-      expect(page).to have_selector menu_selector
-      expect(find(dropdown_selector)).to have_content 'Comment'
+      if resource_name == 'issue'
+        expect(find(dropdown_selector)).to have_content 'Comment'
+
+        find(toggle_selector).click
+        find("#{menu_selector} .divider").click
+      else
+        find(menu_selector).click
 
-      find("#{menu_selector} .divider").click
+        expect(page).to have_selector menu_selector
+        expect(find(dropdown_selector)).to have_content 'Comment'
+
+        find("#{menu_selector} .divider").click
+
+        expect(page).to have_selector menu_selector
+      end
 
-      expect(page).to have_selector menu_selector
       expect(find(dropdown_selector)).to have_content 'Comment'
     end
 
@@ -91,9 +104,8 @@ shared_examples 'discussion comments' do |resource_name|
         all("#{menu_selector} li").last.click
       end
 
-      it 'updates the submit button text, note_type input and closes the dropdown' do
+      it 'updates the submit button text and closes the dropdown' do
         expect(find(dropdown_selector)).to have_content 'Start discussion'
-        expect(find("#{form_selector} #note_type", visible: false).value).to eq('DiscussionNote')
         expect(page).not_to have_selector menu_selector
       end
 
@@ -157,9 +169,8 @@ shared_examples 'discussion comments' do |resource_name|
             find("#{menu_selector} li", match: :first).click
           end
 
-          it 'updates the submit button text, clears the note_type input and closes the dropdown' do
+          it 'updates the submit button text and closes the dropdown' do
             expect(find(dropdown_selector)).to have_content 'Comment'
-            expect(find("#{form_selector} #note_type", visible: false).value).to eq('')
             expect(page).not_to have_selector menu_selector
           end
 
diff --git a/spec/support/features/issuable_slash_commands_shared_examples.rb b/spec/support/features/issuable_slash_commands_shared_examples.rb
index 68f0ce8afb3..8282ba7e536 100644
--- a/spec/support/features/issuable_slash_commands_shared_examples.rb
+++ b/spec/support/features/issuable_slash_commands_shared_examples.rb
@@ -21,7 +21,7 @@ shared_examples 'issuable record that supports quick actions in its description
   before do
     project.team << [master, :master]
 
-    sign_in(master)
+    gitlab_sign_in(master)
   end
 
   after do
@@ -119,16 +119,15 @@ shared_examples 'issuable record that supports quick actions in its description
           guest = create(:user)
           project.add_guest(guest)
 
-          sign_out(:user)
-          sign_in(guest)
-
+          gitlab_sign_out
+          gitlab_sign_in(guest)
           visit public_send("namespace_project_#{issuable_type}_path", project.namespace, project, issuable)
         end
 
         it "does not close the #{issuable_type}" do
           write_note("/close")
 
-          expect(page).not_to have_content '/close'
+          expect(page).to have_content '/close'
           expect(page).not_to have_content 'Commands applied'
 
           expect(issuable).to be_open
@@ -158,16 +157,15 @@ shared_examples 'issuable record that supports quick actions in its description
           guest = create(:user)
           project.add_guest(guest)
 
-          sign_out(:user)
-          sign_in(guest)
-
+          gitlab_sign_out
+          gitlab_sign_in(guest)
           visit public_send("namespace_project_#{issuable_type}_path", project.namespace, project, issuable)
         end
 
         it "does not reopen the #{issuable_type}" do
           write_note("/reopen")
 
-          expect(page).not_to have_content '/reopen'
+          expect(page).to have_content '/reopen'
           expect(page).not_to have_content 'Commands applied'
 
           expect(issuable).to be_closed
@@ -192,15 +190,15 @@ shared_examples 'issuable record that supports quick actions in its description
           guest = create(:user)
           project.add_guest(guest)
 
-          sign_out(:user)
-          sign_in(guest)
+          gitlab_sign_out
+          gitlab_sign_in(guest)
           visit public_send("namespace_project_#{issuable_type}_path", project.namespace, project, issuable)
         end
 
         it "does not reopen the #{issuable_type}" do
           write_note("/title Awesome new title")
 
-          expect(page).not_to have_content '/title'
+          expect(page).to have_content '/title'
           expect(page).not_to have_content 'Commands applied'
 
           expect(issuable.reload.title).not_to eq 'Awesome new title'
@@ -292,7 +290,7 @@ shared_examples 'issuable record that supports quick actions in its description
     end
   end
 
-  describe "preview of note on #{issuable_type}" do
+  describe "preview of note on #{issuable_type}", js: true do
     it 'removes quick actions from note and explains them' do
       create(:user, username: 'bob')
 
diff --git a/spec/support/features/reportable_note_shared_examples.rb b/spec/support/features/reportable_note_shared_examples.rb
index 5a0e7c3d099..192a2fed0a8 100644
--- a/spec/support/features/reportable_note_shared_examples.rb
+++ b/spec/support/features/reportable_note_shared_examples.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-shared_examples 'reportable note' do
+shared_examples 'reportable note' do |type|
   include NotesHelper
 
   let(:comment) { find("##{ActionView::RecordIdentifier.dom_id(note)}") }
@@ -20,7 +20,12 @@ shared_examples 'reportable note' do
     open_dropdown(dropdown)
 
     expect(dropdown).to have_link('Report as abuse', href: abuse_report_path)
-    expect(dropdown).to have_link('Delete comment', href: note_url(note, project))
+
+    if type == 'issue'
+      expect(dropdown).to have_button('Delete comment')
+    else
+      expect(dropdown).to have_link('Delete comment', href: note_url(note, project))
+    end
   end
 
   it 'Report button links to a report page' do
diff --git a/spec/support/javascript_fixtures_helpers.rb b/spec/support/javascript_fixtures_helpers.rb
index aace4b3adee..923c8080e6c 100644
--- a/spec/support/javascript_fixtures_helpers.rb
+++ b/spec/support/javascript_fixtures_helpers.rb
@@ -31,6 +31,10 @@ module JavaScriptFixturesHelpers
     File.write(fixture_file_name, fixture)
   end
 
+  def remove_repository(project)
+    Gitlab::Shell.new.remove_repository(project.repository_storage_path, project.disk_path)
+  end
+
   private
 
   # Private: Prepare a response object for use as a frontend fixture
diff --git a/spec/support/notify_shared_examples.rb b/spec/support/notify_shared_examples.rb
index 136f92c6419..e2c23607406 100644
--- a/spec/support/notify_shared_examples.rb
+++ b/spec/support/notify_shared_examples.rb
@@ -1,9 +1,10 @@
 shared_context 'gitlab email notification' do
+  set(:project) { create(:project, :repository) }
+  set(:recipient) { create(:user, email: 'recipient@example.com') }
+
   let(:gitlab_sender_display_name) { Gitlab.config.gitlab.email_display_name }
   let(:gitlab_sender) { Gitlab.config.gitlab.email_from }
   let(:gitlab_sender_reply_to) { Gitlab.config.gitlab.email_reply_to }
-  let(:recipient) { create(:user, email: 'recipient@example.com') }
-  let(:project) { create(:project) }
   let(:new_user_address) { 'newguy@example.com' }
 
   before do
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 1e39f80699c..290ded3ff7e 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -5,7 +5,7 @@ module TestEnv
 
   # When developing the seed repository, comment out the branch you will modify.
   BRANCH_SHA = {
-    'signed-commits'                     => '5d4a1cb',
+    'signed-commits'                     => '2d1096e',
     'not-merged-branch'                  => 'b83d6e3',
     'branch-merged'                      => '498214d',
     'empty-branch'                       => '7efb185',
diff --git a/spec/views/ci/lints/show.html.haml_spec.rb b/spec/views/ci/lints/show.html.haml_spec.rb
index 3390ae247ff..f2c19c7642a 100644
--- a/spec/views/ci/lints/show.html.haml_spec.rb
+++ b/spec/views/ci/lints/show.html.haml_spec.rb
@@ -73,8 +73,8 @@ describe 'ci/lints/show' do
       render
 
       expect(rendered).to have_content('Tag list: dotnet')
-      expect(rendered).to have_content('Refs only: test@dude/repo')
-      expect(rendered).to have_content('Refs except: deploy')
+      expect(rendered).to have_content('Only policy: refs, test@dude/repo')
+      expect(rendered).to have_content('Except policy: refs, deploy')
       expect(rendered).to have_content('Environment: testing')
       expect(rendered).to have_content('When: on_success')
     end
diff --git a/spec/views/projects/jobs/show.html.haml_spec.rb b/spec/views/projects/jobs/show.html.haml_spec.rb
index 117f48450e2..d4279626e75 100644
--- a/spec/views/projects/jobs/show.html.haml_spec.rb
+++ b/spec/views/projects/jobs/show.html.haml_spec.rb
@@ -195,20 +195,4 @@ describe 'projects/jobs/show' do
         text: /\A\n#{Regexp.escape(commit_title)}\n\Z/)
     end
   end
-
-  describe 'shows trigger variables in sidebar' do
-    let(:trigger_request) { create(:ci_trigger_request_with_variables, pipeline: pipeline) }
-
-    before do
-      build.trigger_request = trigger_request
-      render
-    end
-
-    it 'shows trigger variables in separate lines' do
-      expect(rendered).to have_css('.js-build-variable', visible: false, text: 'TRIGGER_KEY_1')
-      expect(rendered).to have_css('.js-build-variable', visible: false, text: 'TRIGGER_KEY_2')
-      expect(rendered).to have_css('.js-build-value', visible: false, text: 'TRIGGER_VALUE_1')
-      expect(rendered).to have_css('.js-build-value', visible: false, text: 'TRIGGER_VALUE_2')
-    end
-  end
 end
diff --git a/spec/workers/create_gpg_signature_worker_spec.rb b/spec/workers/create_gpg_signature_worker_spec.rb
index 54978baca88..aa6c347d738 100644
--- a/spec/workers/create_gpg_signature_worker_spec.rb
+++ b/spec/workers/create_gpg_signature_worker_spec.rb
@@ -7,9 +7,14 @@ describe CreateGpgSignatureWorker do
     let(:commit_sha) { '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33' }
 
     it 'calls Gitlab::Gpg::Commit#signature' do
-      expect(Gitlab::Gpg::Commit).to receive(:new).with(project, commit_sha).and_call_original
+      commit = instance_double(Commit)
+      gpg_commit = instance_double(Gitlab::Gpg::Commit)
 
-      expect_any_instance_of(Gitlab::Gpg::Commit).to receive(:signature)
+      allow(Project).to receive(:find_by).with(id: project.id).and_return(project)
+      allow(project).to receive(:commit).with(commit_sha).and_return(commit)
+
+      expect(Gitlab::Gpg::Commit).to receive(:new).with(commit).and_return(gpg_commit)
+      expect(gpg_commit).to receive(:signature)
 
       described_class.new.perform(commit_sha, project.id)
     end
diff --git a/spec/workers/git_garbage_collect_worker_spec.rb b/spec/workers/git_garbage_collect_worker_spec.rb
index 05f971dfd13..c4979792194 100644
--- a/spec/workers/git_garbage_collect_worker_spec.rb
+++ b/spec/workers/git_garbage_collect_worker_spec.rb
@@ -23,8 +23,8 @@ describe GitGarbageCollectWorker do
 
         expect_any_instance_of(Repository).to receive(:after_create_branch).and_call_original
         expect_any_instance_of(Repository).to receive(:branch_names).and_call_original
-        expect_any_instance_of(Repository).to receive(:branch_count).and_call_original
-        expect_any_instance_of(Repository).to receive(:has_visible_content?).and_call_original
+        expect_any_instance_of(Gitlab::Git::Repository).to receive(:branch_count).and_call_original
+        expect_any_instance_of(Gitlab::Git::Repository).to receive(:has_visible_content?).and_call_original
 
         subject.perform(project.id)
       end
@@ -143,7 +143,7 @@ describe GitGarbageCollectWorker do
       tree: old_commit.tree,
       parents: [old_commit]
     )
-    GitOperationService.new(nil, project.repository).send(
+    Gitlab::Git::OperationService.new(nil, project.repository.raw_repository).send(
       :update_ref,
       "refs/heads/#{SecureRandom.hex(6)}",
       new_commit_sha,
diff --git a/spec/workers/stuck_ci_jobs_worker_spec.rb b/spec/workers/stuck_ci_jobs_worker_spec.rb
index 549635f7f33..ac6f4fefb4e 100644
--- a/spec/workers/stuck_ci_jobs_worker_spec.rb
+++ b/spec/workers/stuck_ci_jobs_worker_spec.rb
@@ -6,27 +6,31 @@ describe StuckCiJobsWorker do
   let(:worker) { described_class.new }
   let(:exclusive_lease_uuid) { SecureRandom.uuid }
 
-  subject do
-    job.reload
-    job.status
-  end
-
   before do
     job.update!(status: status, updated_at: updated_at)
     allow_any_instance_of(Gitlab::ExclusiveLease).to receive(:try_obtain).and_return(exclusive_lease_uuid)
   end
 
   shared_examples 'job is dropped' do
-    it 'changes status' do
+    before do
       worker.perform
-      is_expected.to eq('failed')
+      job.reload
+    end
+
+    it "changes status" do
+      expect(job).to be_failed
+      expect(job).to be_stuck_or_timeout_failure
     end
   end
 
   shared_examples 'job is unchanged' do
-    it "doesn't change status" do
+    before do
       worker.perform
-      is_expected.to eq(status)
+      job.reload
+    end
+
+    it "doesn't change status" do
+      expect(job.status).to eq(status)
     end
   end