Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 9 deletions

diff --git a/doc/user/analytics/productivity_analytics.md b/doc/user/analytics/productivity_analytics.md
index 27f1864b6af..bd3cbd62ba0 100644
--- a/doc/user/analytics/productivity_analytics.md
+++ b/doc/user/analytics/productivity_analytics.md
@@ -12,6 +12,8 @@ Software Development Life Cycle (SDLC) process, Productivity Analytics provides
 
 Productivity can slow down for many reasons ranging from degrading code base to quickly growing teams. In order to investigate, department or team leaders can start by visualizing the time it takes for merge requests to be merged.
 
+By default, a data migration job covering three months of historical data will kick off when deploying Productivity Analytics for the first time.
+
 ## Supported features
 
 Productivity Analytics allows GitLab users to:
@@ -19,7 +21,6 @@ Productivity Analytics allows GitLab users to:
 - Visualize typical merge request (MR) lifetime and statistics. Use a histogram that shows the distribution of the time elapsed between creating and merging merge requests.
 - Drill down into the most time consuming merge requests, select a number of outliers, and filter down all subsequent charts to investigate potential causes.
 - Filter by group, project, author, label, milestone, or a specific date range. Filter down, for example, to the merge requests of a specific author in a group or project during a milestone or specific date range.
-- Measure velocity over time. Visualize the trends of each metric from the charts above over time in order to observe progress. Zoom in on a particular date range if you notice outliers.
 
 ## Accessing metrics and visualizations
 
@@ -39,9 +40,7 @@ The following metrics and visualizations are available on a project or group lev
   - Number of commits per merge request.
   - Number of lines of code per commit.
   - Number of files touched.
-- Scatterplot showing all MRs merged on a certain date, together with the days it took to complete the action and a 30 day rolling median.
-  - Users can zoom in and out on specific days of interest.
-- Table showing list of merge requests with their respective times and size metrics.
+- Table showing the list of merge requests with their respective time duration metrics.
   - Users can sort by any of the above metrics.
 
 ## Permissions
diff --git a/rubocop/migration_helpers.rb b/rubocop/migration_helpers.rb
index c066d424437..577f768da67 100644
--- a/rubocop/migration_helpers.rb
+++ b/rubocop/migration_helpers.rb
@@ -3,15 +3,17 @@ module RuboCop
   module MigrationHelpers
     # Returns true if the given node originated from the db/migrate directory.
     def in_migration?(node)
-      dirname = File.dirname(node.location.expression.source_buffer.name)
-
-      dirname.end_with?('db/migrate', 'db/post_migrate')
+      dirname(node).end_with?('db/migrate', 'db/geo/migrate') || in_post_deployment_migration?(node)
     end
 
     def in_post_deployment_migration?(node)
-      dirname = File.dirname(node.location.expression.source_buffer.name)
+      dirname(node).end_with?('db/post_migrate', 'db/geo/post_migrate')
+    end
+
+    private
 
-      dirname.end_with?('db/post_migrate')
+    def dirname(node)
+      File.dirname(node.location.expression.source_buffer.name)
     end
   end
 end