summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Add option to disable git archive caching in workhorseoption-disable-archive-cacheJacob Vosmaer2018-01-091-0/+7
|
* Add option to disable commit stats to commit APIFrancisco Javier López2018-01-093-3/+5
|
* Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'Douwe Maan2018-01-093-2/+103
|\ | | | | | | | | | | | | Backport authorized_keys Closes gitlab-ee#3953 See merge request gitlab-org/gitlab-ce!16014
| * Make Gitlab::CurrentSettings available when getting settingsSean McGivern2018-01-081-8/+8
| |
| * Backport authorized_keys_enabled defaults to true'Michael Kozono2018-01-081-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally from branch 'fix-authorized-keys-enabled-default-2738' via merge request https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2240 Removed background migrations which were intended to fix state after using Gitlab without a default having been set Squashed commits: Locally, if Spring was not restarted, `current_application_settings` was still cached, which prevented the migration from editing the file. This will also ensure that any app server somehow hitting old cache data will properly default this setting regardless. Retroactively fix migration This allows us to identify customers who ran the broken migration. Their `authorized_keys_enabled` column does not have a default at this point. We will fix the column after we fix the `authorized_keys` file. Fix authorized_keys file if needed Add default to authorized_keys_enabled setting Reminder: The original migration was fixed retroactively a few commits ago, so people who did not ever run GitLab 9.3.0 already have a column that defaults to true and disallows nulls. I have tested on PostgreSQL and MySQL that it is safe to run this migration regardless. Affected customers who did run 9.3.0 are the ones who need this migration to fix the authorized_keys_enabled column. The reason for the retroactive fix plus this migration is that it allows us to run a migration in between to fix the authorized_keys file only for those who ran 9.3.0. Tweaks to address feedback Extract work into background migration Move batch-add-logic to background migration Do the work synchronously to avoid multiple workers attempting to add batches of keys at the same time. Also, make the delete portion wait until after adding is done. Do read and delete work in background migration Fix Rubocop offenses Add changelog entry Inform the user of actions taken or not taken Prevent unnecessary `select`s and `remove_key`s Add logs for action taken Fix optimization Reuse `Gitlab::ShellAdapter` Guarantee the earliest key Fix migration spec for MySQL
| * Backport option to disable writing to `authorized_keys` fileMichael Kozono2018-01-081-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally branch 'mk-toggle-writing-to-auth-keys-1631' See merge request !2004 Squashed commits: Add authorized_keys_enabled to Application Settings Ensure default settings are exposed in UI Without this change, `authorized_keys_enabled` is unchecked when it is nil, even if it should be checked by default. Add “Speed up SSH operations” documentation Clarify the reasons for disabling writes Add "How to go back" section Tweak copy Update Application Setting screenshot
| * Backport authorized_keys branch 'find-key-by-fingerprint'Pablo Carranza2018-01-082-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add find key by base64 key or fingerprint to the internal API See merge request !250 Squashed changes: Add unique index to fingerprint Add new index to schema Add internal api to get ssh key by fingerprint Change API endpoint to authorized_keys Add InsecureKeyFingerprint that calculates the fingerprint without shelling out Add require for gitlab key fingerprint Remove uniqueness of fingerprint index Remove unique option from migration Fix spec style in fingerprint test Fix rubocop complain Extract insecure key fingerprint to separate file Change migration to support building index concurrently Remove those hideous tabs
* | Merge branch 'check-environment-regex-ce' into 'master'Grzegorz Bizon2018-01-091-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Backport "Fix environment scope regex" to CE Closes gitlab-ee#4308 See merge request gitlab-org/gitlab-ce!15945
| * | Merge branch 'check-environment-regex' into 'master'Grzegorz Bizon2018-01-081-1/+1
| | | | | | | | | | | | | | | | | | Fix environment scope regex See merge request gitlab-org/gitlab-ee!3641
* | | Save user ID and username in Grape API log (api_json.log)sh-store-user-in-api-logsStan Hu2018-01-083-1/+27
| | | | | | | | | | | | | | | | | | This will enable admins to identify who actually made the API request. Relates to #36960
* | | Merge branch '41683-timeout-is-not-set-for-gitaly-fetch_remote-calls' into ↵Stan Hu2018-01-082-3/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Timeout is not set for gitaly fetch_remote calls" Closes #41683 See merge request gitlab-org/gitlab-ce!16245
| * | | Pass timeout to RepositoryService.FetchRemote Gitaly RPC calls41683-timeout-is-not-set-for-gitaly-fetch_remote-callsAlejandro Rodríguez2018-01-052-3/+6
| | | |
* | | | Merge branch 'delay-background-migrations' into 'master'Rémy Coutable2018-01-082-0/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run background migrations with a minimum interval Closes #41624 See merge request gitlab-org/gitlab-ce!16230
| * | | | Run background migrations with a minimum intervaldelay-background-migrationsYorick Peterse2018-01-052-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a minimum interval to BackgroundMigrationWorker, ensuring background migrations of the same class only run once every 5 minutes. This prevents a thundering herd problem where scheduled migrations all run at once due to their delays having been expired (e.g. as the result of a queue being paused for a long time). If a job was recently executed it's rescheduled with a delay that equals the remaining time of the job's lease. This means that if the lease expires in two minutes we only need to wait two minutes, instead of five. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/41624
* | | | | Merge branch 'remove-commit-tree' into 'master'Sean McGivern2018-01-082-4/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove the Commit#tree method See merge request gitlab-org/gitlab-ce!16236
| * | | | | Remove the Commit#tree methodremove-commit-treeJacob Vosmaer2018-01-042-4/+7
| | | | | |
* | | | | | Merge branch 'gitaly-fetch-internal-remote' into 'master'Sean McGivern2018-01-082-13/+26
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate RemoteService.FetchInternalRemote Gitaly RPC Closes gitaly#857 See merge request gitlab-org/gitlab-ce!16140
| * | | | | Incorporate RemoteService.FetchInternalRemote Gitaly RPCgitaly-fetch-internal-remoteAlejandro Rodríguez2018-01-052-13/+26
| | | | | |
* | | | | | Merge branch ↵Kamil Trzciński2018-01-071-0/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled' into 'master' Resolve "Redirect to GCP page if users try to create a cluster but the account is not enabled" Closes #39957 and #41410 See merge request gitlab-org/gitlab-ce!15665
| * \ \ \ \ \ Merge branch 'master' into ↵Matija Čupić2018-01-062-0/+48
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * \ \ \ \ \ \ Merge branch 'master' into ↵Matija Čupić2018-01-0526-208/+398
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * | | | | | | Merge branch 'master' into ↵Matija Čupić2018-01-0552-476/+1331
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * \ \ \ \ \ \ \ Merge branch 'master' into ↵Matija Čupić2017-12-2159-233/+828
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * | | | | | | | | Inluce projects namespace when checking billingMatija Čupić2017-12-161-1/+1
| | | | | | | | | |
| * | | | | | | | | Add Google Cloud client project billing infoMatija Čupić2017-12-161-0/+8
| | | | | | | | | |
| * | | | | | | | | Add Google Cloud client project listMatija Čupić2017-12-151-0/+10
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix/gb/fix-import-export-restoring-associations' into 'master'Kamil Trzciński2018-01-073-8/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix restoring associations with import/export Closes #41646 See merge request gitlab-org/gitlab-ce!16221
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix/gb/fix-import-export-restoring-associationsGrzegorz Bizon2018-01-0636-310/+791
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | * master: (114 commits)
| * | | | | | | | | | Bump import/export version to 2.2.0Grzegorz Bizon2018-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to bump import/export version because we introduced a new object's hierarchy that is not backwards compatible.
| * | | | | | | | | | Assign stage and pipeline to a status when importingGrzegorz Bizon2018-01-052-7/+15
| | | | | | | | | | |
* | | | | | | | | | | Fix error 500 when viewing commit and merge request diffsStan Hu2018-01-071-1/+1
| |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the refactoring in !16082, `Blob#batch` no longer falls back to a default `blob_size_limit`. Since `Repository#batch_blobs` was using a default `nil` value, this would cause issues in the `Blob#find_by_rugged` method. This fix here is to be consistent and use a non-nil default value in `Repository#batch_blobs`. The problem was masked in development and tests because Gitaly is always enabled by default for all features. Closes #41735
* | | | | | | | | | Move git operations for multi_action into Gitlab::GitAlejandro Rodríguez2018-01-052-0/+48
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'dm-copy-mermaid-as-gfm' into 'master'Jacob Schatz2018-01-051-10/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy Mermaid graphs as GFM Closes #41211 See merge request gitlab-org/gitlab-ce!16046
| * | | | | | | | | Copy Mermaid graphs as GFMdm-copy-mermaid-as-gfmDouwe Maan2018-01-051-10/+1
| | | | | | | | | |
* | | | | | | | | | Use --left-right and --max-count for counting diverging commitsLin Jen-Shin (godfat)2018-01-051-7/+68
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | API: get participants from merge_requests & issuesBrent Greeff2018-01-052-0/+23
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch 'api-domains-expose-project_id' into 'master'Dmitriy Zaporozhets2018-01-051-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose project_id on /api/v4/pages/domains See merge request gitlab-org/gitlab-ce!16200
| * | | | | | | | Expose project_id on /api/v4/pages/domainsLuc Didry2018-01-031-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'ban-disk-import' into 'master'Sean McGivern2018-01-053-1/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use Gitlab::Shell#import_repository on local paths See merge request gitlab-org/gitlab-ce!16228
| * | | | | | | | | rubocopban-disk-importJacob Vosmaer2018-01-041-1/+1
| | | | | | | | | |
| * | | | | | | | | Hide hooks stuffJacob Vosmaer2018-01-042-3/+2
| | | | | | | | | |
| * | | | | | | | | get it workingJacob Vosmaer2018-01-043-1/+11
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'backport-issue_3413' into 'master'Sean McGivern2018-01-057-60/+101
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [EE-backport] Add group boards API endpoint See merge request gitlab-org/gitlab-ce!16194
| * | | | | | | | | EE-BACKPORT group boardsFelipe Artur2018-01-047-60/+101
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Allow local tests to use a modified GitalyJacob Vosmaer (GitLab)2018-01-052-55/+63
| | | | | | | | |
* | | | | | | | | Merge branch '40228-verify-integrity-of-repositories' into 'master'Sean McGivern2018-01-053-40/+38
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Verify integrity of repositories" Closes #40228 See merge request gitlab-org/gitlab-ce!15931
| * | | | | | | | | refactor spec, add docsJames Lopez2018-01-041-0/+1
| | | | | | | | | |
| * | | | | | | | | deprecate check integrity taskJames Lopez2018-01-041-39/+2
| | | | | | | | | |
| * | | | | | | | | add locks chekJames Lopez2018-01-041-1/+25
| | | | | | | | | |
| * | | | | | | | | remove max-depth flag so it works with subgroupsJames Lopez2018-01-041-1/+1
| | | | | | | | | |