summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Refactor matchers for background migrationsce-backport=reorder-issuesJarka Kadlecová2018-01-0510-54/+32
|
* Merge branch ↵Stan Hu2018-01-051-0/+18
|\ | | | | | | | | | | | | | | | | '41677-branch-name-omitted-due-to-bad-utf-8-conversion-by-gitaly-ref-handler' into 'master' Resolve "Branch name omitted due to bad UTF-8 conversion by Gitaly ref handler" Closes #41677 See merge request gitlab-org/gitlab-ce!16243
| * Fix a bug where charlock_holmes was used needlessly to encode strings41677-branch-name-omitted-due-to-bad-utf-8-conversion-by-gitaly-ref-handlerAlejandro Rodríguez2018-01-041-0/+18
| |
* | Create Kubernetes based on Application TemplatesMayra Cabrera2018-01-044-20/+82
|/
* Added multi editor setting on the profile preferences pageJose Ivan Vargas2018-01-043-1/+19
|
* Merge branch 'mdelaossa/gitlab-ce-31995-project-limit-default-fix'Dmitriy Zaporozhets2018-01-041-0/+17
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * User#projects_limit remove DB default and added NOT NULL constraintMario de la Ossa2017-12-301-0/+17
| | | | | | | | | | | | | | | | This change is required because otherwise if a user is created with a value for `projects_limit` that matches the DB default, it gets overwritten by `current_application_settings.default_projects_limit`. By removing the default we once again can allow a user to be created with a limit of 10 projects without the risk that it'll change to 10000
* | Merge branch 'conditionally-eager-load-event-target-authors' into 'master'Douwe Maan2018-01-042-0/+23
|\ \ | | | | | | | | | | | | | | | | | | Eager load event target authors whenever possible Closes #41618 See merge request gitlab-org/gitlab-ce!16199
| * | Eager load event target authors whenever possibleconditionally-eager-load-event-target-authorsYorick Peterse2018-01-042-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the "author" association of an event's "target" association is eager loaded whenever the "target" association defines an "author" association. This in turn solves the N+1 query problem we first tried to solve in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788 but caused problems when displaying milestones as those don't define an "author" association. The approach in this commit does mean that the authors are _always_ eager loaded since this takes place in the "belongs_to" block. This however shouldn't pose too much of a problem, and as far as I can tell there's no real way around this unfortunately.
* | | Merge branch ↵Douwe Maan2018-01-041-0/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclass' into 'master' Resolve "Error 500 trying to view a merge request JSON: undefined method `binary?' for nil:NilClass" Closes #41468 See merge request gitlab-org/gitlab-ce!16193
| * | | Fix error when viewing diffs without blobs41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclassSean McGivern2018-01-041-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old merge requests can have diffs without corresponding blobs. (This also may be possible for commit diffs in corrupt repositories.) We can't use the `&.` operator on the blobs, because the blob objects are never nil, but `BatchLoader` instances that delegate to `Blob`. We can't use `Object#try`, because `Blob` doesn't inherit from `Object`. `BatchLoader` provides a `__sync` method that returns the delegated object, but using `itself` also works because it's forwarded, and will work for non-`BatchLoader` instances too. So the simplest solution is to just use that with the `&.` operator.
* | | | Merge branch '3377-use-artifacts-tests-from-ee' into 'master'Rémy Coutable2018-01-041-13/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Unify CE and EE tests in spec/controllers/projects/artifacts_controller_spec.rb Closes gitlab-ee#3377 See merge request gitlab-org/gitlab-ce!16133
| * | | | Just use the tests from EE3377-use-artifacts-tests-from-eeLin Jen-Shin2017-12-261-13/+34
| | | | |
* | | | | Merge branch 'ce-gitaly-remote-mirror-prep' into 'master'Dmitriy Zaporozhets2018-01-042-58/+107
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [CE] Move git operations for UpdateRemoteMirrorService into Gitlab::Git See merge request gitlab-org/gitlab-ce!16023
| * | | | | Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::RepositoryAlejandro Rodríguez2018-01-032-28/+69
| | | | | |
| * | | | | Move push_remote_branches from Gitlab::Shell to Gitlab::Git::RepositoryAlejandro Rodríguez2018-01-032-30/+38
| | | | | |
* | | | | | Merge branch 'mk-no-op-delete-conflicting-redirects' into 'master'Douwe Maan2018-01-042-28/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent excessive DB load due to faulty DeleteConflictingRedirectRoutes background migration See merge request gitlab-org/gitlab-ce!16205
| * | | | | | Make DeleteConflictingRedirectRoutes no-opmk-no-op-delete-conflicting-redirectsMichael Kozono2018-01-032-28/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Both the post-deploy and background migration.
* | | | | | | Merge branch '40533-groups-tree-updates' into 'master'Filipa Lacerda2018-01-046-63/+121
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Groups tree enhancements Closes #40533 See merge request gitlab-org/gitlab-ce!15980
| * | | | | | | Update test to remove carent icon checkKushal Pandya2018-01-021-8/+0
| | | | | | | |
| * | | | | | | Update selector to test SVG icon nameKushal Pandya2017-12-281-7/+3
| | | | | | | |
| * | | | | | | Update selector to test SVG icon name, cleanup testsKushal Pandya2017-12-262-45/+18
| | | | | | | |
| * | | | | | | Update icon names, add `updated_at` prop to mock objectsKushal Pandya2017-12-261-3/+19
| | | | | | | |
| * | | | | | | ItemStatsValue ComponentKushal Pandya2017-12-261-0/+81
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'sh-validate-path-project-import' into 'master'Yorick Peterse2018-01-041-2/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid leaving a push event empty if payload cannot be created See merge request gitlab-org/gitlab-ce!16214
| * | | | | | | Avoid leaving a push event empty if payload cannot be createdsh-validate-path-project-importStan Hu2018-01-031-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the payload cannot be created for some reason, we could be left with a nil push event payload, which causes Error 500s when viewing the dashboard. Guard against this error and log when it happens. Avoids problems seen in #38823
* | | | | | | | Merge branch 'gitaly-merge-nil' into 'master'Sean McGivern2018-01-041-0/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle Gitaly aborted merge due to branch update Closes gitaly#854 See merge request gitlab-org/gitlab-ce!16116
| * | | | | | | | Better Englishgitaly-merge-nilJacob Vosmaer2018-01-031-1/+1
| | | | | | | | |
| * | | | | | | | Handle Gitaly aborted merge due to branch updateJacob Vosmaer2018-01-031-0/+14
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'feature/add-max-count-to-count-commits-rpc' into 'master'Rémy Coutable2018-01-041-3/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for max_count option to Git::Repository#count_commits See merge request gitlab-org/gitlab-ce!16145
| * | | | | | | | Add support for max_count option to Git::Repository#count_commitsfeature/add-max-count-to-count-commits-rpcAhmad Sherif2017-12-271-3/+11
| | | | | | | | |
* | | | | | | | | Merge branch 'change-issues-closed-at-background-migration' into 'master'Sean McGivern2018-01-041-1/+90
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a background migration for migrating issues.closed_at See merge request gitlab-org/gitlab-ce!16083
| * | | | | | | | | Use a background migration for issues.closed_atchange-issues-closed-at-background-migrationYorick Peterse2018-01-031-1/+90
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a previous attempt (rolled back in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16021) we tried to migrate `issues.closed_at` from timestamp to timestamptz using a regular migration. This has a bad impact on GitLab.com and as such was rolled back. This commit re-implements the original migrations using generic background migrations, allowing us to still migrate the data in a single release but without a negative impact on availability. To ensure the database schema is up to date the background migrations are performed inline in development and test environments. We also make sure to not migrate that that doesn't need migrating in the first place or has already been migrated.
* | | | | | | | | Merge branch 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern2018-01-0422-43/+423
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve closed/merged events queries performance on Projects::MergeRequestsController#show.json See merge request gitlab-org/gitlab-ce!15642
| * | | | | | | | | Fixes spec failures due to not returning metrics for MRs other than ↵Oswaldo Ferreira2018-01-022-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closed/merged
| * | | | | | | | | Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-0222-43/+420
| | | | | | | | | |
* | | | | | | | | | Merge branch '41054-disable-creation-of-new-kubernetes-integrations' into ↵Kamil Trzciński2018-01-048-4/+174
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' 41054-Disallow creation of new Kubernetes integrations Closes #41054 See merge request gitlab-org/gitlab-ce!16017
| * | | | | | | | | | 41054-Disallow creation of new Kubernetes integrationsMayra Cabrera2018-01-048-4/+174
| | | | | | | | | | |
* | | | | | | | | | | Resolve "Resizable file list and commit panel"Tim Zallmann2018-01-041-0/+59
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'use-heredoc-for-keys' into 'master'Grzegorz Bizon2018-01-041-27/+36
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use heredoc for long strings so it's easier to read See merge request gitlab-org/gitlab-ce!16179
| * | | | | | | | | | Use heredoc for long strings so it's easier to readuse-heredoc-for-keysLin Jen-Shin2018-01-031-27/+36
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch ↵Grzegorz Bizon2018-01-041-4/+26
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'rd-api-request-to-edit-wiki-page-fails-when-project-belongs-to-group' into 'master' Fix API endpoints to edit wiki pages where project belongs to a group Closes #40453 See merge request gitlab-org/gitlab-ce!16170
| * | | | | | | | | Fix API endpoints to edit wiki pages where project belongs to a grouprd-api-request-to-edit-wiki-page-fails-when-project-belongs-to-groupRubén Dávila2018-01-031-4/+26
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases is prefered to manually create a ProjectWiki over using Project#wiki. This is because Project#wiki always uses the #owner (which is a User sometimes) as the author of the wiki changes but sometimes the owner is a Group and it doesn't respond to #username
* | | | | | | | | fix issue #37843Danny2018-01-031-0/+4
| | | | | | | | |
* | | | | | | | | Merge branch 'da-handle-hashed-storage-repos-using-repo-import-task' into ↵Robert Speicher2018-01-039-49/+192
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Handle GitLab hashed storage repositories using the repo import task Closes #39870 See merge request gitlab-org/gitlab-ce!16027
| * | | | | | | | Refactoring Gitlab::BareRepositoryImport::RepositoryDouglas Barbosa Alexandre2018-01-031-6/+6
| | | | | | | | |
| * | | | | | | | Remove unused variable from bare repository importer specDouglas Barbosa Alexandre2018-01-031-1/+0
| | | | | | | | |
| * | | | | | | | Refactoring spec for Gitlab::BareRepositoryImport::RepositoryDouglas Barbosa Alexandre2018-01-031-6/+11
| | | | | | | | |
| * | | | | | | | Fix Repository#processable? to allow .git repos in the root folderDouglas Barbosa Alexandre2018-01-031-2/+8
| | | | | | | | |
| * | | | | | | | Add spec for Project#write_repository_configDouglas Barbosa Alexandre2018-01-031-0/+22
| | | | | | | | |
View Lorry Controller Status