Hiddenden/beef
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into coverage-improvements

Browse Source
This commit is contained in:
Jake Webster
2026-01-30 14:45:48 +10:00
parent 95052f2066 399ab90207
commit 57777b301a
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/stale.yml vendored
View File

@@ -18,18 +18,18 @@ jobs:
pull-requests: write pull-requests: write
steps: steps:
- uses: actions/stale@v5 - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v10.0.0
with: with:
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 14 days-before-stale: 120
days-before-pr-stale: 29 days-before-pr-stale: 29
days-before-close: 11 days-before-close: 7
days-before-pr-close: 31 days-before-pr-close: 31
stale-issue-message: 'This issue as been marked as stale due to inactivity and will be closed in 7 days' stale-issue-message: 'This issue has been marked as stale due to inactivity and will be closed in 7 days'
stale-pr-message: 'Stale pull request message' stale-pr-message: 'Stale pull request message'
stale-issue-label: 'Stale' stale-issue-label: 'Stale'
stale-pr-label: 'no-pr-activity' stale-pr-label: 'no-pr-activity'
exempt-issue-labels: 'Critical, High, Low, Medium, Review, Backlog' exempt-issue-labels: 'Critical, High, Low, Medium, Review, Backlog'
exempt-milestones: true exempt-all-milestones: true
exempt-draft-pr: true exempt-draft-pr: true
start-date: '2022-06-15' start-date: '2022-06-15T00:00:00Z'

2
Gemfile
View File

@@ -24,7 +24,7 @@ gem 'rake', '~> 13.3'
gem 'activerecord', '~> 8.1' gem 'activerecord', '~> 8.1'
gem 'otr-activerecord', '~> 2.6.0' gem 'otr-activerecord', '~> 2.6.0'
gem 'sqlite3', '~> 2.9' gem 'sqlite3', '~> 2.9'
gem 'rubocop', '~> 1.82.1', require: false gem 'rubocop', '~> 1.84.0', require: false
# Geolocation support # Geolocation support
group :geoip do group :geoip do

14
Gemfile.lock
View File

@@ -135,14 +135,14 @@ GEM
activerecord (>= 6.0, < 9.0) activerecord (>= 6.0, < 9.0)
parallel (1.27.0) parallel (1.27.0)
parseconfig (1.1.2) parseconfig (1.1.2)
parser (3.3.10.0) parser (3.3.10.1)
ast (~> 2.4.1) ast (~> 2.4.1)
racc racc
power_assert (2.0.5) power_assert (2.0.5)
pp (0.6.3) pp (0.6.3)
prettyprint prettyprint
prettyprint (0.2.0) prettyprint (0.2.0)
prism (1.7.0) prism (1.8.0)
pry (0.16.0) pry (0.16.0)
coderay (~> 1.1) coderay (~> 1.1)
method_source (~> 1.0) method_source (~> 1.0)
@@ -198,7 +198,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0) rspec-support (~> 3.13.0)
rspec-support (3.13.6) rspec-support (3.13.6)
rubocop (1.82.1) rubocop (1.84.0)
json (~> 2.3) json (~> 2.3)
language_server-protocol (~> 3.17.0.2) language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0) lint_roller (~> 1.1.0)
@@ -206,12 +206,12 @@ GEM
parser (>= 3.3.0.2) parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0) regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.48.0, < 2.0) rubocop-ast (>= 1.49.0, < 2.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0) unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.48.0) rubocop-ast (1.49.0)
parser (>= 3.3.7.2) parser (>= 3.3.7.2)
prism (~> 1.4) prism (~> 1.7)
ruby-progressbar (1.13.0) ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5) ruby2_keywords (0.0.5)
rubyzip (3.2.2) rubyzip (3.2.2)
@@ -333,7 +333,7 @@ DEPENDENCIES
rdoc (~> 7.1) rdoc (~> 7.1)
rest-client (~> 2.1.0) rest-client (~> 2.1.0)
rspec (~> 3.13) rspec (~> 3.13)
rubocop (~> 1.82.1) rubocop (~> 1.84.0)
rubyzip (~> 3.2) rubyzip (~> 3.2)
rushover (~> 0.3.0) rushover (~> 0.3.0)
selenium-webdriver (~> 4.40) selenium-webdriver (~> 4.40)

1
spec/spec_helper.rb
View File

@@ -3,7 +3,6 @@
# Browser Exploitation Framework (BeEF) - https://beefproject.com # Browser Exploitation Framework (BeEF) - https://beefproject.com
# See the file 'doc/COPYING' for copying permission # See the file 'doc/COPYING' for copying permission
# #
# Coverage must start before loading application code. # Coverage must start before loading application code.
require 'simplecov' require 'simplecov'
SimpleCov.start do SimpleCov.start do