[SCM] ci-tooling packaging branch, master, updated. ab2900f0adedbee9efd8a9fa33858de4e55fb93a

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=96e51c5

The following commit has been merged in the master branch:
commit 96e51c59e75a5d3f047c1aca148c2695161c6eab
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Dec 3 13:44:47 2015 +0100

    add rubocop overrides for tests so we can make the cops happier
---
 .rubocop.yml      | 2 ++
 test/.rubocop.yml | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 0000000..bb81457
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,2 @@
+inherit_from:
+  - ../.rubocop.yml # pangea-tooling
diff --git a/test/.rubocop.yml b/test/.rubocop.yml
new file mode 100644
index 0000000..4b0ebf6
--- /dev/null
+++ b/test/.rubocop.yml
@@ -0,0 +1,3 @@
+inherit_from:
+ - ../.rubocop.yml # ci-tooling
+ - ../../test/.rubocop.yml # pangea-tooling/test

-- 
ci-tooling packaging