Skip to content

Commit

Permalink
Merge branch 'beefproject:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
travelportteam authored Nov 27, 2024
2 parents e70c688 + aa52603 commit ab3806c
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 9 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Dependabot auto-merge
on:
pull_request:
branches:
- master

permissions:
contents: write
pull-requests: write

jobs:
dependabot:
runs-on: ubuntu-latest
if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'beefproject/beef'
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v2
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Enable auto-merge for Dependabot PRs
if: success() && (steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch')
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ end
group :test do
gem 'test-unit-full', '~> 0.0.5'
gem 'rspec', '~> 3.13'
gem 'rdoc', '~> 6.7'
gem 'rdoc', '~> 6.8'
gem 'browserstack-local', '~> 1.4'

gem 'irb', '~> 1.14'
Expand All @@ -79,7 +79,7 @@ group :test do
# Note: selenium-webdriver 3.x is incompatible with Firefox version 48 and prior
# gem 'selenium' # Requires old version of selenium which is no longer available
gem 'geckodriver-helper', '~> 0.24.0'
gem 'selenium-webdriver', '~> 4.26'
gem 'selenium-webdriver', '~> 4.27'

# Note: nokogiri is needed by capybara which may require one of the below commands
# sudo apt-get install libxslt-dev libxml2-dev
Expand Down
14 changes: 7 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ GEM
irb (1.14.1)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
json (2.8.1)
json (2.8.2)
language_server-protocol (3.17.0.3)
logger (1.6.1)
matrix (0.4.2)
Expand Down Expand Up @@ -138,7 +138,7 @@ GEM
pry-byebug (3.10.1)
byebug (~> 11.0)
pry (>= 0.13, < 0.15)
psych (5.1.2)
psych (5.2.0)
stringio
public_suffix (6.0.1)
qr4r (0.6.2)
Expand All @@ -153,7 +153,7 @@ GEM
rack (>= 1.3)
rainbow (3.1.1)
rake (13.2.1)
rdoc (6.7.0)
rdoc (6.8.1)
psych (>= 4.0.0)
regexp_parser (2.9.2)
reline (0.5.10)
Expand Down Expand Up @@ -198,7 +198,7 @@ GEM
json
rest-client
securerandom (0.3.1)
selenium-webdriver (4.26.0)
selenium-webdriver (4.27.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
Expand All @@ -216,7 +216,7 @@ GEM
sqlite3 (2.2.0-x86-linux-gnu)
sqlite3 (2.2.0-x86_64-darwin)
sqlite3 (2.2.0-x86_64-linux-gnu)
stringio (3.1.1)
stringio (3.1.2)
sync (0.5.0)
term-ansicolor (1.11.2)
tins (~> 1.0)
Expand Down Expand Up @@ -297,13 +297,13 @@ DEPENDENCIES
rack (~> 2.2)
rack-protection (~> 3.2.0)
rake (~> 13.2)
rdoc (~> 6.7)
rdoc (~> 6.8)
rest-client (~> 2.1.0)
rspec (~> 3.13)
rubocop (~> 1.68.0)
rubyzip (~> 2.3)
rushover (~> 0.3.0)
selenium-webdriver (~> 4.26)
selenium-webdriver (~> 4.27)
sinatra (~> 3.2)
slack-notifier (~> 2.4)
sqlite3 (~> 2.2)
Expand Down

0 comments on commit ab3806c

Please sign in to comment.