diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-26 00:45:03 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-26 00:45:03 +0000 |
| commit | 0efbc126d080892214d312a3ae2549f1fc341cb6 (patch) | |
| tree | b7131288bcbc3c5b0160ad55ed4b95523ce71c12 /lib/gitlab/regex.rb | |
| parent | 46e3ad4b948dedf67245708493ee17c4429f8bf3 (diff) | |
| parent | 679c0048a8f679aad456c02e30486150bbd0d93d (diff) | |
| download | gitlab-ce-prettify-all-the-things-4.tar.gz | |
Merge branch 'master' into 'prettify-all-the-things-4'prettify-all-the-things-4
# Conflicts:
# app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
Diffstat (limited to 'lib/gitlab/regex.rb')
| -rw-r--r-- | lib/gitlab/regex.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb index 0f26fcfe8cb..7a1a2eaf6c0 100644 --- a/lib/gitlab/regex.rb +++ b/lib/gitlab/regex.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Gitlab module Regex extend self |