Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-11

# Conflicts:
#	app/assets/stylesheets/framework/selects.scss

[ci skip]

app/assets/stylesheets/framework/selects.scss

@@ -238,6 +238,7 @@
 
   .group-path {
     color: $gl-gray-400;
+<<<<<<< HEAD
   }
 }
 
@@ -248,6 +249,8 @@
 
   .project-path {
     color: $gl-gray-400;
+=======
+>>>>>>> upstream/master
   }
 }
 

app/models/concerns/project_services_loggable.rb

+# frozen_string_literal: true
+
 module ProjectServicesLoggable
   def log_info(message, params = {})
     message = build_message(message, params)

app/models/hooks/active_hook_filter.rb

+# frozen_string_literal: true
+
 class ActiveHookFilter
   def initialize(hook)
     @hook = hook

app/serializers/status_entity.rb → app/serializers/detailed_status_entity.rb

 # frozen_string_literal: true
 
-class StatusEntity < Grape::Entity
+class DetailedStatusEntity < Grape::Entity
   include RequestAwareEntity
 
   expose :icon, :text, :label, :group
@@ -8,6 +8,14 @@ class StatusEntity < Grape::Entity
   expose :has_details?, as: :has_details
   expose :details_path
 
+  expose :illustration do |status|
+    begin
+      status.illustration
+    rescue NotImplementedError
+      # ignored
+    end
+  end
+
   expose :favicon do |status|
     Gitlab::Favicon.status_overlay(status.favicon)
   end

app/serializers/job_entity.rb

@@ -27,7 +27,7 @@ class JobEntity < Grape::Entity
   expose :playable?, as: :playable
   expose :created_at
   expose :updated_at
-  expose :detailed_status, as: :status, with: StatusEntity
+  expose :detailed_status, as: :status, with: DetailedStatusEntity
   expose :callout_message, if: -> (*) { failed? && !build.script_failure? }
   expose :recoverable, if: -> (*) { failed? }
 

app/serializers/job_group_entity.rb

@@ -5,7 +5,7 @@ class JobGroupEntity < Grape::Entity
 
   expose :name
   expose :size
-  expose :detailed_status, as: :status, with: StatusEntity
+  expose :detailed_status, as: :status, with: DetailedStatusEntity
   expose :jobs, with: JobEntity
 
   private

app/serializers/pipeline_entity.rb

@@ -30,7 +30,7 @@ class PipelineEntity < Grape::Entity
   end
 
   expose :details do
-    expose :detailed_status, as: :status, with: StatusEntity
+    expose :detailed_status, as: :status, with: DetailedStatusEntity
     expose :duration
     expose :finished_at
   end

app/serializers/stage_entity.rb

@@ -19,7 +19,7 @@ class StageEntity < Grape::Entity
     latest_statuses
   end
 
-  expose :detailed_status, as: :status, with: StatusEntity
+  expose :detailed_status, as: :status, with: DetailedStatusEntity
 
   expose :path do |stage|
     project_pipeline_path(

app/services/emails/base_service.rb

@@ -2,6 +2,8 @@
 
 module Emails
   class BaseService
+    attr_reader :current_user
+
     def initialize(current_user, params = {})
       @current_user, @params = current_user, params.dup
       @user = params.delete(:user)

app/services/emails/create_service.rb

@@ -5,7 +5,12 @@ module Emails
     prepend ::EE::Emails::CreateService
 
     def execute(extra_params = {})
-      @user.emails.create(@params.merge(extra_params))
+      skip_confirmation = @params.delete(:skip_confirmation)
+
+      email = @user.emails.create(@params.merge(extra_params))
+
+      email&.confirm if skip_confirmation && current_user.admin?
+      email
     end
   end
 end

app/validators/branch_filter_validator.rb

+# frozen_string_literal: true
+
 # BranchFilterValidator
 #
 # Custom validator for branch names. Squishes whitespace and ignores empty

app/validators/js_regex_validator.rb

+# frozen_string_literal: true
+
 class JsRegexValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     return true if value.blank?

app/views/events/_event.html.haml

@@ -11,5 +11,5 @@
       = render "events/event/note", event: event
     - else
       = render "events/event/common", event: event
-- elsif @user.include_private_contributions?
+- elsif @user&.include_private_contributions?
   = render "events/event/private", event: event

changelogs/unreleased/51112-add-status-illustration-in-job-api.yml

+---
+title: Add empty state illustration information in job API
+merge_request: 21532
+author:
+type: other

changelogs/unreleased/frozen-string-enable-vestigial.yml

+---
+title: Enable frozen string in vestigial files
+merge_request:
+author: gfyoung
+type: performance

changelogs/unreleased/sh-support-adding-confirmed-emails.yml

+---
+title: Add ability to skip user email confirmation with API
+merge_request: 21630
+author:
+type: added

db/importers/common_metrics_importer.rb

@@ -35,8 +35,8 @@ module Importers
 
     attr_reader :content
 
-    def initialize(file = 'config/prometheus/common_metrics.yml')
-      @content = YAML.load_file(file)
+    def initialize(filename = 'common_metrics.yml')
+      @content = YAML.load_file(Rails.root.join('config', 'prometheus', filename))
     end
 
     def execute

doc/api/users.md

@@ -977,6 +977,7 @@ Parameters:
 
 - `id` (required)    - id of specified user
 - `email` (required) - email address
+- `skip_confirmation` (optional) - Skip confirmation and assume e-mail is verified - true or false (default)
 
 ## Delete email for current user
 

lib/api/users.rb

@@ -367,6 +367,7 @@ module API
       params do
         requires :id, type: Integer, desc: 'The ID of the user'
         requires :email, type: String, desc: 'The email of the user'
+        optional :skip_confirmation, type: Boolean, desc: 'Skip confirmation of email and assume it is verified'
       end
       post ":id/emails" do
         authenticated_as_admin!

spec/controllers/projects/jobs_controller_spec.rb

@@ -194,6 +194,18 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
           expect(json_response['terminal_path']).to match(%r{/terminal})
         end
       end
+
+      context 'when job passed with no trace' do
+        let(:job) { create(:ci_build, :success, :artifacts, pipeline: pipeline) }
+
+        it 'exposes empty state illustrations' do
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response).to match_response_schema('job/job_details')
+          expect(json_response['status']['illustration']).to have_key('image')
+          expect(json_response['status']['illustration']).to have_key('size')
+          expect(json_response['status']['illustration']).to have_key('title')
+        end
+      end
     end
 
     def get_show(**extra_params)

spec/db/importers/common_metrics_importer_spec.rb

@@ -47,6 +47,16 @@ describe Importers::CommonMetricsImporter do
     end
   end
 
+  context "does import common_metrics.yml" do
+    it "when executed from outside of the Rails.root" do
+      Dir.chdir(Dir.tmpdir) do
+        expect { subject.execute }.not_to raise_error
+      end
+
+      expect(PrometheusMetric.common).not_to be_empty
+    end
+  end
+
   context 'does import properly all fields' do
     let(:query_identifier) { 'response-metric' }
     let(:group) do

spec/features/projects/activity/user_sees_private_activity_spec.rb

+require 'spec_helper'
+
+describe 'Project > Activity > User sees private activity', :js do
+  let(:project) { create(:project, :public) }
+  let(:author) { create(:user) }
+  let(:user) { create(:user) }
+  let(:issue) { create(:issue, :confidential, project: project, author: author) }
+  let(:message) { "#{author.name} opened issue #{issue.to_reference}" }
+
+  before do
+    project.add_developer(author)
+
+    create(:event, :created, project: project, target: issue, author: author)
+  end
+
+  it 'shows the activity to a logged-in user with permissions' do
+    sign_in(author)
+    visit activity_project_path(project)
+
+    expect(page).to have_content(message)
+  end
+
+  it 'hides the activity from a logged-in user without permissions' do
+    sign_in(user)
+    visit activity_project_path(project)
+
+    expect(page).not_to have_content(message)
+  end
+
+  it 'hides the activity from an anonymous user' do
+    visit activity_project_path(project)
+
+    expect(page).not_to have_content(message)
+  end
+end

spec/fixtures/api/schemas/job/job.json

@@ -25,7 +25,7 @@
     "playable": { "type": "boolean" },
     "created_at": { "type": "string" },
     "updated_at": { "type": "string" },
-    "status": { "$ref": "../ci_detailed_status.json" }
+    "status": { "$ref": "../status/ci_detailed_status.json" }
   },
   "additionalProperties": true
 }

spec/fixtures/api/schemas/pipeline_stage.json

@@ -16,7 +16,7 @@
       "items": { "$ref": "job/job.json" },
       "optional": true
     },
-    "status": { "$ref": "ci_detailed_status.json" },
+    "status": { "$ref": "status/ci_detailed_status.json" },
     "path": { "type": "string" },
     "dropdown_path": { "type": "string" }
   },

spec/fixtures/api/schemas/status/action.json

+{
+  "type": "object",
+  "required": [
+    "icon",
+    "title",
+    "path",
+    "method"
+  ],
+  "properties": {
+    "icon": {
+      "type": "string",
+      "enum": [
+        "retry",
+        "play",
+        "cancel"
+      ]
+    },
+    "title": { "type": "string" },
+    "path": { "type": "string" },
+    "method": { "$ref": "../http_method.json" }
+  }
+}

spec/fixtures/api/schemas/ci_detailed_status.json → spec/fixtures/api/schemas/status/ci_detailed_status.json

 {
   "type": "object",
-  "required" : [
+  "required": [
     "icon",
     "text",
     "label",
@@ -19,28 +19,8 @@
     "has_details": { "type": "boolean" },
     "details_path": { "type": "string" },
     "favicon": { "type": "string" },
-    "action": {
-      "type": "object",
-      "required": [
-        "icon",
-        "title",
-        "path",
-        "method"
-      ],
-      "properties": {
-        "icon": {
-          "type": "string",
-          "enum": [
-            "retry",
-            "play",
-            "cancel"
-          ]
-        },
-        "title": { "type": "string" },
-        "path": { "type": "string" },
-        "method": { "$ref": "http_method.json" }
-      }
-    }
+    "illustration": { "$ref": "illustration.json" },
+    "action": { "$ref": "action.json" }
   },
   "additionalProperties": false
 }

spec/fixtures/api/schemas/status/illustration.json

+{
+  "oneOf": [
+    { "type": "null" },
+    {
+      "type": "object",
+      "required": [
+        "image",
+        "size",
+        "title"
+      ],
+      "properties": {
+        "image": { "type": "string" },
+        "size": { "type": "string" },
+        "title": { "type": "string" },
+        "content": { "type": "string" }
+      }
+    }
+  ]
+}

spec/requests/api/users_spec.rb

@@ -1064,11 +1064,14 @@ describe API::Users do
       expect(json_response['error']).to eq('email is missing')
     end
 
-    it "creates email" do
+    it "creates unverified email" do
       email_attrs = attributes_for :email
       expect do
         post api("/users/#{user.id}/emails", admin), email_attrs
       end.to change { user.emails.count }.by(1)
+
+      email = Email.find_by(user_id: user.id, email: email_attrs[:email])
+      expect(email).not_to be_confirmed
     end
 
     it "returns a 400 for invalid ID" do
@@ -1076,6 +1079,18 @@ describe API::Users do
 
       expect(response).to have_gitlab_http_status(400)
     end
+
+    it "creates verified email" do
+      email_attrs = attributes_for :email
+      email_attrs[:skip_confirmation] = true
+
+      post api("/users/#{user.id}/emails", admin), email_attrs
+
+      expect(response).to have_gitlab_http_status(201)
+
+      email = Email.find_by(user_id: user.id, email: email_attrs[:email])
+      expect(email).to be_confirmed
+    end
   end
 
   describe 'GET /user/:id/emails' do

spec/serializers/status_entity_spec.rb → spec/serializers/detailed_status_entity_spec.rb

 require 'spec_helper'
 
-describe StatusEntity do
+describe DetailedStatusEntity do
   let(:entity) { described_class.new(status) }
 
   let(:status) do