diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/danger/commit_linter.rb | 3 | ||||
| -rw-r--r-- | lib/gitlab/project_template.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/testing/clear_thread_memory_cache_middleware.rb | 17 |
3 files changed, 20 insertions, 2 deletions
diff --git a/lib/gitlab/danger/commit_linter.rb b/lib/gitlab/danger/commit_linter.rb index c0748a4b8e6..c9cb66e1718 100644 --- a/lib/gitlab/danger/commit_linter.rb +++ b/lib/gitlab/danger/commit_linter.rb @@ -14,6 +14,7 @@ module Gitlab MAX_CHANGED_LINES_IN_COMMIT = 30 SHORT_REFERENCE_REGEX = %r{([\w\-\/]+)?(#|!|&|%)\d+\b}.freeze DEFAULT_SUBJECT_DESCRIPTION = 'commit subject' + WIP_PREFIX = 'WIP: ' PROBLEMS = { subject_too_short: "The %s must contain at least #{MIN_SUBJECT_WORDS_COUNT} words", subject_too_long: "The %s may not be longer than #{MAX_LINE_LENGTH} characters", @@ -164,7 +165,7 @@ module Gitlab end def subject - message_parts[0] + message_parts[0].delete_prefix(WIP_PREFIX) end def separator diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index 7a5b5b0c6d9..9ed6a23632c 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -40,7 +40,7 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), - ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go template for use with iOS Swift apps.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go template for use with iOS Swift apps.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift', 'illustrations/logos/swift.svg'), ProjectTemplate.new('dotnetcore', '.NET Core', _('A .NET Core console application template, customizable for any .NET Core project'), 'https://gitlab.com/gitlab-org/project-templates/dotnetcore', 'illustrations/logos/dotnet.svg'), ProjectTemplate.new('android', 'Android', _('A ready-to-go template for use with Android apps.'), 'https://gitlab.com/gitlab-org/project-templates/android', 'illustrations/logos/android.svg'), ProjectTemplate.new('gomicro', 'Go Micro', _('Go Micro is a framework for micro service development.'), 'https://gitlab.com/gitlab-org/project-templates/go-micro'), diff --git a/lib/gitlab/testing/clear_thread_memory_cache_middleware.rb b/lib/gitlab/testing/clear_thread_memory_cache_middleware.rb new file mode 100644 index 00000000000..6f54038ae22 --- /dev/null +++ b/lib/gitlab/testing/clear_thread_memory_cache_middleware.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +module Gitlab + module Testing + class ClearThreadMemoryCacheMiddleware + def initialize(app) + @app = app + end + + def call(env) + Gitlab::ThreadMemoryCache.cache_backend.clear + + @app.call(env) + end + end + end +end |