From e3c4d19433a6b4c98cfbe927d97cb81c977357c8 Mon Sep 17 00:00:00 2001 From: Felipe Artur Date: Wed, 27 Mar 2019 12:28:27 -0300 Subject: [PATCH 1/4] Load 'Gitlab::Jira::Middleware' if it exists Loads 'Gitlab::Jira::Middleware' only if it exists so this initializer can be backported to CE. --- config/initializers/jira.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config/initializers/jira.rb b/config/initializers/jira.rb index d6b959893f08ab..b17d5e972e6dbd 100644 --- a/config/initializers/jira.rb +++ b/config/initializers/jira.rb @@ -1,3 +1,9 @@ # Treats JIRA DVCS user agent requests in order to be successfully handled # by our API. -Rails.application.config.middleware.use(Gitlab::Jira::Middleware) +# +# Gitlab::Jira::Middleware is only defined on EE +# +# Use safe_constantize because the class may exist but still not be loaded +if "Gitlab::Jira::Middleware".safe_constantize + Rails.application.config.middleware.use(Gitlab::Jira::Middleware) +end -- GitLab From 04036aff631704167dddc910e4a18f2d327fdd9f Mon Sep 17 00:00:00 2001 From: Felipe Artur Date: Wed, 27 Mar 2019 17:32:10 +0000 Subject: [PATCH 2/4] add # frozen_string_literal: true --- config/initializers/jira.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/initializers/jira.rb b/config/initializers/jira.rb index b17d5e972e6dbd..53efc5df6d8ffc 100644 --- a/config/initializers/jira.rb +++ b/config/initializers/jira.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Treats JIRA DVCS user agent requests in order to be successfully handled # by our API. # -- GitLab From 1a092f0ed5435bae1eeba7a439e8d8bb895cb698 Mon Sep 17 00:00:00 2001 From: Felipe Artur Date: Thu, 28 Mar 2019 12:49:53 +0000 Subject: [PATCH 3/4] Apply suggestion to config/initializers/jira.rb --- config/initializers/jira.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/jira.rb b/config/initializers/jira.rb index 53efc5df6d8ffc..b80c97a75a1010 100644 --- a/config/initializers/jira.rb +++ b/config/initializers/jira.rb @@ -5,7 +5,7 @@ # # Gitlab::Jira::Middleware is only defined on EE # -# Use safe_constantize because the class may exist but still not be loaded +# Use safe_constantize because the class may exist but has not been loaded yet if "Gitlab::Jira::Middleware".safe_constantize Rails.application.config.middleware.use(Gitlab::Jira::Middleware) end -- GitLab From e42c1e7a7510a162ab7aec330979747307b5ae03 Mon Sep 17 00:00:00 2001 From: Felipe Artur Date: Thu, 28 Mar 2019 09:54:05 -0300 Subject: [PATCH 4/4] Improve comments --- config/initializers/jira.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/jira.rb b/config/initializers/jira.rb index b17d5e972e6dbd..c1fd3c3c76a490 100644 --- a/config/initializers/jira.rb +++ b/config/initializers/jira.rb @@ -1,4 +1,4 @@ -# Treats JIRA DVCS user agent requests in order to be successfully handled +# Changes JIRA DVCS user agent requests in order to be successfully handled # by our API. # # Gitlab::Jira::Middleware is only defined on EE -- GitLab