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

Commit

Permalink
Figured out the file issue. This isn't edge
Browse files Browse the repository at this point in the history
  • Loading branch information
JessRudder committed Nov 22, 2019
1 parent 27dc594 commit a01781b
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
inherit_gem:
rubocop-github:
- config/default_edge.yml
- config/rails_edge.yml
- config/default.yml
- config/rails.yml

inherit_from: .rubocop_todo.yml

Expand Down
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,11 @@ group :development, :test do
gem "knapsack", "~> 1.14", ">= 1.14.1"
gem "rails-controller-testing", "~> 1.0", ">= 1.0.4"
gem "rspec-rails", ">= 4.0.0.beta3"
gem "rubocop", "~> 0.52", require: false
gem 'rubocop-github', "~> 0.10", require: false
gem "rubocop", "~> 0.74", :require => false
gem "rubocop-github", git: "https://github.com/github/rubocop-github.git", ref: "6bc6dfb", :require => false
gem "rubocop-performance", "~> 1.4", :require => false
gem "rubocop-rails", "~> 2.3", :require => false
gem "rubocop-rspec", "~> 1.30", ">= 1.30.1", require: false
gem "scss_lint", "~> 0.54.0", require: false
gem "spring", "~> 2.1", ">= 2.1.0"
gem "spring-watcher-listen", "~> 2.0", ">= 2.0.1"
Expand Down
19 changes: 14 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
GIT
remote: https://github.com/github/rubocop-github.git
revision: 6bc6dfb5db40c929a69f1721a862781116853469
ref: 6bc6dfb
specs:
rubocop-github (0.13.0)
rubocop (~> 0.59)

GIT
remote: https://github.com/octokit/octokit.rb.git
revision: 790a64e58c5072cc5a240f7e4e3ca4718ea7152e
Expand Down Expand Up @@ -292,7 +300,7 @@ GEM
oauth2 (~> 1.0)
omniauth (~> 1.2)
os (1.0.1)
parallel (1.19.0)
parallel (1.19.1)
parser (2.6.5.0)
ast (~> 2.4.0)
peek (1.0.1)
Expand Down Expand Up @@ -430,13 +438,13 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-github (0.12.0)
rubocop (~> 0.59)
rubocop-performance (1.5.1)
rubocop (>= 0.71.0)
rubocop-rails (2.3.2)
rack (>= 1.1)
rubocop (>= 0.72.0)
rubocop-rspec (1.36.0)
rubocop (>= 0.68.1)
ruby-progressbar (1.10.1)
ruby_dep (1.5.0)
safe_yaml (1.0.5)
Expand Down Expand Up @@ -588,10 +596,11 @@ DEPENDENCIES
rails-i18n (~> 6.0)
redis-namespace (~> 1.5, >= 1.5.3)
rspec-rails (>= 4.0.0.beta3)
rubocop (~> 0.52)
rubocop-github (~> 0.10)
rubocop (~> 0.74)
rubocop-github!
rubocop-performance (~> 1.4)
rubocop-rails (~> 2.3)
rubocop-rspec (~> 1.30, >= 1.30.1)
ruby-progressbar (~> 1.8, >= 1.8.1)
sass-rails (~> 6.0)
scss_lint (~> 0.54.0)
Expand Down
Binary file removed vendor/cache/parallel-1.19.0.gem
Binary file not shown.
Binary file added vendor/cache/parallel-1.19.1.gem
Binary file not shown.
Binary file removed vendor/cache/rubocop-github-0.12.0.gem
Binary file not shown.
Binary file added vendor/cache/rubocop-rspec-1.36.0.gem
Binary file not shown.

0 comments on commit a01781b

Please sign in to comment.