From 9b177bb7c94df6c7d3868235f75939a41acf8718 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Mon, 11 Sep 2017 15:44:42 +0000
Subject: Revert "Merge branch 'revert-f2421b2b' into 'master'"

This reverts merge request !14148
---
 lib/api/entities.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/api')

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 216408064d1..52c49e5caa9 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -45,7 +45,7 @@ module API
       expose :confirmed_at
       expose :last_activity_on
       expose :email
-      expose :color_scheme_id, :projects_limit, :current_sign_in_at
+      expose :theme_id, :color_scheme_id, :projects_limit, :current_sign_in_at
       expose :identities, using: Entities::Identity
       expose :can_create_group?, as: :can_create_group
       expose :can_create_project?, as: :can_create_project
-- 
cgit v1.2.1


From c45ace8972f18af1f232f9074d6e4104fc4f0c14 Mon Sep 17 00:00:00 2001
From: Maxim Rydkin <maks.rydkin@gmail.com>
Date: Wed, 6 Sep 2017 14:23:24 +0300
Subject: move `lib/ci/gitlab_ci_yaml_processor.rb` into
 `lib/gitlab/ci/yaml_processor.rb`

---
 lib/api/lint.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/api')

diff --git a/lib/api/lint.rb b/lib/api/lint.rb
index ae43a4a3237..d202eaa4c49 100644
--- a/lib/api/lint.rb
+++ b/lib/api/lint.rb
@@ -6,7 +6,7 @@ module API
         requires :content, type: String, desc: 'Content of .gitlab-ci.yml'
       end
       post '/lint' do
-        error = Ci::GitlabCiYamlProcessor.validation_message(params[:content])
+        error = Gitlab::Ci::YamlProcessor.validation_message(params[:content])
 
         status 200
 
-- 
cgit v1.2.1


From b60cebb931581a76d3976904ba4b04f6dcab8938 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Wed, 13 Sep 2017 01:25:33 -0700
Subject: Exclude logging of API responses to prevent leakage of confidential
 data

---
 lib/api/api.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib/api')

diff --git a/lib/api/api.rb b/lib/api/api.rb
index ee4e1688e12..79e55a2f4f7 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -8,7 +8,6 @@ module API
         logger: Logger.new(LOG_FILENAME),
         formatter: Gitlab::GrapeLogging::Formatters::LogrageWithTimestamp.new,
         include: [
-          GrapeLogging::Loggers::Response.new,
           GrapeLogging::Loggers::FilterParameters.new,
           GrapeLogging::Loggers::ClientEnv.new
         ]
-- 
cgit v1.2.1