a2a6a5cab6
Merge branch 'zj-find-license-opt-out' into 'master'
...
Move FindLicense RPC to OPT OUT status
See merge request gitlab-org/gitlab-ce!18228
2018-04-09 09:32:58 +00:00
151d87e4a0
Merge branch 'da-gitaly-calculate-repository-checksum' into 'master'
...
Repository checksum calculation is handled by Gitaly when feature is enabled
See merge request gitlab-org/gitlab-ce!18210
2018-04-06 21:32:42 +00:00
9e8f3058af
Merge branch 'fix-500-error-when-mr-ref-is-not-yet-fetched' into 'master'
...
Fix 500 error when MR from fork has conflicts but worker has not run
See merge request gitlab-org/gitlab-ce!18226
2018-04-06 16:38:41 +00:00
76cd2d7881
Move checksum calculation to Gitlab::Git::Repository
2018-04-06 13:25:07 -03:00
13992ac92e
Checksum calculation is handled by Gitaly when feature is enabled
2018-04-06 13:23:23 -03:00
a18eea8c32
Automatically cleanup stale worktrees and lock files upon a push
...
git 2.16 will fail badly if there are stale worktrees.
Closes #44115
2018-04-06 08:17:07 -07:00
44f4a674e2
Merge branch 'jramsay-38830-tarball' into 'master'
...
Add alternative archive route
Closes #38830
See merge request gitlab-org/gitlab-ce!17225
2018-04-06 14:14:39 +00:00
4ca00b52cd
Move FindLicense RPC to OPT OUT status
...
Acceptance testing was successful in
https://gitlab.com/gitlab-org/gitaly/issues/1058 . So this is moved to
OPT OUT.
Part of https://gitlab.com/gitlab-org/gitaly/issues/1026
2018-04-06 16:13:01 +02:00
07f517d441
Add new repository archive route
...
Repository archives are always named `<project>-<ref>-<sha>` even if
the ref is a commit. A consequence of always including the sha even
for tags is that packaging a release is more difficult because both
the ref and sha must be known by the packager.
- add `<project>/-/archive/<ref>/<filename>.<format>` route using the
`-` separator to prevent namespace collisions. If the filename is
`<project>-<ref>` or the ref is a sha, the sha will be omitted,
otherwise the default filename will be used.
- deprecate previous archive route `repository/<ref>/archive`
2018-04-06 08:45:17 -04:00
30bca22d08
Fix 500 error when MR from fork has conflicts but worker has not run
...
If the ref hasn't been fetched into the target repository yet, this will fail
with a Rugged::ReferencError (assuming we're not using Gitaly). We should handle
this in the same way as a missing ref.
2018-04-06 12:16:51 +01:00
dda326f1d3
Merge branch 'ce-4474-custom-additional-text-in-confirmation-email' into 'master'
...
Add custom additional text to emails -- CE backport
Closes gitlab-ee#4474
See merge request gitlab-org/gitlab-ce!18183
2018-04-05 10:20:15 +00:00
4ef3e835cf
Merge branch 'zj-opt-out-list-commits-by-oid' into 'master'
...
Move ListCommitsByOid to OPT_OUT
See merge request gitlab-org/gitlab-ce!18175
2018-04-05 08:48:06 +00:00
0b1b9c409d
Add option to suppress archive commit sha
...
Repository archives are always named `<project>-<ref>-<sha>` even if
the ref is a commit. A consequence of always including the sha even
for tags is that packaging a release is more difficult because both
the ref and sha must be known by the packager.
- add append_sha option (defaults true) to provide a method for
toggling this feature.
Support added to GitLab Workhorse by gitlab-org/gitlab-workhorse!232
2018-04-04 16:56:18 -04:00
a6c7d8050e
Add custom additonal email text to all emails
...
Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4474
Conflicts:
db/schema.rb
ee/app/controllers/ee/admin/application_settings_controller.rb
ee/app/helpers/ee/application_settings_helper.rb
ee/app/models/ee/application_setting.rb
ee/app/models/license.rb
ee/app/views/layouts/service_desk.html.haml
ee/app/views/notify/approved_merge_request_email.html.haml
ee/app/views/notify/service_desk_new_note_email.text.erb
ee/app/views/notify/service_desk_thank_you_email.text.erb
ee/app/views/notify/unapproved_merge_request_email.html.haml
ee/lib/ee/api/entities.rb
ee/spec/controllers/admin/application_settings_controller_spec.rb
ee/spec/models/application_setting_spec.rb
ee/spec/requests/api/settings_spec.rb
lib/api/settings.rb
spec/mailers/previews/notify_preview.rb
2018-04-04 12:29:03 -05:00
39cc4a9202
Bulk deleting refs is handled by Gitaly by default
...
Has been stable for a while in production, so this endpoint grew out if
OPT_IN, the default state.
Part of https://gitlab.com/gitlab-org/gitaly/issues/526
2018-04-04 18:03:24 +02:00
2ba0118505
Move ListCommitsByOid to OPT_OUT
...
Acceptence testing was successfull in
[#844 ](https://gitlab.com/gitlab-org/gitaly/issues/844 )
Part of gitlab-org/gitaly#670
2018-04-04 16:41:43 +02:00
c353426650
Merge branch 'fix/use-shard-name-in-gitlab-projects-instead-of-shard-path' into 'master'
...
Use shard name in Git::GitlabProjects instead of shard path
Closes gitaly#1110
See merge request gitlab-org/gitlab-ce!18015
2018-04-04 09:20:19 +00:00
563d38e81e
Backport Gitlab::Git::Checksum to CE
2018-04-03 15:36:43 -03:00
ddfc661f79
Use shard name in Git::GitlabProjects instead of shard path
...
Closes gitaly#1110
2018-04-03 16:22:13 +02: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
Grzegorz Bizon
Stan Hu
Rémy Coutable
Douglas Barbosa Alexandre
Douwe Maan
Zeger-Jan van de Weg
James Ramsay
Sean McGivern
Sean McGivern
Eric Eastwood
Ahmad Sherif
Jacob Vosmaer (GitLab)
Douwe Maan
Kamil Trzciński
Alejandro Rodríguez
Jasper Maes
James Edwards-Jones
Nick Thomas
Kim "BKC" Carlbäcker
Robert Speicher