Automatic merge of gitlab-org/gitlab-ce master

app/serializers/analytics_issue_entity.rb

@@ -26,6 +26,6 @@ class AnalyticsIssueEntity < Grape::Entity
   private
 
   def url_to(route, object)
-    public_send("#{route}_url", object[:path], object[:name], object[:iid].to_s) # rubocop:disable GitlabSecurity/PublicSend
+    public_send("#{route}_url", object[:namespace_path], object[:project_path], object[:iid].to_s) # rubocop:disable GitlabSecurity/PublicSend
   end
 end

changelogs/unreleased/fix-name-vs-path-problem-for-cycle-analytics.yml

+---
+title: Fix broken issue links and possible 500 error on cycle analytics page when project name and path are different
+merge_request: 31471
+author:
+type: fixed

doc/administration/plugins.md

@@ -52,7 +52,37 @@ as appropriate. The plugins file list is updated for each event, there is no
 need to restart GitLab to apply a new plugin.
 
 If a plugin executes with non-zero exit code or GitLab fails to execute it, a
-message will be logged to `plugin.log`.
+message will be logged to:
+
+- `gitlab-rails/plugin.log` in an Omnibus installation.
+- `log/plugin.log` in a source installation.
+
+## Creating plugins
+
+Below is an example that will only response on the event `project_create` and
+will inform the admins from the GitLab instance that a new project has been created.
+
+```ruby
+# By using the embedded ruby version we eliminate the possibility that our chosen language
+# would be unavailable from
+#!/opt/gitlab/embedded/bin/ruby
+require 'json'
+require 'mail'
+
+# The incoming variables are in JSON format so we need to parse it first.
+ARGS = JSON.parse(STDIN.read)
+
+# We only want to trigger this plugin on the event project_create
+return unless ARGS['event_name'] == 'project_create'
+
+# We will inform our admins of our gitlab instance that a new project is created
+Mail.deliver do
+  from    'info@gitlab_instance.com'
+  to      'admin@gitlab_instance.com'
+  subject "new project " + ARGS['name']
+  body    ARGS['owner_name'] + 'created project ' + ARGS['name']
+end
+```
 
 ## Validation
 

doc/user/project/pipelines/settings.md

@@ -76,6 +76,13 @@ Here are some valid examples:
 - `my/path/.gitlab-ci.yml`
 - `my/path/.my-custom-file.yml`
 
+The path can be customized at a project level. To customize the path:
+
+1. Go to the project's **Settings > CI / CD**.
+1. Expand the **General pipelines** section.
+1. Provide a value in the **Custom CI config path** field.
+1. Click **Save changes**.
+
 ## Test coverage parsing
 
 If you use test coverage in your code, GitLab can capture its output in the

lib/gitlab/cycle_analytics/base_query.rb

@@ -19,9 +19,10 @@ module Gitlab
           .join(projects_table).on(issue_table[:project_id].eq(projects_table[:id]))
           .join(routes_table).on(projects_table[:namespace_id].eq(routes_table[:source_id]))
           .project(issue_table[:project_id].as("project_id"))
-          .where(issue_table[:project_id].in(project_ids))
-          .where(routes_table[:source_type].eq('Namespace'))
-          .where(issue_table[:created_at].gteq(options[:from]))
+          .project(projects_table[:path].as("project_path"))
+          .project(routes_table[:path].as("namespace_path"))
+
+        query = limit_query(query, project_ids)
 
         # Load merge_requests
 
@@ -30,6 +31,12 @@ module Gitlab
         query
       end
 
+      def limit_query(query, project_ids)
+        query.where(issue_table[:project_id].in(project_ids))
+          .where(routes_table[:source_type].eq('Namespace'))
+          .where(issue_table[:created_at].gteq(options[:from]))
+      end
+
       def load_merge_requests(query)
         query.join(mr_table, Arel::Nodes::OuterJoin)
           .on(mr_table[:id].eq(mr_closing_issues_table[:merge_request_id]))

lib/gitlab/cycle_analytics/code_event_fetcher.rb

@@ -11,9 +11,7 @@ module Gitlab
                         mr_table[:id],
                         mr_table[:created_at],
                         mr_table[:state],
-                        mr_table[:author_id],
-                        projects_table[:name],
-                        routes_table[:path]]
+                        mr_table[:author_id]]
         @order = mr_table[:created_at]
 
         super(*args)

lib/gitlab/cycle_analytics/issue_event_fetcher.rb

@@ -10,9 +10,7 @@ module Gitlab
                         issue_table[:iid],
                         issue_table[:id],
                         issue_table[:created_at],
-                        issue_table[:author_id],
-                        projects_table[:name],
-                        routes_table[:path]]
+                        issue_table[:author_id]]
 
         super(*args)
       end

lib/gitlab/cycle_analytics/issue_helper.rb

@@ -8,12 +8,19 @@ module Gitlab
           .join(projects_table).on(issue_table[:project_id].eq(projects_table[:id]))
           .join(routes_table).on(projects_table[:namespace_id].eq(routes_table[:source_id]))
           .project(issue_table[:project_id].as("project_id"))
-          .where(issue_table[:project_id].in(project_ids))
+          .project(projects_table[:path].as("project_path"))
+          .project(routes_table[:path].as("namespace_path"))
+
+        query = limit_query(query, project_ids)
+
+        query
+      end
+
+      def limit_query(query, project_ids)
+        query.where(issue_table[:project_id].in(project_ids))
           .where(routes_table[:source_type].eq('Namespace'))
           .where(issue_table[:created_at].gteq(options[:from]))
           .where(issue_metrics_table[:first_added_to_board_at].not_eq(nil).or(issue_metrics_table[:first_associated_with_milestone_at].not_eq(nil)))
-
-        query
       end
     end
   end

lib/gitlab/cycle_analytics/plan_event_fetcher.rb

@@ -10,9 +10,7 @@ module Gitlab
                         issue_table[:iid],
                         issue_table[:id],
                         issue_table[:created_at],
-                        issue_table[:author_id],
-                        projects_table[:name],
-                        routes_table[:path]]
+                        issue_table[:author_id]]
 
         super(*args)
       end

lib/gitlab/cycle_analytics/plan_helper.rb

@@ -8,14 +8,16 @@ module Gitlab
           .join(projects_table).on(issue_table[:project_id].eq(projects_table[:id]))
           .join(routes_table).on(projects_table[:namespace_id].eq(routes_table[:source_id]))
           .project(issue_table[:project_id].as("project_id"))
+          .project(projects_table[:path].as("project_path"))
+          .project(routes_table[:path].as("namespace_path"))
           .where(issue_table[:project_id].in(project_ids))
           .where(routes_table[:source_type].eq('Namespace'))
-        query = add_conditions_to_query(query)
+        query = limit_query(query)
 
         query
       end
 
-      def add_conditions_to_query(query)
+      def limit_query(query)
         query.where(issue_table[:created_at].gteq(options[:from]))
           .where(issue_metrics_table[:first_added_to_board_at].not_eq(nil).or(issue_metrics_table[:first_associated_with_milestone_at].not_eq(nil)))
           .where(issue_metrics_table[:first_mentioned_in_commit_at].not_eq(nil))

lib/gitlab/cycle_analytics/production_event_fetcher.rb

@@ -11,7 +11,6 @@ module Gitlab
                         issue_table[:id],
                         issue_table[:created_at],
                         issue_table[:author_id],
-                        projects_table[:name],
                         routes_table[:path]]
 
         super(*args)

lib/gitlab/cycle_analytics/review_event_fetcher.rb

@@ -11,9 +11,7 @@ module Gitlab
                         mr_table[:id],
                         mr_table[:created_at],
                         mr_table[:state],
-                        mr_table[:author_id],
-                        projects_table[:name],
-                        routes_table[:path]]
+                        mr_table[:author_id]]
 
         super(*args)
       end

spec/serializers/analytics_issue_entity_spec.rb

@@ -10,12 +10,12 @@ describe AnalyticsIssueEntity do
       id: "1",
       created_at: "2016-11-12 15:04:02.948604",
       author: user,
-      name: project.name,
-      path: project.namespace
+      project_path: project.path,
+      namespace_path: project.namespace.route.path
     }
   end
 
-  let(:project) { create(:project) }
+  let(:project) { create(:project, name: 'my project') }
   let(:request) { EntityRequest.new(entity: :merge_request) }
 
   let(:entity) do

spec/serializers/analytics_issue_serializer_spec.rb

@@ -8,7 +8,7 @@ describe AnalyticsIssueSerializer do
   end
 
   let(:user) { create(:user) }
-  let(:project) { create(:project) }
+  let(:project) { create(:project, name: 'my project') }
   let(:resource) do
     {
       total_time: "172802.724419",
@@ -17,8 +17,8 @@ describe AnalyticsIssueSerializer do
       id: "1",
       created_at: "2016-11-12 15:04:02.948604",
       author: user,
-      name: project.name,
-      path: project.namespace
+      project_path: project.path,
+      namespace_path: project.namespace.route.path
     }
   end
 

spec/serializers/analytics_merge_request_serializer_spec.rb

@@ -8,7 +8,7 @@ describe AnalyticsMergeRequestSerializer do
   end
 
   let(:user) { create(:user) }
-  let(:project) { create(:project) }
+  let(:project) { create(:project, name: 'my project') }
   let(:resource) do
     {
       total_time: "172802.724419",
@@ -18,8 +18,8 @@ describe AnalyticsMergeRequestSerializer do
       state: 'open',
       created_at: "2016-11-12 15:04:02.948604",
       author: user,
-      name: project.name,
-      path: project.namespace
+      project_path: project.path,
+      namespace_path: project.namespace.route.path
     }
   end