diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 18:07:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 18:07:48 +0000 |
| commit | e20baee820ea2c76ee16980a98e8080f255d9035 (patch) | |
| tree | 6e13a73bee42b7ef310850d03982faebea17a0b1 /lib | |
| parent | 71c5863d7b1ca9836a7d7703f35750cd726a9846 (diff) | |
| download | gitlab-ce-e20baee820ea2c76ee16980a98e8080f255d9035.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/analytics/cycle_analytics/stage_events/production_stage_end.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/danger/commit_linter.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/import_export/group/import_export.yml | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/analytics/cycle_analytics/stage_events/production_stage_end.rb b/lib/gitlab/analytics/cycle_analytics/stage_events/production_stage_end.rb index b249f6874e7..619b45664fa 100644 --- a/lib/gitlab/analytics/cycle_analytics/stage_events/production_stage_end.rb +++ b/lib/gitlab/analytics/cycle_analytics/stage_events/production_stage_end.rb @@ -6,7 +6,7 @@ module Gitlab module StageEvents class ProductionStageEnd < StageEvent def self.name - PlanStageStart.name + _("Issue first depoloyed to production") end def self.identifier diff --git a/lib/gitlab/danger/commit_linter.rb b/lib/gitlab/danger/commit_linter.rb index 8f51ef05f69..616c05d0a02 100644 --- a/lib/gitlab/danger/commit_linter.rb +++ b/lib/gitlab/danger/commit_linter.rb @@ -173,7 +173,7 @@ module Gitlab end def details - message_parts[2] + message_parts[2]&.gsub(/^Signed-off-by.*$/, '') end def line_too_long?(line) diff --git a/lib/gitlab/import_export/group/import_export.yml b/lib/gitlab/import_export/group/import_export.yml index 2721198860c..49b9e0f83d9 100644 --- a/lib/gitlab/import_export/group/import_export.yml +++ b/lib/gitlab/import_export/group/import_export.yml @@ -36,6 +36,8 @@ excluded_attributes: - :runners_token_encrypted - :saml_discovery_token - :visibility_level + epics: + - :state_id methods: labels: @@ -50,6 +52,8 @@ methods: - :action lists: - :list_type + epics: + - :state preloads: |