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

# Conflicts:
#	features/steps/shared/authentication.rb

[ci skip]

app/controllers/application_controller.rb

@@ -13,8 +13,7 @@ class ApplicationController < ActionController::Base
 
   before_action :authenticate_sessionless_user!
   before_action :authenticate_user!
-  before_action :enforce_terms!, if: -> { Gitlab::CurrentSettings.current_application_settings.enforce_terms },
-                                 unless: :peek_request?
+  before_action :enforce_terms!, if: :should_enforce_terms?
   before_action :validate_user_service_ticket!
   before_action :check_password_expiration
   before_action :ldap_security_check
@@ -381,4 +380,10 @@ class ApplicationController < ActionController::Base
   def peek_request?
     request.path.start_with?('/-/peek')
   end
+
+  def should_enforce_terms?
+    return false unless Gitlab::CurrentSettings.current_application_settings.enforce_terms
+
+    !(peek_request? || devise_controller?)
+  end
 end

features/steps/shared/authentication.rb

@@ -22,10 +22,13 @@ module SharedAuthentication
     sign_in(@user)
   end
 
+<<<<<<< HEAD
   step 'I sign in as "Pete Peters"' do
     gitlab_sign_in(user_exists("Pete Peters"))
   end
 
+=======
+>>>>>>> upstream/master
   step 'I should be redirected to sign in page' do
     expect(current_path).to eq new_user_session_path
   end

spec/controllers/projects/jobs_controller_spec.rb

@@ -490,43 +490,43 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
                  id: job.id
     end
 
-    context 'when job has a trace artifact' do
+    context "when job has a trace artifact" do
       let(:job) { create(:ci_build, :trace_artifact, pipeline: pipeline) }
 
       it 'returns a trace' do
         response = subject
 
         expect(response).to have_gitlab_http_status(:ok)
-        expect(response.content_type).to eq 'text/plain; charset=utf-8'
-        expect(response.body).to eq job.job_artifacts_trace.open.read
+        expect(response.headers["Content-Type"]).to eq("text/plain; charset=utf-8")
+        expect(response.body).to eq(job.job_artifacts_trace.open.read)
       end
     end
 
-    context 'when job has a trace file' do
+    context "when job has a trace file" do
       let(:job) { create(:ci_build, :trace_live, pipeline: pipeline) }
 
-      it 'send a trace file' do
+      it "send a trace file" do
         response = subject
 
         expect(response).to have_gitlab_http_status(:ok)
-        expect(response.content_type).to eq 'text/plain; charset=utf-8'
-        expect(response.body).to eq 'BUILD TRACE'
+        expect(response.headers["Content-Type"]).to eq("text/plain; charset=utf-8")
+        expect(response.body).to eq("BUILD TRACE")
       end
     end
 
-    context 'when job has a trace in database' do
+    context "when job has a trace in database" do
       let(:job) { create(:ci_build, pipeline: pipeline) }
 
       before do
-        job.update_column(:trace, 'Sample trace')
+        job.update_column(:trace, "Sample trace")
       end
 
-      it 'send a trace file' do
+      it "send a trace file" do
         response = subject
 
         expect(response).to have_gitlab_http_status(:ok)
-        expect(response.content_type).to eq 'text/plain; charset=utf-8'
-        expect(response.body).to eq 'Sample trace'
+        expect(response.headers["Content-Type"]).to eq("text/plain; charset=utf-8")
+        expect(response.body).to eq("Sample trace")
       end
     end
 

spec/features/users/terms_spec.rb

@@ -81,4 +81,22 @@ describe 'Users > Terms' do
       expect(find_field('issue_description').value).to eq("We don't want to lose what the user typed")
     end
   end
+
+  context 'when the terms are enforced' do
+    before do
+      enforce_terms
+    end
+
+    context 'signing out', :js do
+      it 'allows the user to sign out without a response' do
+        visit terms_path
+
+        find('.header-user-dropdown-toggle').click
+        click_link('Sign out')
+
+        expect(page).to have_content('Sign in')
+        expect(page).to have_content('Register')
+      end
+    end
+  end
 end