563d38e81e
Backport Gitlab::Git::Checksum to CE
2018-04-03 15:36:43 -03:00
6fd1d07cfc
Handle CR-LFs properly in .gitmodules file
...
Any submodule lines that had a CR-LF ending would be ignored by the parser.
Closes gitlab-org/gitlab-ce#2262
2018-03-30 15:23:44 -07:00
b942462788
Remove support for absolute dirs from Git::Env
2018-03-30 09:19:46 +00:00
c113b70057
Merge branch 'dm-refs-contains-sha-encoding' into 'master'
...
Fix listing commit branch/tags that contain special characters
Closes #43212
See merge request gitlab-org/gitlab-ce!18023
2018-03-28 09:02:09 +00:00
39c911eaaa
Fix listing commit branch/tags that contain special characters
2018-03-27 18:20:08 +02:00
70af1e2e03
Fix 500 error when trying to resolve non-ASCII conflicts in editor
...
When we added caching, this meant that calling `can_be_resolved_in_ui?` didn't
always call `lines`, which meant that we didn't get the benefit of the
side-effect from that, where it forced the conflict data itself to UTF-8.
To fix that, make this explicit by separating the `raw_content` (any encoding)
from the `content` (which is either UTF-8, or an exception is raised).
2018-03-23 18:33:14 +00:00
bb9d360c0a
Merge branch 'mark-legacy-git-access' into 'master'
...
Route path lookups through legacy_disk_path
See merge request gitlab-org/gitlab-ce!17743
2018-03-23 10:20:45 +00:00
be0ce05c5d
Merge branch 'ci-pipeline-commit-lookup' into 'master'
...
Use porcelain commit lookup method on CI::CreatePipelineService
Closes charts/helm.gitlab.io#291
See merge request gitlab-org/gitlab-ce!17911
2018-03-22 21:09:19 +00:00
04b8e00feb
Use porcelain commit lookup method on CI::CreatePipelineService
...
Before we were using a "plumbing" Gitlab::Git method that does not go
through Gitaly migration checking.
2018-03-22 11:39:20 -03:00
008a6a6ce6
Route path lookups through legacy_disk_path
2018-03-21 18:18:32 +01:00
d0a1da526e
Remove calls to clear_cache from Git::Wiki
...
They were probably added to compensate for tests shortcomings, but now
they don't complain.
Closes gitaly#1095
2018-03-21 18:08:09 +01:00
8ccf7f328d
Merge branch '44280-fix-code-search' into 'master'
...
Resolve "Search code blob sometimes shows filename and branch"
Closes #44280
See merge request gitlab-org/gitlab-ce!17777
2018-03-20 08:47:45 +00:00
d17d3ec7f7
Split repository search result on \n instead of $ to prevent the items of the array to start with a newline. Remove the strip from parsing the search result to keep result endlines.
2018-03-19 19:09:31 +01:00
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
Douglas Barbosa Alexandre
Stan Hu
Jacob Vosmaer (GitLab)
Sean McGivern
Douwe Maan
Sean McGivern
Kamil Trzciński
Alejandro Rodríguez
Ahmad Sherif
Jasper Maes
James Edwards-Jones
Nick Thomas
Douwe Maan
Kim "BKC" Carlbäcker
Robert Speicher
Zeger-Jan van de Weg
Rémy Coutable
Takuya Noguchi
Tiago Botelho