Skip to content
This repository was archived by the owner on Jun 24, 2024. It is now read-only.

Commit a01781b

Browse files
committed
Figured out the file issue. This isn't edge
1 parent 27dc594 commit a01781b

File tree

7 files changed

+19
-9
lines changed

7 files changed

+19
-9
lines changed

.rubocop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
inherit_gem:
22
rubocop-github:
3-
- config/default_edge.yml
4-
- config/rails_edge.yml
3+
- config/default.yml
4+
- config/rails.yml
55

66
inherit_from: .rubocop_todo.yml
77

Gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,11 @@ group :development, :test do
9191
gem "knapsack", "~> 1.14", ">= 1.14.1"
9292
gem "rails-controller-testing", "~> 1.0", ">= 1.0.4"
9393
gem "rspec-rails", ">= 4.0.0.beta3"
94-
gem "rubocop", "~> 0.52", require: false
95-
gem 'rubocop-github', "~> 0.10", require: false
94+
gem "rubocop", "~> 0.74", :require => false
95+
gem "rubocop-github", git: "https://github.com/github/rubocop-github.git", ref: "6bc6dfb", :require => false
9696
gem "rubocop-performance", "~> 1.4", :require => false
9797
gem "rubocop-rails", "~> 2.3", :require => false
98+
gem "rubocop-rspec", "~> 1.30", ">= 1.30.1", require: false
9899
gem "scss_lint", "~> 0.54.0", require: false
99100
gem "spring", "~> 2.1", ">= 2.1.0"
100101
gem "spring-watcher-listen", "~> 2.0", ">= 2.0.1"

Gemfile.lock

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
GIT
2+
remote: https://github.com/github/rubocop-github.git
3+
revision: 6bc6dfb5db40c929a69f1721a862781116853469
4+
ref: 6bc6dfb
5+
specs:
6+
rubocop-github (0.13.0)
7+
rubocop (~> 0.59)
8+
19
GIT
210
remote: https://github.com/octokit/octokit.rb.git
311
revision: 790a64e58c5072cc5a240f7e4e3ca4718ea7152e
@@ -292,7 +300,7 @@ GEM
292300
oauth2 (~> 1.0)
293301
omniauth (~> 1.2)
294302
os (1.0.1)
295-
parallel (1.19.0)
303+
parallel (1.19.1)
296304
parser (2.6.5.0)
297305
ast (~> 2.4.0)
298306
peek (1.0.1)
@@ -430,13 +438,13 @@ GEM
430438
rainbow (>= 2.2.2, < 4.0)
431439
ruby-progressbar (~> 1.7)
432440
unicode-display_width (>= 1.4.0, < 1.7)
433-
rubocop-github (0.12.0)
434-
rubocop (~> 0.59)
435441
rubocop-performance (1.5.1)
436442
rubocop (>= 0.71.0)
437443
rubocop-rails (2.3.2)
438444
rack (>= 1.1)
439445
rubocop (>= 0.72.0)
446+
rubocop-rspec (1.36.0)
447+
rubocop (>= 0.68.1)
440448
ruby-progressbar (1.10.1)
441449
ruby_dep (1.5.0)
442450
safe_yaml (1.0.5)
@@ -588,10 +596,11 @@ DEPENDENCIES
588596
rails-i18n (~> 6.0)
589597
redis-namespace (~> 1.5, >= 1.5.3)
590598
rspec-rails (>= 4.0.0.beta3)
591-
rubocop (~> 0.52)
592-
rubocop-github (~> 0.10)
599+
rubocop (~> 0.74)
600+
rubocop-github!
593601
rubocop-performance (~> 1.4)
594602
rubocop-rails (~> 2.3)
603+
rubocop-rspec (~> 1.30, >= 1.30.1)
595604
ruby-progressbar (~> 1.8, >= 1.8.1)
596605
sass-rails (~> 6.0)
597606
scss_lint (~> 0.54.0)

vendor/cache/parallel-1.19.0.gem

-9 KB
Binary file not shown.

vendor/cache/parallel-1.19.1.gem

9.5 KB
Binary file not shown.
-16 KB
Binary file not shown.
56 KB
Binary file not shown.

0 commit comments

Comments
 (0)