summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Fix hooks not being set up properly for bare import Rake tasksh-fix-bare-import-hooksStan Hu2018-01-092-2/+28
| | | | Closes #41739
* Revert "Fix Route validation for unchanged path"Michael Kozono2018-01-091-60/+0
| | | | This reverts commit 8040edcce8b4e736b4f4857e6709f94aeb5e274c.
* Revert "Add test for permanent redirects of descendants"Michael Kozono2018-01-091-14/+0
| | | | This reverts commit a2cb92495c3149b69eb734596e80fbdd54b0b2dc.
* Add test for permanent redirects of descendantsMichael Kozono2018-01-091-0/+14
|
* Fix Route validation for unchanged pathMichael Kozono2018-01-091-0/+60
|
* Fixing bug related to wiki last versionFrancisco Javier López2018-01-091-0/+62
|
* Merge branch 'changes-dropdown-ellipsis' into 'master'Sean McGivern2018-01-091-0/+10
|\ | | | | | | | | | | | | Fix changes dropdown ellipsis working across browsers Closes #41561 and #41684 See merge request gitlab-org/gitlab-ce!16281
| * Fix changes dropdown ellipsis working across browserschanges-dropdown-ellipsisPhil Hughes2018-01-091-0/+10
| | | | | | | | Closes #41561
* | Add option to disable commit stats to commit APIFrancisco Javier López2018-01-092-0/+52
| |
* | Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'Douwe Maan2018-01-094-11/+391
|\ \ | | | | | | | | | | | | | | | | | | Backport authorized_keys Closes gitlab-ee#3953 See merge request gitlab-org/gitlab-ce!16014
| * | Fix spec in shell_spec.rbJames Edwards-Jones2018-01-081-1/+1
| | | | | | | | | | | | | | | The spec for "#add_key does nothing" would always have passed, since the expectation was on both the wrong object and message.
| * | Fix typo in spec/requests/api/internal_spec.rbJames Edwards-Jones2018-01-081-1/+1
| | |
| * | Backport spec fixes in spec/lib/gitlab/shell_spec.rbValery Sizov2018-01-081-10/+12
| | |
| * | Backport authorized_keys_enabled defaults to true'Michael Kozono2018-01-082-0/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-11/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Fixing re-ordering of an issue when dragging it to the bottom a long issue ↵David Kuri2018-01-091-0/+12
| | | | | | | | | | | | list in the board
* | | Merge branch 'check-environment-regex-ce' into 'master'Grzegorz Bizon2018-01-091-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport "Fix environment scope regex" to CE Closes gitlab-ee#4308 See merge request gitlab-org/gitlab-ce!15945
| * | | Add speccheck-environment-regex-ceShinya Maeda2018-01-081-1/+2
| | | |
* | | | Save user ID and username in Grape API log (api_json.log)sh-store-user-in-api-logsStan Hu2018-01-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | This will enable admins to identify who actually made the API request. Relates to #36960
* | | | Improve table pagination specClement Ho2018-01-091-1/+1
| | | |
* | | | Merge branch '41683-timeout-is-not-set-for-gitaly-fetch_remote-calls' into ↵Stan Hu2018-01-081-2/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-051-2/+18
| | | | |
* | | | | Refactor dashboard todos inside dispatcherClement Ho2018-01-081-1/+1
| | | | |
* | | | | Merge branch 'winh-fix-merge-request-spec' into 'master'Clement Ho2018-01-081-4/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make tasklist:changed test in merge_request_spec.js async Closes #34649 See merge request gitlab-org/gitlab-ce!16097
| * | | | | Make tasklist:changed test in merge_request_spec.js asyncwinh-fix-merge-request-specWinnie Hellmann2018-01-081-4/+11
| | | | | |
* | | | | | Merge branch '28260-fix-pages-custom-domain-url' into 'master'Grzegorz Bizon2018-01-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Fix wrong output protocol pattern when adding custom domain to Pages" Closes #28260 See merge request gitlab-org/gitlab-ce!16279
| * | | | | | Generate HTTP URLs for custom Pages domains when appropriateNick Thomas2018-01-081-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch ↵Yorick Peterse2018-01-081-0/+312
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40418-migrate-existing-data-from-kubernetesservice-to-clusters-platforms-kubernetes' into 'master' Migrate existing data from KubernetesService to Clusters::Platforms::Kubernetes Closes #40418 See merge request gitlab-org/gitlab-ce!15589
| * | | | | | Fix static analysysShinya Maeda2018-01-081-9/+9
| | | | | | |
| * | | | | | Disable STI of ActiveRecord. Refactoring specs.Shinya Maeda2018-01-081-64/+164
| | | | | | |
| * | | | | | Revert bulk_insert and bring back AR insert(one by one)Shinya Maeda2018-01-081-12/+28
| | | | | | |
| * | | | | | Add a new test for emptified paramsShinya Maeda2018-01-081-2/+19
| | | | | | |
| * | | | | | Fix static anylysyShinya Maeda2018-01-081-7/+7
| | | | | | |
| * | | | | | Opitmize migration process by using both unmanaged_kubernetes_service and ↵Shinya Maeda2018-01-081-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | kubernetes_service_without_template
| * | | | | | Add logic to swtich environment_scope by the situationShinya Maeda2018-01-081-10/+40
| | | | | | |
| * | | | | | Add env_scope testsShinya Maeda2018-01-081-0/+32
| | | | | | |
| * | | | | | Fix testShinya Maeda2018-01-081-187/+52
| | | | | | |
| * | | | | | Restructure specShinya Maeda2018-01-081-160/+229
| | | | | | |
| * | | | | | Add test. Disable KubernetesService when migratedShinya Maeda2018-01-081-0/+189
| |/ / / / /
* | | | | | Merge branch 'delay-background-migrations' into 'master'Rémy Coutable2018-01-084-10/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-054-10/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '40549-render-emoj-in-groups-overview' into 'master'Sean McGivern2018-01-082-1/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "No Rendering of emoji's in Group-Overview after update" Closes #40549 See merge request gitlab-org/gitlab-ce!16098
| * | | | | | | Rendering of emoji's in Group-OverviewJacopo2017-12-242-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows rendering of emoji's in the Group Overview.
* | | | | | | | Merge branch 'remove-commit-tree' into 'master'Sean McGivern2018-01-083-4/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Remove the Commit#tree method See merge request gitlab-org/gitlab-ce!16236
| * | | | | | | Remove the Commit#tree methodremove-commit-treeJacob Vosmaer2018-01-043-4/+2
| | | | | | | |
* | | | | | | | Merge branch 'gitaly-fetch-internal-remote' into 'master'Sean McGivern2018-01-082-16/+39
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-16/+39
| | | | | | | | |
* | | | | | | | | Merge branch 'mb-invites-feature-to-rspec' into 'master'Rémy Coutable2018-01-081-0/+97
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move invites spinach test to Rspec See merge request gitlab-org/gitlab-ce!16126
| * | | | | | | | | Move invites spinach test to RspecSemyon Pupkov2017-12-251-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
View Lorry Controller Status