summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into support-gitaly-tlsAhmad Hassan2018-11-15321-502/+1925
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Add more specsAhmad Hassan2018-10-311-5/+1
| | | | | | | | | | |
| | * | | | | | | | | Support tls communication in gitalyAhmad Hassan2018-10-301-4/+17
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'security-import-symlink' into 'master'John Jarvis2018-12-211-3/+5
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Persistent Symlink in Project Import See merge request gitlab/gitlabhq!2673
| | * | | | | | | | | Fix persistent symlink in project importJames Lopez2018-12-171-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix permissions after untar is done - Refactor command line util
| * | | | | | | | | | Merge branch 'ce-8333-add-related-epics-support' into 'master'Dmitriy Zaporozhets2018-12-203-26/+30
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port: Rename GroupHierarchy into ObjectHierarchy See merge request gitlab-org/gitlab-ce!23923
| | * | | | | | | | | | Rename GroupHierarchy into ObjectHierarchyJarka Košanová2018-12-193-26/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - we now use the hierarchy class also for epics - also rename supports_nested_groups? into supports_nested_objects? - move it to a concern
| * | | | | | | | | | | Prevent admins from attempting hashed storage migration on read only DBMichael Kozono2018-12-191-2/+8
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch ↵Stan Hu2018-12-191-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '54953-fix-commit_email_hostname-accessor-in-fake_application_settings' into 'master' Add FakeApplicationSettings#commit_email_hostname Closes #54953 See merge request gitlab-org/gitlab-ce!23939
| | * | | | | | | | | | | Add FakeApplicationSettings#commit_email_hostnameRémy Coutable2018-12-191-0/+4
| | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | Port Gitlab::JsonCache to CEDouglas Barbosa Alexandre2018-12-191-0/+87
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'zj-pool-destruction' into 'master'Kamil Trzciński2018-12-192-2/+5
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leave object pools when destroying projects Closes gitaly#1415 See merge request gitlab-org/gitlab-ce!23869
| | * | | | | | | | | Leave object pools when destroying projectsZeger-Jan van de Weg2018-12-192-2/+5
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This action doesn't lean on reduplication, so a short call can me made to the Gitaly server to have the object pool remove its remote to the project pending deletion. https://gitlab.com/gitlab-org/gitaly/blob/f6cd55357/internal/git/objectpool/link.go#L58 When an object pool doesn't have members, this would invalidate the need for a pool. So when a project leaves the pool, the pool will be destroyed on the background. Fixes: https://gitlab.com/gitlab-org/gitaly/issues/1415
* | | | | | | | | | Method `create_from_defaults` will never give nilLin Jen-Shin2018-12-191-2/+1
| | | | | | | | | |
* | | | | | | | | | Move schema aware defaults to build_from_defaultsLin Jen-Shin2018-12-191-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way we can reuse the safe setting
* | | | | | | | | | Return fake if and only if there's no databaseLin Jen-Shin2018-12-191-21/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because `connect_to_db?` already detects if the table exists or not
* | | | | | | | | | Return an ApplicationSetting in CurrentSettingsRémy Coutable2018-12-191-1/+9
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the use of fake_application_settings with `::ApplicationSetting.build`_from_defaults. The reason is that `fake_application_settings` doesn't have the custom accessors that `ApplicationSetting` has, e.g. `#commit_email_hostname`, thus this can lead to unexpected `nil` values which comes from the database column instead of `.default_commit_email_hostname` returned by `ApplicationSetting#commit_email_hostname`. Using `::ApplicationSetting.build_from_defaults` should be safe as it doesn't try to `INSERT` a DB record, in contrary to `::ApplicationSetting.create_from_defaults` which we used to use, and which created issues that the introduction of `fake_application_settings` tried to resolve (575dced5). Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Backfill project_repositories for legacy storage projectsDouglas Barbosa Alexandre2018-12-183-123/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a background migration that will ensure all projects that are on legacy storage have a row in `project_repositories`.
* | | | | | | | | Merge branch 'osw-revert-suggestions-ff' into 'master'Douwe Maan2018-12-181-1/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove feature flag for suggest changes feature See merge request gitlab-org/gitlab-ce!23892
| * | | | | | | | | Remove feature flag for suggest changes featureOswaldo Ferreira2018-12-181-1/+0
| | | | | | | | | |
* | | | | | | | | | Merge branch 'zj-upgrade-gitaly-version' into 'master'Douwe Maan2018-12-181-7/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to 1.9.0 See merge request gitlab-org/gitlab-ce!23865
| * | | | | | | | | Upgrade Gitaly to 1.9.0Zeger-Jan van de Weg2018-12-171-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This upgrade moves logic from gitlab-rails to Gitaly, which allowed code removal too.
* | | | | | | | | | Merge branch 'bvl-hide-confidential-events-take2' into 'master'Sean McGivern2018-12-181-30/+12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide confidential events in ruby Closes #51791 See merge request gitlab-org/gitlab-ce!23746
| * | | | | | | | | | Hide confidential events in rubyBob Van Landuyt2018-12-171-30/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're filtering the events using `Event#visible_to_user?`. At most we're loading 100 events at once. Pagination is also dealt with in the finder, but the resulting array is wrapped in a `Kaminari.paginate_array` so the API's pagination helpers keep working. We're passing the total count into that paginatable array, which would include confidential events. But we're not disclosing anything.
* | | | | | | | | | | Add "none" syntax highlighting "color" schemekhm2018-12-181-1/+2
| | | | | | | | | | |
* | | | | | | | | | | Change SafeRequestStore#write to accept an options hashDouglas Barbosa Alexandre2018-12-171-0/+8
| |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change the write to accept an options hash to make it compatible with ActiveSupport::Cache::Store#write method. The options hash are not passed to the underlying cache implementation because RequestStore#write accepts only a key, and value params.
* | | | | | | | | | Merge branch 'revert-1cccfca1' into 'master'Grzegorz Bizon2018-12-171-16/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'auto_devops_kubernetes_active' into 'master'" See merge request gitlab-org/gitlab-ce!23826
| * | | | | | | | | Revert "Merge branch 'auto_devops_kubernetes_active' into 'master'"Thong Kuah2018-12-171-16/+10
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22929
* | | | | | | | | Merge branch '55230-remove-project-cleanup-feature-flag' into 'master'Douwe Maan2018-12-171-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the project_cleanup feature flag Closes #55230 See merge request gitlab-org/gitlab-ce!23814
| * | | | | | | | | Fix repository cleanup with object storage onNick Thomas2018-12-151-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the BFG object map file is in object storage (i.e., uploads in general are placed into object storage), we get an instance of the Gitlab::HttpIO class. This doesn't behave as expected when you try to read past EOF, so we need to explicitly check for this condition to avoid ending up in a tight loop around io.read
* | | | | | | | | Merge branch ↵Yorick Peterse2018-12-172-21/+104
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '55433-un-revert-https-gitlab-com-gitlab-org-gitlab-ce-commit-00acef434031b5dc0bf39576a9e83802c7806842-revert' into 'master' Resolve "Un-revert https://gitlab.com/gitlab-org/gitlab-ce/commit/00acef434031b5dc0bf39576a9e83802c7806842 revert" Closes #55433 See merge request gitlab-org/gitlab-ce!23861
| * | | | | | | | Revert "Revert "LfsToken uses JSONWebToken::HMACToken by default""Ash McKenzie2018-12-172-21/+104
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 00acef434031b5dc0bf39576a9e83802c7806842.
* | | | | | | | Remove rails4 specific codeJasper Maes2018-12-1612-109/+23
|/ / / / / / /
* | | | | | | Merge branch '54786-mr-empty-file-display' into 'master'Nick Thomas2018-12-151-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display empty files properly on MR diffs Closes #54786 See merge request gitlab-org/gitlab-ce!23671
| * | | | | | | Display empty files properly on MR diffsSean Nichols2018-12-111-0/+4
| | | | | | | |
* | | | | | | | Merge branch 'rs-transient-help-page-failure' into 'master'Stan Hu2018-12-151-3/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve transient failure in Help page spec Closes #55372 See merge request gitlab-org/gitlab-ce!23839
| * | | | | | | | Use class methods for VersionCheckRobert Speicher2018-12-141-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All of these methods are stateless, there was no point to have them as instance methods. Mostly this allows us to remove an `allow_any_instance_of` usage.
* | | | | | | | | Remove rails 4 support in CI, Gemfiles, bin/ and config/Jasper Maes2018-12-141-16/+0
|/ / / / / / / /
* | | | | | | | Merge branch 'remove-issue-suggestions-flag' into 'master'Douwe Maan2018-12-142-4/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove issue_suggestions feature flag Closes #55166 See merge request gitlab-org/gitlab-ce!23723
| * | | | | | | | Pass on arguments passed to the FeatureConstrainerBob Van Landuyt2018-12-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All arguments passed to the `FeatureConstrainer` will be passed on to the `Feature.enabled?` check.
| * | | | | | | | Enable GraphQL API endpointPhil Hughes2018-12-132-4/+8
| | | | | | | | |
* | | | | | | | | Merge branch 'ac-releases-name-sha-author' into 'master'Kamil Trzciński2018-12-141-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add name, author and sha to releases See merge request gitlab-org/gitlab-ce!23763
| * | | | | | | | | Add name, author and sha to releasesAlessio Caiazza2018-12-131-1/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a name to each release, defaulting it to tag name, keeps track of the SHA when a new release is created and tracks the current user as release author.
* | | | | | | | | Fix deprecation: Passing ActiveRecord::Base objects to ↵Jasper Maes2018-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sanitize_sql_hash_for_assignment
* | | | | | | | | Allow suggesting single line changes in diffsOswaldo Ferreira2018-12-1311-2/+103
| | | | | | | | |
* | | | | | | | | Merge branch 'zj-backup-restore-object-pools' into 'master'Douwe Maan2018-12-131-1/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore Object Pools when restoring an object pool Closes gitaly#1355 See merge request gitlab-org/gitlab-ce!23682
| * | | | | | | | | Restore Object Pools when restoring an object poolZeger-Jan van de Weg2018-12-131-1/+15
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pool repositories are persisted in the database, and when the DB is restored, the data need to be restored on disk. This is done by resetting the state machine and rescheduling the object pool creation. This is not an exact replica of the state like at the time of the creation of the backup. However, the data is consistent again. Dumping isn't required as internally GitLab uses git bundles which bundle all refs and include all objects in the bundle that they require, reduplicating as more repositories get backed up. This does require more data to be stored. Fixes https://gitlab.com/gitlab-org/gitaly/issues/1355
* | | | | | | | | Re-define default only except policyKamil Trzciński2018-12-134-50/+15
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'feature/gb/ci-pipeline-bridge' into 'master'Kamil Trzciński2018-12-122-0/+42
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Add basic implementation of CI/CD bridge job See merge request gitlab-org/gitlab-ce!23730
| * | | | | | | Add basic implementation of CI/CD bridge jobGrzegorz Bizon2018-12-122-0/+42
| | | | | | | |