4582fff662
Merge branch 'close-issue-by-implements' into 'master'
...
Add "implements" to the default issue closing message regex
Closes #38424
See merge request gitlab-org/gitlab-ce!14612
2017-10-03 08:27:54 +00:00
0ac06c89e9
Merge branch 'ff_port_from_ee' into 'master'
...
Move Fast-Forward Merge to CE
See merge request gitlab-org/gitlab-ce!14272
2017-10-03 08:24:31 +00:00
27cc1c2b28
Fix for Gitaly nil encoding issue
2017-10-03 08:03:19 +00:00
40060b18c7
[ci skip] Fix archive spec descrptions
2017-10-02 15:33:31 -03:00
fce708c154
Send extra Gitaly params for `send_git_archive` if needed
2017-10-02 12:39:42 -03:00
b40192a946
Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master'
...
Attempt to link saml users to ldap by email
Closes #33493
See merge request gitlab-org/gitlab-ce!14216
2017-10-02 15:24:48 +00:00
4716e81f9d
Merge branch 'revert-configurable-size-limits' into 'master'
...
Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"
See merge request gitlab-org/gitlab-ce!14628
2017-10-02 14:39:55 +00:00
a5d47bb063
Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"
...
This reverts commit 1d3c33b57e
2017-10-02 13:54:40 +01:00
4e4a29ad75
Add "implements" to the default issue closing message regex
2017-10-02 12:02:38 +00:00
011c168bff
Refactors SAML identity creation in gl_user.
2017-10-02 11:35:09 +01:00
a0ac2d932c
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_ee
2017-10-02 13:15:46 +03:00
284185a356
Add merge_requests_rebase_enabled to json entities for specs
2017-10-02 12:54:28 +03:00
972c5e8900
Fix 'gitlay' typo in spec
2017-10-02 11:37:26 +02:00
0a69abdb28
Merge branch 'gitaly-add-branch' into 'master'
...
Implement OperationService.UserAddBranch Gitaly RPC
Closes gitaly#544
See merge request gitlab-org/gitlab-ce!14522
2017-10-02 09:27:23 +00:00
fa5f0164eb
Implement OperationService.UserAddBranch Gitaly RPC
2017-09-30 00:58:56 -03:00
16f850033f
Populate `Gitlay::Repository`'s `gl_repository` field
2017-09-30 00:58:56 -03:00
a97ff8aae0
Add a factory for `Gitaly::GitCommit`s
2017-09-30 00:51:16 -03:00
dbcf48af8b
Add username as GL_USERNAME in hooks (http)
...
When calling pre-receive, post-receive, and update hooks, add the GitLab
username as the GL_USERNAME environment variable.
This patch only handles cases where pushes are over http, or via
the web interface. Later, we will address the ssh case.
2017-09-29 18:12:03 -04:00
e5fecc3a37
Create repositories via Gitaly
2017-09-29 18:27:06 +02:00
05e9c9f77e
Merge branch '36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master'
...
Insert at most 1,000 rows at once in MR diff background migration
Closes #36631 et #37505
See merge request gitlab-org/gitlab-ce!13661
2017-09-29 13:43:28 +00:00
403712f06e
Make Repository#has_visible_content more efficient
2017-09-29 13:08:44 +00:00
1507ff8ab7
Make MR diff background migration less likely to time out
...
This version does not use transactions, but individual statements. As we have
unique constraints on the target tables for the inserts, we can just ignore
uniqueness violations there (as long as we always insert the same batch size, in
the same order).
This means the spec now must use truncation, not a transaction, as the
uniqueness violation means that the whole transaction for that spec would be
invalid, which isn't what we'd want. In real-world use, this isn't run in a
transaction anyway.
This commit also wraps unhandled exceptions, for easier finding in Sentry, and
logs with a consistent format, for easier searching.
2017-09-29 11:56:08 +01:00
917194153f
Insert at most 1,000 rows at once in MR diff background migration
...
We were hitting the statement timeout for very large MR diffs. Now we insert at
most 1,000 rows to `merge_request_diff_commits` in a single statement, or 100
rows to `merge_request_diff_files`.
2017-09-29 11:00:19 +01:00
07c3112ef5
Merge branch 'feature/migrate-repository-rm-tag-to-gitaly' into 'master'
...
Migrate Git::Repository#rm_tag to Gitaly
Closes gitaly#562
See merge request gitlab-org/gitlab-ce!14388
2017-09-28 22:43:37 +00:00
3468ca835d
Merge branch 'master' into ff_port_from_ee
...
Conflicts:
app/models/project.rb
db/schema.rb
2017-09-28 16:59:49 -05:00
3944e16b4b
Migrate Git::Repository#rm_tag to Gitaly
...
Closes gitaly#562
2017-09-28 23:36:40 +02:00
ae03a52f09
Merge branch 'hashed-storage-migration-path' into 'master'
...
Hashed storage migration path
Closes gitlab-ee#3118
See merge request gitlab-org/gitlab-ce!14067
2017-09-28 17:26:16 +00:00
38607b48b6
[Backported from EE] Readonly flag for Projects
...
This is used in EE for the storage migration, and we want to use this
in CE as well to be able to migrate projects to hashed_storage.
2017-09-28 13:20:11 +01:00
b63e8d64c1
Handle error when fetching ref for MR with deleted source branch
...
If the ref doesn't exist, and the source branch is deleted, we can't get it back
easily. Previously, we ignored this error by shelling out, so replicate that
behaviour.
2017-09-28 11:11:10 +01:00
0bba522f74
Merge branch 'backstage/gb/refactor-pipeline-create-service' into 'master'
...
Refactor a service responsible for creating a pipeline
Closes #37563 and #34415
See merge request gitlab-org/gitlab-ce!14482
2017-09-27 14:44:28 +00:00
6f9a6d37a9
Merge branch 'master' into ff_port_from_ee
2017-09-26 16:24:54 -05:00
d0606b5ff4
Merge branch 'dm-bitbucket-import-truncated-shas' into 'master'
...
Fix bug that caused merge requests with diff notes imported from Bitbucket to raise errors
Closes #38100
See merge request gitlab-org/gitlab-ce!14438
2017-09-26 14:16:46 +00:00
835bdcb88e
Add specs for pipeline chain builder sequence class
2017-09-26 14:24:40 +02:00
f6bd832f3f
Fix some code style offenses in pipeline chain classes
2017-09-26 14:15:05 +02:00
53cad50043
Add missing tests for pipeline chain access validator
2017-09-26 14:13:08 +02:00
6a9cfdde02
Add specs for pipeline builder that validates config
2017-09-26 14:04:28 +02:00
39f05fd85e
Add specs for pipeline builder repository validator
2017-09-26 13:40:37 +02:00
652ecff91b
Add specs for builder chain that persist a pipeline
2017-09-26 13:34:53 +02:00
2432d5bd9e
Add specs for builder chain step that skipps pipelines
2017-09-26 13:22:28 +02:00
da15b38850
Add specs for pipeline builder abilities validator
2017-09-26 13:00:29 +02:00
fa3fb23fb1
Move pipeline builder validation chain to a module
2017-09-26 11:53:50 +02:00
609fa45f0e
Split pipeline chain builder validation class
2017-09-26 11:50:47 +02:00
c19030332c
Add specs
2017-09-25 16:56:14 +02:00
8f47d484da
Extract pipeline chain builder classes from service
2017-09-25 16:22:00 +02:00
1209f4f671
Move related pipeline class to new pipeline module
2017-09-25 13:22:04 +02:00
9c16958c30
Migrate Gitlab::Git::Repository#log to Gitaly
2017-09-25 11:34:10 +02:00
718e5b0865
Attempt to link saml users to ldap by email
2017-09-25 09:44:31 +01:00
7cf8e0981a
Merge branch '36549-circuit-breaker-handles-missing-storages' into 'master'
...
Allow the git circuit breaker to correctly handle missing repository storages
Closes #36549
See merge request gitlab-org/gitlab-ce!14417
2017-09-22 20:24:22 +00:00
41eea4fd6a
Merge branch '33328-usage-ping-for-gitlab-features-and-components' into 'master'
...
Adds gitlab features and components to usage ping data.
Closes #33328
See merge request gitlab-org/gitlab-ce!14305
2017-09-22 11:06:02 +00:00
408c595292
Merge branch 'sh-blob-raw-check' into 'master'
...
Ensure that Blob.raw returns always returns a valid blob object
See merge request gitlab-org/gitlab-ce!14412
2017-09-22 10:40:27 +00:00
Sean McGivern
Andrew Newdigate
Alejandro Rodríguez
Douwe Maan
Sean McGivern
Guilherme Vieira
Tiago Botelho
Valery Sizov
Jacob Vosmaer
David Turner
Rémy Coutable
Robert Speicher
Eric Eastwood
Ahmad Sherif
Gabriel Mazetto
Kamil Trzciński
Grzegorz Bizon
Douwe Maan
Kim "BKC" Carlbäcker