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
72,140 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

706 Commits

Author SHA1 Message Date
Stan Hu 63cadbe1ad Work around Ruby 2.3.7 bug by defining prepended class methods needed for tests 2018-04-09 06:46:33 -07:00
Jan Provaznik c194636470 Better group support notes-related code 
Updates notes-related services and rendering so this code can be
easily used for group-scoped resources (specifically Epics).

Related to gitlab-ee!5205
 2018-04-05 13:29:57 +02:00
Sean McGivern 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
Ahmad Sherif ddfc661f79 Use shard name in Git::GitlabProjects instead of shard path 
Closes gitaly#1110
 2018-04-03 16:22:13 +02:00
Micaël Bergeron 8fe5bcde56 apply feedback 2018-04-02 08:19:34 -04:00
Micaël Bergeron 4f24a65e45 fix the rake task from being to strict about Group 2018-04-02 08:19:34 -04:00
Francisco Javier López 22b05a1ff7 Extend API for exporting a project with direct upload URL 2018-03-30 15:45:59 +00:00
Jacob Vosmaer (GitLab) c43e18fc49 Remove some easy cases of 'path_to_repo' use 2018-03-28 09:21:32 +00:00
Micaël Bergeron 9c6663ea07 Merge remote-tracking branch 'origin/master' into 40781-os-to-ce 2018-03-22 09:06:10 -04:00
Tiago Botelho 5248e37f27 Adds the option to override project description on export via API 
and fixes the project description not being imported
 2018-03-16 13:56:11 +00:00
Micaël Bergeron f7b8ae3fe2 apply feedback 2018-03-09 10:31:31 -05:00
Micaël Bergeron 6466739e2e Merge remote-tracking branch 'origin/master' into 40781-os-to-ce 2018-03-08 10:55:47 -05:00
Douglas Barbosa Alexandre c0c3170381
Update project activity when pushing to a wiki repository 2018-03-07 17:16:14 -03:00
Dmitriy Zaporozhets aeab4e6263
Use Project#full_name instead of name_with_namespace 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2018-03-07 16:07:09 +02:00
Micaël Bergeron a85948862e fix some broken specs 2018-03-06 16:19:24 -05:00
Shinya Maeda f0dac72979 Change queue namespace of UpdateHeadPipelineForMergeRequestWorker 2018-03-07 02:43:10 +09:00
Shinya Maeda 10f135cf8a Move update_head_pipeline_for_merge_request queue to pipeline_processing namespace 2018-03-07 01:39:00 +09:00
Shinya Maeda 335bc0fec0 Integrate two workers into one ArchiveTraceWorker with pipeline_background queue. This queue takes loqer precedence than pipeline_default. 2018-03-06 21:44:15 +09:00
Shinya Maeda 481d0bc3db Change the place of definition of object_storage:archive_legacy_trace 2018-03-06 21:43:20 +09:00
Shinya Maeda d4c9c52251 Add object_storage queue to sidekiq_queues.ym. and correct queue name in all_queues.yml. 2018-03-06 21:43:20 +09:00
Shinya Maeda cd39318765 Add object_storage queue 2018-03-06 21:43:19 +09:00
Shinya Maeda 32c1501d69 Add rake task. Adopt the latest fix. Drop CreateTraceArtifactService 2018-03-06 21:43:19 +09:00
Kamil Trzciński f0d7a2ffc4 Proper fix for artifacts trace migration which is fully safe 2018-03-06 21:43:19 +09:00
Shinya Maeda 1c931f0784 Rework to minimize changes 2018-03-06 16:53:24 +09:00
Robert Speicher 62d6f1ed66 Merge branch 'sh-cleanup-after-git-gc' into 'master' 
Release libgit2 cache and open file descriptors after `git gc` run

See merge request gitlab-org/gitlab-ce!17506
 2018-03-05 21:51:49 +00:00
Douwe Maan 650d758f05 Merge branch 'dz-use-less-deprecated-methods' into 'master' 
Reduce usage of deprecated *_with_namespace methods

See merge request gitlab-org/gitlab-ce!17523
 2018-03-05 18:53:38 +00:00
Sean McGivern 641b058b9e Fix MR merge commit cross-references to the MR itself 2018-03-05 14:15:58 +00:00
Dmitriy Zaporozhets 86df5c6793
Replace deprecated path_with_namespace with full_path 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2018-03-05 15:41:54 +02:00
Stan Hu 885998c220 Release libgit2 cache and open file descriptors after `git gc` run 
Relates to #21879
 2018-03-03 22:21:50 -08:00
Kamil Trzciński ccb080d94a Merge branch '42643-persist-external-ip-of-ingress-controller-gke' into 'master' 
Display ingress IP address in the Kubernetes page

See merge request gitlab-org/gitlab-ce!17052
 2018-03-01 17:38:04 +00:00
Micaël Bergeron e43d7d2b4d fix the prepare_untracked_uploads_spec from using the EE schema 2018-03-01 10:38:37 -05:00
Micaël Bergeron a8df653fae another round of fixes 2018-03-01 10:36:24 -05:00
Micaël Bergeron 0f1d348d68 port the object storage to CE 2018-03-01 10:34:30 -05:00
Douwe Maan 7aa9ec7aa1 Merge branch 'dz-system-hooks-plugins' into 'master' 
Add ability to use external plugins as system hooks

See merge request gitlab-org/gitlab-ce!17003
 2018-03-01 10:51:36 +00:00
Kamil Trzciński a2f375e8f7 Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-backport 2018-02-28 21:28:43 +01:00
Kamil Trzciński 79a5e7fb53 Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-ee-to-ce-backport 2018-02-28 21:14:25 +01:00
Kamil Trzciński 729391fbfc Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport 2018-02-28 21:11:53 +01:00
Kamil Trzciński 8af23def1d Revert "Merge branch '3867-port-to-ce' into 'master'" 
This reverts commit 54a575f1bb, reversing
changes made to c63af942e5.
 2018-02-28 21:09:34 +01:00
Kamil Trzciński 999118f0ec Merge branch 'feature/sm/artifacts-trace-ee' into 'master' 
EE: Trace as artifacts (FileStorage and ObjectStorage)

Closes #4171

See merge request gitlab-org/gitlab-ee!4258
 2018-02-28 20:59:25 +01:00
Sean McGivern a7dae52e9d Merge branch '4163-move-uploads-to-object-storage' into 'master' 
Move uploads to object storage

Closes #4163

See merge request gitlab-org/gitlab-ee!3867
 2018-02-28 20:58:15 +01:00
Kamil Trzciński 45d2c31643 Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-ee-to-ce-backport 2018-02-28 20:46:53 +01:00
Kamil Trzciński 87f11d2cf5 Merge branch 'zj-auto-upload-job-artifacts' into 'master' 
Transfer job archives after creation

See merge request gitlab-org/gitlab-ee!3646
 2018-02-28 20:45:07 +01:00
Kamil Trzciński 965dc28691 Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-ee-to-ce-backport 2018-02-28 20:36:55 +01:00
Kamil Trzciński e3fafa7632 Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-ee-to-ce-backport 2018-02-28 20:36:07 +01:00
Kamil Trzciński e0401df121 Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-ee-to-ce-backport 2018-02-28 20:35:22 +01:00
Douwe Maan bc76062774 Merge branch 'jej/lfs-object-storage' into 'master' 
Can migrate LFS objects to S3 style object storage

Closes #2841

See merge request !2760
 2018-02-28 20:29:37 +01:00
Dmitriy Zaporozhets 2577ff7fd6
Refactor plugins feature and make some doc improvements 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2018-02-28 12:16:23 +02:00
Dmitriy Zaporozhets f0a64399c1
Refactor plugin execution method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2018-02-27 18:08:38 +02:00
Rémy Coutable 1c88d92b3f Improve Member services 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2018-02-27 16:02:22 +01:00
Rémy Coutable bf41063679 Remove explicit audit event log in MembershipActions 
Move it to Members::ApproveAccessRequestService.

Also, note that there was a double audit event log for access request
destruction.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2018-02-27 16:02:22 +01:00