root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
79,054 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

4708 Commits

Author SHA1 Message Date
Jose df04160884 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jivl-dev-master-into-com-master 2018-07-17 17:27:44 -05:00
José Iván Vargas López 465da1c7b4 Merge branch 'fix-issue-49133' into 'master' 
Fix symlink vulnerability in project import

See merge request gitlab/gitlabhq!2440
 2018-07-17 22:04:29 +00:00
Douwe Maan 10bd800297 Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into 'master' 
Include full image URL in webhooks for uploaded images

Closes #20720

See merge request gitlab-org/gitlab-ce!18109
 2018-07-17 15:57:10 +00:00
Sean McGivern fc580935ca Keep #absolute_image_urls as a private instance method 2018-07-17 14:58:14 +01:00
Grzegorz Bizon 416076610e Implement scaffold of authentication activity metrics 2018-07-17 14:50:04 +02:00
Sean McGivern c093193b1a Merge branch 'feature/gb/email-delivery-metrics' into 'master' 
Add emails delivery metrics

Closes #49214

See merge request gitlab-org/gitlab-ce!20638
 2018-07-17 08:53:41 +00:00
Stan Hu eda8156e5c Fix symlink vulnerability in project import 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49133
 2018-07-17 10:30:52 +02:00
Rémy Coutable a73f480715 Merge branch 'update-issue-closing-pattern' into 'master' 
Update issue closing pattern

Closes #49166

See merge request gitlab-org/gitlab-ce!20554
 2018-07-16 14:46:39 +00:00
Grzegorz Bizon dce9599ef5 Implement action mailer delivery metrics observer 2018-07-16 13:40:55 +02:00
Jacob Vosmaer (GitLab) 37eca76583 Remove Repository#lookup and unreachable rugged code 2018-07-16 10:34:31 +00:00
Sean McGivern 01ad732f8d Merge branch '48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storage' into 'master' 
Resolve "Project exports fail when uploads have been migrated to object storage"

Closes #48745

See merge request gitlab-org/gitlab-ce!20484
 2018-07-16 10:28:21 +00:00
Grzegorz Bizon e682d94180 Move existing email interceptors into the same module 2018-07-16 11:23:15 +02:00
Kukovskii Vladimir 07d9b036a9 Add dummy Google Hangouts Chat integration 2018-07-14 20:45:04 +09:00
James Lopez 07ec2c7bd0
use fileuploader dynamic path method in uploads manager and add spec 2018-07-13 16:13:13 +02:00
Yorick Peterse 9451c80ac9 Merge branch 'sh-fix-stderr-pipe-consumption' into 'master' 
Avoid process deadlock in popen by consuming input pipes

Closes gitlab-ee#6895

See merge request gitlab-org/gitlab-ce!20600
 2018-07-13 13:14:34 +00:00
Stan Hu fd392cd725 Avoid process deadlock in popen by consuming input pipes 
A process that spews a lot of output to stderr or stdout could stall out
due to the pipe buffer being full. As described in https://bugs.ruby-lang.org/issues/9082,
we can use the trick used in Ruby's capture3 function to read the pipes in separate
threads.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6895
 2018-07-12 16:21:30 -07:00
Jacob Vosmaer 40ed88b784 whitespace 2018-07-12 15:35:24 +02:00
Jacob Vosmaer d1d7144b96 Make more ref RPC's mandatory 2018-07-12 15:12:00 +02:00
Douwe Maan 2f83794d2b Merge branch 'dz-manifest-import' into 'master' 
Add manifest import

See merge request gitlab-org/gitlab-ce!20304
 2018-07-12 11:50:27 +00:00
James Lopez c2d297d97a
update saver spec to use the old uploads code 2018-07-12 12:53:57 +02:00
Jacob Vosmaer (GitLab) 62ffad0802 Remove Repository#path memoization 2018-07-12 09:49:25 +00:00
Kamil Trzciński c7c630f142 Merge branch 'fix-no-method-error-on-nil' into 'master' 
Fix an exception seen using the online terminal

See merge request gitlab-org/gitlab-ce!18299
 2018-07-11 16:14:28 +00:00
Nick Thomas ca692fbcc1
Fix an exception seen using the online terminal 2018-07-11 15:44:34 +01:00
Mark Chao a63bce1a4b Resolve "Rename the `Master` role to `Maintainer`" Backend 2018-07-11 14:36:08 +00:00
George Tsiolis 69f9c91161 Add tests for non-comma-separated issue numbers in single line message 2018-07-11 16:28:53 +03:00
James Lopez fa2e3162f8
added changelog, small refactor 2018-07-11 15:02:59 +02:00
Yorick Peterse d975a29be9 Merge branch 'add-back-mr-diff-deletion-migration' into 'master' 
Add back MR diff deletion migration

See merge request gitlab-org/gitlab-ce!20331
 2018-07-11 12:59:43 +00:00
James Lopez 3c31de7520
refactor uploads manager 2018-07-11 14:52:48 +02:00
Jacob Vosmaer 723f74d49d Remove last flags from Blob and Workhorse 2018-07-11 12:59:15 +02:00
James Lopez 3a114c2d11
fix specs 2018-07-11 11:36:59 +02:00
Dmitriy Zaporozhets 6743147b7d Improve manifest feature after backend review 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2018-07-11 12:22:57 +03:00
Dmitriy Zaporozhets a4b6707e63 Refactor manifest import code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2018-07-11 12:22:57 +03:00
Dmitriy Zaporozhets 1885a3014c Fix tests in import_sources_spec.rb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2018-07-11 12:22:57 +03:00
Dmitriy Zaporozhets 88e640374a Add manifest import feature 
It allows user to automatically import multiple repositories
with nested structure by uploading a manifest xml file.

AOSP project was used as an example during development of this feature.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2018-07-11 12:22:57 +03:00
James Lopez c6b670216c Merge branch 'sh-handle-colons-in-url-passwords' into 'master' 
Properly handle colons in URL passwords

Closes #49080

See merge request gitlab-org/gitlab-ce!20538
 2018-07-11 06:00:17 +00:00
Stan Hu 718a23fd36 Properly handle colons in URL passwords 
Before b46d5b13ec, we relied on
`Addressable::URI` to parse the username/password in a URL, but this failed
when credentials contained special characters. However, this introduced a regression
where the parsing would incorrectly truncate the password if the password had a colon.

Closes #49080
 2018-07-10 13:09:37 -07:00
James Lopez a27d4d9e52
update uploads saver 2018-07-10 16:33:40 +02:00
Robert Speicher 0abda34c4c Merge branch 'rd-6804-bug-unable-to-delete-branches-when-repo-reaches-the-size-limit-ce' into 'master' 
Backport some changes from EE

See merge request gitlab-org/gitlab-ce!20388
 2018-07-10 14:29:16 +00:00
James Lopez 2c1e66d4d2
Fix avatar saver and spec 2018-07-10 16:23:45 +02:00
James Lopez 874a4ff16a
add more object storage specs 2018-07-10 15:29:31 +02:00
Oswaldo Ferreira 659aeba43c Use schedulers and delete diff files upon deadtuples check 2018-07-10 10:25:48 -03:00
Oswaldo Ferreira db0f150516 Reschedule DeleteDiffFiles until there is none left to remove 2018-07-10 09:43:58 -03:00
Oswaldo Ferreira 19966e7095 Wait postgresql vacuum of deadtuples on merge_request_diff_files deletion 2018-07-10 09:43:58 -03:00
Oswaldo Ferreira 4455904bc1 Add 1000 files per minute deletion ratio on scheduler 2018-07-10 09:43:58 -03:00
Oswaldo Ferreira e66535e840 Create a diff deletion worker scheduler to avoid long-running post-migration 2018-07-10 09:43:58 -03:00
Sean McGivern 3acf7ba9ca Revert "Temporarily remove MR diffs removal migration" 
This reverts commit 15ec6a13eb.
 2018-07-10 09:43:57 -03:00
Douwe Maan 937d916b5f Merge branch 'gitaly-mandatory-20180709-jv' into 'master' 
Use Gitaly for fetches and creating bundles

Closes gitaly#387, gitaly#874, gitaly#750, and gitaly#665

See merge request gitlab-org/gitlab-ce!20490
 2018-07-10 10:22:05 +00:00
James Lopez 4c7b120acf
add upload manager and spec 2018-07-10 11:40:39 +02:00
Grzegorz Bizon c7b8afcd90 Merge branch 'improve-metadata-access-performance' into 'master' 
Improve metadata access performance

See merge request gitlab-org/gitlab-ce!20493
 2018-07-10 09:21:11 +00:00
Rubén Dávila b98bff13de Backport some changes from EE 2018-07-09 12:32:37 -05:00
Sean McGivern 2a4039cf66 Merge branch 'update-rubocop' 2018-07-09 17:23:30 +01:00
Rémy Coutable c7e980674e Merge branch 'rails5-mysql-fix-pr-importer-spec' into 'master' 
Rails5 mysql fix milliseconds problem in pull request importer spec

See merge request gitlab-org/gitlab-ce!20475
 2018-07-09 16:15:34 +00:00
Robert Speicher 2cedb243ee Merge branch 'gitaly-update-branch' into 'master' 
Use Gitaly's OperationService.UserUpdateBranch RPC

Closes gitaly#1252

See merge request gitlab-org/gitlab-ce!20231
 2018-07-09 16:12:18 +00:00
Kamil Trzciński e8d7b283be Merge branch 'jprovazn-upload-symlink' into 'master' 
Add FileUploader.root to allowed upload paths

Closes gitlab-qa#291

See merge request gitlab-org/gitlab-ce!20472
 2018-07-09 15:07:26 +00:00
Lin Jen-Shin 9286f5b934 Use stable gitlab-styles and eliminate offenses 2018-07-09 21:13:08 +08:00
Lin Jen-Shin 4ee08b77bc Updates from `rubocop -a` 2018-07-09 21:13:08 +08:00
Kamil Trzciński 5a9f23e780 Fix and add specs for testing metadata entry 2018-07-09 14:19:52 +02:00
Kamil Trzciński bc00803af0 Access metadata directly from Object Storage 
Previously we would pull the file, now, we just stream-it as needed from Object Storage
 2018-07-09 14:19:52 +02:00
Jan Provaznik 6b2ebea7dc Added test and used Array() instead of .wrap 2018-07-09 13:06:12 +02:00
Jacob Vosmaer a4e75e7a83 Use Gitaly for fetches and creating bundles 2018-07-09 12:50:17 +02:00
Jacob Vosmaer (GitLab) 3082b7d1c2 Make blob and other RPC's mandatory 2018-07-09 10:02:02 +00:00
Grzegorz Bizon 1a78483b49 Merge branch 'gitaly-diff-mandatory' into 'master' 
Make all Gitaly diff flags mandatory

Closes gitaly#528 and gitaly#222

See merge request gitlab-org/gitlab-ce!20424
 2018-07-09 09:42:30 +00:00
Alejandro Rodríguez 4a4338fcc6 Use Gitaly's OperationService.UserUpdateBranch RPC 2018-07-08 23:27:20 -04:00
Jasper Maes d17e131f68 Rails5 mysql fix milliseconds problem in pull request importer spec 2018-07-08 13:01:20 +02:00
Brett Walker f3e1028371 Refactor rspec matchers in read_only_spec.rb 2018-07-07 04:22:44 +00:00
Sean McGivern e0c0ce28ea Merge branch '46246-gitlab-project-export-should-use-object-storage' into 'master' 
Resolve "GitLab Project export should use object storage"

Closes #46246

See merge request gitlab-org/gitlab-ce!20105
 2018-07-06 18:57:58 +00:00
Brett Walker fd2ea94f60 Ability to check if underlying database is read only 2018-07-06 17:07:49 +00:00
Nick Thomas 7a17f8d85d Merge branch 'gitaly-set-delete-config' into 'master' 
Add Repository#set_config and #delete_config

See merge request gitlab-org/gitlab-ce!20372
 2018-07-06 15:55:10 +00:00
James Lopez a2bf164154
Update Import/Export to use object storage (based on aa feature flag) 2018-07-06 15:46:18 +02:00
Grzegorz Bizon 9c720a98b9 Merge branch 'build-chunks-on-object-storage' into 'master' 
Allow to store BuildTraceChunks on Object Storage

Closes #45712

See merge request gitlab-org/gitlab-ce!19515
 2018-07-06 11:38:07 +00:00
Sean McGivern 827712e78e Merge branch 'master' into satishperala/gitlab-ce-20720_webhooks_full_image_url 2018-07-06 11:41:03 +01:00
Sean McGivern 0d9ef34a25 Add documentation and specs for webhook URL rewriting 2018-07-06 11:35:30 +01:00
Jacob Vosmaer ff112ce641 Add Repository#set_config and #delete_config 2018-07-06 12:06:54 +02:00
Jacob Vosmaer b012abee8b Make all Gitaly diff flags mandatory 2018-07-06 12:01:15 +02:00
Sean McGivern f5b12225d8 Merge branch 'jprovazn-label-links-update' into 'master' 
Fix cross-project label references

Closes #45539

See merge request gitlab-org/gitlab-ce!20308
 2018-07-06 09:31:11 +00:00
Shinya Maeda 25bd541320 Merge branch 'master' into build-chunks-on-object-storage 2018-07-06 14:38:24 +09:00
Jan Provaznik 1f320d1c50 Added tests for MRs 2018-07-05 10:12:15 +02:00
Sean McGivern 7a355f6856 Merge branch 'gitaly-mandatory-20180703-jv-2' into 'master' 
Remove more Gitaly feature flags

Closes gitaly#329, gitaly#320, gitaly#323, and gitaly#328

See merge request gitlab-org/gitlab-ce!20343
 2018-07-04 10:39:59 +00:00
Sean McGivern b2f2241c0c Merge branch 'jprovazn-fix-mr-caching' into 'master' 
Use serialize_keys as part of highlight diff cache key

Closes #48801

See merge request gitlab-org/gitlab-ce!20360
 2018-07-04 10:25:53 +00:00
Kamil Trzciński (OoO till 3th) 34694c3afc Merge branch 'jprovazn-direct-upload' into 'master' 
Add workhorse authorize method for project/group uploads

Closes #44663

See merge request gitlab-org/gitlab-ce!19717
 2018-07-04 09:50:29 +00:00
Jan Provaznik dc551581d0 Use serialize_keys as part of highlight diff cache 
This assures that old cache is not used if we change format of
cached data.
 2018-07-04 11:34:35 +02:00
Douwe Maan 03f0f2566b Merge branch 'bvl-graphql-pipeline-lists' into 'master' 
Add pipeline lists to graphql

Closes #48469

See merge request gitlab-org/gitlab-ce!20249
 2018-07-04 09:31:07 +00:00
Bob Van Landuyt 04b046587f Add pipeline lists to GraphQL 
This adds Keyset pagination to GraphQL lists. PoC for that is
pipelines on merge requests and projects.

When paginating a list, the base-64 encoded id of the ordering
field (in most cases the primary key) can be passed in the `before` or
`after` GraphQL argument.
 2018-07-04 10:53:39 +02:00
Shinya Maeda 202c2c6aef Fix static analysys 2018-07-04 13:28:18 +09:00
Shinya Maeda f11aa51eea Merge branch 'master' into build-chunks-on-object-storage 2018-07-04 13:17:54 +09:00
Jan Provaznik e33c95cf96 Migration which fixes cross-project label references 2018-07-03 21:21:36 +02:00
Stan Hu 1181cf336f Fix minor spec review comments in uploader specs 2018-07-03 09:57:15 -07:00
Micaël Bergeron 91c9c4b728 fix an issue with local files 2018-07-03 09:57:15 -07:00
Micaël Bergeron cebdd267e6 add support for file copy on object storage 2018-07-03 09:57:15 -07:00
Stan Hu e61f66b3d1 When moving issues, don't attempt to move files in object storage 
Closes #48505
 2018-07-03 09:57:15 -07:00
Jacob Vosmaer 201802f723 Remove more feature flags 2018-07-03 17:39:08 +02:00
Sean McGivern 15ec6a13eb Temporarily remove MR diffs removal migration 
We will re-add this with a more efficient bulk scheduling method.
 2018-07-03 12:02:04 +01:00
Jacob Vosmaer (GitLab) 15aadc665f Make OperationService RPC's mandatory 2018-07-03 09:12:03 +00:00
Douwe Maan 7e84f353b9 Merge branch 'fix-gitaly-mr-creation-limits' into 'master' 
Fix MR diffs created with gitaly_diff_between enabled

Closes gitaly#1256

See merge request gitlab-org/gitlab-ce!20300
 2018-07-03 09:11:23 +00:00
Sean McGivern a65fec0b0b Merge branch 'jprovazn-extra-line' into 'master' 
Don't add bottom 'match' line for deleted files

Closes #48160

See merge request gitlab-org/gitlab-ce!20255
 2018-07-03 08:21:08 +00:00
Shinya Maeda 93a964d449 Add spec for ExclusiveLeaseHelpers 2018-07-03 16:20:27 +09:00
Nick Thomas 0e6757e842 Merge branch '6195-http-git-push-to-secondary-for-git-lfs-currently-does-not-work' into 'master' 
Prep work to support git/git-lfs redirect to primary

See merge request gitlab-org/gitlab-ce!19728
 2018-07-02 13:20:57 +00:00
Douwe Maan 3c0ff4ddb9 Merge branch '43270-import-with-milestones-failing' into 'master' 
Resolve "Import with Milestones Failing"

Closes #43270 and #47626

See merge request gitlab-org/gitlab-ce!19961
 2018-07-02 08:56:09 +00:00
Grzegorz Bizon 1de68dc33f Merge branch '44725-expire_correct_methods_after_change_head' into 'master' 
Expire correct method caches after HEAD changed

Closes #44725

See merge request gitlab-org/gitlab-ce!20102
 2018-07-02 08:00:30 +00:00
Ash McKenzie 26bea57883 Better route matching for read-only detection 2018-07-02 17:29:04 +10:00