From 71282a241e76608df5d99112df005ebbc7a3204b Mon Sep 17 00:00:00 2001
From: Hannah Wolfe <github.erisds@gmail.com>
Date: Tue, 12 Jul 2016 18:55:46 +0100
Subject: [PATCH] Various post-repo-split cleanup (#6910)

no issue

- remove bower from dependencies, greenkeeper ignores & .editorconfig
- remove old custom jscs rule for ember
---
 .editorconfig                                 |  2 +-
 .jscsrc                                       |  1 -
 .../jscs-rules/disallow-object-controller.js  | 32 -------------------
 package.json                                  |  2 --
 4 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 core/test/utils/jscs-rules/disallow-object-controller.js

diff --git a/.editorconfig b/.editorconfig
index 9b23950ce9..35c1776c30 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,7 +13,7 @@ trim_trailing_whitespace = true
 [*.hbs]
 insert_final_newline = false
 
-[{package,bower}.json]
+[{package}.json]
 indent_size = 2
 
 [*.md]
diff --git a/.jscsrc b/.jscsrc
index 6df9747b94..d7aa689539 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,5 +1,4 @@
 {
-    "additionalRules": [ "core/test/utils/jscs-rules/*.js" ],
     "requireCurlyBraces": [
         "if",
         "else",
diff --git a/core/test/utils/jscs-rules/disallow-object-controller.js b/core/test/utils/jscs-rules/disallow-object-controller.js
deleted file mode 100644
index 6feb2c90f5..0000000000
--- a/core/test/utils/jscs-rules/disallow-object-controller.js
+++ /dev/null
@@ -1,32 +0,0 @@
-var assert = require('assert');
-
-module.exports = function () {};
-
-module.exports.prototype = {
-    configure: function (disallowObjectController) {
-        assert(
-            typeof disallowObjectController === 'boolean',
-            'disallowObjectController option requires boolean value'
-        );
-        assert(
-            disallowObjectController === true,
-            'disallowObjectController option requires true value or should be removed'
-        );
-    },
-
-    getOptionName: function () {
-        return 'disallowObjectController';
-    },
-
-    check: function (file, errors) {
-        var lines = file.getLines();
-
-        lines.forEach(function (line, index) {
-            var location = line.indexOf('ObjectController.extend');
-
-            if (location !== -1) {
-                errors.add('Ember.ObjectController is deprecated, please use Ember.Controller and access model properties directly.', index + 1, location + 1);
-            }
-        });
-    }
-};
diff --git a/package.json b/package.json
index fcdd6a77f4..4d7db8ba54 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,6 @@
     "pg": "4.1.1"
   },
   "devDependencies": {
-    "bower": "1.4.1",
     "csscomb": "3.1.8",
     "grunt": "1.0.1",
     "grunt-bg-shell": "2.3.3",
@@ -109,7 +108,6 @@
   },
   "greenkeeper": {
     "ignore": [
-      "bower",
       "glob",
       "mysql",
       "nodemailer",