Skip to content

Commit

Permalink
Merge #298
Browse files Browse the repository at this point in the history
298: Revert "Revert #295" r=unleashed a=davidor

Reverts #297

We can update bundler now.

Co-authored-by: David Ortiz <[email protected]>
  • Loading branch information
bors[bot] and davidor authored Jul 5, 2021
2 parents 4af3526 + 5ac9297 commit ea23574
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

docker:
# specify the version you desire here
- image: quay.io/3scale/apisonator-ci:v3.3.1.1
- image: quay.io/3scale/apisonator-ci:v3.4.3

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -311,4 +311,4 @@ DEPENDENCIES
yajl-ruby (~> 1.3.1)

BUNDLED WITH
1.16.6
2.2.21
2 changes: 1 addition & 1 deletion Gemfile.on_prem.lock
Original file line number Diff line number Diff line change
Expand Up @@ -289,4 +289,4 @@ DEPENDENCIES
yajl-ruby (~> 1.3.1)

BUNDLED WITH
1.16.6
2.2.21

0 comments on commit ea23574

Please sign in to comment.