summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch ↵Stan Hu2018-09-131-9/+5
| | | | | | | | | '51271-error-500-due-to-encoding-issues-when-when-attempting-to-access-issues-api' into 'master' Resolve "Error 500 due to encoding issues when when attempting to access issues API" Closes #51271 See merge request gitlab-org/gitlab-ce!21680
* Merge branch '51318-project-export-broken-when-avatar-is-set' into 'master'11-3-stable-prepare-rc7Grzegorz Bizon2018-09-111-1/+1
| | | | | | | Resolve "Project export broken when avatar is set" Closes #51318 See merge request gitlab-org/gitlab-ce!21649
* Merge branch 'sh-fix-ee-issue-7543' into 'master'Bob Van Landuyt2018-09-111-10/+18
| | | | | | | Add stub methods for FakeApplicationSetting Closes gitlab-ee#7543 See merge request gitlab-org/gitlab-ce!21662
* Merge branch '51268-clear-in-memory-application-settings-between-examples' ↵Robert Speicher2018-09-102-0/+8
| | | | | | | | | into 'master' Resolve "Changes in in-memory application settings in one spec can break another spec" Closes #51268 See merge request gitlab-org/gitlab-ce!21638
* Merge branch 'api-promote-find-branch' into 'master'Rémy Coutable2018-09-103-11/+8
|\ | | | | | | | | | | | | API: Use find_branch! in all places Closes #51250 See merge request gitlab-org/gitlab-ce!21614
| * Fix rubocopRobert Schilling2018-09-081-5/+3
| |
| * API: Use find_branch! in all placesRobert Schilling2018-09-083-11/+10
| |
* | Remove Gitlab::GitAccess#authed_via_jwt?Ash McKenzie2018-09-081-6/+0
| | | | | | | | Previously overridden in EE but no longer required.
* | Resolve "Process urls with spaces in all markdown processing"Brett Walker2018-09-083-4/+5
| |
* | Add receive_max_input_size setting to Application settingsRubén Dávila2018-09-072-1/+18
| | | | | | | | | | If user has configure the setting then it will be passed to gitlab-shell and gitlab-workhorse
* | Merge branch '7204-follow-up-protected-environments-technical-debt-ce' into ↵Kamil Trzciński2018-09-071-1/+7
|\ \ | | | | | | | | | | | | | | | | | | 'master' CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7256 See merge request gitlab-org/gitlab-ce!21545
| * | Introduce class methods so CE constants can be easily overridden on EEMayra Cabrera2018-09-071-1/+7
| | |
* | | Merge branch 'osw-write-cache-upon-mr-creation-and-cache-refactoring' into ↵Douwe Maan2018-09-073-49/+92
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Write diff highlighting cache upon MR creation (refactors caching) Closes #50204 See merge request gitlab-org/gitlab-ce!21489
| * | | Cache diff highlighting upon Merge Request creation (refactors diff caching)Oswaldo Ferreira2018-09-073-49/+92
| | | |
* | | | Include private contributions in user contribution graphGeorge Tsiolis2018-09-071-6/+6
| | | |
* | | | Merge branch '48778-remove-old-storage-logic-from-import-export' into 'master'Douwe Maan2018-09-0714-101/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove old storage logic from Import/Export" Closes #51144, #50109, #48778, and #51079 See merge request gitlab-org/gitlab-ce!21409
| * | | | refactor code based on feedbackJames Lopez2018-09-074-8/+8
| | | | |
| * | | | refactor code based on feedbackJames Lopez2018-09-075-8/+8
| | | | |
| * | | | Refactor code to remove object storage flag from Import/ExportJames Lopez2018-09-0613-96/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated docs, refactor import/export code Fix AvatarUploader path issue Fix project export upload webhook error
* | | | | Resolve "Wiki page attachments not rendered properly"Brett Walker2018-09-072-15/+35
| | | | |
* | | | | Merge branch 'osw-send-max-patch-bytes-to-gitaly' into 'master'Douwe Maan2018-09-072-3/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send max_patch_bytes to Gitaly via Gitaly::CommitDiffRequest Closes #50635 See merge request gitlab-org/gitlab-ce!21575
| * | | | | Send max_patch_bytes to Gitaly via Gitaly::CommitDiffRequestOswaldo Ferreira2018-09-062-3/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Use ResourceLabelEvent for tracking label changesJan Provaznik2018-09-075-0/+91
| | | | |
* | | | | Merge branch 'zj-cleanup-port-gitaly' into 'master'Douwe Maan2018-09-072-50/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port cleanup tasks to use Gitaly Closes #40529 and gitaly#954 See merge request gitlab-org/gitlab-ce!21588
| * | | | | Port cleanup tasks to use GitalyZeger-Jan van de Weg2018-09-072-50/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Encode remote root refDouglas Barbosa Alexandre2018-09-071-1/+3
| | | | | |
* | | | | | Merge branch 'alerts-for-built-in-metrics' into 'master'Grzegorz Bizon2018-09-074-2/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import common metrics into database. Closes gitlab-ee#6948 See merge request gitlab-org/gitlab-ce!21459
| * | | | | Merge branch 'master' into 'alerts-for-built-in-metrics'Kamil Trzciński2018-09-0644-151/+1181
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | Fix migrationsKamil Trzciński2018-09-041-0/+2
| | | | | | |
| * | | | | | Fix import/exportKamil Trzciński2018-09-041-0/+4
| | | | | | |
| * | | | | | Import common metrics into database.Kamil Trzciński2018-09-042-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR backports PrometheusMetric model to CE and adds: common, identifier to figure out what kind of metric is used.
* | | | | | | Merge branch 'issue_50488' into 'master'Stan Hu2018-09-071-0/+7
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Move project services log to a separate file See merge request gitlab-org/gitlab-ce!21316
| * | | | | | Move project services log to a separate fileFelipe Artur2018-09-061-0/+7
| | | | | | |
* | | | | | | Add Gitlab::Git::Repository#find_remote_root_refDouglas Barbosa Alexandre2018-09-061-0/+8
| | | | | | |
* | | | | | | Add Gitlab::GitalyClient::RemoteService#find_remote_root_refDouglas Barbosa Alexandre2018-09-061-0/+12
| | | | | | |
* | | | | | | Merge branch '43140-reduce-logs-tree-load' into 'master'51201-document-review-appsRémy Coutable2018-09-061-0/+115
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bulk-render commit titles in the tree view to improve performance Closes #43140 See merge request gitlab-org/gitlab-ce!21500
| * | | | | | | Extract tree summary logic out of RefsController#logs_treeNick Thomas2018-09-061-0/+115
| | | | | | | |
* | | | | | | | Recognize 'UNLICENSE' license filesJ.D. Bean2018-09-061-1/+1
| | | | | | | |
* | | | | | | | Add git_v2 flag to GitalyClientJames Lopez2018-09-061-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'sh-fix-attachments-inline' into 'master'Nick Thomas2018-09-061-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix attachments not displaying inline with Google Cloud Storage Closes #49957 See merge request gitlab-org/gitlab-ce!21265
| * | | | | | | Fix attachments not displaying inline with Google Cloud StorageStan Hu2018-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were several issues: 1. With Google Cloud Storage, we can't override the Content-Type with Response-Content-Type once it is set. Setting the value to `application/octet-stream` doesn't buy us anything. GCS defaults to `application/octet-stream`, and AWS uses `binary/octet-stream`. Just remove this `Content-Type` when we upload new files. 2. CarrierWave and fog-google need to support query parameters: https://github.com/fog/fog-google/pull/409/files, https://github.com/carrierwaveuploader/carrierwave/pull/2332/files. CarrierWave has been monkey-patched until an official release. 3. Workhorse also needs to remove the Content-Type header in the request (https://gitlab.com/gitlab-org/gitlab-workhorse/blob/ef80978ff89e628c8eeb66556720e30587d3deb6/internal/objectstore/object.go#L66), or we'll get a 403 error when uploading due to signed URLs not matching the headers. Upgrading to Workhorse 6.1.0 for https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/297 will make Workhorse use the headers that are used by Rails. Closes #49957
* | | | | | | | Merge branch 'ash.mckenzie/geo-git-push-ssh-proxy' into 'master'Sean McGivern2018-09-064-22/+80
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom Action support See merge request gitlab-org/gitlab-ce!21034
| * | | | | | | | Update /api/v4/allowedAsh McKenzie2018-09-062-24/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use proper HTTP codes for /api/v4/allowed response - CustomAction support
| * | | | | | | | GitAccess#check custom action supportAsh McKenzie2018-09-061-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - if #check_custom_action!(cmd) returns something, return from #check() - now returns :Gitlab::GitAccessResult::Success.new instead of true
| * | | | | | | | New GitAccessResult::Success/CustomActionAsh McKenzie2018-09-062-0/+33
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'bvl-codeowners-file-ce' into 'master'Douwe Maan2018-09-061-0/+53
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port changes for CODEOWNERS to CE See merge request gitlab-org/gitlab-ce!21309
| * | | | | | | | Port changes for CODEOWNERS to CEBob Van Landuyt2018-09-061-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ports the changes for the CODEOWNERS feature to CE: - It adds the CODEOWNERS file. - It adds the mention of the `with-codeowners` branch in TestEnv
* | | | | | | | | Enable Kubernetes RBAC for GitLab Managed Apps for existing clustersThong Kuah2018-09-069-21/+342
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'bw-commonmark-for-files' into 'master'Sean McGivern2018-09-061-4/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable CommonMark for files and wikis See merge request gitlab-org/gitlab-ce!21228
| * | | | | | | | remove guard clause and add comment on performaceBrett Walker2018-09-051-3/+7
| | | | | | | | |
View Lorry Controller Status