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

7842 Commits

Author SHA1 Message Date
Ryan Hefner 2906e09f3a Add dbname to MySQL migration GRANT command 2018-09-13 16:27:57 +02:00
Grzegorz Bizon 71f3d48544 Merge branch '42861-move-include-external-files-in-gitlab-ci-yml-from-starter-to-libre' into 'master' 
Resolve "Move "include external files in .gitlab-ci.yml" from Starter to Libre"

Closes #42861

See merge request gitlab-org/gitlab-ce!21603
 2018-09-13 08:11:48 +00:00
Alejandro Rodríguez d3c5b07962 Remove Rugged and shell code from Gitlab::Git 2018-09-12 12:32:32 -03:00
Matija Čupić 7600a6469b
Stack rescue blocks for Gitlab::Ci::Config#initialize 2018-09-11 16:29:48 +02:00
Matija Čupić b470f975e1
Add missing frozen string literal comments 2018-09-11 16:26:57 +02:00
Grzegorz Bizon c56f2b9615 Merge branch '51318-project-export-broken-when-avatar-is-set' into 'master' 
Resolve "Project export broken when avatar is set"

Closes #51318

See merge request gitlab-org/gitlab-ce!21649
 2018-09-11 10:39:36 +00:00
James Lopez 678ceb257e
use find instead of reject in avatar export file 2018-09-11 10:22:34 +02:00
James Lopez 994d91883b
fix avatar restorer 2018-09-11 08:59:14 +02:00
Stan Hu 70799b05ab Add additional stub methods for FakeApplicationSetting 
In a migration spec, a default ApplicationSetting object may fail to
create due to an unknown attribute and fall back to
FakeApplicationSetting.  FakeApplicationSetting appears to be missing a
number of methods that are needed
(https://gitlab.com/gitlab-org/gitlab-ce/issues/47491). This commit adds
the ones needed to make an EE spec pass.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/7543
 2018-09-10 22:27:21 -07:00
Stan Hu 855b238361 Simplify setting of in_memory_application_settings 2018-09-10 15:04:27 -07:00
Stan Hu 183c94dd63 Work around migration specs failing due to repository storages not being selected 
Migration specs may be missing a column necessary to create an ApplicationSetting
object, which causes the FakeApplicationSetting to be initialized. However, the
project selects a random repository storage via ApplicationSetting#pick_repository_storage,
which isn't present in the OpenStruct.

To workaround this issues, we add a pick_repository_storage method in
FakeApplicationSetting.
 2018-09-10 14:03:21 -07:00
Rémy Coutable 3bf1cd5780
Ensure in-memory application settings are cleared before each test 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2018-09-10 11:48:09 +02:00
Matija Čupić df16969c24
Reconcile differences in lib/gitlab/ci 2018-09-08 14:55:36 +02:00
Matija Čupić 5e0ce238d2
Reconcile differences in lib/gitlab/ci/external 2018-09-08 14:09:26 +02:00
Matija Čupić 797046e358
Reconcile differences in lib/gitlab/ci/external/file 2018-09-08 12:09:14 +02:00
Ash McKenzie 90f67306ab
Remove Gitlab::GitAccess#authed_via_jwt? 
Previously overridden in EE but no longer required.
 2018-09-08 14:43:24 +10:00
Matija Čupić 6a8133b943
Stub http request on specs intead of mocking HTTParty 
CE mirror of bb2a9fde8e6a4d1df13638fe336f641b9c72ef59
 2018-09-07 22:37:37 +02:00
Matija Čupić 1e816a9721
Address MR suggestions 
CE mirror of c4578b951e331fe8c75cd4f948ce74cec6587bad
 2018-09-07 22:22:52 +02:00
Matija Čupić 3149b5cfea
Improve external architecture 
CE mirror of 4f17c7b2c30188302e6a73421acbf5a09fb2c823
 2018-09-07 22:03:05 +02:00
Matija Čupić 1a53f017b4
Make Repository#blob_data_at public 
CE mirror of 17de13ada1a98da060802c55889489a512183cd1
 2018-09-07 21:37:44 +02:00
Matija Čupić eca73d2b30
Address MR comments 
CE mirror of 1269dc47b7f8d1a9913de326c9bd356d3e603663
 2018-09-07 21:33:06 +02:00
Matija Čupić 95b296f8ac
Change ExternalFile to retrieve local file from repository instead of GitLab project 
CE mirror of 03c6094997023d9c8875ced421a6c9ef39a4af44
 2018-09-07 21:18:26 +02:00
Matija Čupić cd72189fc0
Import external files in Gitlab CI config 
CE mirror of a10b777f8cb1902bba3964a4cbad2b1dd6bce785
 2018-09-07 21:00:52 +02:00
Matija Čupić 5f33690ebb
Load external files in config 
CE mirror of 8e03a6619be44fdaf19a6c13284ea8e51377b311
 2018-09-07 20:54:27 +02:00
Matija Čupić c3e33f06c2
Build barebones for ExternalFiles libraries 
CE mirror of 30ca00f17034f654403ec7cb5dc370d1e5db8152
 2018-09-07 19:57:57 +02:00
Rubén Dávila 007b81b8e2 Add receive_max_input_size setting to Application settings 
If user has configure the setting then it will be passed to gitlab-shell
and gitlab-workhorse
 2018-09-07 12:27:35 -05:00
Kamil Trzciński dc658a181c Merge branch '7204-follow-up-protected-environments-technical-debt-ce' into 'master' 
CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7256

See merge request gitlab-org/gitlab-ce!21545
 2018-09-07 16:49:35 +00:00
Douwe Maan b027b3e037 Merge branch 'osw-write-cache-upon-mr-creation-and-cache-refactoring' into 'master' 
Write diff highlighting cache upon MR creation (refactors caching)

Closes #50204

See merge request gitlab-org/gitlab-ce!21489
 2018-09-07 15:42:01 +00:00
George Tsiolis 124cece3b3 Include private contributions in user contribution graph 2018-09-07 15:08:55 +00:00
Douwe Maan 1f765ce9ea Merge branch '48778-remove-old-storage-logic-from-import-export' into 'master' 
Resolve "Remove old storage logic from Import/Export"

Closes #51144, #50109, #48778, and #51079

See merge request gitlab-org/gitlab-ce!21409
 2018-09-07 14:28:25 +00:00
Mayra Cabrera 5cfdcce0e6 Introduce class methods so CE constants can be easily overridden on EE 2018-09-07 09:08:31 -05:00
Douwe Maan 7f2b287f66 Merge branch 'osw-send-max-patch-bytes-to-gitaly' into 'master' 
Send max_patch_bytes to Gitaly via Gitaly::CommitDiffRequest

Closes #50635

See merge request gitlab-org/gitlab-ce!21575
 2018-09-07 14:02:17 +00:00
Jan Provaznik d95c1f0335 Use ResourceLabelEvent for tracking label changes 2018-09-07 13:39:20 +00:00
Douwe Maan 81f4dc059d Merge branch 'zj-cleanup-port-gitaly' into 'master' 
Port cleanup tasks to use Gitaly

Closes #40529 and gitaly#954

See merge request gitlab-org/gitlab-ce!21588
 2018-09-07 13:20:54 +00:00
Oswaldo Ferreira cd1d5b2440 Cache diff highlighting upon Merge Request creation (refactors diff caching) 2018-09-07 10:07:18 -03:00
James Lopez f1277fbf0b
refactor code based on feedback 2018-09-07 14:43:51 +02:00
Zeger-Jan van de Weg 3aedccb17a
Port cleanup tasks to use Gitaly 
Rake tasks cleaning up the Git storage were still using direct disk
access, which won't work if these aren't attached. To mitigate a
migration issue was created.

To port gitlab:cleanup:dirs, and gitlab:cleanup:repos, a new RPC was
required, ListDirectories. This was implemented in Gitaly, through
https://gitlab.com/gitlab-org/gitaly/merge_requests/868.

To be able to use the new RPC the Gitaly server was bumped to v0.120.

This is an RPC that will not use feature gates, as this doesn't scale on
.com so there is no way to test it at scale. Futhermore, we _know_ it
doesn't scale, but this might be a useful task for smaller instances.

Lastly, the tests are slightly updated to also work when the disk isn't
attached. Eventhough this is not planned, it was very little effort and
thus I applied the boy scout rule.

Closes https://gitlab.com/gitlab-org/gitaly/issues/954
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/40529
 2018-09-07 13:58:31 +02:00
Douglas Barbosa Alexandre 42c061781a
Encode remote root ref 2018-09-07 08:45:37 -03:00
James Lopez 27442862cf
refactor code based on feedback 2018-09-07 13:42:49 +02:00
Grzegorz Bizon 63620ec7ad Merge branch 'alerts-for-built-in-metrics' into 'master' 
Import common metrics into database.

Closes gitlab-ee#6948

See merge request gitlab-org/gitlab-ce!21459
 2018-09-07 09:10:46 +00:00
Stan Hu c9116b6de5 Merge branch 'issue_50488' into 'master' 
Move project services log to a separate file

See merge request gitlab-org/gitlab-ce!21316
 2018-09-07 04:19:08 +00:00
Oswaldo Ferreira 965ff14b6f Send max_patch_bytes to Gitaly via Gitaly::CommitDiffRequest 
We used to apply this limitation on GitLab when using Rugged. Now that
we've shifted to Gitaly, this parameter needs to be sent via a RPC
request. Currently this value is hardcoded on Gitaly.
 2018-09-06 19:18:27 -03:00
Kamil Trzciński 915306ec50 Merge branch 'master' into 'alerts-for-built-in-metrics' 
# Conflicts:
#   db/schema.rb
 2018-09-06 21:06:55 +00:00
Douglas Barbosa Alexandre 460badd8cc
Add Gitlab::Git::Repository#find_remote_root_ref 2018-09-06 16:01:48 -03:00
Douglas Barbosa Alexandre 21096e2391
Add Gitlab::GitalyClient::RemoteService#find_remote_root_ref 2018-09-06 16:01:48 -03:00
Felipe Artur 9710cda30e Move project services log to a separate file 2018-09-06 14:48:31 -03:00
Rémy Coutable dd66040274 Merge branch '43140-reduce-logs-tree-load' into 'master' 
Bulk-render commit titles in the tree view to improve performance

Closes #43140

See merge request gitlab-org/gitlab-ce!21500
 2018-09-06 17:20:28 +00:00
Nick Thomas bc3d1afe13
Extract tree summary logic out of RefsController#logs_tree 2018-09-06 16:04:21 +01:00
James Lopez a2aa505805
Refactor code to remove object storage flag from Import/Export 
Updated docs, refactor import/export code
Fix AvatarUploader path issue
Fix project export upload webhook error
 2018-09-06 16:52:42 +02:00
J.D. Bean 643c6f31e5 Recognize 'UNLICENSE' license files 2018-09-06 12:36:19 +00:00