Add latest changes from gitlab-org/gitlab@master

3 files changed, 17 insertions, 4 deletions

diff --git a/lib/gitlab/devise_failure.rb b/lib/gitlab/devise_failure.rb
new file mode 100644
index 00000000000..4d27b706e1e
--- /dev/null
+++ b/lib/gitlab/devise_failure.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Gitlab
+  class DeviseFailure < Devise::FailureApp
+    # If the request format is not known, send a redirect instead of a 401
+    # response, since this is the outcome we're most likely to want
+    def http_auth?
+      return super unless Feature.enabled?(:devise_redirect_unknown_formats, default_enabled: true)
+
+      request_format && super
+    end
+  end
+end
diff --git a/lib/gitlab/time_tracking_formatter.rb b/lib/gitlab/time_tracking_formatter.rb
index 31883527135..b15cb85dde0 100644
--- a/lib/gitlab/time_tracking_formatter.rb
+++ b/lib/gitlab/time_tracking_formatter.rb
@@ -5,7 +5,7 @@ module Gitlab
     extend self
 
     # We may want to configure it through project settings in a future version.
-    CUSTOM_DAY_AND_WEEK_LENGTH = { hours_per_day: 8, days_per_month: 20 }.freeze
+    CUSTOM_DAY_AND_MONTH_LENGTH = { hours_per_day: 8, days_per_month: 20 }.freeze
 
     def parse(string)
       string = string.sub(/\A-/, '')
@@ -14,7 +14,7 @@ module Gitlab
         begin
           ChronicDuration.parse(
             string,
-            CUSTOM_DAY_AND_WEEK_LENGTH.merge(default_unit: 'hours'))
+            CUSTOM_DAY_AND_MONTH_LENGTH.merge(default_unit: 'hours'))
         rescue
           nil
         end
@@ -26,7 +26,7 @@ module Gitlab
     def output(seconds)
       ChronicDuration.output(
         seconds,
-        CUSTOM_DAY_AND_WEEK_LENGTH.merge(
+        CUSTOM_DAY_AND_MONTH_LENGTH.merge(
           format: :short,
           limit_to_hours: limit_to_hours_setting,
           weeks: true))
diff --git a/lib/gitlab_danger.rb b/lib/gitlab_danger.rb
index b4768a9546d..cf297c142dc 100644
--- a/lib/gitlab_danger.rb
+++ b/lib/gitlab_danger.rb
@@ -10,13 +10,13 @@ class GitlabDanger
     prettier
     eslint
     database
+    commit_messages
   ].freeze
 
   CI_ONLY_RULES ||= %w[
     metadata
     changelog
     specs
-    commit_messages
     roulette
     single_codebase
     gitlab_ui_wg