Merge branch 'master' into 32077-pipeline-graph-margins32077-pipeline-graph-margins

* master:
  Fix broken test - load correct data
  Remove redirect for old issue url containing id instead of iid

4 files changed, 238 insertions, 118 deletions

diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index bcd23d61519..58d41e0478d 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -227,7 +227,7 @@ class Projects::IssuesController < Projects::ApplicationController
 
   def issue
     # The Sortable default scope causes performance issues when used with find_by
-    @noteable = @issue ||= @project.issues.where(iid: params[:id]).reorder(nil).take || redirect_old
+    @noteable = @issue ||= @project.issues.where(iid: params[:id]).reorder(nil).take!
   end
   alias_method :subscribable_resource, :issue
   alias_method :issuable, :issue
@@ -266,21 +266,6 @@ class Projects::IssuesController < Projects::ApplicationController
     end
   end
 
-  # Since iids are implemented only in 6.1
-  # user may navigate to issue page using old global ids.
-  #
-  # To prevent 404 errors we provide a redirect to correct iids until 7.0 release
-  #
-  def redirect_old
-    issue = @project.issues.find_by(id: params[:id])
-
-    if issue
-      redirect_to issue_path(issue)
-    else
-      raise ActiveRecord::RecordNotFound.new
-    end
-  end
-
   def issue_params
     params.require(:issue).permit(
       :title, :assignee_id, :position, :description, :confidential,
diff --git a/changelogs/unreleased/20517-delete-projects-issuescontroller-redirect_old.yml b/changelogs/unreleased/20517-delete-projects-issuescontroller-redirect_old.yml
new file mode 100644
index 00000000000..1f3ab3a2c10
--- /dev/null
+++ b/changelogs/unreleased/20517-delete-projects-issuescontroller-redirect_old.yml
@@ -0,0 +1,4 @@
+---
+title: Remove redirect for old issue url containing id instead of iid
+merge_request: 11135
+author: blackst0ne
diff --git a/spec/javascripts/pipelines/graph/graph_component_spec.js b/spec/javascripts/pipelines/graph/graph_component_spec.js
index 024426acf05..6bd0eb86263 100644
--- a/spec/javascripts/pipelines/graph/graph_component_spec.js
+++ b/spec/javascripts/pipelines/graph/graph_component_spec.js
@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import graphComponent from '~/pipelines/components/graph/graph_component.vue';
+import graphJSON from './mock_data';
 
 describe('graph component', () => {
   preloadFixtures('static/graph.html.raw');
@@ -19,108 +20,6 @@ describe('graph component', () => {
   });
 
   describe('with a successfull response', () => {
-    const graphJSON = {
-      details: {
-        stages: [{
-          name: 'review',
-          title: 'review: passed',
-          groups: [{
-            name: 'review_1',
-            size: 1,
-            status: {
-              icon: 'icon_status_success',
-              text: 'passed',
-              label: 'passed',
-              group: 'success',
-              has_details: true,
-              details_path: '/root/review-app/builds/4374',
-              favicon: '/assets/ci_favicons/dev/favicon_status_success-308b4fc054cdd1b68d0865e6cfb7b02e92e3472f201507418f8eddb74ac11a59.ico',
-              action: {
-                icon: 'icon_action_retry',
-                title: 'Retry',
-                path: '/root/review-app/builds/4374/retry',
-                method: 'post',
-              },
-            },
-            jobs: [{
-              id: 4374,
-              name: 'review_1',
-              build_path: '/root/review-app/builds/4374',
-              retry_path: '/root/review-app/builds/4374/retry',
-              playable: false,
-              created_at: '2017-05-08T14:57:39.880Z',
-              updated_at: '2017-05-08T14:57:52.639Z',
-              status: {
-                icon: 'icon_status_success',
-                text: 'passed',
-                label: 'passed',
-                group: 'success',
-                has_details: true,
-                details_path: '/root/review-app/builds/4374',
-                favicon: '/assets/ci_favicons/dev/favicon_status_success-308b4fc054cdd1b68d0865e6cfb7b02e92e3472f201507418f8eddb74ac11a59.ico',
-                action: {
-                  icon: 'icon_action_retry',
-                  title: 'Retry',
-                  path: '/root/review-app/builds/4374/retry',
-                  method: 'post',
-                },
-              },
-            }],
-          },
-          {
-            name: 'test_1',
-            title: 'test_1: passed',
-            status: {
-              icon: 'icon_status_success',
-              text: 'passed',
-              label: 'passed',
-              details_path: '/root/ci-mock/pipelines/123#test',
-            },
-            path: '/root/ci-mock/pipelines/123#test',
-            groups: [{
-              name: 'test',
-              size: 1,
-              jobs: [{
-                id: 4153,
-                name: 'test',
-                status: {
-                  icon: 'icon_status_success',
-                  text: 'passed',
-                  label: 'passed',
-                  details_path: '/root/ci-mock/builds/4153',
-                  action: {
-                    icon: 'icon_action_retry',
-                    title: 'Retry',
-                    path: '/root/ci-mock/builds/4153/retry',
-                    method: 'post',
-                  },
-                },
-              }],
-            }, {
-              name: 'test',
-              size: 1,
-              jobs: [{
-                id: 4153,
-                name: 'test',
-                status: {
-                  icon: 'icon_status_success',
-                  text: 'passed',
-                  label: 'passed',
-                  details_path: '/root/ci-mock/builds/4153',
-                  action: {
-                    icon: 'icon_action_retry',
-                    title: 'Retry',
-                    path: '/root/ci-mock/builds/4153/retry',
-                    method: 'post',
-                  },
-                },
-              }],
-            }],
-          }],
-        }],
-      },
-    };
-
     const interceptor = (request, next) => {
       next(request.respondWith(JSON.stringify(graphJSON), {
         status: 200,
diff --git a/spec/javascripts/pipelines/graph/mock_data.js b/spec/javascripts/pipelines/graph/mock_data.js
new file mode 100644
index 00000000000..56c522b7f77
--- /dev/null
+++ b/spec/javascripts/pipelines/graph/mock_data.js
@@ -0,0 +1,232 @@
+/* eslint-disable quote-props, quotes, comma-dangle */
+export default {
+  "id": 123,
+  "user": {
+    "name": "Root",
+    "username": "root",
+    "id": 1,
+    "state": "active",
+    "avatar_url": null,
+    "web_url": "http://localhost:3000/root"
+  },
+  "active": false,
+  "coverage": null,
+  "path": "/root/ci-mock/pipelines/123",
+  "details": {
+    "status": {
+      "icon": "icon_status_success",
+      "text": "passed",
+      "label": "passed",
+      "group": "success",
+      "has_details": true,
+      "details_path": "/root/ci-mock/pipelines/123",
+      "favicon": "/assets/ci_favicons/dev/favicon_status_success-308b4fc054cdd1b68d0865e6cfb7b02e92e3472f201507418f8eddb74ac11a59.ico"
+    },
+    "duration": 9,
+    "finished_at": "2017-04-19T14:30:27.542Z",
+    "stages": [{
+      "name": "test",
+      "title": "test: passed",
+      "groups": [{
+        "name": "test",
+        "size": 1,
+        "status": {
+          "icon": "icon_status_success",
+          "text": "passed",
+          "label": "passed",
+          "group": "success",
+          "has_details": true,
+          "details_path": "/root/ci-mock/builds/4153",
+          "favicon": "/assets/ci_favicons/dev/favicon_status_success-308b4fc054cdd1b68d0865e6cfb7b02e92e3472f201507418f8eddb74ac11a59.ico",
+          "action": {
+            "icon": "icon_action_retry",
+            "title": "Retry",
+            "path": "/root/ci-mock/builds/4153/retry",
+            "method": "post"
+          }
+        },
+        "jobs": [{
+          "id": 4153,
+          "name": "test",
+          "build_path": "/root/ci-mock/builds/4153",
+          "retry_path": "/root/ci-mock/builds/4153/retry",
+          "playable": false,
+          "created_at": "2017-04-13T09:25:18.959Z",
+          "updated_at": "2017-04-13T09:25:23.118Z",
+          "status": {
+            "icon": "icon_status_success",
+            "text": "passed",
+            "label": "passed",
+            "group": "success",
+            "has_details": true,
+            "details_path": "/root/ci-mock/builds/4153",
+            "favicon": "/assets/ci_favicons/dev/favicon_status_success-308b4fc054cdd1b68d0865e6cfb7b02e92e3472f201507418f8eddb74ac11a59.ico",
+            "action": {
+              "icon": "icon_action_retry",
+              "title": "Retry",
+              "path": "/root/ci-mock/builds/4153/retry",
+              "method": "post"
+            }
+          }
+        }]
+      }],
+      "status": {
+        "icon": "icon_status_success",
+        "text": "passed",
+        "label": "passed",
+        "group": "success",
+        "has_details": true,
+        "details_path": "/root/ci-mock/pipelines/123#test",
+        "favicon": "/assets/ci_favicons/dev/favicon_status_success-308b4fc054cdd1b68d0865e6cfb7b02e92e3472f201507418f8eddb74ac11a59.ico"
+      },
+      "path": "/root/ci-mock/pipelines/123#test",
+      "dropdown_path": "/root/ci-mock/pipelines/123/stage.json?stage=test"
+    }, {
+      "name": "deploy",
+      "title": "deploy: passed",
+      "groups": [{
+        "name": "deploy to production",
+        "size": 1,
+        "status": {
+          "icon": "icon_status_success",
+          "text": "passed",
+          "label": "passed",
+          "group": "success",
+          "has_details": true,
+          "details_path": "/root/ci-mock/builds/4166",
+          "favicon": "/assets/ci_favicons/dev/favicon_status_success-308b4fc054cdd1b68d0865e6cfb7b02e92e3472f201507418f8eddb74ac11a59.ico",
+          "action": {
+            "icon": "icon_action_retry",
+            "title": "Retry",
+            "path": "/root/ci-mock/builds/4166/retry",
+            "method": "post"
+          }
+        },
+        "jobs": [{
+          "id": 4166,
+          "name": "deploy to production",
+          "build_path": "/root/ci-mock/builds/4166",
+          "retry_path": "/root/ci-mock/builds/4166/retry",
+          "playable": false,
+          "created_at": "2017-04-19T14:29:46.463Z",
+          "updated_at": "2017-04-19T14:30:27.498Z",
+          "status": {
+            "icon": "icon_status_success",
+            "text": "passed",
+            "label": "passed",
+            "group": "success",
+            "has_details": true,
+            "details_path": "/root/ci-mock/builds/4166",
+            "favicon": "/assets/ci_favicons/dev/favicon_status_success-308b4fc054cdd1b68d0865e6cfb7b02e92e3472f201507418f8eddb74ac11a59.ico",
+            "action": {
+              "icon": "icon_action_retry",
+              "title": "Retry",
+              "path": "/root/ci-mock/builds/4166/retry",
+              "method": "post"
+            }
+          }
+        }]
+      }, {
+        "name": "deploy to staging",
+        "size": 1,
+        "status": {
+          "icon": "icon_status_success",
+          "text": "passed",
+          "label": "passed",
+          "group": "success",
+          "has_details": true,
+          "details_path": "/root/ci-mock/builds/4159",
+          "favicon": "/assets/ci_favicons/dev/favicon_status_success-308b4fc054cdd1b68d0865e6cfb7b02e92e3472f201507418f8eddb74ac11a59.ico",
+          "action": {
+            "icon": "icon_action_retry",
+            "title": "Retry",
+            "path": "/root/ci-mock/builds/4159/retry",
+            "method": "post"
+          }
+        },
+        "jobs": [{
+          "id": 4159,
+          "name": "deploy to staging",
+          "build_path": "/root/ci-mock/builds/4159",
+          "retry_path": "/root/ci-mock/builds/4159/retry",
+          "playable": false,
+          "created_at": "2017-04-18T16:32:08.420Z",
+          "updated_at": "2017-04-18T16:32:12.631Z",
+          "status": {
+            "icon": "icon_status_success",
+            "text": "passed",
+            "label": "passed",
+            "group": "success",
+            "has_details": true,
+            "details_path": "/root/ci-mock/builds/4159",
+            "favicon": "/assets/ci_favicons/dev/favicon_status_success-308b4fc054cdd1b68d0865e6cfb7b02e92e3472f201507418f8eddb74ac11a59.ico",
+            "action": {
+              "icon": "icon_action_retry",
+              "title": "Retry",
+              "path": "/root/ci-mock/builds/4159/retry",
+              "method": "post"
+            }
+          }
+        }]
+      }],
+      "status": {
+        "icon": "icon_status_success",
+        "text": "passed",
+        "label": "passed",
+        "group": "success",
+        "has_details": true,
+        "details_path": "/root/ci-mock/pipelines/123#deploy",
+        "favicon": "/assets/ci_favicons/dev/favicon_status_success-308b4fc054cdd1b68d0865e6cfb7b02e92e3472f201507418f8eddb74ac11a59.ico"
+      },
+      "path": "/root/ci-mock/pipelines/123#deploy",
+      "dropdown_path": "/root/ci-mock/pipelines/123/stage.json?stage=deploy"
+    }],
+    "artifacts": [],
+    "manual_actions": [{
+      "name": "deploy to production",
+      "path": "/root/ci-mock/builds/4166/play",
+      "playable": false
+    }]
+  },
+  "flags": {
+    "latest": true,
+    "triggered": false,
+    "stuck": false,
+    "yaml_errors": false,
+    "retryable": false,
+    "cancelable": false
+  },
+  "ref": {
+    "name": "master",
+    "path": "/root/ci-mock/tree/master",
+    "tag": false,
+    "branch": true
+  },
+  "commit": {
+    "id": "798e5f902592192afaba73f4668ae30e56eae492",
+    "short_id": "798e5f90",
+    "title": "Merge branch 'new-branch' into 'master'\r",
+    "created_at": "2017-04-13T10:25:17.000+01:00",
+    "parent_ids": ["54d483b1ed156fbbf618886ddf7ab023e24f8738", "c8e2d38a6c538822e81c57022a6e3a0cfedebbcc"],
+    "message": "Merge branch 'new-branch' into 'master'\r\n\r\nAdd new file\r\n\r\nSee merge request !1",
+    "author_name": "Root",
+    "author_email": "admin@example.com",
+    "authored_date": "2017-04-13T10:25:17.000+01:00",
+    "committer_name": "Root",
+    "committer_email": "admin@example.com",
+    "committed_date": "2017-04-13T10:25:17.000+01:00",
+    "author": {
+      "name": "Root",
+      "username": "root",
+      "id": 1,
+      "state": "active",
+      "avatar_url": null,
+      "web_url": "http://localhost:3000/root"
+    },
+    "author_gravatar_url": null,
+    "commit_url": "http://localhost:3000/root/ci-mock/commit/798e5f902592192afaba73f4668ae30e56eae492",
+    "commit_path": "/root/ci-mock/commit/798e5f902592192afaba73f4668ae30e56eae492"
+  },
+  "created_at": "2017-04-13T09:25:18.881Z",
+  "updated_at": "2017-04-19T14:30:27.561Z"
+};