Skip to content

Commit e6d504f

Browse files
committed
Resolve merge conflicts
2 parents 5e161c0 + 39c30d6 commit e6d504f

39 files changed

+28
-30
lines changed

Gemfile.lock

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PATH
88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
activesupport (7.1.3.2)
11+
activesupport (7.1.3.3)
1212
base64
1313
bigdecimal
1414
concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -21,8 +21,8 @@ GEM
2121
addressable (2.8.6)
2222
public_suffix (>= 2.0.2, < 6.0)
2323
ast (2.4.2)
24-
base64 (0.1.1)
25-
bigdecimal (3.1.7)
24+
base64 (0.2.0)
25+
bigdecimal (3.1.8)
2626
concurrent-ruby (1.1.9)
2727
connection_pool (2.4.1)
2828
contracts (0.17)
@@ -32,40 +32,38 @@ GEM
3232
diff-lcs (1.5.1)
3333
docile (1.4.0)
3434
drb (2.2.1)
35-
entitlements-app (0.3.3)
35+
entitlements-app (0.3.4)
3636
concurrent-ruby (= 1.1.9)
37-
faraday (~> 2.0)
38-
net-ldap (~> 0.17)
37+
faraday (> 2.0, <= 2.7.10)
38+
net-ldap (~> 0.19)
3939
octokit (~> 4.18)
4040
optimist (= 3.0.0)
41-
faraday (2.9.0)
42-
faraday-net_http (>= 2.0, < 3.2)
43-
faraday-net_http (3.1.0)
44-
net-http
41+
faraday (2.7.10)
42+
faraday-net_http (>= 2.0, < 3.1)
43+
ruby2_keywords (>= 0.0.4)
44+
faraday-net_http (3.0.2)
4545
hashdiff (1.1.0)
46-
i18n (1.14.4)
46+
i18n (1.14.5)
4747
concurrent-ruby (~> 1.0)
4848
json (2.7.2)
4949
language_server-protocol (3.17.0.3)
50-
minitest (5.22.3)
50+
minitest (5.23.1)
5151
mutex_m (0.2.0)
52-
net-http (0.4.1)
53-
uri
5452
net-ldap (0.19.0)
5553
octokit (4.25.1)
5654
faraday (>= 1, < 3)
5755
sawyer (~> 0.9)
5856
optimist (3.0.0)
5957
parallel (1.24.0)
60-
parser (3.3.0.5)
58+
parser (3.3.1.0)
6159
ast (~> 2.4.1)
6260
racc
6361
public_suffix (5.0.5)
64-
racc (1.7.3)
65-
rack (3.0.10)
62+
racc (1.8.0)
63+
rack (3.0.11)
6664
rainbow (3.1.1)
6765
rake (13.2.1)
68-
regexp_parser (2.9.0)
66+
regexp_parser (2.9.2)
6967
rexml (3.2.8)
7068
strscan (>= 3.0.9)
7169
rspec (3.13.0)
@@ -77,11 +75,11 @@ GEM
7775
rspec-expectations (3.13.0)
7876
diff-lcs (>= 1.2.0, < 2.0)
7977
rspec-support (~> 3.13.0)
80-
rspec-mocks (3.13.0)
78+
rspec-mocks (3.13.1)
8179
diff-lcs (>= 1.2.0, < 2.0)
8280
rspec-support (~> 3.13.0)
8381
rspec-support (3.13.1)
84-
rubocop (1.63.3)
82+
rubocop (1.64.0)
8583
json (~> 2.3)
8684
language_server-protocol (>= 3.17.0)
8785
parallel (~> 1.10)
@@ -92,21 +90,22 @@ GEM
9290
rubocop-ast (>= 1.31.1, < 2.0)
9391
ruby-progressbar (~> 1.7)
9492
unicode-display_width (>= 2.4.0, < 3.0)
95-
rubocop-ast (1.31.2)
96-
parser (>= 3.3.0.4)
93+
rubocop-ast (1.31.3)
94+
parser (>= 3.3.1.0)
9795
rubocop-github (0.20.0)
9896
rubocop (>= 1.37)
9997
rubocop-performance (>= 1.15)
10098
rubocop-rails (>= 2.17)
10199
rubocop-performance (1.21.0)
102100
rubocop (>= 1.48.1, < 2.0)
103101
rubocop-ast (>= 1.31.1, < 2.0)
104-
rubocop-rails (2.24.1)
102+
rubocop-rails (2.25.0)
105103
activesupport (>= 4.2.0)
106104
rack (>= 1.1)
107105
rubocop (>= 1.33.0, < 2.0)
108106
rubocop-ast (>= 1.31.1, < 2.0)
109107
ruby-progressbar (1.13.0)
108+
ruby2_keywords (0.0.5)
110109
rugged (1.7.2)
111110
sawyer (0.9.2)
112111
addressable (>= 2.3.5)
@@ -123,9 +122,8 @@ GEM
123122
tzinfo (2.0.6)
124123
concurrent-ruby (~> 1.0)
125124
unicode-display_width (2.5.0)
126-
uri (0.13.0)
127125
vcr (6.2.0)
128-
webmock (3.23.0)
126+
webmock (3.23.1)
129127
addressable (>= 2.8.0)
130128
crack (>= 0.3.2)
131129
hashdiff (>= 0.4.0, < 2.0.0)
@@ -138,14 +136,14 @@ DEPENDENCIES
138136
rake (= 13.2.1)
139137
rspec (= 3.13.0)
140138
rspec-core (= 3.13.0)
141-
rubocop (= 1.63.3)
139+
rubocop (= 1.64.0)
142140
rubocop-github (= 0.20.0)
143141
rubocop-performance (= 1.21.0)
144142
rugged (~> 1.7, >= 1.7.2)
145143
simplecov (= 0.22.0)
146144
simplecov-erb (= 1.0.1)
147145
vcr (= 6.2.0)
148-
webmock (= 3.23.0)
146+
webmock (= 3.23.1)
149147

150148
BUNDLED WITH
151-
2.3.19
149+
2.5.3

entitlements-gitrepo-auditor-plugin.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ Gem::Specification.new do |s|
2020
s.add_development_dependency "rake", "= 13.2.1"
2121
s.add_development_dependency "rspec", "= 3.13.0"
2222
s.add_development_dependency "rspec-core", "= 3.13.0"
23-
s.add_development_dependency "rubocop", "= 1.63.3"
23+
s.add_development_dependency "rubocop", "= 1.64.0"
2424
s.add_development_dependency "rubocop-github", "= 0.20.0"
2525
s.add_development_dependency "rubocop-performance", "= 1.21.0"
2626
s.add_development_dependency "rugged", "~> 1.7", ">= 1.7.2"
2727
s.add_development_dependency "simplecov", "= 0.22.0"
2828
s.add_development_dependency "simplecov-erb", "= 1.0.1"
2929
s.add_development_dependency "vcr", "= 6.2.0"
30-
s.add_development_dependency "webmock", "3.23.0"
30+
s.add_development_dependency "webmock", "3.23.1"
3131
end
-252 KB
Binary file not shown.
252 KB
Binary file not shown.

vendor/cache/base64-0.1.1.gem

-7 KB
Binary file not shown.

vendor/cache/base64-0.2.0.gem

8.5 KB
Binary file not shown.

vendor/cache/bigdecimal-3.1.7.gem

-86 KB
Binary file not shown.

vendor/cache/bigdecimal-3.1.8.gem

86.5 KB
Binary file not shown.
-154 KB
Binary file not shown.
154 KB
Binary file not shown.

0 commit comments

Comments
 (0)