From 2c11e386f12eae5dac58379ab0d355bf44d4f969 Mon Sep 17 00:00:00 2001 From: jjaffeux Date: Wed, 6 May 2020 18:11:07 +0200 Subject: [PATCH] DEV: Move to rubocop-discourse. --- .gitignore | 3 --- .rubocop.yml | 3 ++- Gemfile | 1 + Gemfile.lock | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index fb79787..2f9ee3b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,10 +2,7 @@ log/*.log pkg/ auto_generated -Gemfile.lock .DS_Store *.swp *.swo node_modules/ - -.rubocop-https---raw-githubusercontent-com-discourse-discourse-master--rubocop-yml diff --git a/.rubocop.yml b/.rubocop.yml index 0ca7eff..d46296c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1 +1,2 @@ -inherit_from: https://raw.githubusercontent.com/discourse/discourse/master/.rubocop.yml +inherit_gem: + rubocop-discourse: default.yml diff --git a/Gemfile b/Gemfile index df32188..f6bd3b2 100644 --- a/Gemfile +++ b/Gemfile @@ -2,4 +2,5 @@ group :development do gem 'translations-manager', git: 'https://github.com/discourse/translations-manager.git' + gem 'rubocop-discourse' end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..a49fac9 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,40 @@ +GIT + remote: https://github.com/discourse/translations-manager.git + revision: d6da5ff928b9ea39a15c9b6f16b856f46bc9069b + specs: + translations-manager (0.6) + +GEM + specs: + ast (2.4.0) + jaro_winkler (1.5.4) + parallel (1.19.1) + parser (2.7.1.2) + ast (~> 2.4.0) + rainbow (3.0.0) + rexml (3.2.4) + rubocop (0.82.0) + jaro_winkler (~> 1.5.1) + parallel (~> 1.10) + parser (>= 2.7.0.1) + rainbow (>= 2.2.2, < 4.0) + rexml + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-discourse (2.1.2) + rubocop (>= 0.69.0) + rubocop-rspec (>= 1.39.0) + rubocop-rspec (1.39.0) + rubocop (>= 0.68.1) + ruby-progressbar (1.10.1) + unicode-display_width (1.7.0) + +PLATFORMS + ruby + +DEPENDENCIES + rubocop-discourse + translations-manager! + +BUNDLED WITH + 2.1.4