BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
d6d7abb1
Commit
d6d7abb1
authored
May 23, 2018
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'gitaly-repo-squash-in-progress-opt-out' into 'master'
Make Repo#squash_in_progress Opt-Out See merge request gitlab-org/gitlab-ce!19088
parents
91f3930c
536b32c8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
repository.rb
lib/gitlab/git/repository.rb
+1
-1
No files found.
lib/gitlab/git/repository.rb
View file @
d6d7abb1
...
...
@@ -1334,7 +1334,7 @@ module Gitlab
end
def
squash_in_progress?
(
squash_id
)
gitaly_migrate
(
:squash_in_progress
)
do
|
is_enabled
|
gitaly_migrate
(
:squash_in_progress
,
status:
Gitlab
::
GitalyClient
::
MigrationStatus
::
OPT_OUT
)
do
|
is_enabled
|
if
is_enabled
gitaly_repository_client
.
squash_in_progress?
(
squash_id
)
else
...
...
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