diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e60d0c2..4e456310 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -157,9 +157,9 @@ jobs: steps: - checkout - run: - name: install rubocop + name: install danger command: | - gem install danger + bundle install danger --version - run: danger --verbose diff --git a/Dangerfile b/Dangerfile index 44c972f9..e7cf1660 100644 --- a/Dangerfile +++ b/Dangerfile @@ -52,13 +52,15 @@ end # ------------------------------------------------------------------------------ begin - # Pay extra attention if they modify stuff - important_files = %w[Gemfile Dangerfile] - modified_important_files = git.modified_files & important_files - unless modified_important_files.empty? - warn <<~WARNING - External contributor has edited these files: #{modified_important_files.to_a.join(', ')} - WARNING + unless github.api.organization_member?('bunnylabs', github.pr_author) + # Pay extra attention if they modify stuff + important_files = %w[Gemfile Dangerfile] + modified_important_files = git.modified_files & important_files + unless modified_important_files.empty? + warn <<~WARNING + External contributor has edited these files: #{modified_important_files.to_a.join(', ')} + WARNING + end end rescue URI::InvalidURIError => e warn <<~WARNING diff --git a/app/models/paper_trail/version.rb b/app/models/paper_trail/version.rb index 2081fc88..ecbe3046 100644 --- a/app/models/paper_trail/version.rb +++ b/app/models/paper_trail/version.rb @@ -2,7 +2,7 @@ module PaperTrail # Extension to allow papertrail versions to use ULID - class Version < ApplicationRecord + class Version < ActiveRecord::Base include PaperTrail::VersionConcern include ULID::Rails ulid :id