c1e3942122
Extract constant for LfsPointerFile::VERSION_LINE
2018-03-16 13:35:03 +00:00
9d32fccfa7
Avoid printing data for LfsPointerFile#inspect
2018-03-15 21:49:02 +00:00
ca66a04ffe
Lfs::FileTranformer caches .gitattributes parser
...
Prevents `.gitattributes` blob lookup being repeated for every file checked at a given ref
2018-03-15 21:49:01 +00:00
91ff0eaa13
Respect the configured git path for imported gitlab-shell operations
2018-03-12 16:03:00 +00:00
47b9854dac
Merge branch 'gitaly-fsck-mandatory' into 'master'
...
Make 'git fsck' mandatory
See merge request gitlab-org/gitlab-ce!17648
2018-03-08 22:21:04 +00:00
3ddde75a1b
Make 'git fsck' mandatory
2018-03-08 16:27:31 +01:00
f45c66e5b0
Remove duplicate method definitions
2018-03-08 12:50:42 +01:00
3da9cb6929
Merge branch 'fix/reduce-number-of-find-commit-for-log-tree' into 'master'
...
Reduce number of FindCommit calls from RefsController#logs_tree
Closes gitaly#1057
See merge request gitlab-org/gitlab-ce!17566
2018-03-07 17:53:16 +00:00
0136bbbb89
Move OperationService#UserRemoveBranch
...
Part of: gitlab-org/gitaly#476
2018-03-07 14:52:57 +01:00
790d5147e3
Move OperationService#UserCreateBranch
...
Part of: gitlab-org/gitaly#476
2018-03-07 14:52:57 +01:00
113d9d6475
Move CommitService#Languages to OPT_OUT
...
Part of: gitlab-org/gitlab-ce!17561
2018-03-07 14:52:57 +01:00
e0931b3af1
Move RefService#CreateBranch to OPT_OUT
...
Part of: gitlab-org/gitaly#540
2018-03-07 14:52:57 +01:00
4604e2c6db
Move RefService#DeleteBranch to OPT_OUT
...
Part of: gitlab-org/gitaly#546
2018-03-07 14:52:57 +01:00
1985300134
Move OperationService#UserRevert to OPT_OUT
...
Part of: gitlab-org/gitaly#779
2018-03-07 14:52:56 +01:00
718011748a
Move OperationService#UserAddTag to OPT_OUT
...
Part of: gitlab-org/gitaly#541
2018-03-07 14:52:56 +01:00
635d5bf2a2
Move CommitService::CommitPatch to OPT_OUT
...
Part of gitlab-org/gitaly#324
2018-03-07 14:52:56 +01:00
2cdbfef109
Move Repository#HasLocalBranches to OPT_OUT
...
Part of gitlab-org/gitaly#616
2018-03-07 08:47:53 +01:00
0649a1f835
Merge branch 'sh-make-prune-optional-in-git-fetch' into 'master'
...
Make --prune a configurable parameter in fetching a git remote
See merge request gitlab-org/gitlab-ce!17346
2018-03-07 02:02:24 +00:00
37162a5fa6
Reduce number of FindCommit calls from RefsController#logs_tree
...
Fixes gitaly#1057
The old code was calling LastCommitForPath to extract a commit ID _then_
call FindCommit to get a commit it already had in the first place!
2018-03-06 15:27:03 +01:00
af84ccbd82
Merge branch '40187-project-branch-dashboard-with-active-stale-branches' into 'master'
...
Add overview of branches and filtered views for active/stale branches
Closes #40187 et #17293
See merge request gitlab-org/gitlab-ce!15402
2018-03-06 13:14:10 +00:00
580d895363
Add overview of branches and a filter for active/stale branches
2018-03-06 21:28:14 +09:00
e9fad3e501
Make --prune a configurable parameter in fetching a git remote
...
By default, --prune is added to the command-line of a `git fetch` operation,
but for repositories with many references this can take a long time to run. We
shouldn't need to run --prune the first time we fetch a new repository.
2018-03-06 00:10:04 -08:00
0736197f63
Merge branch 'gitaly-lfs-changes' into 'master'
...
Incorporate Gitaly's RPCs for Gitlab::Git::LfsChanges
Closes gitaly#1048
See merge request gitlab-org/gitlab-ce!16973
2018-03-05 15:43:26 +00:00
899967fbd8
Merge branch 'feature/add-support-for-all-option-in-count-find-commits' into 'master'
...
Add support for :all option to {count,find}_commits
See merge request gitlab-org/gitlab-ce!17464
2018-03-05 15:41:49 +00:00
0a4ee10eda
Fix n+1 issue by not reloading fully loaded blobs
2018-03-05 11:14:43 -03:00
a0a7b551ae
Incorporate Gitaly's RPCs for Gitlab::Git::LfsChanges
2018-03-02 17:12:08 -03:00
cd770946c4
Add support for :all option to {count,find}_commits
2018-03-02 14:55:20 +01:00
40c61acb6a
Merge branch 'feature/fetch-commit-signs-from-gitaly-in-batch' into 'master'
...
Fetch commit signatures from Gitaly in batches
Closes gitaly#1046
See merge request gitlab-org/gitlab-ce!17456
2018-03-02 11:16:20 +00:00
03f3350f3f
Fetch commit signatures from Gitaly in batches
...
Closes gitaly#1046
2018-03-01 18:31:31 +01:00
52e133d176
Merge branch 'zj-licensee-key' into 'master'
...
Client implementation for Licensee#key
See merge request gitlab-org/gitlab-ce!17449
2018-03-01 17:10:39 +00:00
de454de9b1
Merge branch '42434-allow-commits-endpoint-to-work-over-all-commits' into 'master'
...
Resolve "Allow API method /projects/:id/repository/commits to work over all commits"
Closes #42434
See merge request gitlab-org/gitlab-ce!17182
2018-03-01 15:54:43 +00:00
34fbade4ae
Client implementation for Licensee#key
...
Part of the migration as tracked in: gitlab-org/gitaly#1026
2018-03-01 16:41:08 +01:00
cd9daf644e
Add specs
2018-03-01 14:38:35 +00:00
17b91050ba
Re-enable the remaning Wiki Gitaly-Endpoints
2018-02-28 13:23:26 +00:00
e0195f3369
Merge branch 'feature/migrate-recursive-tree-entries-fetching' into 'master'
...
Migrate recursive tree entries fetching to Gitaly
See merge request gitlab-org/gitlab-ce!17191
2018-02-26 16:26:28 +00:00
c370f53cb6
Migrate recursive tree entries fetching to Gitaly
2018-02-26 16:59:29 +01:00
e351f67874
Suppress whitespace warnings in squash error messages
...
These are obscuring the real error, which is confusing for everyone.
2018-02-26 09:08:17 +00:00
442a6e8800
API method /projects/:id/repository/commits now works over every commit
2018-02-23 10:09:46 +00:00
eb421c88ee
Merge branch 'fix-squash-with-renamed-files' into 'master'
...
Fix squash with renamed files
Closes gitlab-ee#4975
See merge request gitlab-org/gitlab-ce!17216
2018-02-22 11:35:34 +00:00
e503efa320
Merge branch 'zj-branch-contains-git-message' into 'master'
...
Allow branchnames to be named the same as the commit it points to
See merge request gitlab-org/gitlab-ce!17231
2018-02-22 11:34:03 +00:00
15196f9269
Merge branch 'ce-gitaly-squash-in-progress' into 'master'
...
[CE] Incorporate Gitaly's RepositoryService.IsSquashInProgress RPC
See merge request gitlab-org/gitlab-ce!17002
2018-02-22 08:03:15 +00:00
acc0e25de7
Incorporate Gitaly's RepositoryService.IsSquashInProgress RPC
2018-02-21 17:35:31 -03:00
e70fe78281
Handle branch and tag names which are commit ids
...
Adds a test where a branch name is also a valid commit id. Git, the
binary should create an error message which is difficult to parse and
leading to errors later, as seen in: gitlab-org/gitlab-ce#43222
To catch these cases in the future,
gitlab-test@1942eed5cc108b19c7405106e81fa96125d0be22 was created. Which
a branch name matching the commit
2018-02-21 19:08:26 +01:00
01f5035bfe
Fix squash with renamed files
...
We need to ignore the names for renamed files when configuring with sparse
checkout.
2018-02-19 15:11:10 +00:00
0b032daa11
Merge branch '32564-fix-double-system-closing-notes' into 'master'
...
Resolve "Double closing system notes when closing issue with Merge Request"
Closes #32546 and #32564
See merge request gitlab-org/gitlab-ce!17035
2018-02-19 11:50:28 +00:00
23dd313d76
Convert Gitaly commit parent IDs to array as early as possible
...
The tracking issue if this causes problems is
https://gitlab.com/gitlab-org/gitaly/issues/1028
2018-02-19 11:21:23 +00:00
8d32dfef9b
Fix squash rebase not working when diff contained encoded data
...
When the applied diff contains UTF-8 or some other encoded data, the diff
returned back from the git process may be in ASCII-8BIT format. Writing this
data to stdin may fail if the data because stdin expects this data to be in
UTF-8. By switching the output to binmode, we ensure that the diff will
always be written as-is.
Closes gitlab-org/gitlab-ee#4960
2018-02-18 21:48:49 -08:00
af5cd10e00
applying feedback
...
# modified: lib/gitlab/git/commit.rb
2018-02-16 13:51:19 -05:00
f949255461
fix specs
2018-02-16 13:51:19 -05:00
8cdb3477b0
Remove allow_n_plus_1 from Git::Repository#branches_filter
2018-02-08 19:20:46 +01:00
James Edwards-Jones
Nick Thomas
Douwe Maan
Kim "BKC" Carlbäcker
Jacob Vosmaer
Robert Speicher
Zeger-Jan van de Weg
Ahmad Sherif
Rémy Coutable
Takuya Noguchi
Stan Hu
Alejandro Rodríguez
Sean McGivern
Tiago Botelho
Sean McGivern
Grzegorz Bizon
Micaël Bergeron