Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
79cda4c1
Commit
79cda4c1
authored
Dec 10, 2021
by
Luke Duncalfe
Committed by
Vitali Tatarintev
Dec 10, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove api_v3_commits_skip_diff_files feature flag
parent
01dd30cc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
22 deletions
+0
-22
config/feature_flags/development/api_v3_commits_skip_diff_files.yml
...ture_flags/development/api_v3_commits_skip_diff_files.yml
+0
-8
lib/api/v3/github.rb
lib/api/v3/github.rb
+0
-2
spec/requests/api/v3/github_spec.rb
spec/requests/api/v3/github_spec.rb
+0
-12
No files found.
config/feature_flags/development/api_v3_commits_skip_diff_files.yml
deleted
100644 → 0
View file @
01dd30cc
---
name
:
api_v3_commits_skip_diff_files
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67647
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/344617
milestone
:
'
14.5'
type
:
development
group
:
group::integrations
default_enabled
:
true
lib/api/v3/github.rb
View file @
79cda4c1
...
...
@@ -101,8 +101,6 @@ module API
# of time after a Gitaly timeout, to mitigate frequent Gitaly timeouts
# for some Commit diffs.
def
diff_files
(
commit
)
return
commit
.
diffs
.
diff_files
unless
Feature
.
enabled?
(
:api_v3_commits_skip_diff_files
,
commit
.
project
,
default_enabled: :yaml
)
cache_key
=
[
GITALY_TIMEOUT_CACHE_KEY
,
commit
.
project
.
id
,
...
...
spec/requests/api/v3/github_spec.rb
View file @
79cda4c1
...
...
@@ -567,18 +567,6 @@ RSpec.describe API::V3::Github do
expect
(
response_diff_files
(
response
)).
to
be_blank
end
it
'does not handle the error when feature flag is disabled'
,
:aggregate_failures
do
stub_feature_flags
(
api_v3_commits_skip_diff_files:
false
)
allow
(
Gitlab
::
GitalyClient
).
to
receive
(
:call
)
.
with
(
*
commit_diff_args
)
.
and_raise
(
GRPC
::
DeadlineExceeded
)
call_api
expect
(
response
).
to
have_gitlab_http_status
(
:error
)
end
it
'only calls Gitaly once for all attempts within a period of time'
,
:aggregate_failures
do
expect
(
Gitlab
::
GitalyClient
).
to
receive
(
:call
)
.
with
(
*
commit_diff_args
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment